summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrion Vibber <brion@pobox.com>2010-04-30 13:15:53 -0700
committerBrion Vibber <brion@pobox.com>2010-04-30 13:16:13 -0700
commitcae1329f3bca1f5f1fbfdb1d96b38cbb790fbe00 (patch)
tree21ae74d08b6496c7d7fafbe95a9b147a9ac56cc0
parent5c05cd2b1a93d360bde7cb7dfc9ba39e5a5a7624 (diff)
parentf8883367184e4fd31dc819d5e1257d0eee11eb10 (diff)
Merge branch '0.9.x' into 1.0.x
Conflicts: lib/util.php
-rw-r--r--README55
-rw-r--r--actions/apistatusesupdate.php91
-rw-r--r--actions/apitimelinefriends.php97
-rw-r--r--actions/apitimelinepublic.php89
-rw-r--r--actions/login.php10
-rwxr-xr-x[-rw-r--r--]avatar/.gitignore0
-rw-r--r--classes/Notice.php46
-rw-r--r--classes/Reply.php14
-rw-r--r--doc-src/sms2
-rw-r--r--index.php2
-rw-r--r--lib/action.php2
-rw-r--r--lib/activity.php14
-rw-r--r--lib/activityutils.php12
-rw-r--r--lib/apiaction.php61
-rw-r--r--lib/apiauth.php18
-rw-r--r--lib/common.php4
-rw-r--r--lib/distribqueuehandler.php17
-rw-r--r--lib/installer.php14
-rw-r--r--lib/mail.php4
-rw-r--r--lib/plugin.php1
-rw-r--r--lib/util.php35
-rw-r--r--locale/af/LC_MESSAGES/statusnet.po70
-rw-r--r--locale/ar/LC_MESSAGES/statusnet.po146
-rw-r--r--locale/arz/LC_MESSAGES/statusnet.po70
-rw-r--r--locale/bg/LC_MESSAGES/statusnet.po129
-rw-r--r--locale/br/LC_MESSAGES/statusnet.po410
-rw-r--r--locale/ca/LC_MESSAGES/statusnet.po405
-rw-r--r--locale/cs/LC_MESSAGES/statusnet.po70
-rw-r--r--locale/de/LC_MESSAGES/statusnet.po267
-rw-r--r--locale/el/LC_MESSAGES/statusnet.po70
-rw-r--r--locale/en_GB/LC_MESSAGES/statusnet.po326
-rw-r--r--locale/es/LC_MESSAGES/statusnet.po78
-rw-r--r--locale/fa/LC_MESSAGES/statusnet.po72
-rw-r--r--locale/fi/LC_MESSAGES/statusnet.po70
-rw-r--r--locale/fr/LC_MESSAGES/statusnet.po83
-rw-r--r--locale/ga/LC_MESSAGES/statusnet.po70
-rw-r--r--locale/gl/LC_MESSAGES/statusnet.po1506
-rw-r--r--locale/he/LC_MESSAGES/statusnet.po70
-rw-r--r--locale/hsb/LC_MESSAGES/statusnet.po221
-rw-r--r--locale/ia/LC_MESSAGES/statusnet.po270
-rw-r--r--locale/is/LC_MESSAGES/statusnet.po70
-rw-r--r--locale/it/LC_MESSAGES/statusnet.po155
-rw-r--r--locale/ja/LC_MESSAGES/statusnet.po72
-rw-r--r--locale/ko/LC_MESSAGES/statusnet.po77
-rw-r--r--locale/mk/LC_MESSAGES/statusnet.po74
-rw-r--r--locale/nb/LC_MESSAGES/statusnet.po731
-rw-r--r--locale/nl/LC_MESSAGES/statusnet.po75
-rw-r--r--locale/nn/LC_MESSAGES/statusnet.po76
-rw-r--r--locale/pl/LC_MESSAGES/statusnet.po77
-rw-r--r--locale/pt/LC_MESSAGES/statusnet.po788
-rw-r--r--locale/pt_BR/LC_MESSAGES/statusnet.po116
-rw-r--r--locale/ru/LC_MESSAGES/statusnet.po79
-rw-r--r--locale/statusnet.pot65
-rw-r--r--locale/sv/LC_MESSAGES/statusnet.po77
-rw-r--r--locale/te/LC_MESSAGES/statusnet.po186
-rw-r--r--locale/tr/LC_MESSAGES/statusnet.po70
-rw-r--r--locale/uk/LC_MESSAGES/statusnet.po77
-rw-r--r--locale/vi/LC_MESSAGES/statusnet.po72
-rw-r--r--locale/zh_CN/LC_MESSAGES/statusnet.po91
-rw-r--r--locale/zh_TW/LC_MESSAGES/statusnet.po70
-rw-r--r--plugins/Autocomplete/AutocompletePlugin.php12
-rw-r--r--plugins/Blacklist/BlacklistPlugin.php4
-rw-r--r--plugins/Blacklist/Homepage_blacklist.php4
-rw-r--r--plugins/Blacklist/Nickname_blacklist.php4
-rw-r--r--plugins/Blacklist/blacklistadminpanel.php29
-rw-r--r--plugins/ClientSideShorten/ClientSideShortenPlugin.php79
-rw-r--r--plugins/ClientSideShorten/README6
-rw-r--r--plugins/ClientSideShorten/shorten.js66
-rw-r--r--plugins/ClientSideShorten/shorten.php68
-rw-r--r--plugins/OStatus/actions/ostatussub.php14
-rw-r--r--plugins/OStatus/classes/Ostatus_profile.php28
-rw-r--r--plugins/OStatus/scripts/resub-feed.php74
-rw-r--r--plugins/OStatus/scripts/update-profile.php147
-rw-r--r--plugins/OpenID/openid.php16
-rw-r--r--plugins/RSSCloud/RSSCloudPlugin.php2
-rw-r--r--scripts/apidocs.config1551
-rw-r--r--scripts/commandline.inc4
-rwxr-xr-xscripts/docgen.php38
-rw-r--r--tests/ActivityParseTests.php77
79 files changed, 6511 insertions, 3801 deletions
diff --git a/README b/README
index dcf305ea6..4f31c4ac8 100644
--- a/README
+++ b/README
@@ -2,8 +2,8 @@
README
------
-StatusNet 0.9.1 ("Everybody Hurts")
-28 Mar 2010
+StatusNet 0.9.2 ("King of Birds")
+21 Apr 2010
This is the README file for StatusNet, the Open Source microblogging
platform. It includes installation instructions, descriptions of
@@ -77,7 +77,7 @@ for additional terms.
New this version
================
-This is a minor bug and feature release since version 0.9.0 released 4
+This is a minor bug and feature release since version 0.9.1 released 28
March 2010.
Because of fixes to OStatus bugs, it is highly recommended that all
@@ -85,26 +85,23 @@ public sites upgrade to the new version immediately.
Notable changes this version:
-- Twitter bridge truncates and links back to original for long
- notices.
-- Changed "Home" link in main menu to "Personal".
-- A new memcached plugin (using pecl/memcached versus pecl/memcache)
-- Opt-in subscription to update@status.net
-- Script to run commands on behalf of a user.
-- Better Web UI for long notices.
-- A plugin to open external links in their own window or tab
-- Fixes to Salmon protocol for compatibility with other systems.
-- Updates to latest ActivityStreams definition.
-- Twitpic-compatible API for image upload.
-- Background deletion of user accounts.
-- Better support for HTTP basic authentication with CGI/FastCGI
-- Better discovery on OStatus
-- Support for PuSH-enabled RSS 2.0 feeds
-- OpenID-only mode
-- OpenID blacklist/whitelist
-- OStatus unit tests
-
-A full changelog is available at http://status.net/wiki/StatusNet_0.9.1.
+- Fixed email notifications for @-replies that come in via OStatus
+- OStatus related Fixes to the cloudy theme
+- Pass geo locations over Twitter bridge (will only be used if enabled on the Twitter side)
+- scripts/showplugins.php - script to dump the list of activated plugins and their settings
+- scripts/fixup_blocks.php - script to finds any stray subscriptions in violation of blocks, and removes them
+- Allow blocking someone who's not currently subscribed to you (prevents seeing @-replies from them, or them subbing to you in future)
+- Default 2-second timeout on Geonames web service lookups
+- Improved localization for plugins
+- New anti-spam measures: added nofollow rels to group members list, subscribers list
+- Shared cache key option for Geonames plugin (lets multi-instance sites share their cached geoname lookups)
+- Stability fixes to the TwitterStatusFetcher
+- If user allows location sharing but turned off browser location use profile location
+- Improved group listing via the API
+- Improved FOAF output
+- Several other bugfixes
+
+A full changelog is available at http://status.net/wiki/StatusNet_0.9.2.
Prerequisites
=============
@@ -216,9 +213,9 @@ especially if you've previously installed PHP/MySQL packages.
1. Unpack the tarball you downloaded on your Web server. Usually a
command like this will work:
- tar zxf statusnet-0.9.1.tar.gz
+ tar zxf statusnet-0.9.2.tar.gz
- ...which will make a statusnet-0.9.1 subdirectory in your current
+ ...which will make a statusnet-0.9.2 subdirectory in your current
directory. (If you don't have shell access on your Web server, you
may have to unpack the tarball on your local computer and FTP the
files to the server.)
@@ -226,7 +223,7 @@ especially if you've previously installed PHP/MySQL packages.
2. Move the tarball to a directory of your choosing in your Web root
directory. Usually something like this will work:
- mv statusnet-0.9.1 /var/www/statusnet
+ mv statusnet-0.9.2 /var/www/statusnet
This will make your StatusNet instance available in the statusnet path of
your server, like "http://example.net/statusnet". "microblog" or
@@ -641,7 +638,7 @@ with this situation.
If you've been using StatusNet 0.7, 0.6, 0.5 or lower, or if you've
been tracking the "git" version of the software, you will probably
want to upgrade and keep your existing data. There is no automated
-upgrade procedure in StatusNet 0.9.1. Try these step-by-step
+upgrade procedure in StatusNet 0.9.2. Try these step-by-step
instructions; read to the end first before trying them.
0. Download StatusNet and set up all the prerequisites as if you were
@@ -662,7 +659,7 @@ instructions; read to the end first before trying them.
5. Once all writing processes to your site are turned off, make a
final backup of the Web directory and database.
6. Move your StatusNet directory to a backup spot, like "statusnet.bak".
-7. Unpack your StatusNet 0.9.1 tarball and move it to "statusnet" or
+7. Unpack your StatusNet 0.9.2 tarball and move it to "statusnet" or
wherever your code used to be.
8. Copy the config.php file and avatar directory from your old
directory to your new directory.
@@ -1539,7 +1536,7 @@ repository (see below), and you get a compilation error ("unexpected
T_STRING") in the browser, check to see that you don't have any
conflicts in your code.
-If you upgraded to StatusNet 0.9.1 without reading the "Notice
+If you upgraded to StatusNet 0.9.2 without reading the "Notice
inboxes" section above, and all your users' 'Personal' tabs are empty,
read the "Notice inboxes" section above.
diff --git a/actions/apistatusesupdate.php b/actions/apistatusesupdate.php
index d4ef6b550..5f3a447c2 100644
--- a/actions/apistatusesupdate.php
+++ b/actions/apistatusesupdate.php
@@ -33,6 +33,97 @@
* @link http://status.net/
*/
+/* External API usage documentation. Please update when you change how this method works. */
+
+/*! @page statusesupdate statuses/update
+
+ @section Description
+ Updates the authenticating user's status. Requires the status parameter specified below.
+ Request must be a POST.
+
+ @par URL pattern
+ /api/statuses/update.:format
+
+ @par Formats (:format)
+ xml, json
+
+ @par HTTP Method(s)
+ POST
+
+ @par Requires Authentication
+ Yes
+
+ @param status (Required) The URL-encoded text of the status update.
+ @param source (Optional) The source of the status.
+ @param in_reply_to_status_id (Optional) The ID of an existing status that the update is in reply to.
+ @param lat (Optional) The latitude the status refers to.
+ @param long (Optional) The longitude the status refers to.
+ @param media (Optional) a media upload, such as an image or movie file.
+
+ @sa @ref authentication
+ @sa @ref apiroot
+
+ @subsection usagenotes Usage notes
+
+ @li The URL pattern is relative to the @ref apiroot.
+ @li If the @e source parameter is not supplied the source of the status will default to 'api'.
+ @li The XML response uses <a href="http://georss.org/Main_Page">GeoRSS</a>
+ to encode the latitude and longitude (see example response below <georss:point>).
+ @li Data uploaded via the @e media parameter should be multipart/form-data encoded.
+
+ @subsection exampleusage Example usage
+
+ @verbatim
+ curl -u username:password http://example.com/api/statuses/update.xml -d status='Howdy!' -d lat='30.468' -d long='-94.743'
+ @endverbatim
+
+ @subsection exampleresponse Example response
+
+ @verbatim
+ <?xml version="1.0" encoding="UTF-8"?>
+ <status>
+ <text>Howdy!</text>
+ <truncated>false</truncated>
+ <created_at>Tue Mar 30 23:28:05 +0000 2010</created_at>
+ <in_reply_to_status_id/>
+ <source>api</source>
+ <id>26668724</id>
+ <in_reply_to_user_id/>
+ <in_reply_to_screen_name/>
+ <geo xmlns:georss="http://www.georss.org/georss">
+ <georss:point>30.468 -94.743</georss:point>
+ </geo>
+ <favorited>false</favorited>
+ <user>
+ <id>25803</id>
+ <name>Jed Sanders</name>
+ <screen_name>jedsanders</screen_name>
+ <location>Hoop and Holler, Texas</location>
+ <description>I like to think of myself as America's Favorite.</description>
+ <profile_image_url>http://avatar.example.com/25803-48-20080924200604.png</profile_image_url>
+ <url>http://jedsanders.net</url>
+ <protected>false</protected>
+ <followers_count>5</followers_count>
+ <profile_background_color/>
+ <profile_text_color/>
+ <profile_link_color/>
+ <profile_sidebar_fill_color/>
+ <profile_sidebar_border_color/>
+ <friends_count>2</friends_count>
+ <created_at>Wed Sep 24 20:04:00 +0000 2008</created_at>
+ <favourites_count>0</favourites_count>
+ <utc_offset>0</utc_offset>
+ <time_zone>UTC</time_zone>
+ <profile_background_image_url/>
+ <profile_background_tile>false</profile_background_tile>
+ <statuses_count>70</statuses_count>
+ <following>true</following>
+ <notifications>true</notifications>
+ </user>
+ </status>
+ @endverbatim
+*/
+
if (!defined('STATUSNET')) {
exit(1);
}
diff --git a/actions/apitimelinefriends.php b/actions/apitimelinefriends.php
index 7f80f252e..3c25c049e 100644
--- a/actions/apitimelinefriends.php
+++ b/actions/apitimelinefriends.php
@@ -28,11 +28,106 @@
* @author Mike Cochrane <mikec@mikenz.geek.nz>
* @author Robin Millette <robin@millette.info>
* @author Zach Copley <zach@status.net>
- * @copyright 2009 StatusNet, Inc.
+ * @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/
*/
+/* External API usage documentation. Please update when you change how this method works. */
+
+/*! @page friendstimeline statuses/friends_timeline
+
+ @section Description
+ Returns the 20 most recent statuses posted by the authenticating
+ user and that user's friends. This is the equivalent of "You and
+ friends" page in the web interface.
+
+ @par URL patterns
+ @li /api/statuses/friends_timeline.:format
+ @li /api/statuses/friends_timeline/:id.:format
+
+ @par Formats (:format)
+ xml, json, rss, atom
+
+ @par ID (:id)
+ username, user id
+
+ @par HTTP Method(s)
+ GET
+
+ @par Requires Authentication
+ Sometimes (see: @ref authentication)
+
+ @param user_id (Optional) Specifies a user by ID
+ @param screen_name (Optional) Specifies a user by screename (nickname)
+ @param since_id (Optional) Returns only statuses with an ID greater
+ than (that is, more recent than) the specified ID.
+ @param max_id (Optional) Returns only statuses with an ID less than
+ (that is, older than) or equal to the specified ID.
+ @param count (Optional) Specifies the number of statuses to retrieve.
+ @param page (Optional) Specifies the page of results to retrieve.
+
+ @sa @ref authentication
+ @sa @ref apiroot
+
+ @subsection usagenotes Usage notes
+ @li The URL pattern is relative to the @ref apiroot.
+ @li The XML response uses <a href="http://georss.org/Main_Page">GeoRSS</a>
+ to encode the latitude and longitude (see example response below <georss:point>).
+
+ @subsection exampleusage Example usage
+
+ @verbatim
+ curl http://identi.ca/api/statuses/friends_timeline/evan.xml?count=1&page=2
+ @endverbatim
+
+ @subsection exampleresponse Example response
+
+ @verbatim
+ <?xml version="1.0"?>
+ <statuses type="array">
+ <status>
+ <text>back from the !yul !drupal meet with Evolving Web folk, @anarcat, @webchick and others, and an interesting refresher on SQL indexing</text>
+ <truncated>false</truncated>
+ <created_at>Wed Mar 31 01:33:02 +0000 2010</created_at>
+ <in_reply_to_status_id/>
+ <source>&lt;a href="http://code.google.com/p/microblog-purple/"&gt;mbpidgin&lt;/a&gt;</source>
+ <id>26674201</id>
+ <in_reply_to_user_id/>
+ <in_reply_to_screen_name/>
+ <geo/>
+ <favorited>false</favorited>
+ <user>
+ <id>246</id>
+ <name>Mark</name>
+ <screen_name>lambic</screen_name>
+ <location>Montreal, Canada</location>
+ <description>Geek</description>
+ <profile_image_url>http://avatar.identi.ca/246-48-20080702141545.png</profile_image_url>
+ <url>http://lambic.co.uk</url>
+ <protected>false</protected>
+ <followers_count>73</followers_count>
+ <profile_background_color>#F0F2F5</profile_background_color>
+ <profile_text_color/>
+ <profile_link_color>#002E6E</profile_link_color>
+ <profile_sidebar_fill_color>#CEE1E9</profile_sidebar_fill_color>
+ <profile_sidebar_border_color/>
+ <friends_count>58</friends_count>
+ <created_at>Wed Jul 02 14:12:15 +0000 2008</created_at>
+ <favourites_count>2</favourites_count>
+ <utc_offset>-14400</utc_offset>
+ <time_zone>US/Eastern</time_zone>
+ <profile_background_image_url/>
+ <profile_background_tile>false</profile_background_tile>
+ <statuses_count>933</statuses_count>
+ <following>false</following>
+ <notifications>false</notifications>
+ </user>
+ </status>
+ </statuses>
+ @endverbatim
+*/
+
if (!defined('STATUSNET')) {
exit(1);
}
diff --git a/actions/apitimelinepublic.php b/actions/apitimelinepublic.php
index 903461425..30f9f4cda 100644
--- a/actions/apitimelinepublic.php
+++ b/actions/apitimelinepublic.php
@@ -55,6 +55,95 @@ require_once INSTALLDIR . '/lib/apiprivateauth.php';
* @link http://status.net/
*/
+/* External API usage documentation. Please update when you change how this method works. */
+
+/*! @page publictimeline statuses/public_timeline
+
+ @section Description
+ Returns the 20 most recent notices from users throughout the system who have
+ uploaded their own avatars. Depending on configuration, it may or may not
+ not include notices from automatic posting services.
+
+ @par URL patterns
+ @li /api/statuses/public_timeline.:format
+
+ @par Formats (:format)
+ xml, json, rss, atom
+
+ @par HTTP Method(s)
+ GET
+
+ @par Requires Authentication
+ No
+
+ @param since_id (Optional) Returns only statuses with an ID greater
+ than (that is, more recent than) the specified ID.
+ @param max_id (Optional) Returns only statuses with an ID less than
+ (that is, older than) or equal to the specified ID.
+ @param count (Optional) Specifies the number of statuses to retrieve.
+ @param page (Optional) Specifies the page of results to retrieve.
+
+ @sa @ref apiroot
+
+ @subsection usagenotes Usage notes
+ @li The URL pattern is relative to the @ref apiroot.
+ @li The XML response uses <a href="http://georss.org/Main_Page">GeoRSS</a>
+ to encode the latitude and longitude (see example response below <georss:point>).
+
+ @subsection exampleusage Example usage
+
+ @verbatim
+ curl http://identi.ca/api/statuses/friends_timeline/evan.xml?count=1&page=2
+ @endverbatim
+
+ @subsection exampleresponse Example response
+
+ @verbatim
+ <?xml version="1.0" encoding="UTF-8"?>
+ <statuses type="array">
+ <status>
+ <text>@skwashd oh, commbank reenabled me super quick both times. but disconcerting when you don't expect it though</text>
+ <truncated>false</truncated>
+ <created_at>Sat Apr 17 00:49:12 +0000 2010</created_at>
+ <in_reply_to_status_id>28838393</in_reply_to_status_id>
+ <source>xmpp</source>
+ <id>28838456</id>
+ <in_reply_to_user_id>39303</in_reply_to_user_id>
+ <in_reply_to_screen_name>skwashd</in_reply_to_screen_name>
+ <geo></geo>
+ <favorited>false</favorited>
+ <user>
+ <id>44517</id>
+ <name>joshua may</name>
+ <screen_name>notjosh</screen_name>
+ <location></location>
+ <description></description>
+ <profile_image_url>http://avatar.identi.ca/44517-48-20090321004106.jpeg</profile_image_url>
+ <url></url>
+ <protected>false</protected>
+ <followers_count>17</followers_count>
+ <profile_background_color></profile_background_color>
+ <profile_text_color></profile_text_color>
+ <profile_link_color></profile_link_color>
+ <profile_sidebar_fill_color></profile_sidebar_fill_color>
+ <profile_sidebar_border_color></profile_sidebar_border_color>
+ <friends_count>20</friends_count>
+ <created_at>Sat Mar 21 00:40:25 +0000 2009</created_at>
+ <favourites_count>0</favourites_count>
+ <utc_offset>0</utc_offset>
+ <time_zone>UTC</time_zone>
+ <profile_background_image_url></profile_background_image_url>
+ <profile_background_tile>false</profile_background_tile>
+ <statuses_count>100</statuses_count>
+ <following>false</following>
+ <notifications>false</notifications>
+ </user>
+ </status>
+ [....]
+ </statuses>
+@endverbatim
+*/
+
class ApiTimelinePublicAction extends ApiPrivateAuthAction
{
diff --git a/actions/login.php b/actions/login.php
index 8ea3c800b..dc6352368 100644
--- a/actions/login.php
+++ b/actions/login.php
@@ -267,9 +267,13 @@ class LoginAction extends Action
'user name and password ' .
'before changing your settings.');
} else {
- return _('Login with your username and password. ' .
- 'Don\'t have a username yet? ' .
- '[Register](%%action.register%%) a new account.');
+ $prompt = _('Login with your username and password.');
+ if (!common_config('site', 'closed') && !common_config('site', 'inviteonly')) {
+ $prompt .= ' ';
+ $prompt .= _('Don\'t have a username yet? ' .
+ '[Register](%%action.register%%) a new account.');
+ }
+ return $prompt;
}
}
diff --git a/avatar/.gitignore b/avatar/.gitignore
index e69de29bb..e69de29bb 100644..100755
--- a/avatar/.gitignore
+++ b/avatar/.gitignore
diff --git a/classes/Notice.php b/classes/Notice.php
index d65f0da9a..c0828674d 100644
--- a/classes/Notice.php
+++ b/classes/Notice.php
@@ -981,8 +981,7 @@ class Notice extends Memcached_DataObject
* messages, we won't deliver to any remote targets as that's the
* source service's responsibility.
*
- * @fixme Unlike saveReplies() there's no mail notification here.
- * Move that to distrib queue handler?
+ * Mail notifications etc will be handled later.
*
* @param array of unique identifier URIs for recipients
*/
@@ -1008,8 +1007,6 @@ class Notice extends Memcached_DataObject
$reply->profile_id = $user->id;
$id = $reply->insert();
-
- self::blow('reply:stream:%d', $user->id);
}
}
@@ -1021,8 +1018,7 @@ class Notice extends Memcached_DataObject
* and save reply records indicating that this message needs to be
* delivered to those users.
*
- * Side effect: local recipients get e-mail notifications here.
- * @fixme move mail notifications to distrib?
+ * Mail notifications to local profiles will be sent later.
*
* @return array of integer profile IDs
*/
@@ -1076,23 +1072,21 @@ class Notice extends Memcached_DataObject
throw new ServerException("Couldn't save reply for {$this->id}, {$mentioned->id}");
} else {
$replied[$mentioned->id] = 1;
+ self::blow('reply:stream:%d', $mentioned->id);
}
}
}
$recipientIds = array_keys($replied);
- foreach ($recipientIds as $recipientId) {
- $user = User::staticGet('id', $recipientId);
- if (!empty($user)) {
- self::blow('reply:stream:%d', $reply->profile_id);
- mail_notify_attn($user, $this);
- }
- }
-
return $recipientIds;
}
+ /**
+ * Pull the complete list of @-reply targets for this notice.
+ *
+ * @return array of integer profile ids
+ */
function getReplies()
{
// XXX: cache me
@@ -1116,6 +1110,30 @@ class Notice extends Memcached_DataObject
}
/**
+ * Send e-mail notifications to local @-reply targets.
+ *
+ * Replies must already have been saved; this is expected to be run
+ * from the distrib queue handler.
+ */
+ function sendReplyNotifications()
+ {
+ // Don't send reply notifications for repeats
+
+ if (!empty($this->repeat_of)) {
+ return array();
+ }
+
+ $recipientIds = $this->getReplies();
+
+ foreach ($recipientIds as $recipientId) {
+ $user = User::staticGet('id', $recipientId);
+ if (!empty($user)) {
+ mail_notify_attn($user, $this);
+ }
+ }
+ }
+
+ /**
* Pull list of groups this notice needs to be delivered to,
* as previously recorded by saveGroups() or saveKnownGroups().
*
diff --git a/classes/Reply.php b/classes/Reply.php
index 659e04c92..dc6296bda 100644
--- a/classes/Reply.php
+++ b/classes/Reply.php
@@ -22,6 +22,20 @@ class Reply extends Memcached_DataObject
/* the code above is auto generated do not remove the tag below */
###END_AUTOCODE
+ /**
+ * Wrapper for record insertion to update related caches
+ */
+ function insert()
+ {
+ $result = parent::insert();
+
+ if ($result) {
+ self::blow('reply:stream:%d', $this->profile_id);
+ }
+
+ return $result;
+ }
+
function stream($user_id, $offset=0, $limit=NOTICES_PER_PAGE, $since_id=0, $max_id=0)
{
$ids = Notice::stream(array('Reply', '_streamDirect'),
diff --git a/doc-src/sms b/doc-src/sms
index 1a3064318..6cdccc6e9 100644
--- a/doc-src/sms
+++ b/doc-src/sms
@@ -1,4 +1,4 @@
-You can post messages to %%site.name%% using a many kinds of cell
+You can post messages to %%site.name%% using many kinds of cell
phones that support SMS messaging. This site does not support SMS
directly; rather, it uses your carrier's email gateway to send and
receive messages.
diff --git a/index.php b/index.php
index 66a9838d6..b60b5bd8c 100644
--- a/index.php
+++ b/index.php
@@ -200,7 +200,7 @@ function checkMirror($action_obj, $args)
function isLoginAction($action)
{
- static $loginActions = array('login', 'recoverpassword', 'api', 'doc', 'register', 'publicxrds', 'otp', 'opensearch');
+ static $loginActions = array('login', 'recoverpassword', 'api', 'doc', 'register', 'publicxrds', 'otp', 'opensearch', 'rsd');
$login = null;
diff --git a/lib/action.php b/lib/action.php
index 4296ae7de..98e5ec2c9 100644
--- a/lib/action.php
+++ b/lib/action.php
@@ -467,7 +467,7 @@ class Action extends HTMLOutputter // lawsuit
_m('MENU', 'Logout'), $tooltip, false, 'nav_logout');
}
else {
- if (!common_config('site', 'closed')) {
+ if (!common_config('site', 'closed') && !common_config('site', 'inviteonly')) {
// TRANS: Tooltip for main menu option "Register"
$tooltip = _m('TOOLTIP', 'Create an account');
$this->menuItem(common_local_url('register'),
diff --git a/lib/activity.php b/lib/activity.php
index 365bb6258..8e2da99bb 100644
--- a/lib/activity.php
+++ b/lib/activity.php
@@ -83,6 +83,7 @@ class Activity
const CREATOR = 'creator';
const CONTENTNS = 'http://purl.org/rss/1.0/modules/content/';
+ const ENCODED = 'encoded';
public $actor; // an ActivityObject
public $verb; // a string (the URL)
@@ -269,14 +270,21 @@ class Activity
$this->title = ActivityUtils::childContent($item, ActivityObject::TITLE, self::RSS);
- $contentEl = ActivityUtils::child($item, ActivityUtils::CONTENT, self::CONTENTNS);
+ $contentEl = ActivityUtils::child($item, self::ENCODED, self::CONTENTNS);
if (!empty($contentEl)) {
- $this->content = htmlspecialchars_decode($contentEl->textContent, ENT_QUOTES);
+ // <content:encoded> XML node's text content is HTML; no further processing needed.
+ $this->content = $contentEl->textContent;
} else {
$descriptionEl = ActivityUtils::child($item, self::DESCRIPTION, self::RSS);
if (!empty($descriptionEl)) {
- $this->content = htmlspecialchars_decode($descriptionEl->textContent, ENT_QUOTES);
+ // Per spec, <description> must be plaintext.
+ // In practice, often there's HTML... but these days good
+ // feeds are using <content:encoded> which is explicitly
+ // real HTML.
+ // We'll treat this following spec, and do HTML escaping
+ // to convert from plaintext to HTML.
+ $this->content = htmlspecialchars($descriptionEl->textContent);
}
}
diff --git a/lib/activityutils.php b/lib/activityutils.php
index a7e99fb11..401fd7fc2 100644
--- a/lib/activityutils.php
+++ b/lib/activityutils.php
@@ -213,11 +213,19 @@ class ActivityUtils
// slavishly following http://atompub.org/rfc4287.html#rfc.section.4.1.3.3
if (empty($type) || $type == 'text') {
- return $el->textContent;
+ // We have plaintext saved as the XML text content.
+ // Since we want HTML, we need to escape any special chars.
+ return htmlspecialchars($el->textContent);
} else if ($type == 'html') {
+ // We have HTML saved as the XML text content.
+ // No additional processing required once we've got it.
$text = $el->textContent;
- return htmlspecialchars_decode($text, ENT_QUOTES);
+ return $text;
} else if ($type == 'xhtml') {
+ // Per spec, the <content type="xhtml"> contains a single
+ // HTML <div> with XHTML namespace on it as a child node.
+ // We need to pull all of that <div>'s child nodes and
+ // serialize them back to an (X)HTML source fragment.
$divEl = ActivityUtils::child($el, 'div', 'http://www.w3.org/1999/xhtml');
if (empty($divEl)) {
return null;
diff --git a/lib/apiaction.php b/lib/apiaction.php
index d5580abd3..a3c34a91b 100644
--- a/lib/apiaction.php
+++ b/lib/apiaction.php
@@ -32,6 +32,67 @@
* @link http://status.net/
*/
+/* External API usage documentation. Please update when you change how the API works. */
+
+/*! @mainpage StatusNet REST API
+
+ @section Introduction
+
+ Some explanatory text about the API would be nice.
+
+ @section API Methods
+
+ @subsection timelinesmethods_sec Timeline Methods
+
+ @li @ref publictimeline
+ @li @ref friendstimeline
+
+ @subsection statusmethods_sec Status Methods
+
+ @li @ref statusesupdate
+
+ @subsection usermethods_sec User Methods
+
+ @subsection directmessagemethods_sec Direct Message Methods
+
+ @subsection friendshipmethods_sec Friendship Methods
+
+ @subsection socialgraphmethods_sec Social Graph Methods
+
+ @subsection accountmethods_sec Account Methods
+
+ @subsection favoritesmethods_sec Favorites Methods
+
+ @subsection blockmethods_sec Block Methods
+
+ @subsection oauthmethods_sec OAuth Methods
+
+ @subsection helpmethods_sec Help Methods
+
+ @subsection groupmethods_sec Group Methods
+
+ @page apiroot API Root
+
+ The URLs for methods referred to in this API documentation are
+ relative to the StatusNet API root. The API root is determined by the
+ site's @b server and @b path variables, which are generally specified
+ in config.php. For example:
+
+ @code
+ $config['site']['server'] = 'example.org';
+ $config['site']['path'] = 'statusnet'
+ @endcode
+
+ The pattern for a site's API root is: @c protocol://server/path/api E.g:
+
+ @c http://example.org/statusnet/api
+
+ The @b path can be empty. In that case the API root would simply be:
+
+ @c http://example.org/api
+
+*/
+
if (!defined('STATUSNET')) {
exit(1);
}
diff --git a/lib/apiauth.php b/lib/apiauth.php
index d6ad7e021..8c3998888 100644
--- a/lib/apiauth.php
+++ b/lib/apiauth.php
@@ -34,6 +34,24 @@
* @link http://status.net/
*/
+/* External API usage documentation. Please update when you change how this method works. */
+
+/*! @page authentication Authentication
+
+ StatusNet supports HTTP Basic Authentication and OAuth for API calls.
+
+ @warning Currently, users who have created accounts without setting a
+ password via OpenID, Facebook Connect, etc., cannot use the API until
+ they set a password with their account settings panel.
+
+ @section HTTP Basic Auth
+
+
+
+ @section OAuth
+
+*/
+
if (!defined('STATUSNET')) {
exit(1);
}
diff --git a/lib/common.php b/lib/common.php
index 45946c216..2bda88c97 100644
--- a/lib/common.php
+++ b/lib/common.php
@@ -22,10 +22,10 @@ if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); }
//exit with 200 response, if this is checking fancy from the installer
if (isset($_REQUEST['p']) && $_REQUEST['p'] == 'check-fancy') { exit; }
-define('STATUSNET_VERSION', '0.9.1');
+define('STATUSNET_VERSION', '0.9.2');
define('LACONICA_VERSION', STATUSNET_VERSION); // compatibility
-define('STATUSNET_CODENAME', 'Everybody Hurts');
+define('STATUSNET_CODENAME', 'King of Birds');
define('AVATAR_PROFILE_SIZE', 96);
define('AVATAR_STREAM_SIZE', 48);
diff --git a/lib/distribqueuehandler.php b/lib/distribqueuehandler.php
index d2be7a92c..8f4b72d5c 100644
--- a/lib/distribqueuehandler.php
+++ b/lib/distribqueuehandler.php
@@ -49,19 +49,22 @@ class DistribQueueHandler
}
/**
- * Here's the meat of your queue handler -- you're handed a Notice
- * object, which you may do as you will with.
+ * Handle distribution of a notice after we've saved it:
+ * @li add to local recipient inboxes
+ * @li send email notifications to local @-reply targets
+ * @li run final EndNoticeSave plugin events
+ * @li put any remaining post-processing into the queues
*
* If this function indicates failure, a warning will be logged
* and the item is placed back in the queue to be re-run.
*
+ * @fixme addToInboxes is known to fail sometimes with large recipient sets
+ *
* @param Notice $notice
* @return boolean true on success, false on failure
*/
function handle($notice)
{
- // XXX: do we need to change this for remote users?
-
try {
$notice->addToInboxes();
} catch (Exception $e) {
@@ -69,6 +72,12 @@ class DistribQueueHandler
}
try {
+ $notice->sendReplyNotifications();
+ } catch (Exception $e) {
+ $this->logit($notice, $e);
+ }
+
+ try {
Event::handle('EndNoticeSave', array($notice));
// Enqueue for other handlers
} catch (Exception $e) {
diff --git a/lib/installer.php b/lib/installer.php
index d0e46f95c..589a19a66 100644
--- a/lib/installer.php
+++ b/lib/installer.php
@@ -51,7 +51,7 @@ abstract class Installer
public static $dbModules = array(
'mysql' => array(
'name' => 'MySQL',
- 'check_module' => 'mysql', // mysqli?
+ 'check_module' => 'mysqli',
'installer' => 'mysql_db_installer',
),
'pgsql' => array(
@@ -341,7 +341,6 @@ abstract class Installer
* @param string $password
* @return mixed array of database connection params on success, false on failure
*
- * @fixme be consistent about using mysqli vs mysql!
* @fixme escape things in the connection string in case we have a funny pass etc
*/
function Mysql_Db_installer($host, $database, $username, $password)
@@ -349,14 +348,13 @@ abstract class Installer
$this->updateStatus("Starting installation...");
$this->updateStatus("Checking database...");
- $conn = mysql_connect($host, $username, $password);
- if (!$conn) {
+ $conn = mysqli_init();
+ if (!$conn->real_connect($host, $username, $password)) {
$this->updateStatus("Can't connect to server '$host' as '$username'.", true);
return false;
}
$this->updateStatus("Changing to database...");
- $res = mysql_select_db($database, $conn);
- if (!$res) {
+ if (!$conn->select_db($database)) {
$this->updateStatus("Can't change to database.", true);
return false;
}
@@ -438,9 +436,9 @@ abstract class Installer
// FIXME: use PEAR::DB or PDO instead of our own switch
switch ($type) {
case 'mysqli':
- $res = mysql_query($stmt, $conn);
+ $res = $conn->query($stmt);
if ($res === false) {
- $error = mysql_error();
+ $error = $conn->error();
}
break;
case 'pgsql':
diff --git a/lib/mail.php b/lib/mail.php
index c38d9f2f5..5fc584e28 100644
--- a/lib/mail.php
+++ b/lib/mail.php
@@ -636,7 +636,7 @@ function mail_notify_attn($user, $notice)
$bestname = $sender->getBestName();
- common_init_locale($user->language);
+ common_switch_locale($user->language);
if ($notice->hasConversation()) {
$conversationUrl = common_local_url('conversation',
@@ -679,7 +679,7 @@ function mail_notify_attn($user, $notice)
$headers = _mail_prepare_headers('mention', $user->nickname, $sender->nickname);
- common_init_locale();
+ common_switch_locale();
mail_to_user($user, $subject, $body, $headers);
}
diff --git a/lib/plugin.php b/lib/plugin.php
index 65ccdafbb..f63bdf309 100644
--- a/lib/plugin.php
+++ b/lib/plugin.php
@@ -91,6 +91,7 @@ class Plugin
$path = INSTALLDIR . "/plugins/$name/locale";
if (file_exists($path) && is_dir($path)) {
bindtextdomain($name, $path);
+ bind_textdomain_codeset($name, 'UTF-8');
}
}
}
diff --git a/lib/util.php b/lib/util.php
index 1f3aaf711..e7ea9df61 100644
--- a/lib/util.php
+++ b/lib/util.php
@@ -41,11 +41,13 @@ function common_init_locale($language=null)
}
putenv('LANGUAGE='.$language);
putenv('LANG='.$language);
- return setlocale(LC_ALL, $language . ".utf8",
+ $ok = setlocale(LC_ALL, $language . ".utf8",
$language . ".UTF8",
$language . ".utf-8",
$language . ".UTF-8",
$language);
+
+ return $ok;
}
function common_init_language()
@@ -89,6 +91,32 @@ function common_init_language()
$locale_set = common_init_locale($language);
}
+ common_init_gettext();
+}
+
+/**
+ * @access private
+ */
+function common_init_gettext()
+{
+ setlocale(LC_CTYPE, 'C');
+ // So we do not have to make people install the gettext locales
+ $path = common_config('site','locale_path');
+ bindtextdomain("statusnet", $path);
+ bind_textdomain_codeset("statusnet", "UTF-8");
+ textdomain("statusnet");
+}
+
+/**
+ * Switch locale during runtime, and poke gettext until it cries uncle.
+ * Otherwise, sometimes it doesn't actually switch away from the old language.
+ *
+ * @param string $language code for locale ('en', 'fr', 'pt_BR' etc)
+ */
+function common_switch_locale($language=null)
+{
+ common_init_locale($language);
+
setlocale(LC_CTYPE, 'C');
// So we do not have to make people install the gettext locales
$path = common_config('site','locale_path');
@@ -97,6 +125,7 @@ function common_init_language()
textdomain("statusnet");
}
+
function common_timezone()
{
if (common_logged_in()) {
@@ -826,7 +855,7 @@ function common_linkify($url) {
return XMLStringer::estring('a', $attrs, $url);
}
-function common_shorten_links($text)
+function common_shorten_links($text, $always = false)
{
common_debug("common_shorten_links() called");
@@ -836,7 +865,7 @@ function common_shorten_links($text)
common_debug("maxLength = $maxLength");
- if (mb_strlen($text) > $maxLength) {
+ if ($always || mb_strlen($text) > $maxLength) {
common_debug("Forcing shortening");
return common_replace_urls_callback($text, array('File_redirection', 'forceShort'));
} else {
diff --git a/locale/af/LC_MESSAGES/statusnet.po b/locale/af/LC_MESSAGES/statusnet.po
index b9bae5212..10dab614e 100644
--- a/locale/af/LC_MESSAGES/statusnet.po
+++ b/locale/af/LC_MESSAGES/statusnet.po
@@ -8,12 +8,12 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-12 21:47+0000\n"
-"PO-Revision-Date: 2010-04-12 21:48:00+0000\n"
+"POT-Creation-Date: 2010-04-24 14:16+0000\n"
+"PO-Revision-Date: 2010-04-26 22:15:59+0000\n"
"Language-Team: Afrikaans\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r64984); Translate extension (2010-01-16)\n"
+"X-Generator: MediaWiki 1.17alpha (r65552); Translate extension (2010-04-25)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: af\n"
"X-Message-Group: out-statusnet\n"
@@ -98,8 +98,8 @@ msgstr "Hierdie bladsy bestaan nie"
#: actions/apidirectmessagenew.php:75 actions/apigroupcreate.php:112
#: actions/apigroupismember.php:90 actions/apigroupjoin.php:99
#: actions/apigroupleave.php:99 actions/apigrouplist.php:72
-#: actions/apistatusesupdate.php:148 actions/apisubscriptions.php:87
-#: actions/apitimelinefavorites.php:71 actions/apitimelinefriends.php:78
+#: actions/apistatusesupdate.php:239 actions/apisubscriptions.php:87
+#: actions/apitimelinefavorites.php:71 actions/apitimelinefriends.php:173
#: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79
#: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75
#: actions/favoritesrss.php:74 actions/foaf.php:40 actions/foaf.php:58
@@ -123,7 +123,7 @@ msgstr "%1$s en vriende, bladsy %2$d"
#. TRANS: H1 text. %1$s is user nickname
#. TRANS: Message is used as link title. %s is a user nickname.
#: actions/all.php:89 actions/all.php:181 actions/allrss.php:116
-#: actions/apitimelinefriends.php:114 actions/apitimelinehome.php:115
+#: actions/apitimelinefriends.php:209 actions/apitimelinehome.php:115
#: lib/personalgroupnav.php:100
#, php-format
msgid "%s and friends"
@@ -185,7 +185,7 @@ msgstr "U en vriende"
#. 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:121 actions/apitimelinefriends.php:120
+#: actions/allrss.php:121 actions/apitimelinefriends.php:215
#: actions/apitimelinehome.php:121
#, php-format
msgid "Updates from %1$s and friends on %2$s!"
@@ -207,9 +207,9 @@ msgstr "Opdaterings van %1$s en vriende op %2$s."
#: actions/apistatusesdestroy.php:102 actions/apistatusesretweets.php:112
#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:141
#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111
-#: actions/apitimelinefavorites.php:173 actions/apitimelinefriends.php:175
+#: actions/apitimelinefavorites.php:173 actions/apitimelinefriends.php:270
#: actions/apitimelinegroup.php:151 actions/apitimelinehome.php:174
-#: actions/apitimelinementions.php:173 actions/apitimelinepublic.php:151
+#: actions/apitimelinementions.php:173 actions/apitimelinepublic.php:240
#: actions/apitimelineretweetedtome.php:121
#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:160
#: actions/apitimelineuser.php:162 actions/apiusershow.php:101
@@ -226,7 +226,7 @@ msgstr "Die API-funksie is nie gevind nie."
#: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91
#: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91
#: actions/apigroupleave.php:91 actions/apimediaupload.php:67
-#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:118
+#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:209
msgid "This method requires a POST."
msgstr "Hierdie metode benodig 'n POST."
@@ -256,7 +256,7 @@ msgstr "Kon nie die profiel stoor nie."
#: actions/apiaccountupdateprofilebackgroundimage.php:108
#: actions/apiaccountupdateprofileimage.php:97 actions/apimediaupload.php:80
-#: actions/apistatusesupdate.php:131 actions/avatarsettings.php:257
+#: actions/apistatusesupdate.php:222 actions/avatarsettings.php:257
#: actions/designadminpanel.php:123 actions/editapplication.php:118
#: actions/newapplication.php:101 actions/newnotice.php:94
#: lib/designsettings.php:283
@@ -643,17 +643,17 @@ msgstr "Die status is verwyder."
msgid "No status with that ID found."
msgstr "Geen status met die ID gevind nie."
-#: actions/apistatusesupdate.php:161 actions/newnotice.php:155
+#: actions/apistatusesupdate.php:252 actions/newnotice.php:155
#: lib/mailhandler.php:60
#, php-format
msgid "That's too long. Max notice size is %d chars."
msgstr "Die kennisgewing is te lank. Gebruik maksimum %d karakters."
-#: actions/apistatusesupdate.php:202 actions/apiusershow.php:96
+#: actions/apistatusesupdate.php:293 actions/apiusershow.php:96
msgid "Not found."
msgstr "Nie gevind nie."
-#: actions/apistatusesupdate.php:225 actions/newnotice.php:178
+#: actions/apistatusesupdate.php:316 actions/newnotice.php:178
#, php-format
msgid "Max notice size is %d chars, including attachment URL."
msgstr ""
@@ -682,12 +682,12 @@ msgstr ""
msgid "%1$s updates that reply to updates from %2$s / %3$s."
msgstr ""
-#: actions/apitimelinepublic.php:107 actions/publicrss.php:103
+#: actions/apitimelinepublic.php:196 actions/publicrss.php:103
#, php-format
msgid "%s public timeline"
msgstr ""
-#: actions/apitimelinepublic.php:112 actions/publicrss.php:105
+#: actions/apitimelinepublic.php:201 actions/publicrss.php:105
#, php-format
msgid "%s updates from everyone!"
msgstr ""
@@ -2236,10 +2236,14 @@ msgid ""
msgstr ""
#: actions/login.php:270
+#, fuzzy
+msgid "Login with your username and password."
+msgstr "Verkeerde gebruikersnaam of wagwoord."
+
+#: actions/login.php:273
#, php-format
msgid ""
-"Login with your username and password. Don't have a username yet? [Register]"
-"(%%action.register%%) a new account."
+"Don't have a username yet? [Register](%%action.register%%) a new account."
msgstr ""
#: actions/makeadmin.php:92
@@ -2455,8 +2459,8 @@ msgid "Only %s URLs over plain HTTP please."
msgstr ""
#. TRANS: Client error on an API request with an unsupported data format.
-#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1069
-#: lib/apiaction.php:1098 lib/apiaction.php:1215
+#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1131
+#: lib/apiaction.php:1160 lib/apiaction.php:1277
msgid "Not a supported data format."
msgstr ""
@@ -4606,13 +4610,13 @@ msgstr ""
msgid "Problem saving notice."
msgstr ""
-#: classes/Notice.php:965
+#: classes/Notice.php:967
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:1513
+#: classes/Notice.php:1535
#, php-format
msgid "RT @%1$s %2$s"
msgstr "RT @%1$s %2$s"
@@ -5064,7 +5068,7 @@ msgid "Snapshots configuration"
msgstr ""
#. TRANS: Client error 401.
-#: lib/apiauth.php:95
+#: lib/apiauth.php:113
msgid "API resource requires read-write access, but you only have read access."
msgstr ""
@@ -6468,56 +6472,56 @@ msgid "Moderator"
msgstr "Moderator"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1054
+#: lib/util.php:1083
msgid "a few seconds ago"
msgstr "'n paar sekondes gelede"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1057
+#: lib/util.php:1086
msgid "about a minute ago"
msgstr "ongeveer 'n minuut gelede"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1061
+#: lib/util.php:1090
#, php-format
msgid "about %d minutes ago"
msgstr "ongeveer %d minute gelede"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1064
+#: lib/util.php:1093
msgid "about an hour ago"
msgstr "ongeveer 'n uur gelede"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1068
+#: lib/util.php:1097
#, php-format
msgid "about %d hours ago"
msgstr "ongeveer %d uur gelede"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1071
+#: lib/util.php:1100
msgid "about a day ago"
msgstr "ongeveer een dag gelede"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1075
+#: lib/util.php:1104
#, php-format
msgid "about %d days ago"
msgstr "ongeveer %d dae gelede"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1078
+#: lib/util.php:1107
msgid "about a month ago"
msgstr "ongeveer een maand gelede"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1082
+#: lib/util.php:1111
#, php-format
msgid "about %d months ago"
msgstr "ongeveer %d maande gelede"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1085
+#: lib/util.php:1114
msgid "about a year ago"
msgstr "ongeveer een jaar gelede"
diff --git a/locale/ar/LC_MESSAGES/statusnet.po b/locale/ar/LC_MESSAGES/statusnet.po
index f6bf14d12..84c856ba8 100644
--- a/locale/ar/LC_MESSAGES/statusnet.po
+++ b/locale/ar/LC_MESSAGES/statusnet.po
@@ -9,12 +9,12 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-12 21:47+0000\n"
-"PO-Revision-Date: 2010-04-12 21:48:04+0000\n"
+"POT-Creation-Date: 2010-04-24 14:16+0000\n"
+"PO-Revision-Date: 2010-04-26 22:16:02+0000\n"
"Language-Team: Arabic\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r64984); Translate extension (2010-01-16)\n"
+"X-Generator: MediaWiki 1.17alpha (r65552); Translate extension (2010-04-25)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: ar\n"
"X-Message-Group: out-statusnet\n"
@@ -51,7 +51,7 @@ msgstr "خاص"
#. TRANS: Checkbox instructions for admin setting "Invite only"
#: actions/accessadminpanel.php:174
msgid "Make registration invitation only."
-msgstr ""
+msgstr "اجعل التسجيل عبر الدعوة Ùقط."
#. TRANS: Checkbox label for configuring site as invite only.
#: actions/accessadminpanel.php:176
@@ -87,9 +87,8 @@ msgstr "احÙظ"
#. TRANS: Server error when page not found (404)
#: actions/all.php:64 actions/public.php:98 actions/replies.php:93
#: actions/showfavorites.php:138 actions/tag.php:52
-#, fuzzy
msgid "No such page."
-msgstr "لا صÙحة كهذه"
+msgstr "لا صÙحة كهذه."
#: actions/all.php:75 actions/allrss.php:68
#: actions/apiaccountupdatedeliverydevice.php:113
@@ -100,8 +99,8 @@ msgstr "لا صÙحة كهذه"
#: actions/apidirectmessagenew.php:75 actions/apigroupcreate.php:112
#: actions/apigroupismember.php:90 actions/apigroupjoin.php:99
#: actions/apigroupleave.php:99 actions/apigrouplist.php:72
-#: actions/apistatusesupdate.php:148 actions/apisubscriptions.php:87
-#: actions/apitimelinefavorites.php:71 actions/apitimelinefriends.php:78
+#: actions/apistatusesupdate.php:239 actions/apisubscriptions.php:87
+#: actions/apitimelinefavorites.php:71 actions/apitimelinefriends.php:173
#: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79
#: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75
#: actions/favoritesrss.php:74 actions/foaf.php:40 actions/foaf.php:58
@@ -125,7 +124,7 @@ msgstr "%1$s والأصدقاء, الصÙحة %2$d"
#. TRANS: H1 text. %1$s is user nickname
#. TRANS: Message is used as link title. %s is a user nickname.
#: actions/all.php:89 actions/all.php:181 actions/allrss.php:116
-#: actions/apitimelinefriends.php:114 actions/apitimelinehome.php:115
+#: actions/apitimelinefriends.php:209 actions/apitimelinehome.php:115
#: lib/personalgroupnav.php:100
#, php-format
msgid "%s and friends"
@@ -185,7 +184,7 @@ msgstr "أنت والأصدقاء"
#. 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:121 actions/apitimelinefriends.php:120
+#: actions/allrss.php:121 actions/apitimelinefriends.php:215
#: actions/apitimelinehome.php:121
#, php-format
msgid "Updates from %1$s and friends on %2$s!"
@@ -207,9 +206,9 @@ msgstr ""
#: actions/apistatusesdestroy.php:102 actions/apistatusesretweets.php:112
#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:141
#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111
-#: actions/apitimelinefavorites.php:173 actions/apitimelinefriends.php:175
+#: actions/apitimelinefavorites.php:173 actions/apitimelinefriends.php:270
#: actions/apitimelinegroup.php:151 actions/apitimelinehome.php:174
-#: actions/apitimelinementions.php:173 actions/apitimelinepublic.php:151
+#: actions/apitimelinementions.php:173 actions/apitimelinepublic.php:240
#: actions/apitimelineretweetedtome.php:121
#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:160
#: actions/apitimelineuser.php:162 actions/apiusershow.php:101
@@ -226,7 +225,7 @@ msgstr "لم يتم العثور على وسيلة API."
#: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91
#: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91
#: actions/apigroupleave.php:91 actions/apimediaupload.php:67
-#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:118
+#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:209
msgid "This method requires a POST."
msgstr "تتطلب هذه الطريقة POST."
@@ -256,7 +255,7 @@ msgstr "لم يمكن Ø­Ùظ الملÙ."
#: actions/apiaccountupdateprofilebackgroundimage.php:108
#: actions/apiaccountupdateprofileimage.php:97 actions/apimediaupload.php:80
-#: actions/apistatusesupdate.php:131 actions/avatarsettings.php:257
+#: actions/apistatusesupdate.php:222 actions/avatarsettings.php:257
#: actions/designadminpanel.php:123 actions/editapplication.php:118
#: actions/newapplication.php:101 actions/newnotice.php:94
#: lib/designsettings.php:283
@@ -448,9 +447,8 @@ msgstr ""
#: actions/apigroupismember.php:95 actions/apigroupjoin.php:104
#: actions/apigroupleave.php:104 actions/apigroupmembership.php:91
#: actions/apigroupshow.php:82 actions/apitimelinegroup.php:91
-#, fuzzy
msgid "Group not found."
-msgstr "لم توجد المجموعة!"
+msgstr "المجموعة غير موجودة."
#: actions/apigroupjoin.php:110 actions/joingroup.php:100
msgid "You are already a member of that group."
@@ -639,17 +637,17 @@ msgstr "Ø­ÙØ°ÙÙت الحالة."
msgid "No status with that ID found."
msgstr "لا حالة ÙˆÙجدت بهذه الهوية."
-#: actions/apistatusesupdate.php:161 actions/newnotice.php:155
+#: actions/apistatusesupdate.php:252 actions/newnotice.php:155
#: lib/mailhandler.php:60
#, php-format
msgid "That's too long. Max notice size is %d chars."
msgstr ""
-#: actions/apistatusesupdate.php:202 actions/apiusershow.php:96
+#: actions/apistatusesupdate.php:293 actions/apiusershow.php:96
msgid "Not found."
msgstr "لم يوجد."
-#: actions/apistatusesupdate.php:225 actions/newnotice.php:178
+#: actions/apistatusesupdate.php:316 actions/newnotice.php:178
#, php-format
msgid "Max notice size is %d chars, including attachment URL."
msgstr ""
@@ -678,12 +676,12 @@ msgstr ""
msgid "%1$s updates that reply to updates from %2$s / %3$s."
msgstr ""
-#: actions/apitimelinepublic.php:107 actions/publicrss.php:103
+#: actions/apitimelinepublic.php:196 actions/publicrss.php:103
#, php-format
msgid "%s public timeline"
msgstr "مسار %s الزمني العام"
-#: actions/apitimelinepublic.php:112 actions/publicrss.php:105
+#: actions/apitimelinepublic.php:201 actions/publicrss.php:105
#, php-format
msgid "%s updates from everyone!"
msgstr ""
@@ -819,7 +817,6 @@ msgstr ""
#: actions/block.php:145 actions/deleteapplication.php:154
#: actions/deletenotice.php:147 actions/deleteuser.php:152
#: actions/groupblock.php:178
-#, fuzzy
msgctxt "BUTTON"
msgid "No"
msgstr "لا"
@@ -838,7 +835,6 @@ msgstr "لا تمنع هذا المستخدم"
#: actions/block.php:152 actions/deleteapplication.php:161
#: actions/deletenotice.php:154 actions/deleteuser.php:159
#: actions/groupblock.php:185
-#, fuzzy
msgctxt "BUTTON"
msgid "Yes"
msgstr "نعم"
@@ -894,9 +890,9 @@ msgstr "ألغ٠منع هذا المستخدم"
#. TRANS: Title for mini-posting window loaded from bookmarklet.
#: actions/bookmarklet.php:51
-#, fuzzy, php-format
+#, php-format
msgid "Post to %s"
-msgstr "مجموعات %s"
+msgstr "أرسل إلى %s"
#: actions/confirmaddress.php:75
msgid "No confirmation code."
@@ -1078,7 +1074,7 @@ msgid "Invalid logo URL."
msgstr "مسار شعار غير صالح."
#: actions/designadminpanel.php:280
-#, fuzzy, php-format
+#, php-format
msgid "Theme not available: %s."
msgstr "السمة غير متوÙرة: %s"
@@ -1332,7 +1328,6 @@ msgstr "عنوان البريد الإلكتروني المÙؤكد الحالي
#: actions/emailsettings.php:115 actions/emailsettings.php:158
#: actions/imsettings.php:116 actions/smssettings.php:124
#: actions/smssettings.php:180
-#, fuzzy
msgctxt "BUTTON"
msgid "Remove"
msgstr "أزل"
@@ -1349,7 +1344,6 @@ msgstr ""
#. TRANS: Button label
#: actions/emailsettings.php:127 actions/imsettings.php:131
#: actions/smssettings.php:137 lib/applicationeditform.php:357
-#, fuzzy
msgctxt "BUTTON"
msgid "Cancel"
msgstr "ألغÙ"
@@ -1364,7 +1358,6 @@ msgstr "عنوان البريد الإلكتروني، مثل \"UserName@example
#. TRANS: Button label for adding a SMS phone number in SMS settings form.
#: actions/emailsettings.php:139 actions/imsettings.php:148
#: actions/smssettings.php:162
-#, fuzzy
msgctxt "BUTTON"
msgid "Add"
msgstr "أضÙ"
@@ -1390,16 +1383,14 @@ 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:168 actions/smssettings.php:189
-#, fuzzy
msgctxt "BUTTON"
msgid "New"
msgstr "جديد"
#. TRANS: Form legend for e-mail preferences form.
#: actions/emailsettings.php:174
-#, fuzzy
msgid "Email preferences"
-msgstr "التÙضيلات"
+msgstr "تÙضيلات البريد الإلكتروني"
#. TRANS: Checkbox label in e-mail preferences form.
#: actions/emailsettings.php:180
@@ -1438,9 +1429,8 @@ msgstr "انشر هوية مصغّرة لعنوان بريدي الإلكتروÙ
#. TRANS: Confirmation message for successful e-mail preferences save.
#: actions/emailsettings.php:334
-#, fuzzy
msgid "Email preferences saved."
-msgstr "Ø­ÙÙظت تÙضيلات التصميم."
+msgstr "Ø­ÙÙظت تÙضيلات البريد الإلكرتوني."
#. TRANS: Message given saving e-mail address without having provided one.
#: actions/emailsettings.php:353
@@ -1493,15 +1483,13 @@ msgstr ""
#. TRANS: Message given canceling e-mail address confirmation for the wrong e-mail address.
#: actions/emailsettings.php:424
-#, fuzzy
msgid "That is the wrong email address."
-msgstr "هذا عنوان محادثة Ùورية خاطئ."
+msgstr "هذا عنوان بريد إلكتروني خطأ."
#. TRANS: Message given after successfully canceling e-mail address confirmation.
#: actions/emailsettings.php:438
-#, fuzzy
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.
@@ -1511,9 +1499,8 @@ msgstr "هذا ليس عنوان بريدك الإلكتروني."
#. TRANS: Message given after successfully removing a registered e-mail address.
#: actions/emailsettings.php:479
-#, fuzzy
msgid "The email address was removed."
-msgstr "أزيل هذا العنوان."
+msgstr "أزيل عنوان البريد الإلكتروني."
#: actions/emailsettings.php:493 actions/smssettings.php:568
msgid "No incoming email address."
@@ -1809,7 +1796,7 @@ msgstr "اجعل المستخدم إداريًا ÙÙŠ المجموعة"
#: actions/groupmembers.php:519
msgid "Make Admin"
-msgstr ""
+msgstr "اجعله إداريًا"
#: actions/groupmembers.php:519
msgid "Make this user an admin"
@@ -1930,7 +1917,7 @@ msgstr "عنوان المراسلة الÙورية"
#: actions/imsettings.php:113
msgid "Current confirmed Jabber/GTalk address."
-msgstr ""
+msgstr "عنوان جابر أو محادثة غوغل المعتمد حاليًا."
#. TRANS: Form note in IM settings form.
#. TRANS: %s is the IM address set for the site.
@@ -1952,9 +1939,8 @@ msgstr ""
#. TRANS: Form legend for IM preferences form.
#: actions/imsettings.php:155
-#, fuzzy
msgid "IM preferences"
-msgstr "التÙضيلات"
+msgstr "تÙضيلات المحادثة الÙورية"
#. TRANS: Checkbox label in IM preferences form.
#: actions/imsettings.php:160
@@ -2242,10 +2228,14 @@ msgstr ""
"لأسباب أمنية، من Ùضلك أعد إدخال اسم مستخدمك وكلمة سرك قبل تغيير إعداداتك."
#: actions/login.php:270
+#, fuzzy
+msgid "Login with your username and password."
+msgstr "Ù„Ùج باسم مستخدم وكلمة سر"
+
+#: actions/login.php:273
#, php-format
msgid ""
-"Login with your username and password. Don't have a username yet? [Register]"
-"(%%action.register%%) a new account."
+"Don't have a username yet? [Register](%%action.register%%) a new account."
msgstr ""
#: actions/makeadmin.php:92
@@ -2463,8 +2453,8 @@ msgid "Only %s URLs over plain HTTP please."
msgstr ""
#. TRANS: Client error on an API request with an unsupported data format.
-#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1069
-#: lib/apiaction.php:1098 lib/apiaction.php:1215
+#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1131
+#: lib/apiaction.php:1160 lib/apiaction.php:1277
msgid "Not a supported data format."
msgstr "ليس نسق بيانات مدعوم."
@@ -3321,9 +3311,9 @@ msgid "Replies to %s"
msgstr "الردود على %s"
#: actions/replies.php:128
-#, fuzzy, php-format
+#, php-format
msgid "Replies to %1$s, page %2$d"
-msgstr "الردود على %s"
+msgstr "الردود على %1$sØŒ الصÙحة %2$d"
#: actions/replies.php:145
#, php-format
@@ -3470,7 +3460,7 @@ msgstr ""
#: actions/showapplication.php:261
msgid "Application info"
-msgstr ""
+msgstr "معلومات التطبيق"
#: actions/showapplication.php:263
msgid "Consumer key"
@@ -3499,14 +3489,13 @@ msgid ""
msgstr ""
#: actions/showapplication.php:309
-#, fuzzy
msgid "Are you sure you want to reset your consumer key and secret?"
-msgstr "أمتأكد من أنك تريد حذ٠هذا الإشعار؟"
+msgstr "أمتأكد من أنك تريد إعادة ضبط Ù…Ùتاح المستهلك وكلمة سره؟"
#: actions/showfavorites.php:79
-#, fuzzy, php-format
+#, php-format
msgid "%1$s's favorite notices, page %2$d"
-msgstr "إشعارات %s المÙÙضلة"
+msgstr "إشعارات %1$s المÙÙضلة، الصÙحة %2$d"
#: actions/showfavorites.php:132
msgid "Could not retrieve favorite notices."
@@ -3788,9 +3777,8 @@ msgid "Unknown language \"%s\"."
msgstr "لغة غير معروÙØ© \"%s\"."
#: actions/siteadminpanel.php:165
-#, fuzzy
msgid "Minimum text limit is 0 (unlimited)."
-msgstr "حد النص الأدنى هو 140 حرÙًا."
+msgstr "حد النص الأدنى 0 (غير محدود)."
#: actions/siteadminpanel.php:171
msgid "Dupe limit must be one or more seconds."
@@ -3915,9 +3903,8 @@ 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
@@ -3941,7 +3928,6 @@ msgstr ""
#. TRANS: Button label to confirm SMS confirmation code in SMS settings.
#: actions/smssettings.php:148
-#, fuzzy
msgctxt "BUTTON"
msgid "Confirm"
msgstr "أكّد"
@@ -3954,13 +3940,12 @@ msgstr "رقم هات٠SMS"
#. TRANS: SMS phone number input field instructions in SMS settings form.
#: actions/smssettings.php:156
msgid "Phone number, no punctuation or spaces, with area code"
-msgstr ""
+msgstr "رقم الهات٠بدون شرطات أو مساÙات مع رمز المنطقة"
#. TRANS: Form legend for SMS preferences form.
#: actions/smssettings.php:195
-#, fuzzy
msgid "SMS preferences"
-msgstr "التÙضيلات"
+msgstr "تÙضيلات الرسائل القصيرة"
#. TRANS: Checkbox label in SMS preferences form.
#: actions/smssettings.php:201
@@ -3971,9 +3956,8 @@ 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
@@ -4009,9 +3993,8 @@ msgstr "إن رقم التأكيد هذا خاطئ."
#. TRANS: Message given after successfully canceling SMS phone number confirmation.
#: actions/smssettings.php:427
-#, fuzzy
msgid "SMS confirmation cancelled."
-msgstr "Ø£Ùلغي التأكيد."
+msgstr "Ø£Ùلغي تأكيد الرسائل القصيرة."
#. TRANS: Message given trying to remove an SMS phone number that is not
#. TRANS: registered for the active user.
@@ -4021,9 +4004,8 @@ 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 "رقم هات٠SMS"
+msgstr "تمت إزالة رقم هات٠الرسائل القصيرة."
#. TRANS: Label for mobile carrier dropdown menu in SMS settings.
#: actions/smssettings.php:511
@@ -4652,14 +4634,14 @@ msgstr ""
msgid "Problem saving notice."
msgstr "مشكلة أثناء Ø­Ùظ الإشعار."
-#: classes/Notice.php:965
+#: classes/Notice.php:967
#, fuzzy
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:1513
+#: classes/Notice.php:1535
#, php-format
msgid "RT @%1$s %2$s"
msgstr "آر تي @%1$s %2$s"
@@ -5121,7 +5103,7 @@ msgid "Snapshots configuration"
msgstr "ضبط المسارات"
#. TRANS: Client error 401.
-#: lib/apiauth.php:95
+#: lib/apiauth.php:113
msgid "API resource requires read-write access, but you only have read access."
msgstr ""
@@ -6597,56 +6579,56 @@ msgid "Moderator"
msgstr "مراقب"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1054
+#: lib/util.php:1083
msgid "a few seconds ago"
msgstr "قبل لحظات قليلة"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1057
+#: lib/util.php:1086
msgid "about a minute ago"
msgstr "قبل دقيقة تقريبًا"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1061
+#: lib/util.php:1090
#, php-format
msgid "about %d minutes ago"
msgstr ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1064
+#: lib/util.php:1093
msgid "about an hour ago"
msgstr "قبل ساعة تقريبًا"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1068
+#: lib/util.php:1097
#, php-format
msgid "about %d hours ago"
msgstr ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1071
+#: lib/util.php:1100
msgid "about a day ago"
msgstr "قبل يوم تقريبا"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1075
+#: lib/util.php:1104
#, php-format
msgid "about %d days ago"
msgstr ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1078
+#: lib/util.php:1107
msgid "about a month ago"
msgstr "قبل شهر تقريبًا"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1082
+#: lib/util.php:1111
#, php-format
msgid "about %d months ago"
msgstr ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1085
+#: lib/util.php:1114
msgid "about a year ago"
msgstr "قبل سنة تقريبًا"
diff --git a/locale/arz/LC_MESSAGES/statusnet.po b/locale/arz/LC_MESSAGES/statusnet.po
index 3b6d78a7b..e67405582 100644
--- a/locale/arz/LC_MESSAGES/statusnet.po
+++ b/locale/arz/LC_MESSAGES/statusnet.po
@@ -10,12 +10,12 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-12 21:47+0000\n"
-"PO-Revision-Date: 2010-04-12 21:48:07+0000\n"
+"POT-Creation-Date: 2010-04-24 14:16+0000\n"
+"PO-Revision-Date: 2010-04-26 22:16:06+0000\n"
"Language-Team: Egyptian Spoken Arabic\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r64984); Translate extension (2010-01-16)\n"
+"X-Generator: MediaWiki 1.17alpha (r65552); Translate extension (2010-04-25)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: arz\n"
"X-Message-Group: out-statusnet\n"
@@ -106,8 +106,8 @@ msgstr "لا صÙحه كهذه"
#: actions/apidirectmessagenew.php:75 actions/apigroupcreate.php:112
#: actions/apigroupismember.php:90 actions/apigroupjoin.php:99
#: actions/apigroupleave.php:99 actions/apigrouplist.php:72
-#: actions/apistatusesupdate.php:148 actions/apisubscriptions.php:87
-#: actions/apitimelinefavorites.php:71 actions/apitimelinefriends.php:78
+#: actions/apistatusesupdate.php:239 actions/apisubscriptions.php:87
+#: actions/apitimelinefavorites.php:71 actions/apitimelinefriends.php:173
#: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79
#: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75
#: actions/favoritesrss.php:74 actions/foaf.php:40 actions/foaf.php:58
@@ -131,7 +131,7 @@ msgstr "%1$s Ùˆ الصحاب, صÙحه %2$d"
#. TRANS: H1 text. %1$s is user nickname
#. TRANS: Message is used as link title. %s is a user nickname.
#: actions/all.php:89 actions/all.php:181 actions/allrss.php:116
-#: actions/apitimelinefriends.php:114 actions/apitimelinehome.php:115
+#: actions/apitimelinefriends.php:209 actions/apitimelinehome.php:115
#: lib/personalgroupnav.php:100
#, php-format
msgid "%s and friends"
@@ -191,7 +191,7 @@ msgstr "أنت والأصدقاء"
#. 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:121 actions/apitimelinefriends.php:120
+#: actions/allrss.php:121 actions/apitimelinefriends.php:215
#: actions/apitimelinehome.php:121
#, php-format
msgid "Updates from %1$s and friends on %2$s!"
@@ -213,9 +213,9 @@ msgstr ""
#: actions/apistatusesdestroy.php:102 actions/apistatusesretweets.php:112
#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:141
#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111
-#: actions/apitimelinefavorites.php:173 actions/apitimelinefriends.php:175
+#: actions/apitimelinefavorites.php:173 actions/apitimelinefriends.php:270
#: actions/apitimelinegroup.php:151 actions/apitimelinehome.php:174
-#: actions/apitimelinementions.php:173 actions/apitimelinepublic.php:151
+#: actions/apitimelinementions.php:173 actions/apitimelinepublic.php:240
#: actions/apitimelineretweetedtome.php:121
#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:160
#: actions/apitimelineuser.php:162 actions/apiusershow.php:101
@@ -232,7 +232,7 @@ msgstr "الـ API method مش موجوده."
#: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91
#: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91
#: actions/apigroupleave.php:91 actions/apimediaupload.php:67
-#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:118
+#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:209
msgid "This method requires a POST."
msgstr "تتطلب هذه الطريقه POST."
@@ -262,7 +262,7 @@ msgstr "لم يمكن Ø­Ùظ الملÙ."
#: actions/apiaccountupdateprofilebackgroundimage.php:108
#: actions/apiaccountupdateprofileimage.php:97 actions/apimediaupload.php:80
-#: actions/apistatusesupdate.php:131 actions/avatarsettings.php:257
+#: actions/apistatusesupdate.php:222 actions/avatarsettings.php:257
#: actions/designadminpanel.php:123 actions/editapplication.php:118
#: actions/newapplication.php:101 actions/newnotice.php:94
#: lib/designsettings.php:283
@@ -645,17 +645,17 @@ msgstr "Ø­ÙØ°ÙÙت الحاله."
msgid "No status with that ID found."
msgstr ""
-#: actions/apistatusesupdate.php:161 actions/newnotice.php:155
+#: actions/apistatusesupdate.php:252 actions/newnotice.php:155
#: lib/mailhandler.php:60
#, php-format
msgid "That's too long. Max notice size is %d chars."
msgstr ""
-#: actions/apistatusesupdate.php:202 actions/apiusershow.php:96
+#: actions/apistatusesupdate.php:293 actions/apiusershow.php:96
msgid "Not found."
msgstr "لم يوجد."
-#: actions/apistatusesupdate.php:225 actions/newnotice.php:178
+#: actions/apistatusesupdate.php:316 actions/newnotice.php:178
#, php-format
msgid "Max notice size is %d chars, including attachment URL."
msgstr ""
@@ -684,12 +684,12 @@ msgstr ""
msgid "%1$s updates that reply to updates from %2$s / %3$s."
msgstr ""
-#: actions/apitimelinepublic.php:107 actions/publicrss.php:103
+#: actions/apitimelinepublic.php:196 actions/publicrss.php:103
#, php-format
msgid "%s public timeline"
msgstr "مسار %s الزمنى العام"
-#: actions/apitimelinepublic.php:112 actions/publicrss.php:105
+#: actions/apitimelinepublic.php:201 actions/publicrss.php:105
#, php-format
msgid "%s updates from everyone!"
msgstr ""
@@ -2249,10 +2249,14 @@ msgid ""
msgstr ""
#: actions/login.php:270
+#, fuzzy
+msgid "Login with your username and password."
+msgstr "اسم المستخدم أو كلمه السر غير صحيحان."
+
+#: actions/login.php:273
#, php-format
msgid ""
-"Login with your username and password. Don't have a username yet? [Register]"
-"(%%action.register%%) a new account."
+"Don't have a username yet? [Register](%%action.register%%) a new account."
msgstr ""
#: actions/makeadmin.php:92
@@ -2469,8 +2473,8 @@ msgid "Only %s URLs over plain HTTP please."
msgstr ""
#. TRANS: Client error on an API request with an unsupported data format.
-#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1069
-#: lib/apiaction.php:1098 lib/apiaction.php:1215
+#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1131
+#: lib/apiaction.php:1160 lib/apiaction.php:1277
msgid "Not a supported data format."
msgstr " مش نظام بيانات مدعوم."
@@ -4647,14 +4651,14 @@ msgstr ""
msgid "Problem saving notice."
msgstr "مشكله أثناء Ø­Ùظ الإشعار."
-#: classes/Notice.php:965
+#: classes/Notice.php:967
#, fuzzy
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:1513
+#: classes/Notice.php:1535
#, php-format
msgid "RT @%1$s %2$s"
msgstr "آر تى @%1$s %2$s"
@@ -5138,7 +5142,7 @@ msgid "Snapshots configuration"
msgstr "ضبط المسارات"
#. TRANS: Client error 401.
-#: lib/apiauth.php:95
+#: lib/apiauth.php:113
msgid "API resource requires read-write access, but you only have read access."
msgstr ""
@@ -6556,56 +6560,56 @@ msgid "Moderator"
msgstr ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1054
+#: lib/util.php:1083
msgid "a few seconds ago"
msgstr "قبل لحظات قليلة"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1057
+#: lib/util.php:1086
msgid "about a minute ago"
msgstr "قبل دقيقه تقريبًا"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1061
+#: lib/util.php:1090
#, php-format
msgid "about %d minutes ago"
msgstr ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1064
+#: lib/util.php:1093
msgid "about an hour ago"
msgstr "قبل ساعه تقريبًا"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1068
+#: lib/util.php:1097
#, php-format
msgid "about %d hours ago"
msgstr ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1071
+#: lib/util.php:1100
msgid "about a day ago"
msgstr "قبل يوم تقريبا"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1075
+#: lib/util.php:1104
#, php-format
msgid "about %d days ago"
msgstr ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1078
+#: lib/util.php:1107
msgid "about a month ago"
msgstr "قبل شهر تقريبًا"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1082
+#: lib/util.php:1111
#, php-format
msgid "about %d months ago"
msgstr ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1085
+#: lib/util.php:1114
msgid "about a year ago"
msgstr "قبل سنه تقريبًا"
diff --git a/locale/bg/LC_MESSAGES/statusnet.po b/locale/bg/LC_MESSAGES/statusnet.po
index e38fe609c..c96b66ee6 100644
--- a/locale/bg/LC_MESSAGES/statusnet.po
+++ b/locale/bg/LC_MESSAGES/statusnet.po
@@ -9,12 +9,12 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-12 21:47+0000\n"
-"PO-Revision-Date: 2010-04-12 21:48:11+0000\n"
+"POT-Creation-Date: 2010-04-24 14:16+0000\n"
+"PO-Revision-Date: 2010-04-26 22:16:09+0000\n"
"Language-Team: Bulgarian\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r64984); Translate extension (2010-01-16)\n"
+"X-Generator: MediaWiki 1.17alpha (r65552); Translate extension (2010-04-25)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: bg\n"
"X-Message-Group: out-statusnet\n"
@@ -100,8 +100,8 @@ msgstr "ÐÑма такака Ñтраница."
#: actions/apidirectmessagenew.php:75 actions/apigroupcreate.php:112
#: actions/apigroupismember.php:90 actions/apigroupjoin.php:99
#: actions/apigroupleave.php:99 actions/apigrouplist.php:72
-#: actions/apistatusesupdate.php:148 actions/apisubscriptions.php:87
-#: actions/apitimelinefavorites.php:71 actions/apitimelinefriends.php:78
+#: actions/apistatusesupdate.php:239 actions/apisubscriptions.php:87
+#: actions/apitimelinefavorites.php:71 actions/apitimelinefriends.php:173
#: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79
#: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75
#: actions/favoritesrss.php:74 actions/foaf.php:40 actions/foaf.php:58
@@ -125,7 +125,7 @@ msgstr "%1$s и приÑтели, Ñтраница %2$d"
#. TRANS: H1 text. %1$s is user nickname
#. TRANS: Message is used as link title. %s is a user nickname.
#: actions/all.php:89 actions/all.php:181 actions/allrss.php:116
-#: actions/apitimelinefriends.php:114 actions/apitimelinehome.php:115
+#: actions/apitimelinefriends.php:209 actions/apitimelinehome.php:115
#: lib/personalgroupnav.php:100
#, php-format
msgid "%s and friends"
@@ -185,7 +185,7 @@ msgstr "Вие и приÑтелите"
#. 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:121 actions/apitimelinefriends.php:120
+#: actions/allrss.php:121 actions/apitimelinefriends.php:215
#: actions/apitimelinehome.php:121
#, php-format
msgid "Updates from %1$s and friends on %2$s!"
@@ -207,9 +207,9 @@ msgstr "Бележки от %1$s и приÑтели в %2$s."
#: actions/apistatusesdestroy.php:102 actions/apistatusesretweets.php:112
#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:141
#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111
-#: actions/apitimelinefavorites.php:173 actions/apitimelinefriends.php:175
+#: actions/apitimelinefavorites.php:173 actions/apitimelinefriends.php:270
#: actions/apitimelinegroup.php:151 actions/apitimelinehome.php:174
-#: actions/apitimelinementions.php:173 actions/apitimelinepublic.php:151
+#: actions/apitimelinementions.php:173 actions/apitimelinepublic.php:240
#: actions/apitimelineretweetedtome.php:121
#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:160
#: actions/apitimelineuser.php:162 actions/apiusershow.php:101
@@ -226,7 +226,7 @@ msgstr "Ðе е открит методът в API."
#: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91
#: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91
#: actions/apigroupleave.php:91 actions/apimediaupload.php:67
-#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:118
+#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:209
msgid "This method requires a POST."
msgstr "Този метод изиÑква заÑвка POST."
@@ -256,7 +256,7 @@ msgstr "Грешка при запазване на профила."
#: actions/apiaccountupdateprofilebackgroundimage.php:108
#: actions/apiaccountupdateprofileimage.php:97 actions/apimediaupload.php:80
-#: actions/apistatusesupdate.php:131 actions/avatarsettings.php:257
+#: actions/apistatusesupdate.php:222 actions/avatarsettings.php:257
#: actions/designadminpanel.php:123 actions/editapplication.php:118
#: actions/newapplication.php:101 actions/newnotice.php:94
#: lib/designsettings.php:283
@@ -455,7 +455,6 @@ msgstr ""
#: actions/apigroupismember.php:95 actions/apigroupjoin.php:104
#: actions/apigroupleave.php:104 actions/apigroupmembership.php:91
#: actions/apigroupshow.php:82 actions/apitimelinegroup.php:91
-#, fuzzy
msgid "Group not found."
msgstr "Групата не е открита."
@@ -647,17 +646,17 @@ msgstr "Бележката е изтрита."
msgid "No status with that ID found."
msgstr "Ðе е открита бележка Ñ Ñ‚Ð°ÐºÑŠÐ² идентификатор."
-#: actions/apistatusesupdate.php:161 actions/newnotice.php:155
+#: actions/apistatusesupdate.php:252 actions/newnotice.php:155
#: lib/mailhandler.php:60
#, fuzzy, php-format
msgid "That's too long. Max notice size is %d chars."
msgstr "Твърде дълга бележка. ТрÑбва да е най-много 140 знака."
-#: actions/apistatusesupdate.php:202 actions/apiusershow.php:96
+#: actions/apistatusesupdate.php:293 actions/apiusershow.php:96
msgid "Not found."
msgstr "Ðе е открито."
-#: actions/apistatusesupdate.php:225 actions/newnotice.php:178
+#: actions/apistatusesupdate.php:316 actions/newnotice.php:178
#, php-format
msgid "Max notice size is %d chars, including attachment URL."
msgstr ""
@@ -686,12 +685,12 @@ msgstr "%1$s / Реплики на %2$s"
msgid "%1$s updates that reply to updates from %2$s / %3$s."
msgstr "%1$s реплики на ÑÑŠÐ¾Ð±Ñ‰ÐµÐ½Ð¸Ñ Ð¾Ñ‚ %2$s / %3$s."
-#: actions/apitimelinepublic.php:107 actions/publicrss.php:103
+#: actions/apitimelinepublic.php:196 actions/publicrss.php:103
#, php-format
msgid "%s public timeline"
msgstr "Общ поток на %s"
-#: actions/apitimelinepublic.php:112 actions/publicrss.php:105
+#: actions/apitimelinepublic.php:201 actions/publicrss.php:105
#, php-format
msgid "%s updates from everyone!"
msgstr ""
@@ -830,7 +829,6 @@ msgstr ""
#: actions/block.php:145 actions/deleteapplication.php:154
#: actions/deletenotice.php:147 actions/deleteuser.php:152
#: actions/groupblock.php:178
-#, fuzzy
msgctxt "BUTTON"
msgid "No"
msgstr "Ðе"
@@ -849,7 +847,6 @@ msgstr "Да не Ñе блокира този потребител"
#: actions/block.php:152 actions/deleteapplication.php:161
#: actions/deletenotice.php:154 actions/deleteuser.php:159
#: actions/groupblock.php:185
-#, fuzzy
msgctxt "BUTTON"
msgid "Yes"
msgstr "Да"
@@ -973,20 +970,17 @@ msgid "Notices"
msgstr "Бележки"
#: actions/deleteapplication.php:63
-#, fuzzy
msgid "You must be logged in to delete an application."
-msgstr "За да редактирате група, Ñ‚Ñ€Ñбва да Ñте влезли."
+msgstr "За да изтриете приложение, Ñ‚Ñ€Ñбва да Ñте влезли."
#: actions/deleteapplication.php:71
-#, fuzzy
msgid "Application not found."
-msgstr "Бележката нÑма профил"
+msgstr "Приложението не е открито."
#: actions/deleteapplication.php:78 actions/editapplication.php:77
#: actions/showapplication.php:94
-#, fuzzy
msgid "You are not the owner of this application."
-msgstr "Ðе членувате в тази група."
+msgstr "Ðе Ñте ÑобÑтвеник на това приложение."
#: actions/deleteapplication.php:102 actions/editapplication.php:127
#: actions/newapplication.php:110 actions/showapplication.php:118
@@ -995,9 +989,8 @@ msgid "There was a problem with your session token."
msgstr "Имаше проблем ÑÑŠÑ ÑеÑиÑта ви в Ñайта."
#: actions/deleteapplication.php:123 actions/deleteapplication.php:147
-#, fuzzy
msgid "Delete application"
-msgstr "ÐÑма такава бележка."
+msgstr "Изтриване на приложението"
#: actions/deleteapplication.php:149
msgid ""
@@ -1008,15 +1001,13 @@ msgstr ""
#. TRANS: Submit button title for 'No' when deleting an application.
#: actions/deleteapplication.php:158
-#, fuzzy
msgid "Do not delete this application"
-msgstr "Да не Ñе изтрива бележката"
+msgstr "Да не Ñе изтрива приложението"
#. TRANS: Submit button title for 'Yes' when deleting an application.
#: actions/deleteapplication.php:164
-#, fuzzy
msgid "Delete this application"
-msgstr "Изтриване на бележката"
+msgstr "Изтриване на това приложение"
#. TRANS: Client error message thrown when trying to access the admin panel while not logged in.
#: actions/deletenotice.php:67 actions/disfavor.php:61 actions/favor.php:62
@@ -1362,7 +1353,6 @@ msgstr "Текущ потвърден Ð°Ð´Ñ€ÐµÑ Ð½Ð° е-поща."
#: actions/emailsettings.php:115 actions/emailsettings.php:158
#: actions/imsettings.php:116 actions/smssettings.php:124
#: actions/smssettings.php:180
-#, fuzzy
msgctxt "BUTTON"
msgid "Remove"
msgstr "Премахване"
@@ -1396,7 +1386,6 @@ msgstr "ÐÐ´Ñ€ÐµÑ Ð½Ð° е-поща, като \"UserName@example.org\""
#. TRANS: Button label for adding a SMS phone number in SMS settings form.
#: actions/emailsettings.php:139 actions/imsettings.php:148
#: actions/smssettings.php:162
-#, fuzzy
msgctxt "BUTTON"
msgid "Add"
msgstr "ДобавÑне"
@@ -2334,10 +2323,14 @@ msgstr ""
"при промÑна на наÑтройките."
#: actions/login.php:270
+#, fuzzy
+msgid "Login with your username and password."
+msgstr "Вход Ñ Ð¸Ð¼Ðµ и парола"
+
+#: actions/login.php:273
#, fuzzy, php-format
msgid ""
-"Login with your username and password. Don't have a username yet? [Register]"
-"(%%action.register%%) a new account."
+"Don't have a username yet? [Register](%%action.register%%) a new account."
msgstr ""
"Влезте Ñ Ð¸Ð¼Ðµ и парола. ÐÑмате такива? [РегиÑтрирайте](%%action.register%%) "
"нова Ñметка или опитайте Ñ [OpenID](%%action.openidlogin%%). "
@@ -2565,8 +2558,8 @@ msgid "Only %s URLs over plain HTTP please."
msgstr ""
#. TRANS: Client error on an API request with an unsupported data format.
-#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1069
-#: lib/apiaction.php:1098 lib/apiaction.php:1215
+#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1131
+#: lib/apiaction.php:1160 lib/apiaction.php:1277
msgid "Not a supported data format."
msgstr "Ðеподдържан формат на данните"
@@ -2588,7 +2581,7 @@ msgstr "Управление на различни други наÑтройки
#: actions/othersettings.php:108
msgid " (free service)"
-msgstr ""
+msgstr " (безплатна уÑлуга)"
#: actions/othersettings.php:116
msgid "Shorten URLs with"
@@ -3556,14 +3549,12 @@ msgid "Save site settings"
msgstr "Запазване наÑтройките на Ñайта"
#: actions/showapplication.php:82
-#, fuzzy
msgid "You must be logged in to view an application."
-msgstr "За напуÑнете група, Ñ‚Ñ€Ñбва да Ñте влезли."
+msgstr "За прегледате приложение, Ñ‚Ñ€Ñбва да Ñте влезли."
#: actions/showapplication.php:157
-#, fuzzy
msgid "Application profile"
-msgstr "Бележката нÑма профил"
+msgstr "Профил на приложението"
#. TRANS: Form input field label for application icon.
#: actions/showapplication.php:159 lib/applicationeditform.php:182
@@ -4277,9 +4268,9 @@ msgid "%s subscribers"
msgstr "%s абоната"
#: actions/subscribers.php:52
-#, fuzzy, php-format
+#, php-format
msgid "%1$s subscribers, page %2$d"
-msgstr "Ðбонаменти на %s, Ñтраница %d"
+msgstr "Ðбонати на %1$s, Ñтраница %2$d"
#: actions/subscribers.php:63
msgid "These are the people who listen to your notices."
@@ -4314,9 +4305,9 @@ msgid "%s subscriptions"
msgstr "Ðбонаменти на %s"
#: actions/subscriptions.php:54
-#, fuzzy, php-format
+#, php-format
msgid "%1$s subscriptions, page %2$d"
-msgstr "Ðбонаменти на %s, Ñтраница %d"
+msgstr "Ðбонаменти на %1$s, Ñтраница %2$d"
#: actions/subscriptions.php:65
msgid "These are the people whose notices you listen to."
@@ -4818,14 +4809,14 @@ msgstr "Забранено ви е да публикувате бележки в
msgid "Problem saving notice."
msgstr "Проблем при запиÑване на бележката."
-#: classes/Notice.php:965
+#: classes/Notice.php:967
#, fuzzy
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:1513
+#: classes/Notice.php:1535
#, php-format
msgid "RT @%1$s %2$s"
msgstr "RT @%1$s %2$s"
@@ -4952,14 +4943,12 @@ msgstr "Лично"
#. TRANS: Tooltip for main menu option "Account"
#: lib/action.php:437
-#, fuzzy
msgctxt "TOOLTIP"
msgid "Change your email, avatar, password, profile"
msgstr "ПромÑна на поща, аватар, парола, профил"
#. TRANS: Tooltip for main menu option "Services"
#: lib/action.php:442
-#, fuzzy
msgctxt "TOOLTIP"
msgid "Connect to services"
msgstr "Свързване към уÑлуги"
@@ -4971,7 +4960,6 @@ msgstr "Свързване"
#. TRANS: Tooltip for menu option "Admin"
#: lib/action.php:448
-#, fuzzy
msgctxt "TOOLTIP"
msgid "Change site configuration"
msgstr "ПромÑна наÑтройките на Ñайта"
@@ -4985,7 +4973,7 @@ msgstr "ÐаÑтройки"
#. TRANS: Tooltip for main menu option "Invite"
#: lib/action.php:455
-#, fuzzy, php-format
+#, php-format
msgctxt "TOOLTIP"
msgid "Invite friends and colleagues to join you on %s"
msgstr "Поканете приÑтели и колеги да Ñе приÑъединÑÑ‚ към Ð²Ð°Ñ Ð² %s"
@@ -5011,14 +4999,12 @@ msgstr "Изход"
#. TRANS: Tooltip for main menu option "Register"
#: lib/action.php:472
-#, fuzzy
msgctxt "TOOLTIP"
msgid "Create an account"
msgstr "Създаване на нова Ñметка"
#. TRANS: Main menu option when not logged in to register a new account
#: lib/action.php:475
-#, fuzzy
msgctxt "MENU"
msgid "Register"
msgstr "РегиÑтриране"
@@ -5049,7 +5035,6 @@ msgstr "Помощ"
#. TRANS: Tooltip for main menu option "Search"
#: lib/action.php:490
-#, fuzzy
msgctxt "TOOLTIP"
msgid "Search for people or text"
msgstr "ТърÑене за хора или бележки"
@@ -5313,7 +5298,7 @@ msgid "Snapshots configuration"
msgstr "ÐаÑтройка на пътищата"
#. TRANS: Client error 401.
-#: lib/apiauth.php:95
+#: lib/apiauth.php:113
msgid "API resource requires read-write access, but you only have read access."
msgstr ""
@@ -6355,14 +6340,12 @@ msgid "Attach a file"
msgstr "ПрикрепÑне на файл"
#: lib/noticeform.php:212
-#, fuzzy
msgid "Share my location"
-msgstr "Грешка при запазване етикетите."
+msgstr "СподелÑне на меÑтоположението ми"
#: lib/noticeform.php:215
-#, fuzzy
msgid "Do not share my location"
-msgstr "Грешка при запазване етикетите."
+msgstr "Без ÑподелÑне на меÑтоположението ми"
#: lib/noticeform.php:216
msgid ""
@@ -6557,9 +6540,8 @@ msgid "No return-to arguments."
msgstr "ЛипÑват аргументи return-to."
#: lib/repeatform.php:107
-#, fuzzy
msgid "Repeat this notice?"
-msgstr "ПовтарÑне на тази бележка"
+msgstr "Да Ñе повтори ли тази бележка?"
#: lib/repeatform.php:132
msgid "Yes"
@@ -6602,9 +6584,8 @@ msgid "Search"
msgstr "ТърÑене"
#: lib/searchaction.php:162
-#, fuzzy
msgid "Search help"
-msgstr "ТърÑене"
+msgstr "Помощ за Ñ‚ÑŠÑ€Ñенето"
#: lib/searchgroupnav.php:80
msgid "People"
@@ -6758,56 +6739,56 @@ msgid "Moderator"
msgstr "Модератор"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1054
+#: lib/util.php:1083
msgid "a few seconds ago"
msgstr "преди нÑколко Ñекунди"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1057
+#: lib/util.php:1086
msgid "about a minute ago"
msgstr "преди около минута"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1061
+#: lib/util.php:1090
#, php-format
msgid "about %d minutes ago"
msgstr "преди около %d минути"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1064
+#: lib/util.php:1093
msgid "about an hour ago"
msgstr "преди около чаÑ"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1068
+#: lib/util.php:1097
#, php-format
msgid "about %d hours ago"
msgstr "преди около %d чаÑа"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1071
+#: lib/util.php:1100
msgid "about a day ago"
msgstr "преди около ден"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1075
+#: lib/util.php:1104
#, php-format
msgid "about %d days ago"
msgstr "преди около %d дни"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1078
+#: lib/util.php:1107
msgid "about a month ago"
msgstr "преди около меÑец"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1082
+#: lib/util.php:1111
#, php-format
msgid "about %d months ago"
msgstr "преди около %d меÑеца"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1085
+#: lib/util.php:1114
msgid "about a year ago"
msgstr "преди около година"
diff --git a/locale/br/LC_MESSAGES/statusnet.po b/locale/br/LC_MESSAGES/statusnet.po
index 3b72ee8c2..9e0994529 100644
--- a/locale/br/LC_MESSAGES/statusnet.po
+++ b/locale/br/LC_MESSAGES/statusnet.po
@@ -9,12 +9,12 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-12 21:47+0000\n"
-"PO-Revision-Date: 2010-04-12 21:48:14+0000\n"
+"POT-Creation-Date: 2010-04-24 14:16+0000\n"
+"PO-Revision-Date: 2010-04-26 22:16:12+0000\n"
"Language-Team: Dutch\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r64984); Translate extension (2010-01-16)\n"
+"X-Generator: MediaWiki 1.17alpha (r65552); Translate extension (2010-04-25)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: br\n"
"X-Message-Group: out-statusnet\n"
@@ -98,8 +98,8 @@ msgstr "N'eus ket eus ar bajenn-se."
#: actions/apidirectmessagenew.php:75 actions/apigroupcreate.php:112
#: actions/apigroupismember.php:90 actions/apigroupjoin.php:99
#: actions/apigroupleave.php:99 actions/apigrouplist.php:72
-#: actions/apistatusesupdate.php:148 actions/apisubscriptions.php:87
-#: actions/apitimelinefavorites.php:71 actions/apitimelinefriends.php:78
+#: actions/apistatusesupdate.php:239 actions/apisubscriptions.php:87
+#: actions/apitimelinefavorites.php:71 actions/apitimelinefriends.php:173
#: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79
#: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75
#: actions/favoritesrss.php:74 actions/foaf.php:40 actions/foaf.php:58
@@ -123,7 +123,7 @@ msgstr "%1$s hag e vignoned, pajenn %2$d"
#. TRANS: H1 text. %1$s is user nickname
#. TRANS: Message is used as link title. %s is a user nickname.
#: actions/all.php:89 actions/all.php:181 actions/allrss.php:116
-#: actions/apitimelinefriends.php:114 actions/apitimelinehome.php:115
+#: actions/apitimelinefriends.php:209 actions/apitimelinehome.php:115
#: lib/personalgroupnav.php:100
#, php-format
msgid "%s and friends"
@@ -183,7 +183,7 @@ msgstr "C'hwi hag o mignoned"
#. 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:121 actions/apitimelinefriends.php:120
+#: actions/allrss.php:121 actions/apitimelinefriends.php:215
#: actions/apitimelinehome.php:121
#, php-format
msgid "Updates from %1$s and friends on %2$s!"
@@ -205,9 +205,9 @@ msgstr "Hizivadennoù %1$s ha mignoned e %2$s!"
#: actions/apistatusesdestroy.php:102 actions/apistatusesretweets.php:112
#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:141
#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111
-#: actions/apitimelinefavorites.php:173 actions/apitimelinefriends.php:175
+#: actions/apitimelinefavorites.php:173 actions/apitimelinefriends.php:270
#: actions/apitimelinegroup.php:151 actions/apitimelinehome.php:174
-#: actions/apitimelinementions.php:173 actions/apitimelinepublic.php:151
+#: actions/apitimelinementions.php:173 actions/apitimelinepublic.php:240
#: actions/apitimelineretweetedtome.php:121
#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:160
#: actions/apitimelineuser.php:162 actions/apiusershow.php:101
@@ -224,7 +224,7 @@ msgstr "N'eo ket bet kavet an hentenn API !"
#: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91
#: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91
#: actions/apigroupleave.php:91 actions/apimediaupload.php:67
-#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:118
+#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:209
msgid "This method requires a POST."
msgstr "Ezhomm en deus an argerzh-mañ eus ur POST."
@@ -254,7 +254,7 @@ msgstr "Diposubl eo enrollañ ar profil."
#: actions/apiaccountupdateprofilebackgroundimage.php:108
#: actions/apiaccountupdateprofileimage.php:97 actions/apimediaupload.php:80
-#: actions/apistatusesupdate.php:131 actions/avatarsettings.php:257
+#: actions/apistatusesupdate.php:222 actions/avatarsettings.php:257
#: actions/designadminpanel.php:123 actions/editapplication.php:118
#: actions/newapplication.php:101 actions/newnotice.php:94
#: lib/designsettings.php:283
@@ -482,9 +482,9 @@ msgstr "Strollad %s"
#. TRANS: Meant to convey the user %2$s is a member of each of the groups listed on site %1$s
#: actions/apigrouplist.php:107
-#, fuzzy, php-format
+#, php-format
msgid "%1$s groups %2$s is a member of."
-msgstr "Ezel eo %s eus ar strolladoù"
+msgstr "Strolladoù %1s m'eo ezel %2s."
#. TRANS: Message is used as a title. %s is a site name.
#. TRANS: Message is used as a page title. %s is a nick name.
@@ -636,17 +636,17 @@ msgstr "Statud diverket."
msgid "No status with that ID found."
msgstr "N'eo ket bet kavet a statud evit an ID-mañ"
-#: actions/apistatusesupdate.php:161 actions/newnotice.php:155
+#: actions/apistatusesupdate.php:252 actions/newnotice.php:155
#: lib/mailhandler.php:60
#, php-format
msgid "That's too long. Max notice size is %d chars."
msgstr "Re hir eo ! Ment hirañ an ali a zo a %d arouezenn."
-#: actions/apistatusesupdate.php:202 actions/apiusershow.php:96
+#: actions/apistatusesupdate.php:293 actions/apiusershow.php:96
msgid "Not found."
msgstr "N'eo ket bet kavet."
-#: actions/apistatusesupdate.php:225 actions/newnotice.php:178
+#: actions/apistatusesupdate.php:316 actions/newnotice.php:178
#, php-format
msgid "Max notice size is %d chars, including attachment URL."
msgstr ""
@@ -675,12 +675,12 @@ msgstr "%1$s / Hizivadennoù a veneg %2$s"
msgid "%1$s updates that reply to updates from %2$s / %3$s."
msgstr ""
-#: actions/apitimelinepublic.php:107 actions/publicrss.php:103
+#: actions/apitimelinepublic.php:196 actions/publicrss.php:103
#, php-format
msgid "%s public timeline"
msgstr "Oberezhioù publik %s"
-#: actions/apitimelinepublic.php:112 actions/publicrss.php:105
+#: actions/apitimelinepublic.php:201 actions/publicrss.php:105
#, php-format
msgid "%s updates from everyone!"
msgstr "%s statud an holl !"
@@ -816,10 +816,9 @@ msgstr ""
#: actions/block.php:145 actions/deleteapplication.php:154
#: actions/deletenotice.php:147 actions/deleteuser.php:152
#: actions/groupblock.php:178
-#, fuzzy
msgctxt "BUTTON"
msgid "No"
-msgstr "Ket"
+msgstr "Nann"
#. TRANS: Submit button title for 'No' when blocking a user.
#. TRANS: Submit button title for 'No' when deleting a user.
@@ -835,7 +834,6 @@ msgstr "Arabat stankañ an implijer-mañ"
#: actions/block.php:152 actions/deleteapplication.php:161
#: actions/deletenotice.php:154 actions/deleteuser.php:159
#: actions/groupblock.php:185
-#, fuzzy
msgctxt "BUTTON"
msgid "Yes"
msgstr "Ya"
@@ -892,9 +890,9 @@ msgstr "Distankañ an implijer-mañ"
#. TRANS: Title for mini-posting window loaded from bookmarklet.
#: actions/bookmarklet.php:51
-#, fuzzy, php-format
+#, php-format
msgid "Post to %s"
-msgstr "Postañ war "
+msgstr "Postañ war %s"
#: actions/confirmaddress.php:75
msgid "No confirmation code."
@@ -910,9 +908,9 @@ msgstr "N'eo ket ar c'hod-se evidoc'h !"
#. TRANS: Server error for an unknow address type, which can be 'email', 'jabber', or 'sms'.
#: actions/confirmaddress.php:91
-#, fuzzy, php-format
+#, php-format
msgid "Unrecognized address type %s."
-msgstr "N'eo ket bet anavezet seurt ar chomlec'h %s"
+msgstr "Doare chomlec'h dianav %s."
#. TRANS: Client error for an already confirmed email/jabbel/sms address.
#: actions/confirmaddress.php:96
@@ -1076,9 +1074,9 @@ msgid "Invalid logo URL."
msgstr "URL fall evit al logo."
#: actions/designadminpanel.php:280
-#, fuzzy, php-format
+#, php-format
msgid "Theme not available: %s."
-msgstr "N'eus ket tu kaout an dodenn : %s"
+msgstr "N'eus ket eus ar gaoz-se : %s."
#: actions/designadminpanel.php:376
msgid "Change logo"
@@ -1330,7 +1328,6 @@ msgstr "Chomlec'h postel gwiriekaet er mare-mañ."
#: actions/emailsettings.php:115 actions/emailsettings.php:158
#: actions/imsettings.php:116 actions/smssettings.php:124
#: actions/smssettings.php:180
-#, fuzzy
msgctxt "BUTTON"
msgid "Remove"
msgstr "Dilemel"
@@ -1347,7 +1344,6 @@ msgstr ""
#. TRANS: Button label
#: actions/emailsettings.php:127 actions/imsettings.php:131
#: actions/smssettings.php:137 lib/applicationeditform.php:357
-#, fuzzy
msgctxt "BUTTON"
msgid "Cancel"
msgstr "Nullañ"
@@ -1362,7 +1358,6 @@ msgstr "Chomlec'h postel, evel \"AnvImplijer@example.org\""
#. TRANS: Button label for adding a SMS phone number in SMS settings form.
#: actions/emailsettings.php:139 actions/imsettings.php:148
#: actions/smssettings.php:162
-#, fuzzy
msgctxt "BUTTON"
msgid "Add"
msgstr "Ouzhpennañ"
@@ -1388,16 +1383,14 @@ 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:168 actions/smssettings.php:189
-#, fuzzy
msgctxt "BUTTON"
msgid "New"
msgstr "Nevez"
#. TRANS: Form legend for e-mail preferences form.
#: actions/emailsettings.php:174
-#, fuzzy
msgid "Email preferences"
-msgstr "Penndibaboù"
+msgstr "Penndibaboù ar posteloù"
#. TRANS: Checkbox label in e-mail preferences form.
#: actions/emailsettings.php:180
@@ -1436,9 +1429,8 @@ msgstr "Embann ur MicroID evit ma chomlec'h postel."
#. TRANS: Confirmation message for successful e-mail preferences save.
#: actions/emailsettings.php:334
-#, fuzzy
msgid "Email preferences saved."
-msgstr "Enrollet eo bet an arventennoù design."
+msgstr "Enrollet eo bet an arventennoù postel."
#. TRANS: Message given saving e-mail address without having provided one.
#: actions/emailsettings.php:353
@@ -1472,7 +1464,7 @@ msgstr ""
#: actions/emailsettings.php:391 actions/imsettings.php:348
#: actions/smssettings.php:373
msgid "Couldn't insert confirmation code."
-msgstr ""
+msgstr "Dibosupl eo ensoc'hañ ar c'hod gwiriekaat."
#. TRANS: Message given saving valid e-mail address that is to be confirmed.
#: actions/emailsettings.php:398
@@ -1491,15 +1483,13 @@ msgstr ""
#. TRANS: Message given canceling e-mail address confirmation for the wrong e-mail address.
#: actions/emailsettings.php:424
-#, fuzzy
msgid "That is the wrong email address."
msgstr "N'eo ket mat ar chomlec'h postelerezh prim."
#. TRANS: Message given after successfully canceling e-mail address confirmation.
#: actions/emailsettings.php:438
-#, fuzzy
msgid "Email confirmation cancelled."
-msgstr "Nullet eo bet ar gadarnadenn."
+msgstr "Nullet eo bet kadarnadenn ar postel."
#. TRANS: Message given trying to remove an e-mail address that is not
#. TRANS: registered for the active user.
@@ -1509,9 +1499,8 @@ msgstr "N'eo ket ho postel."
#. TRANS: Message given after successfully removing a registered e-mail address.
#: actions/emailsettings.php:479
-#, fuzzy
msgid "The email address was removed."
-msgstr "Dilamet eo bet ar chomlec'h."
+msgstr "Dilamet eo bet ar chomlec'h postel."
#: actions/emailsettings.php:493 actions/smssettings.php:568
msgid "No incoming email address."
@@ -1522,7 +1511,7 @@ msgstr "Chomlec'h postel ebet o tont."
#: actions/emailsettings.php:504 actions/emailsettings.php:528
#: actions/smssettings.php:578 actions/smssettings.php:602
msgid "Couldn't update user record."
-msgstr ""
+msgstr "Dibosupl eo hizivaat doser an implijer."
#. TRANS: Message given after successfully removing an incoming e-mail address.
#: actions/emailsettings.php:508 actions/smssettings.php:581
@@ -1943,9 +1932,8 @@ msgstr ""
#. TRANS: Form legend for IM preferences form.
#: actions/imsettings.php:155
-#, fuzzy
msgid "IM preferences"
-msgstr "Penndibaboù"
+msgstr "Penndibaboù ar bostelerezh prim"
#. TRANS: Checkbox label in IM preferences form.
#: actions/imsettings.php:160
@@ -2019,9 +2007,8 @@ msgstr "Diposubl eo dilemel ar postel kadarnadur."
#. TRANS: Message given after successfully canceling IM address confirmation.
#: actions/imsettings.php:402
-#, fuzzy
msgid "IM confirmation cancelled."
-msgstr "Nullet eo bet ar gadarnadenn."
+msgstr "Nullet eo bet kadarnadenn ar bostelerezh prim."
#. TRANS: Message given trying to remove an IM address that is not
#. TRANS: registered for the active user.
@@ -2054,9 +2041,9 @@ msgid "Invites have been disabled."
msgstr "Diweredekaat eo bet ar bedadennoù."
#: actions/invite.php:41
-#, fuzzy, php-format
+#, php-format
msgid "You must be logged in to invite other users to use %s."
-msgstr "Rankout a reoc'h bezañ luget evit mont en ur strollad."
+msgstr "Rankout a reoc'h bezañ luget evit pediñ implijerien all e %s."
#: actions/invite.php:72
#, php-format
@@ -2239,13 +2226,16 @@ msgstr ""
"tremen a-benn enrollañ ho penndibaboù."
#: actions/login.php:270
+msgid "Login with your username and password."
+msgstr "Kevreit gant ho anv implijer hag ho ker-tremen."
+
+#: actions/login.php:273
#, php-format
msgid ""
-"Login with your username and password. Don't have a username yet? [Register]"
-"(%%action.register%%) a new account."
+"Don't have a username yet? [Register](%%action.register%%) a new account."
msgstr ""
-"Kevreit gant ho anv implijer hag ho ker tremen. N'o peus ket a anv implijer "
-"evit c'hoazh ? [Krouit](%%action.register%%) ur gont nevez."
+"N'o peus ket a anv implijer evit c'hoazh ? [Krouit](%%action.register%%) ur "
+"gont nevez."
#: actions/makeadmin.php:92
msgid "Only an admin can make another user an admin."
@@ -2460,8 +2450,8 @@ msgid "Only %s URLs over plain HTTP please."
msgstr ""
#. TRANS: Client error on an API request with an unsupported data format.
-#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1069
-#: lib/apiaction.php:1098 lib/apiaction.php:1215
+#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1131
+#: lib/apiaction.php:1160 lib/apiaction.php:1277
msgid "Not a supported data format."
msgstr ""
@@ -2765,9 +2755,9 @@ msgid "People search"
msgstr "Klask tud"
#: actions/peopletag.php:68
-#, fuzzy, php-format
+#, php-format
msgid "Not a valid people tag: %s."
-msgstr "N'eo ket reizh ar merk-se : %s"
+msgstr "N'eo ket reizh ar merk-se : %s."
#: actions/peopletag.php:142
#, php-format
@@ -2775,9 +2765,8 @@ msgid "Users self-tagged with %1$s - page %2$d"
msgstr "Implijerien bet merket drezo o unan gant %1$s - pajenn %2$d"
#: actions/postnotice.php:95
-#, fuzzy
msgid "Invalid notice content."
-msgstr "Danvez direizh an ali"
+msgstr "Danvez direizh an ali."
#: actions/postnotice.php:101
#, php-format
@@ -2824,7 +2813,7 @@ msgstr ""
#: actions/profilesettings.php:125 actions/register.php:464
msgid "Describe yourself and your interests"
-msgstr ""
+msgstr "Deskrivit hoc'h-unan hag ar pezh a zedenn ac'hanoc'h"
#: actions/profilesettings.php:127 actions/register.php:466
msgid "Bio"
@@ -2843,7 +2832,7 @@ msgstr "El lec'h m'emaoc'h, da skouer \"Kêr, Stad (pe Rannvro), Bro\""
#: actions/profilesettings.php:138
msgid "Share my current location when posting notices"
-msgstr ""
+msgstr "Rannañ va lec'hiadur pa bostan un ali."
#: actions/profilesettings.php:145 actions/tagother.php:149
#: actions/tagother.php:209 lib/subscriptionlist.php:106
@@ -2901,7 +2890,7 @@ msgstr ""
#: actions/profilesettings.php:363
msgid "Couldn't save location prefs."
-msgstr ""
+msgstr "Dibosupl eo enrollañ an dibaboù lec'hiadur."
#: actions/profilesettings.php:375
msgid "Couldn't save profile."
@@ -2919,7 +2908,7 @@ msgstr "Enrollet eo bet an arventennoù."
#: actions/public.php:83
#, php-format
msgid "Beyond the page limit (%s)."
-msgstr ""
+msgstr "Dreist da bevennoù ar bajenn (%s)."
#: actions/public.php:92
msgid "Could not retrieve public stream."
@@ -2936,15 +2925,15 @@ msgstr ""
#: actions/public.php:160
msgid "Public Stream Feed (RSS 1.0)"
-msgstr ""
+msgstr "Neudenn gwazh foran (RSS 1.0)"
#: actions/public.php:164
msgid "Public Stream Feed (RSS 2.0)"
-msgstr ""
+msgstr "Neudenn gwazh foran (RSS 2.0)"
#: actions/public.php:168
msgid "Public Stream Feed (Atom)"
-msgstr ""
+msgstr "Neudenn gwazh foran (Atom)"
#: actions/public.php:188
#, php-format
@@ -2987,7 +2976,7 @@ msgstr ""
#: actions/publictagcloud.php:63
#, php-format
msgid "These are most popular recent tags on %s "
-msgstr ""
+msgstr "Ar merkoù ziwezhañ evit ar re vrudetañ war %s "
#: actions/publictagcloud.php:69
#, php-format
@@ -2996,7 +2985,7 @@ msgstr ""
#: actions/publictagcloud.php:72
msgid "Be the first to post one!"
-msgstr ""
+msgstr "Bezit an hini gentañ oc'h embann unan !"
#: actions/publictagcloud.php:75
#, php-format
@@ -3023,15 +3012,15 @@ msgstr "N'eo ket ur c'hod adtapout an dra-mañ."
#: actions/recoverpassword.php:73
msgid "Recovery code for unknown user."
-msgstr ""
+msgstr "Kod adtapout evit un implijer dizanv."
#: actions/recoverpassword.php:86
msgid "Error with confirmation code."
-msgstr ""
+msgstr "Ur fazi 'zo bet gant ar c'hod kadarnaat."
#: actions/recoverpassword.php:97
msgid "This confirmation code is too old. Please start again."
-msgstr ""
+msgstr "Re gozh eo ar c'hod gwiriañ. Adkrogit mar plij."
#: actions/recoverpassword.php:111
msgid "Could not update user with confirmed email address."
@@ -3053,7 +3042,7 @@ msgstr "Adtapout ar ger-tremen"
#: actions/recoverpassword.php:191
msgid "Nickname or email address"
-msgstr ""
+msgstr "Lesanv pe chomlec'h postel"
#: actions/recoverpassword.php:193
msgid "Your nickname on this server, or your registered email address."
@@ -3093,15 +3082,15 @@ msgstr "Lakait ul lesanv pe ur chomlec'h postel."
#: actions/recoverpassword.php:282
msgid "No user with that email address or username."
-msgstr ""
+msgstr "N'eus bet kavet implijer ebet gant ar postel-se pe an anv-se."
#: actions/recoverpassword.php:299
msgid "No registered email address for that user."
-msgstr ""
+msgstr "Chomlec'h postel enrollet ebet evit an implijer-mañ."
#: actions/recoverpassword.php:313
msgid "Error saving address confirmation."
-msgstr ""
+msgstr "Ur fazi 'zo bet pa voe enrollet kod kadarnaat ar postel."
#: actions/recoverpassword.php:338
msgid ""
@@ -3115,23 +3104,25 @@ msgstr ""
#: actions/recoverpassword.php:365
msgid "Password must be 6 chars or more."
-msgstr ""
+msgstr "Rankout a ra ar ger-tremen bezañ 6 arouezenn d'an nebeutañ."
#: actions/recoverpassword.php:369
msgid "Password and confirmation do not match."
-msgstr ""
+msgstr "Ne glot ket ar ger-tremen gant ar c'hadarnadur."
#: actions/recoverpassword.php:388 actions/register.php:248
msgid "Error setting user."
-msgstr ""
+msgstr "Ur fazi 'zo bet e-pad kefluniadur an implijer."
#: actions/recoverpassword.php:395
msgid "New password successfully saved. You are now logged in."
-msgstr ""
+msgstr "Krouet eo bet ar ger-tremen nevez. Kevreet oc'h bremañ."
#: actions/register.php:85 actions/register.php:189 actions/register.php:405
msgid "Sorry, only invited people can register."
msgstr ""
+"Digarezit, met n'eus nemet an implijerien bet pedet hag a c'hell en em "
+"enskrivañ."
#: actions/register.php:92
msgid "Sorry, invalid invitation code."
@@ -3139,7 +3130,7 @@ msgstr "Digarezit, kod pedadenn direizh."
#: actions/register.php:112
msgid "Registration successful"
-msgstr ""
+msgstr "Krouet eo bet ar gont."
#: actions/register.php:114 actions/register.php:507 lib/logingroupnav.php:85
msgid "Register"
@@ -3147,11 +3138,13 @@ msgstr "Krouiñ ur gont"
#: actions/register.php:135
msgid "Registration not allowed."
-msgstr ""
+msgstr "N'eo ket aotreet krouiñ kontoù."
#: actions/register.php:198
msgid "You can't register if you don't agree to the license."
msgstr ""
+"Rankout a reoc'h bezañ a-du gant termenoù an aotre-implijout evit krouiñ ur "
+"gont."
#: actions/register.php:212
msgid "Email address already exists."
@@ -3159,7 +3152,7 @@ msgstr "Implijet eo dija ar chomlec'h postel-se."
#: actions/register.php:243 actions/register.php:265
msgid "Invalid username or password."
-msgstr ""
+msgstr "Anv implijer pe ger-tremen direizh."
#: actions/register.php:343
msgid ""
@@ -3235,11 +3228,11 @@ msgstr ""
#: actions/remotesubscribe.php:112
msgid "Remote subscribe"
-msgstr ""
+msgstr "Koumanant eus a-bell"
#: actions/remotesubscribe.php:124
msgid "Subscribe to a remote user"
-msgstr ""
+msgstr "Koumanantiñ d'un implijer pell"
#: actions/remotesubscribe.php:129
msgid "User nickname"
@@ -3264,7 +3257,7 @@ msgstr "En em enskrivañ"
#: actions/remotesubscribe.php:159
msgid "Invalid profile URL (bad format)"
-msgstr ""
+msgstr "URL direizh evit ar profil (furmad fall)"
#: actions/remotesubscribe.php:168
msgid "Not a valid profile URL (no YADIS document or invalid XRDS defined)."
@@ -3276,11 +3269,11 @@ msgstr ""
#: actions/remotesubscribe.php:183
msgid "Couldn’t get a request token."
-msgstr ""
+msgstr "Dibosupl eo kaout ur jedaouer reked."
#: actions/repeat.php:57
msgid "Only logged-in users can repeat notices."
-msgstr ""
+msgstr "N'eus nemet an implijerien kevreet hag a c'hell adkemer alioù."
#: actions/repeat.php:64 actions/repeat.php:71
msgid "No notice specified."
@@ -3404,7 +3397,7 @@ msgstr ""
#: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
#: actions/useradminpanel.php:294
msgid "Save site settings"
-msgstr ""
+msgstr "Enrollañ arventennoù al lec'hienn"
#: actions/showapplication.php:82
msgid "You must be logged in to view an application."
@@ -3500,12 +3493,12 @@ msgstr ""
#: actions/showfavorites.php:171
#, php-format
msgid "Feed for favorites of %s (RSS 1.0)"
-msgstr ""
+msgstr "Gwazh evit mignoned %s (RSS 1.0)"
#: actions/showfavorites.php:178
#, php-format
msgid "Feed for favorites of %s (RSS 2.0)"
-msgstr ""
+msgstr "Gwazh evit mignoned %s (RSS 2.0)"
#: actions/showfavorites.php:185
#, php-format
@@ -3572,17 +3565,17 @@ msgstr "Obererezh ar strollad"
#: actions/showgroup.php:338
#, php-format
msgid "Notice feed for %s group (RSS 1.0)"
-msgstr ""
+msgstr "Neudenn alioù ar strollad %s (RSS 1.0)"
#: actions/showgroup.php:344
#, php-format
msgid "Notice feed for %s group (RSS 2.0)"
-msgstr ""
+msgstr "Neudenn alioù ar strollad %s (RSS 2.0)"
#: actions/showgroup.php:350
#, php-format
msgid "Notice feed for %s group (Atom)"
-msgstr ""
+msgstr "Neudenn alioù ar strollad %s (Atom)"
#: actions/showgroup.php:355
#, php-format
@@ -3667,17 +3660,17 @@ msgstr "%1$s, pajenn %2$d"
#: actions/showstream.php:122
#, php-format
msgid "Notice feed for %1$s tagged %2$s (RSS 1.0)"
-msgstr ""
+msgstr "Neudenn an alioù evit %1$s merket %2$s (RSS 1.0)"
#: actions/showstream.php:129
#, php-format
msgid "Notice feed for %s (RSS 1.0)"
-msgstr ""
+msgstr "Neudenn an alioù evit %s (RSS 1.0)"
#: actions/showstream.php:136
#, php-format
msgid "Notice feed for %s (RSS 2.0)"
-msgstr ""
+msgstr "Neudenn an alioù evit %s (RSS 2.0)"
#: actions/showstream.php:143
#, php-format
@@ -3756,7 +3749,7 @@ msgstr "Yezh \"%s\" dizanv."
#: actions/siteadminpanel.php:165
msgid "Minimum text limit is 0 (unlimited)."
-msgstr ""
+msgstr "Ar vevenn izelañ evit an destenn a zo 0 arouezenn (anvevenn)."
#: actions/siteadminpanel.php:171
msgid "Dupe limit must be one or more seconds."
@@ -3772,7 +3765,7 @@ msgstr "Anv al lec'hienn"
#: actions/siteadminpanel.php:225
msgid "The name of your site, like \"Yourcompany Microblog\""
-msgstr ""
+msgstr "Anv ho lec'hienn, evel \"Microblog ho embregerezh\""
#: actions/siteadminpanel.php:229
msgid "Brought by"
@@ -3792,7 +3785,7 @@ msgstr ""
#: actions/siteadminpanel.php:239
msgid "Contact email address for your site"
-msgstr ""
+msgstr "Chomlec'h postel daremprediñ ho lec'hienn"
#: actions/siteadminpanel.php:245
msgid "Local"
@@ -3839,9 +3832,8 @@ msgid "Site Notice"
msgstr "Ali al lec'hienn"
#: actions/sitenoticeadminpanel.php:67
-#, fuzzy
msgid "Edit site-wide message"
-msgstr "Kemennadenn nevez"
+msgstr "Kemmañ ur gemennadenn hag a zo diwar-benn al lec'hienn a-bezh"
#: actions/sitenoticeadminpanel.php:103
msgid "Unable to save site notice."
@@ -3858,6 +3850,8 @@ msgstr "Testenn ali al lec'hienn"
#: actions/sitenoticeadminpanel.php:178
msgid "Site-wide notice text (255 chars max; HTML okay)"
msgstr ""
+"Testenn an ali diwar-benn al lec'hienn a-bezh (255 arouezenn d'ar muiañ ; "
+"HTML gweredekaet)"
#: actions/sitenoticeadminpanel.php:198
msgid "Save site notice"
@@ -3874,6 +3868,8 @@ msgstr "Arventennoù SMS"
#, php-format
msgid "You can receive SMS messages through email from %%site.name%%."
msgstr ""
+"Gellout a reoc'h resevout kemmadennoù SMS dre postel o tont eus %%site.name%"
+"%."
#. TRANS: Message given in the SMS settings if SMS is not enabled on the site.
#: actions/smssettings.php:97
@@ -3882,19 +3878,18 @@ msgstr "Dizimplijadus eo an SMS."
#. TRANS: Form legend for SMS settings form.
#: actions/smssettings.php:111
-#, fuzzy
msgid "SMS address"
-msgstr "Chomlec'h postelerezh prim"
+msgstr "Chomlec'h SMS"
#. TRANS: Form guide in SMS settings form.
#: actions/smssettings.php:120
msgid "Current confirmed SMS-enabled phone number."
-msgstr ""
+msgstr "Niverenn pellgomz bet gwiriekaet evit resevout SMSoù."
#. TRANS: Form guide in IM settings form.
#: actions/smssettings.php:133
msgid "Awaiting confirmation on this phone number."
-msgstr ""
+msgstr "Niverenn pellgomz o c'hortoz bezañ kadarnaet."
#. TRANS: Field label for SMS address input in SMS settings form.
#: actions/smssettings.php:142
@@ -3904,11 +3899,10 @@ msgstr "Kod kadarnaat"
#. TRANS: Form field instructions in SMS settings form.
#: actions/smssettings.php:144
msgid "Enter the code you received on your phone."
-msgstr ""
+msgstr "Lakait ar c'hod o peus resevet war ho pellgomzer hezoug."
#. TRANS: Button label to confirm SMS confirmation code in SMS settings.
#: actions/smssettings.php:148
-#, fuzzy
msgctxt "BUTTON"
msgid "Confirm"
msgstr "Kadarnaat"
@@ -3925,9 +3919,8 @@ msgstr ""
#. TRANS: Form legend for SMS preferences form.
#: actions/smssettings.php:195
-#, fuzzy
msgid "SMS preferences"
-msgstr "Penndibaboù"
+msgstr "Penndibaboù an SMSoù"
#. TRANS: Checkbox label in SMS preferences form.
#: actions/smssettings.php:201
@@ -3938,9 +3931,8 @@ msgstr ""
#. TRANS: Confirmation message for successful SMS preferences save.
#: actions/smssettings.php:315
-#, fuzzy
msgid "SMS preferences saved."
-msgstr "Penndibaboù enrollet"
+msgstr "Penndibaboù an SMSoù enrollet."
#. TRANS: Message given saving SMS phone number without having provided one.
#: actions/smssettings.php:338
@@ -3976,9 +3968,8 @@ msgstr "Direizh eo ar c'hod gwiriekaat-mañ."
#. TRANS: Message given after successfully canceling SMS phone number confirmation.
#: actions/smssettings.php:427
-#, fuzzy
msgid "SMS confirmation cancelled."
-msgstr "Nullet eo bet ar gadarnadenn."
+msgstr "Nullet eo bet ar gadarnadenn SMS."
#. TRANS: Message given trying to remove an SMS phone number that is not
#. TRANS: registered for the active user.
@@ -3988,14 +3979,13 @@ msgstr "n'eo ket ho niverenn pellgomz."
#. TRANS: Message given after successfully removing a registered SMS phone number.
#: actions/smssettings.php:470
-#, fuzzy
msgid "The SMS phone number was removed."
-msgstr "Niverenn bellgomz evit an SMS"
+msgstr "Dilamet eo bet an niverenn bellgomz evit an SMSoù."
#. TRANS: Label for mobile carrier dropdown menu in SMS settings.
#: actions/smssettings.php:511
msgid "Mobile carrier"
-msgstr ""
+msgstr "Pourvezer pellgomzerezh hezoug"
#. TRANS: Default option for mobile carrier dropdown menu in SMS settings.
#: actions/smssettings.php:516
@@ -4064,7 +4054,7 @@ msgstr ""
#: actions/snapshotadminpanel.php:226
msgid "Report URL"
-msgstr ""
+msgstr "URL an danevell"
#: actions/snapshotadminpanel.php:227
msgid "Snapshots will be sent to this URL"
@@ -4140,16 +4130,16 @@ msgstr ""
#: actions/subscriptions.php:52
#, php-format
msgid "%s subscriptions"
-msgstr ""
+msgstr "Koumanantoù %s"
#: actions/subscriptions.php:54
#, php-format
msgid "%1$s subscriptions, page %2$d"
-msgstr ""
+msgstr "Koumanantoù %1$s, pajenn %2$d"
#: actions/subscriptions.php:65
msgid "These are the people whose notices you listen to."
-msgstr ""
+msgstr "Heuliañ a reoc'h alioù an dud-se."
#: actions/subscriptions.php:69
#, php-format
@@ -4182,26 +4172,26 @@ msgstr "SMS"
#: actions/tag.php:69
#, php-format
msgid "Notices tagged with %1$s, page %2$d"
-msgstr ""
+msgstr "Alioù merket gant %1$s, pajenn %2$d"
#: actions/tag.php:87
#, php-format
msgid "Notice feed for tag %s (RSS 1.0)"
-msgstr ""
+msgstr "Gwazh an alioù evit ar merk %s (RSS 1.0)"
#: actions/tag.php:93
#, php-format
msgid "Notice feed for tag %s (RSS 2.0)"
-msgstr ""
+msgstr "Gwazh an alioù evit ar merk %s (RSS 2.0)"
#: actions/tag.php:99
#, php-format
msgid "Notice feed for tag %s (Atom)"
-msgstr ""
+msgstr "Gwazh an alioù evit ar merk %s (Atom)"
#: actions/tagother.php:39
msgid "No ID argument."
-msgstr ""
+msgstr "Arguzenn ID ebet."
#: actions/tagother.php:65
#, php-format
@@ -4226,6 +4216,8 @@ msgid ""
"Tags for this user (letters, numbers, -, ., and _), comma- or space- "
"separated"
msgstr ""
+"Merkoù evit an implijer-mañ (lizherennoù, sifroù, -, ., ha _), dispartiet "
+"gant virgulennoù pe gant esaouennoù"
#: actions/tagother.php:193
msgid ""
@@ -4261,9 +4253,8 @@ msgid "User is not silenced."
msgstr ""
#: actions/unsubscribe.php:77
-#, fuzzy
msgid "No profile ID in request."
-msgstr "N'eus profil id ebet er reked."
+msgstr "N'eus profil ID ebet er reked."
#: actions/unsubscribe.php:98
msgid "Unsubscribed"
@@ -4405,27 +4396,27 @@ msgstr ""
#: actions/userauthorization.php:303
#, php-format
msgid "Listener URI ‘%s’ not found here."
-msgstr ""
+msgstr "N'eo ket bet kavet amañ URI ar selaouer \"%s\"."
#: actions/userauthorization.php:308
#, php-format
msgid "Listenee URI ‘%s’ is too long."
-msgstr ""
+msgstr "Re hir eo an URI \"%s\" ez oc'h koumanantet dezhi."
#: actions/userauthorization.php:314
#, php-format
msgid "Listenee URI ‘%s’ is a local user."
-msgstr ""
+msgstr "An URI \"%s\" ez oc'h koumanantet dezhi a zo un implijer lec'hel."
#: actions/userauthorization.php:329
#, php-format
msgid "Profile URL ‘%s’ is for a local user."
-msgstr ""
+msgstr "URI ar profil \"%s\" a zo evit un implijer lec'hel."
#: actions/userauthorization.php:345
#, php-format
msgid "Avatar URL ‘%s’ is not valid."
-msgstr ""
+msgstr "N'eo ket reizh URL an avatar \"%s\"."
#: actions/userauthorization.php:350
#, php-format
@@ -4435,11 +4426,11 @@ msgstr "Dibosupl eo lenn URL an avatar \"%s\"."
#: actions/userauthorization.php:355
#, php-format
msgid "Wrong image type for avatar URL ‘%s’."
-msgstr ""
+msgstr "Seurt skeudenn direizh evit URL an avatar \"%s\"."
#: actions/userdesignsettings.php:76 lib/designsettings.php:65
msgid "Profile design"
-msgstr ""
+msgstr "Design ar profil"
#: actions/userdesignsettings.php:87 lib/designsettings.php:76
msgid ""
@@ -4615,22 +4606,22 @@ msgstr ""
#: classes/Notice.php:332 classes/Notice.php:358
msgid "Problem saving notice."
-msgstr ""
+msgstr "Ur gudenn 'zo bet pa veze enrollet an ali."
-#: classes/Notice.php:965
+#: classes/Notice.php:967
msgid "Problem saving group inbox."
-msgstr ""
+msgstr "Ur gudenn 'zo bet pa veze enrollet boest degemer ar strollad."
#. 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:1513
+#: classes/Notice.php:1535
#, php-format
msgid "RT @%1$s %2$s"
msgstr "RT @%1$s %2$s"
#: classes/Subscription.php:74 lib/oauthstore.php:465
msgid "You have been banned from subscribing."
-msgstr ""
+msgstr "Nac'het ez eus bet deoc'h en em goumanantiñ."
#: classes/Subscription.php:78
msgid "Already subscribed!"
@@ -4655,7 +4646,7 @@ msgstr "Diposubl eo dilemel ar postel kadarnadur."
#: classes/Subscription.php:211
msgid "Couldn't delete subscription."
-msgstr ""
+msgstr "Dibosupl eo paouez gant ar c'houmanant."
#: classes/User.php:363
#, php-format
@@ -4668,20 +4659,20 @@ msgstr "Dibosupl eo krouiñ ar strollad."
#: classes/User_group.php:489
msgid "Could not set group URI."
-msgstr ""
+msgstr "Dibosupl eo termeniñ URI ar strollad."
#: classes/User_group.php:510
msgid "Could not set group membership."
-msgstr ""
+msgstr "Dibosupl eo en em enskrivañ d'ar strollad."
#: classes/User_group.php:524
msgid "Could not save local group info."
-msgstr ""
+msgstr "Dibosupl eo enrollañ titouroù ar strollad lec'hel."
#. TRANS: Link title attribute in user account settings menu.
#: lib/accountsettingsaction.php:109
msgid "Change your profile settings"
-msgstr ""
+msgstr "Kemmañ arventennoù ho profil"
#. TRANS: Link title attribute in user account settings menu.
#: lib/accountsettingsaction.php:116
@@ -4696,12 +4687,12 @@ msgstr "Cheñch ar ger-tremen"
#. TRANS: Link title attribute in user account settings menu.
#: lib/accountsettingsaction.php:130
msgid "Change email handling"
-msgstr ""
+msgstr "Kemmañ tretadur ar posteloù"
#. TRANS: Link title attribute in user account settings menu.
#: lib/accountsettingsaction.php:137
msgid "Design your profile"
-msgstr ""
+msgstr "Krouit ho profil"
#. TRANS: Link title attribute in user account settings menu.
#: lib/accountsettingsaction.php:144
@@ -4762,7 +4753,7 @@ msgstr "Kevreañ"
#: lib/action.php:448
msgctxt "TOOLTIP"
msgid "Change site configuration"
-msgstr ""
+msgstr "Kemmañ arventennoù al lec'hienn"
#. TRANS: Main menu option when logged in and site admin for access to site configuration
#: lib/action.php:451
@@ -4775,7 +4766,7 @@ msgstr "Merañ"
#, php-format
msgctxt "TOOLTIP"
msgid "Invite friends and colleagues to join you on %s"
-msgstr ""
+msgstr "Pediñ mignoned hag kenseurted da zont ganeoc'h war %s"
#. TRANS: Main menu option when logged in and invitations are allowed for inviting new users
#: lib/action.php:458
@@ -4931,7 +4922,7 @@ msgstr ""
#. TRANS: DT element for StatusNet site content license.
#: lib/action.php:840
msgid "Site content license"
-msgstr ""
+msgstr "Aotre-implijout diwar-benn danvez al lec'hienn"
#. TRANS: Content license displayed when license is set to 'private'.
#. TRANS: %1$s is the site name.
@@ -5000,28 +4991,28 @@ msgstr ""
#. TRANS: Client error message throw when a certain panel's settings cannot be changed.
#: lib/adminpanelaction.php:110
msgid "Changes to that panel are not allowed."
-msgstr ""
+msgstr "N'eo ket aotreet kemmañ ar panell-se"
#. TRANS: Client error message.
#: lib/adminpanelaction.php:229
msgid "showForm() not implemented."
-msgstr ""
+msgstr "N'eo ket bet emplementet showForm()."
#. TRANS: Client error message
#: lib/adminpanelaction.php:259
msgid "saveSettings() not implemented."
-msgstr ""
+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.
#: lib/adminpanelaction.php:284
msgid "Unable to delete design setting."
-msgstr ""
+msgstr "Dibosupl eo dilemel an arventennoù krouiñ."
#. TRANS: Menu item title/tooltip
#: lib/adminpanelaction.php:349
msgid "Basic site configuration"
-msgstr ""
+msgstr "Arventennoù diazez al lec'hienn"
#. TRANS: Menu item for site administration
#: lib/adminpanelaction.php:351
@@ -5032,7 +5023,7 @@ msgstr "Lec'hienn"
#. TRANS: Menu item title/tooltip
#: lib/adminpanelaction.php:357
msgid "Design configuration"
-msgstr ""
+msgstr "Kefluniadur ar c'hrouiñ"
#. TRANS: Menu item for site administration
#: lib/adminpanelaction.php:359
@@ -5043,7 +5034,7 @@ msgstr "Design"
#. TRANS: Menu item title/tooltip
#: lib/adminpanelaction.php:365
msgid "User configuration"
-msgstr ""
+msgstr "Kefluniadur an implijer"
#. TRANS: Menu item for site administration
#: lib/adminpanelaction.php:367 lib/personalgroupnav.php:115
@@ -5053,17 +5044,17 @@ msgstr "Implijer"
#. TRANS: Menu item title/tooltip
#: lib/adminpanelaction.php:373
msgid "Access configuration"
-msgstr ""
+msgstr "Kefluniadur ar moned"
#. TRANS: Menu item title/tooltip
#: lib/adminpanelaction.php:381
msgid "Paths configuration"
-msgstr ""
+msgstr "Kefluniadur an hentoù"
#. TRANS: Menu item title/tooltip
#: lib/adminpanelaction.php:389
msgid "Sessions configuration"
-msgstr ""
+msgstr "Kefluniadur an dalc'hoù"
#. TRANS: Menu item title/tooltip
#: lib/adminpanelaction.php:397
@@ -5073,10 +5064,10 @@ msgstr "Kemmañ ali al lec'hienn"
#. TRANS: Menu item title/tooltip
#: lib/adminpanelaction.php:405
msgid "Snapshots configuration"
-msgstr ""
+msgstr "Kefluniadur ar primoù"
#. TRANS: Client error 401.
-#: lib/apiauth.php:95
+#: lib/apiauth.php:113
msgid "API resource requires read-write access, but you only have read access."
msgstr ""
@@ -5088,23 +5079,23 @@ msgstr "Kemmañ an arload"
#. TRANS: Form guide.
#: lib/applicationeditform.php:187
msgid "Icon for this application"
-msgstr ""
+msgstr "Arlun evit ar poellad-mañ"
#. TRANS: Form input field instructions.
#: lib/applicationeditform.php:209
#, php-format
msgid "Describe your application in %d characters"
-msgstr ""
+msgstr "Diskrivit ho poellad gant %d arouezenn"
#. TRANS: Form input field instructions.
#: lib/applicationeditform.php:213
msgid "Describe your application"
-msgstr ""
+msgstr "Deskrivit ho poellad"
#. TRANS: Form input field instructions.
#: lib/applicationeditform.php:224
msgid "URL of the homepage of this application"
-msgstr ""
+msgstr "URL pajenn degemer ar poellad-mañ"
#. TRANS: Form input field label.
#: lib/applicationeditform.php:226
@@ -5114,17 +5105,17 @@ msgstr "Mammenn URL"
#. TRANS: Form input field instructions.
#: lib/applicationeditform.php:233
msgid "Organization responsible for this application"
-msgstr ""
+msgstr "An aozadur e karg eus ar poellad-mañ"
#. TRANS: Form input field instructions.
#: lib/applicationeditform.php:242
msgid "URL for the homepage of the organization"
-msgstr ""
+msgstr "URL pajenn degemer an aozadur-se"
#. TRANS: Form input field instructions.
#: lib/applicationeditform.php:251
msgid "URL to redirect to after authentication"
-msgstr ""
+msgstr "URL davet pehini e o ret adkas goude bezañ kevreet"
#. TRANS: Radio button label for application type
#: lib/applicationeditform.php:278
@@ -5139,7 +5130,7 @@ msgstr "Burev"
#. TRANS: Form guide.
#: lib/applicationeditform.php:297
msgid "Type of application, browser or desktop"
-msgstr ""
+msgstr "Seurt ar poellad, merdeer pe burev"
#. TRANS: Radio button label for access type.
#: lib/applicationeditform.php:320
@@ -5163,21 +5154,19 @@ msgstr "Nullañ"
#. TRANS: Application access type
#: lib/applicationlist.php:136
-#, fuzzy
msgid "read-write"
-msgstr "Lenn-skrivañ"
+msgstr "lenn-skrivañ"
#. TRANS: Application access type
#: lib/applicationlist.php:138
-#, fuzzy
msgid "read-only"
-msgstr "Lenn hepken"
+msgstr "lenn hepken"
#. TRANS: Used in application list. %1$s is a modified date, %2$s is access type (read-write or read-only)
#: lib/applicationlist.php:144
#, php-format
msgid "Approved %1$s - \"%2$s\" access."
-msgstr ""
+msgstr "Aprouet d'an %1$s - moned \"%2$s\"."
#. TRANS: Button label
#: lib/applicationlist.php:159
@@ -5211,53 +5200,54 @@ msgstr ""
#: lib/authenticationplugin.php:220 lib/authenticationplugin.php:225
msgid "Password changing failed"
-msgstr ""
+msgstr "N'eo ket aet betek penn kemmañ ar ger-tremen"
#: lib/authenticationplugin.php:235
msgid "Password changing is not allowed"
-msgstr ""
+msgstr "N'eo ket aotreet kemmañ ar ger-tremen"
#: lib/channel.php:157 lib/channel.php:177
msgid "Command results"
-msgstr ""
+msgstr "Disoc'hoù an urzhiad"
#: lib/channel.php:229 lib/mailhandler.php:142
msgid "Command complete"
-msgstr ""
+msgstr "Urzhiad bet klokaet"
#: lib/channel.php:240
msgid "Command failed"
-msgstr ""
+msgstr "C'hwitet en deus an urzhiad"
#: lib/command.php:83 lib/command.php:105
msgid "Notice with that id does not exist"
-msgstr ""
+msgstr "N'eus ali ebet gant an id-mañ."
#: lib/command.php:99 lib/command.php:596
msgid "User has no last notice"
-msgstr ""
+msgstr "N'eus ali nevez evit an implijer-mañ"
#. 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:127
#, php-format
msgid "Could not find a user with nickname %s"
-msgstr ""
+msgstr "Dibosupl eo kavout un implijer gant al lesanv %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:147
#, php-format
msgid "Could not find a local user with nickname %s"
-msgstr ""
+msgstr "Dibosupl eo kavout un implijer lec'hel gant al lesanv %s"
#: lib/command.php:180
msgid "Sorry, this command is not yet implemented."
-msgstr ""
+msgstr "Digarezit, n'eo ket bet emplementet an urzhiad-mañ c'hoazh."
#: lib/command.php:225
msgid "It does not make a lot of sense to nudge yourself!"
msgstr ""
+"N'eus tamm talvoudegezh ebet ober ur blinkadenn deoc'h c'hwi oc'h unan !"
#. TRANS: Message given having nudged another user.
#. TRANS: %s is the nickname of the user that was nudged.
@@ -5273,14 +5263,17 @@ msgid ""
"Subscribers: %2$s\n"
"Notices: %3$s"
msgstr ""
+"Koumanatoù : %1$s\n"
+"Tud koumanantet : %2$s\n"
+"kemennadennoù : %3$s"
#: lib/command.php:302
msgid "Notice marked as fave."
-msgstr ""
+msgstr "Ali bet ouzhpennet d'ar pennroll."
#: lib/command.php:323
msgid "You are already a member of that group"
-msgstr ""
+msgstr "Ezel oc'h eus ar strollad-mañ dija."
#. 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.
@@ -5292,9 +5285,9 @@ msgstr "Diposubl eo stagañ an implijer %1$s d'ar strollad %2$s."
#. 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.
#: lib/command.php:385
-#, fuzzy, php-format
+#, php-format
msgid "Could not remove user %1$s from group %2$s"
-msgstr "Diposubl eo dilemel an implijer %1$s deus ar strollad %2$s."
+msgstr "Diposubl eo dilemel an implijer %1$s deus ar strollad %2$s"
#. TRANS: Whois output. %s is the full name of the queried user.
#: lib/command.php:418
@@ -5332,11 +5325,11 @@ msgstr ""
#. TRANS: Message given if content is too long.
#. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
#: lib/command.php:472
-#, fuzzy, php-format
+#, php-format
msgid "Message too long - maximum is %1$d characters, you sent %2$d"
msgstr ""
"Re hir eo ar gemennadenn - ar ment brasañ a zo %1$d arouezenn, %2$d "
-"arouezenn o peus lakaet."
+"arouezenn o peus lakaet"
#. TRANS: Message given have sent a direct message to another user.
#. TRANS: %s is the name of the other user.
@@ -5347,15 +5340,15 @@ msgstr "Kaset eo bet ar gemennadenn war eeun da %s."
#: lib/command.php:494
msgid "Error sending direct message."
-msgstr ""
+msgstr "Ur gudenn 'zo bet pa veze kaset ho kemennadenn."
#: lib/command.php:514
msgid "Cannot repeat your own notice"
-msgstr ""
+msgstr "Ne c'helloc'h ket adkemer ho ali"
#: lib/command.php:519
msgid "Already repeated that notice"
-msgstr ""
+msgstr "Ali bet adkemeret dija"
#. TRANS: Message given having repeated a notice from another user.
#. TRANS: %s is the name of the user for which the notice was repeated.
@@ -5410,7 +5403,7 @@ msgstr ""
#: lib/command.php:685
msgid "Notification off."
-msgstr ""
+msgstr "Kemennoù diweredekaet."
#: lib/command.php:687
msgid "Can't turn off notification."
@@ -5418,7 +5411,7 @@ msgstr ""
#: lib/command.php:708
msgid "Notification on."
-msgstr ""
+msgstr "Kemennoù gweredekaet"
#: lib/command.php:710
msgid "Can't turn on notification."
@@ -5426,7 +5419,7 @@ msgstr ""
#: lib/command.php:723
msgid "Login command is disabled"
-msgstr ""
+msgstr "Diweredekaet eo an urzhiad evit digeriñ un dalc'h"
#: lib/command.php:734
#, php-format
@@ -5462,7 +5455,7 @@ msgstr[1] "These people are subscribed to you:"
#: lib/command.php:822
msgid "You are not a member of any groups."
-msgstr ""
+msgstr "N'oc'h ezel eus strollad ebet."
#: lib/command.php:824
#, fuzzy
@@ -5843,7 +5836,7 @@ msgstr "Statud %s"
#. TRANS: Subject line for SMS-by-email address confirmation message
#: lib/mail.php:454
msgid "SMS confirmation"
-msgstr ""
+msgstr "Kadarnadur SMS"
#. TRANS: Main body heading for SMS-by-email address confirmation message
#: lib/mail.php:457
@@ -6469,9 +6462,8 @@ msgid "Moderate"
msgstr "Habaskaat"
#: lib/userprofile.php:364
-#, fuzzy
msgid "User role"
-msgstr "Strolladoù implijerien"
+msgstr "Rol an implijer"
#: lib/userprofile.php:366
msgctxt "role"
@@ -6484,56 +6476,56 @@ msgid "Moderator"
msgstr "Habasker"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1054
+#: lib/util.php:1083
msgid "a few seconds ago"
msgstr "un nebeud eilennoù zo"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1057
+#: lib/util.php:1086
msgid "about a minute ago"
msgstr "1 vunutenn zo well-wazh"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1061
+#: lib/util.php:1090
#, php-format
msgid "about %d minutes ago"
msgstr "%d munutenn zo well-wazh"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1064
+#: lib/util.php:1093
msgid "about an hour ago"
msgstr "1 eurvezh zo well-wazh"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1068
+#: lib/util.php:1097
#, php-format
msgid "about %d hours ago"
msgstr "%d eurvezh zo well-wazh"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1071
+#: lib/util.php:1100
msgid "about a day ago"
msgstr "1 devezh zo well-wazh"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1075
+#: lib/util.php:1104
#, php-format
msgid "about %d days ago"
msgstr "%d devezh zo well-wazh"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1078
+#: lib/util.php:1107
msgid "about a month ago"
msgstr "miz zo well-wazh"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1082
+#: lib/util.php:1111
#, php-format
msgid "about %d months ago"
msgstr "%d miz zo well-wazh"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1085
+#: lib/util.php:1114
msgid "about a year ago"
msgstr "bloaz zo well-wazh"
diff --git a/locale/ca/LC_MESSAGES/statusnet.po b/locale/ca/LC_MESSAGES/statusnet.po
index 55bbac196..7b59c0ef4 100644
--- a/locale/ca/LC_MESSAGES/statusnet.po
+++ b/locale/ca/LC_MESSAGES/statusnet.po
@@ -11,12 +11,12 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-12 21:47+0000\n"
-"PO-Revision-Date: 2010-04-12 21:48:18+0000\n"
+"POT-Creation-Date: 2010-04-24 14:16+0000\n"
+"PO-Revision-Date: 2010-04-26 22:16:15+0000\n"
"Language-Team: Catalan\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r64984); Translate extension (2010-01-16)\n"
+"X-Generator: MediaWiki 1.17alpha (r65552); Translate extension (2010-04-25)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: ca\n"
"X-Message-Group: out-statusnet\n"
@@ -30,9 +30,8 @@ msgstr "Accés"
#. TRANS: Page notice
#: actions/accessadminpanel.php:67
-#, fuzzy
msgid "Site access settings"
-msgstr "Desa els paràmetres del lloc"
+msgstr "Paràmetres d'accés al lloc"
#. TRANS: Form legend for registration form.
#: actions/accessadminpanel.php:161
@@ -74,9 +73,8 @@ msgstr "Tancat"
#. TRANS: Title / tooltip for button to save access settings in site admin panel
#: actions/accessadminpanel.php:202
-#, fuzzy
msgid "Save access settings"
-msgstr "Desa els paràmetres del lloc"
+msgstr "Desa els paràmetres d'accés"
#. TRANS: Button label to save e-mail preferences.
#. TRANS: Button label to save IM preferences.
@@ -104,8 +102,8 @@ msgstr "No existeix la pàgina."
#: actions/apidirectmessagenew.php:75 actions/apigroupcreate.php:112
#: actions/apigroupismember.php:90 actions/apigroupjoin.php:99
#: actions/apigroupleave.php:99 actions/apigrouplist.php:72
-#: actions/apistatusesupdate.php:148 actions/apisubscriptions.php:87
-#: actions/apitimelinefavorites.php:71 actions/apitimelinefriends.php:78
+#: actions/apistatusesupdate.php:239 actions/apisubscriptions.php:87
+#: actions/apitimelinefavorites.php:71 actions/apitimelinefriends.php:173
#: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79
#: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75
#: actions/favoritesrss.php:74 actions/foaf.php:40 actions/foaf.php:58
@@ -121,15 +119,15 @@ msgstr "No existeix aquest usuari."
#. TRANS: Page title. %1$s is user nickname, %2$d is page number
#: actions/all.php:86
-#, fuzzy, php-format
+#, php-format
msgid "%1$s and friends, page %2$d"
-msgstr "%s perfils blocats, pàgina %d"
+msgstr "%1$s i amics, pàgina %2$d"
#. TRANS: Page title. %1$s is user nickname
#. TRANS: H1 text. %1$s is user nickname
#. TRANS: Message is used as link title. %s is a user nickname.
#: actions/all.php:89 actions/all.php:181 actions/allrss.php:116
-#: actions/apitimelinefriends.php:114 actions/apitimelinehome.php:115
+#: actions/apitimelinefriends.php:209 actions/apitimelinehome.php:115
#: lib/personalgroupnav.php:100
#, php-format
msgid "%s and friends"
@@ -191,7 +189,7 @@ msgstr "Un mateix i amics"
#. 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:121 actions/apitimelinefriends.php:120
+#: actions/allrss.php:121 actions/apitimelinefriends.php:215
#: actions/apitimelinehome.php:121
#, php-format
msgid "Updates from %1$s and friends on %2$s!"
@@ -213,13 +211,12 @@ msgstr "Actualitzacions de %1$s i amics a %2$s!"
#: actions/apistatusesdestroy.php:102 actions/apistatusesretweets.php:112
#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:141
#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111
-#: actions/apitimelinefavorites.php:173 actions/apitimelinefriends.php:175
+#: actions/apitimelinefavorites.php:173 actions/apitimelinefriends.php:270
#: actions/apitimelinegroup.php:151 actions/apitimelinehome.php:174
-#: actions/apitimelinementions.php:173 actions/apitimelinepublic.php:151
+#: actions/apitimelinementions.php:173 actions/apitimelinepublic.php:240
#: actions/apitimelineretweetedtome.php:121
#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:160
#: actions/apitimelineuser.php:162 actions/apiusershow.php:101
-#, fuzzy
msgid "API method not found."
msgstr "No s'ha trobat el mètode API!"
@@ -233,7 +230,7 @@ msgstr "No s'ha trobat el mètode API!"
#: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91
#: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91
#: actions/apigroupleave.php:91 actions/apimediaupload.php:67
-#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:118
+#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:209
msgid "This method requires a POST."
msgstr "Aquest mètode requereix POST."
@@ -265,7 +262,7 @@ msgstr "No s'ha pogut guardar el perfil."
#: actions/apiaccountupdateprofilebackgroundimage.php:108
#: actions/apiaccountupdateprofileimage.php:97 actions/apimediaupload.php:80
-#: actions/apistatusesupdate.php:131 actions/avatarsettings.php:257
+#: actions/apistatusesupdate.php:222 actions/avatarsettings.php:257
#: actions/designadminpanel.php:123 actions/editapplication.php:118
#: actions/newapplication.php:101 actions/newnotice.php:94
#: lib/designsettings.php:283
@@ -581,11 +578,11 @@ msgstr "Enviament de formulari inesperat."
#: actions/apioauthauthorize.php:259
msgid "An application would like to connect to your account"
-msgstr ""
+msgstr "Una aplicació voldria connectar-se al vostre compte"
#: actions/apioauthauthorize.php:276
msgid "Allow or deny access"
-msgstr ""
+msgstr "Permet o denega l'accés"
#: actions/apioauthauthorize.php:292
#, php-format
@@ -624,7 +621,7 @@ msgstr "Permet"
#: actions/apioauthauthorize.php:351
msgid "Allow or deny access to your account information."
-msgstr ""
+msgstr "Permet o denega l'accés a la informació del vostre compte."
#: actions/apistatusesdestroy.php:107
msgid "This method requires a POST or DELETE."
@@ -655,17 +652,17 @@ msgstr "S'ha suprimit l'estat."
msgid "No status with that ID found."
msgstr "No s'ha trobat cap estatus amb la ID trobada."
-#: actions/apistatusesupdate.php:161 actions/newnotice.php:155
+#: actions/apistatusesupdate.php:252 actions/newnotice.php:155
#: lib/mailhandler.php:60
#, php-format
msgid "That's too long. Max notice size is %d chars."
msgstr "Massa llarg. La longitud màxima és de %d caràcters."
-#: actions/apistatusesupdate.php:202 actions/apiusershow.php:96
+#: actions/apistatusesupdate.php:293 actions/apiusershow.php:96
msgid "Not found."
msgstr "No s'ha trobat."
-#: actions/apistatusesupdate.php:225 actions/newnotice.php:178
+#: actions/apistatusesupdate.php:316 actions/newnotice.php:178
#, php-format
msgid "Max notice size is %d chars, including attachment URL."
msgstr ""
@@ -675,9 +672,9 @@ msgid "Unsupported format."
msgstr "El format no està implementat."
#: actions/apitimelinefavorites.php:109
-#, fuzzy, php-format
+#, php-format
msgid "%1$s / Favorites from %2$s"
-msgstr "%s / Preferits de %s"
+msgstr "%1$s / Preferits de %2$s"
#: actions/apitimelinefavorites.php:118
#, fuzzy, php-format
@@ -694,12 +691,12 @@ msgstr "%1$s / Notificacions contestant a %2$s"
msgid "%1$s updates that reply to updates from %2$s / %3$s."
msgstr "%1$s notificacions que responen a notificacions de %2$s / %3$s."
-#: actions/apitimelinepublic.php:107 actions/publicrss.php:103
+#: actions/apitimelinepublic.php:196 actions/publicrss.php:103
#, php-format
msgid "%s public timeline"
msgstr "%s línia temporal pública"
-#: actions/apitimelinepublic.php:112 actions/publicrss.php:105
+#: actions/apitimelinepublic.php:201 actions/publicrss.php:105
#, php-format
msgid "%s updates from everyone!"
msgstr "%s notificacions de tots!"
@@ -758,9 +755,8 @@ msgstr ""
#: actions/avatarsettings.php:106 actions/avatarsettings.php:185
#: actions/grouplogo.php:181 actions/remotesubscribe.php:191
#: actions/userauthorization.php:72 actions/userrss.php:108
-#, fuzzy
msgid "User without matching profile."
-msgstr "Usuari sense perfil coincident"
+msgstr "L'usuari que no coincideix amb cap perfil"
#: actions/avatarsettings.php:119 actions/avatarsettings.php:197
#: actions/grouplogo.php:254
@@ -839,7 +835,6 @@ msgstr ""
#: actions/block.php:145 actions/deleteapplication.php:154
#: actions/deletenotice.php:147 actions/deleteuser.php:152
#: actions/groupblock.php:178
-#, fuzzy
msgctxt "BUTTON"
msgid "No"
msgstr "No"
@@ -858,7 +853,6 @@ msgstr "No bloquis l'usuari"
#: actions/block.php:152 actions/deleteapplication.php:161
#: actions/deletenotice.php:154 actions/deleteuser.php:159
#: actions/groupblock.php:185
-#, fuzzy
msgctxt "BUTTON"
msgid "Yes"
msgstr "Sí"
@@ -892,14 +886,13 @@ msgid "%s blocked profiles"
msgstr "%s perfils blocats"
#: actions/blockedfromgroup.php:100
-#, fuzzy, php-format
+#, php-format
msgid "%1$s blocked profiles, page %2$d"
-msgstr "%s perfils blocats, pàgina %d"
+msgstr "%1$s perfils blocats, pàgina %2$d"
#: actions/blockedfromgroup.php:115
-#, fuzzy
msgid "A list of the users blocked from joining this group."
-msgstr "La llista dels usuaris d'aquest grup."
+msgstr "Una llista d'usuaris que han estat blocats d'afegir-se a aquest grup."
#: actions/blockedfromgroup.php:288
msgid "Unblock user from group"
@@ -982,9 +975,8 @@ msgid "Notices"
msgstr "Avisos"
#: actions/deleteapplication.php:63
-#, fuzzy
msgid "You must be logged in to delete an application."
-msgstr "Heu d'iniciar una sessió per editar un grup."
+msgstr "Heu d'haver iniciat una sessió per a suprimir una aplicació."
#: actions/deleteapplication.php:71
msgid "Application not found."
@@ -1011,12 +1003,14 @@ msgid ""
"about the application from the database, including all existing user "
"connections."
msgstr ""
+"Esteu segur que voler suprimir l'aplicació? Això netejarà totes les dades de "
+"l'aplicació de la base de dades, incloent-hi totes les connexions d'usuari "
+"existents."
#. TRANS: Submit button title for 'No' when deleting an application.
#: actions/deleteapplication.php:158
-#, fuzzy
msgid "Do not delete this application"
-msgstr "No es pot esborrar la notificació."
+msgstr "No suprimeixis l'aplicació"
#. TRANS: Submit button title for 'Yes' when deleting an application.
#: actions/deleteapplication.php:164
@@ -1184,15 +1178,15 @@ msgstr "Enllaços"
#: actions/designadminpanel.php:580 lib/designsettings.php:247
msgid "Use defaults"
-msgstr ""
+msgstr "Utilitza els paràmetres per defecte"
#: actions/designadminpanel.php:581 lib/designsettings.php:248
msgid "Restore default designs"
-msgstr ""
+msgstr "Restaura els dissenys per defecte"
#: actions/designadminpanel.php:587 lib/designsettings.php:254
msgid "Reset back to default"
-msgstr ""
+msgstr "Torna a restaurar al valor per defecte"
#. TRANS: Submit button title
#: actions/designadminpanel.php:589 actions/othersettings.php:126
@@ -1236,33 +1230,28 @@ msgid "No such application."
msgstr "No hi ha tal aplicació."
#: actions/editapplication.php:161
-#, fuzzy
msgid "Use this form to edit your application."
-msgstr "Utilitza aquest formulari per editar el grup."
+msgstr "Utilitza el formulari per a editar la vostra aplicació."
#: actions/editapplication.php:177 actions/newapplication.php:159
-#, fuzzy
msgid "Name is required."
-msgstr "Igual a la contrasenya de dalt. Requerit."
+msgstr "Cal un nom."
#: actions/editapplication.php:180 actions/newapplication.php:165
-#, fuzzy
msgid "Name is too long (max 255 chars)."
-msgstr "El teu nom és massa llarg (màx. 255 caràcters)."
+msgstr "El nom és massa llarg (màx. 255 caràcters)."
#: actions/editapplication.php:183 actions/newapplication.php:162
-#, fuzzy
msgid "Name already in use. Try another one."
-msgstr "Aquest sobrenom ja existeix. Prova un altre. "
+msgstr "El nom ja es troba en ús. Proveu-ne un altre."
#: actions/editapplication.php:186 actions/newapplication.php:168
-#, fuzzy
msgid "Description is required."
-msgstr "Descripció"
+msgstr "Cal una descripció."
#: actions/editapplication.php:194
msgid "Source URL is too long."
-msgstr ""
+msgstr "L'URL font és massa llarg."
#: actions/editapplication.php:200 actions/newapplication.php:185
msgid "Source URL is not valid."
@@ -1270,7 +1259,7 @@ msgstr "La URL d'origen no és vàlida."
#: actions/editapplication.php:203 actions/newapplication.php:188
msgid "Organization is required."
-msgstr ""
+msgstr "Cal una organització."
#: actions/editapplication.php:206 actions/newapplication.php:191
msgid "Organization is too long (max 255 chars)."
@@ -1278,7 +1267,7 @@ msgstr "El camp organització és massa llarg (màx. 255 caràcters)."
#: actions/editapplication.php:209 actions/newapplication.php:194
msgid "Organization homepage is required."
-msgstr ""
+msgstr "Cal una pàgina d'inici de l'organització."
#: actions/editapplication.php:218 actions/newapplication.php:206
msgid "Callback is too long."
@@ -1336,9 +1325,8 @@ msgstr "Configuració guardada."
#. TRANS: Title for e-mail settings.
#: actions/emailsettings.php:61
-#, fuzzy
msgid "Email settings"
-msgstr "Configuració del correu electrònic"
+msgstr "Paràmetres del correu electrònic"
#. TRANS: E-mail settings page instructions.
#. TRANS: %%site.name%% is the name of the site.
@@ -1366,7 +1354,6 @@ msgstr "Adreça electrònica confirmada actualment."
#: actions/emailsettings.php:115 actions/emailsettings.php:158
#: actions/imsettings.php:116 actions/smssettings.php:124
#: actions/smssettings.php:180
-#, fuzzy
msgctxt "BUTTON"
msgid "Remove"
msgstr "Suprimeix"
@@ -1385,7 +1372,6 @@ msgstr ""
#. TRANS: Button label
#: actions/emailsettings.php:127 actions/imsettings.php:131
#: actions/smssettings.php:137 lib/applicationeditform.php:357
-#, fuzzy
msgctxt "BUTTON"
msgid "Cancel"
msgstr "Cancel·la"
@@ -1400,7 +1386,6 @@ msgstr "Adreça electrònica, com ara «nomusuari@example.org»"
#. TRANS: Button label for adding a SMS phone number in SMS settings form.
#: actions/emailsettings.php:139 actions/imsettings.php:148
#: actions/smssettings.php:162
-#, fuzzy
msgctxt "BUTTON"
msgid "Add"
msgstr "Afegeix"
@@ -1427,16 +1412,14 @@ msgstr "Posar un nou correu electrònic per publicar; cancel·lar l'antic."
#. 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:168 actions/smssettings.php:189
-#, fuzzy
msgctxt "BUTTON"
msgid "New"
msgstr "Nou"
#. TRANS: Form legend for e-mail preferences form.
#: actions/emailsettings.php:174
-#, fuzzy
msgid "Email preferences"
-msgstr "Preferències"
+msgstr "Preferències del correu electrònic"
#. TRANS: Checkbox label in e-mail preferences form.
#: actions/emailsettings.php:180
@@ -1458,9 +1441,8 @@ msgstr "Envia'm un correu electrònic quan algú m'envii un missatge privat."
#. TRANS: Checkbox label in e-mail preferences form.
#: actions/emailsettings.php:199
-#, fuzzy
msgid "Send me email when someone sends me an \"@-reply\"."
-msgstr "Envia'm un correu electrònic quan algú m'envii un missatge privat."
+msgstr "Envia'm un correu electrònic quan algú m'enviï una resposta amb @."
#. TRANS: Checkbox label in e-mail preferences form.
#: actions/emailsettings.php:205
@@ -1479,9 +1461,8 @@ msgstr "Publica una MicroID per al meu correu electrònic."
#. TRANS: Confirmation message for successful e-mail preferences save.
#: actions/emailsettings.php:334
-#, fuzzy
msgid "Email preferences saved."
-msgstr "S'han desat les preferències de disseny."
+msgstr "S'han desat les preferències del correu electrònic."
#. TRANS: Message given saving e-mail address without having provided one.
#: actions/emailsettings.php:353
@@ -1537,15 +1518,13 @@ msgstr "Cap confirmació pendent per a cancel·lar."
#. TRANS: Message given canceling e-mail address confirmation for the wrong e-mail address.
#: actions/emailsettings.php:424
-#, fuzzy
msgid "That is the wrong email address."
-msgstr "Aquesta adreça de missatgeria instantània és incorrecta."
+msgstr "Aquesta l'adreça de correu electrònic incorrecta."
#. TRANS: Message given after successfully canceling e-mail address confirmation.
#: actions/emailsettings.php:438
-#, fuzzy
msgid "Email confirmation cancelled."
-msgstr "Confirmació cancel·lada."
+msgstr "S'ha cancel·lat la confirmació de correu electrònic."
#. TRANS: Message given trying to remove an e-mail address that is not
#. TRANS: registered for the active user.
@@ -1555,9 +1534,8 @@ msgstr "Aquest no és el teu correu electrònic"
#. TRANS: Message given after successfully removing a registered e-mail address.
#: actions/emailsettings.php:479
-#, fuzzy
msgid "The email address was removed."
-msgstr "L'adreça ha estat eliminada."
+msgstr "S'ha suprimit l'adreça de correu electrònic."
#: actions/emailsettings.php:493 actions/smssettings.php:568
msgid "No incoming email address."
@@ -1605,12 +1583,16 @@ msgstr "Les notificacions més populars en aquest lloc ara mateix."
#: actions/favorited.php:150
msgid "Favorite notices appear on this page but no one has favorited one yet."
msgstr ""
+"Els avisos de preferits apareixen en aquesta pàgina però ningú n'ha preferit "
+"cap encara."
#: actions/favorited.php:153
msgid ""
"Be the first to add a notice to your favorites by clicking the fave button "
"next to any notice you like."
msgstr ""
+"Sigueu el primer en afegir un avís dels vostres preferits fent clic al botó "
+"de preferit que es troba al costat dels avisos que us poden agradar."
#: actions/favorited.php:156
#, php-format
@@ -1618,6 +1600,8 @@ msgid ""
"Why not [register an account](%%action.register%%) and be the first to add a "
"notice to your favorites!"
msgstr ""
+"Per què no [registreu un compte](%%action.register%%) i sou el primer en "
+"afegir un avís als vostres preferits!"
#: actions/favoritesrss.php:111 actions/showfavorites.php:77
#: lib/personalgroupnav.php:115
@@ -1626,9 +1610,9 @@ msgid "%s's favorite notices"
msgstr "%s's notes favorites"
#: actions/favoritesrss.php:115
-#, fuzzy, php-format
+#, php-format
msgid "Updates favored by %1$s on %2$s!"
-msgstr "Actualitzacions de %1$s a %2$s!"
+msgstr "Actualitzacions preferides per %1$s a %2$s!"
#: actions/featured.php:69 lib/featureduserssection.php:87
#: lib/publicgroupnav.php:89
@@ -1641,7 +1625,7 @@ msgid "Featured users, page %d"
msgstr "Usuaris destacats, pàgina %d"
#: actions/featured.php:99
-#, fuzzy, php-format
+#, php-format
msgid "A selection of some great users on %s"
msgstr "Una selecció d'alguns dels millors usuaris a %s"
@@ -1692,9 +1676,8 @@ msgid "Remote service uses unknown version of OMB protocol."
msgstr "Versió desconeguda del protocol OMB."
#: actions/finishremotesubscribe.php:138
-#, fuzzy
msgid "Error updating remote profile."
-msgstr "Error en actualitzar el perfil remot"
+msgstr "S'ha produït un error en actualitzar el perfil remot."
#: actions/getfile.php:79
msgid "No such file."
@@ -1710,23 +1693,21 @@ msgstr "Rol no vàlid."
#: actions/grantrole.php:66 actions/revokerole.php:66
msgid "This role is reserved and cannot be set."
-msgstr ""
+msgstr "Aquest rol està reservat i no pot definir-se."
#: actions/grantrole.php:75
-#, fuzzy
msgid "You cannot grant user roles on this site."
-msgstr "No pots enviar un missatge a aquest usuari."
+msgstr "No podeu establir rols d'usuari en aquest lloc."
#: actions/grantrole.php:82
-#, fuzzy
msgid "User already has this role."
-msgstr "L'usuari ja està silenciat."
+msgstr "L'usuari ja té aquest rol."
#: actions/groupblock.php:71 actions/groupunblock.php:71
#: actions/makeadmin.php:71 actions/subedit.php:46
#: lib/profileformaction.php:70
msgid "No profile specified."
-msgstr "No s'ha especificat perfil."
+msgstr "No s'ha especificat cap perfil."
#: actions/groupblock.php:76 actions/groupunblock.php:76
#: actions/makeadmin.php:76 actions/subedit.php:53 actions/tagother.php:46
@@ -1744,9 +1725,8 @@ msgid "Only an admin can block group members."
msgstr "Només un administrador pot blocar membres del grup."
#: actions/groupblock.php:95
-#, fuzzy
msgid "User is already blocked from group."
-msgstr "Un usuari t'ha bloquejat."
+msgstr "L'usuari ja està blocat del grup."
#: actions/groupblock.php:100
msgid "User is not a member of group."
@@ -1757,14 +1737,14 @@ msgid "Block user from group"
msgstr "Bloca l'usuari del grup"
#: actions/groupblock.php:160
-#, fuzzy, php-format
+#, 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 ""
-"Esteu segur que voleu blocar l'usuari «%s» del grup «%s»? Se suprimiran del "
-"grup, i no podran enviar-hi res ni subscriure-s'hi en el futur."
+"Esteu segur que voleu blocar l'usuari «%1$s» del grup «%2$s»? Se suprimiran "
+"del grup, i no podran enviar-hi res ni subscriure-s'hi en el futur."
#. TRANS: Submit button title for 'No' when blocking a user from a group.
#: actions/groupblock.php:182
@@ -1781,9 +1761,8 @@ msgid "Database error blocking user from group."
msgstr "S'ha produït un error en la base de dades en blocar l'usuari del grup."
#: actions/groupbyid.php:74 actions/userbyid.php:70
-#, fuzzy
msgid "No ID."
-msgstr "No ID"
+msgstr "Sense ID."
#: actions/groupdesignsettings.php:68
msgid "You must be logged in to edit a group."
@@ -1815,10 +1794,12 @@ msgid "Group logo"
msgstr "Logo del grup"
#: actions/grouplogo.php:153
-#, fuzzy, php-format
+#, php-format
msgid ""
"You can upload a logo image for your group. The maximum file size is %s."
-msgstr "Pots pujar una imatge de logo per al grup."
+msgstr ""
+"Podeu pujar una imatge com a logotip del vostre grup. La mida màxima del "
+"fitxer és %s."
#: actions/grouplogo.php:365
msgid "Pick a square area of the image to be the logo."
@@ -1838,9 +1819,9 @@ msgid "%s group members"
msgstr "%s membre/s en el grup"
#: actions/groupmembers.php:103
-#, fuzzy, php-format
+#, php-format
msgid "%1$s group members, page %2$d"
-msgstr "%s membre/s en el grup, pàgina %d"
+msgstr "%1$s membres del grup, pàgina %2$d"
#: actions/groupmembers.php:118
msgid "A list of the users in this group."
@@ -2007,9 +1988,8 @@ msgstr ""
#. TRANS: Form legend for IM preferences form.
#: actions/imsettings.php:155
-#, fuzzy
msgid "IM preferences"
-msgstr "Preferències"
+msgstr "Preferències de MI"
#. TRANS: Checkbox label in IM preferences form.
#: actions/imsettings.php:160
@@ -2087,9 +2067,8 @@ msgstr "No s'ha pogut eliminar la confirmació de correu electrònic."
#. TRANS: Message given after successfully canceling IM address confirmation.
#: actions/imsettings.php:402
-#, fuzzy
msgid "IM confirmation cancelled."
-msgstr "Confirmació cancel·lada."
+msgstr "S'ha cancel·lat la confirmació de MI."
#. TRANS: Message given trying to remove an IM address that is not
#. TRANS: registered for the active user.
@@ -2099,9 +2078,8 @@ msgstr "Aquest no és el teu Jabber ID."
#. TRANS: Message given after successfully removing a registered IM address.
#: actions/imsettings.php:447
-#, fuzzy
msgid "The IM address was removed."
-msgstr "L'adreça ha estat eliminada."
+msgstr "S'ha suprimit l'adreça de MI."
#: actions/inbox.php:59
#, fuzzy, php-format
@@ -2291,9 +2269,9 @@ msgstr "No ets membre d'aquest grup."
#. 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.
#: actions/leavegroup.php:137 lib/command.php:392
-#, fuzzy, php-format
+#, php-format
msgid "%1$s left group %2$s"
-msgstr "%s ha abandonat el grup %s"
+msgstr "%1$s ha abandonat el grup %2$s"
#: actions/login.php:80 actions/otp.php:62 actions/register.php:137
msgid "Already logged in."
@@ -2304,9 +2282,10 @@ msgid "Incorrect username or password."
msgstr "Nom d'usuari o contrasenya incorrectes."
#: actions/login.php:132 actions/otp.php:120
-#, fuzzy
msgid "Error setting user. You are probably not authorized."
-msgstr "No autoritzat."
+msgstr ""
+"S'ha produït un error en definir l'usuari. Probablement no hi esteu "
+"autoritzat."
#: actions/login.php:188 actions/login.php:241 lib/logingroupnav.php:79
msgid "Login"
@@ -2339,10 +2318,13 @@ msgstr ""
"contrasenya abans de canviar la teva configuració."
#: actions/login.php:270
+msgid "Login with your username and password."
+msgstr "Inicieu una sessió amb nom d'usuari i contrasenya"
+
+#: actions/login.php:273
#, fuzzy, php-format
msgid ""
-"Login with your username and password. Don't have a username yet? [Register]"
-"(%%action.register%%) a new account."
+"Don't have a username yet? [Register](%%action.register%%) a new account."
msgstr ""
"Inicia una sessió amb el teu nom d'usuari i la teva contrasenya. Encara no "
"tens un nom d'usuari? [Crea](%%action.register%%) un nou compte o prova "
@@ -2353,9 +2335,9 @@ msgid "Only an admin can make another user an admin."
msgstr "Només un administrador poc fer a un altre usuari administrador."
#: actions/makeadmin.php:96
-#, fuzzy, php-format
+#, php-format
msgid "%1$s is already an admin for group \"%2$s\"."
-msgstr "%s ja és un administrador del grup «%s»."
+msgstr "%1$s ja és un administrador del grup «%2$s»."
#: actions/makeadmin.php:133
#, fuzzy, php-format
@@ -2368,9 +2350,8 @@ msgid "Can't make %1$s an admin for group %2$s."
msgstr "No es pot fer %s un administrador del grup %s"
#: actions/microsummary.php:69
-#, fuzzy
msgid "No current status."
-msgstr "No té cap estatus ara mateix"
+msgstr "No hi ha cap estat actual."
#: actions/newapplication.php:52
msgid "New Application"
@@ -2390,9 +2371,8 @@ msgid "Source URL is required."
msgstr "URL d'origen requerida."
#: actions/newapplication.php:258 actions/newapplication.php:267
-#, fuzzy
msgid "Could not create application."
-msgstr "No s'han pogut crear els àlies."
+msgstr "No s'ha pogut crear l'aplicació."
#: actions/newgroup.php:53
msgid "New group"
@@ -2514,20 +2494,20 @@ msgstr "Aplicacions OAuth"
#: actions/oauthappssettings.php:85
msgid "Applications you have registered"
-msgstr ""
+msgstr "Aplicacions que heu registrat"
#: actions/oauthappssettings.php:135
#, php-format
msgid "You have not registered any applications yet."
-msgstr ""
+msgstr "No teniu cap aplicació registrada encara."
#: actions/oauthconnectionssettings.php:72
msgid "Connected applications"
-msgstr ""
+msgstr "Aplicacions connectades"
#: actions/oauthconnectionssettings.php:83
msgid "You have allowed the following applications to access you account."
-msgstr ""
+msgstr "Heu permès les aplicacions següents accedir al vostre compte."
#: actions/oauthconnectionssettings.php:175
msgid "You are not a user of that application."
@@ -2547,9 +2527,8 @@ msgid "Developers can edit the registration settings for their applications "
msgstr ""
#: actions/oembed.php:79 actions/shownotice.php:100
-#, fuzzy
msgid "Notice has no profile."
-msgstr "Avís sense perfil"
+msgstr "L'avís no té cap perfil."
#: actions/oembed.php:86 actions/shownotice.php:175
#, php-format
@@ -2569,8 +2548,8 @@ msgid "Only %s URLs over plain HTTP please."
msgstr ""
#. TRANS: Client error on an API request with an unsupported data format.
-#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1069
-#: lib/apiaction.php:1098 lib/apiaction.php:1215
+#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1131
+#: lib/apiaction.php:1160 lib/apiaction.php:1277
msgid "Not a supported data format."
msgstr "Format de data no suportat."
@@ -2779,11 +2758,11 @@ msgstr ""
#: actions/pathsadminpanel.php:250
msgid "Fancy URLs"
-msgstr ""
+msgstr "URL atractius"
#: actions/pathsadminpanel.php:252
msgid "Use fancy (more readable and memorable) URLs?"
-msgstr ""
+msgstr "Voleu fer servir URL atractius (més fàcils de llegir i de recordar)?"
#: actions/pathsadminpanel.php:259
msgid "Theme"
@@ -2855,21 +2834,19 @@ msgstr "Utilitza l'SSL"
#: actions/pathsadminpanel.php:330
msgid "When to use SSL"
-msgstr ""
+msgstr "Quan utilitzar l'SSL"
#: actions/pathsadminpanel.php:335
-#, fuzzy
msgid "SSL server"
msgstr "Servidor SSL"
#: actions/pathsadminpanel.php:336
msgid "Server to direct SSL requests to"
-msgstr ""
+msgstr "Servidor on dirigir les sol·licituds SSL"
#: actions/pathsadminpanel.php:352
-#, fuzzy
msgid "Save paths"
-msgstr "Avís del lloc"
+msgstr "Desa els camins"
#: actions/peoplesearch.php:52
#, php-format
@@ -2895,9 +2872,8 @@ msgid "Users self-tagged with %1$s - page %2$d"
msgstr "Usuaris que s'han etiquetat %s - pàgina %d"
#: actions/postnotice.php:95
-#, fuzzy
msgid "Invalid notice content."
-msgstr "El contingut de l'avís és invàlid"
+msgstr "El contingut de l'avís no és vàlid."
#: actions/postnotice.php:101
#, php-format
@@ -2967,7 +2943,7 @@ msgstr "On ets, per exemple \"Ciutat, Estat (o Regió), País\""
#: actions/profilesettings.php:138
msgid "Share my current location when posting notices"
-msgstr ""
+msgstr "Comparteix la meva ubicació actual en enviar avisos"
#: actions/profilesettings.php:145 actions/tagother.php:149
#: actions/tagother.php:209 lib/subscriptionlist.php:106
@@ -3045,7 +3021,7 @@ msgid "Settings saved."
msgstr "Configuració guardada."
#: actions/public.php:83
-#, fuzzy, php-format
+#, php-format
msgid "Beyond the page limit (%s)."
msgstr "Més enllà del límit de la pàgina (%s)"
@@ -3437,9 +3413,8 @@ msgid "Not a valid profile URL (no YADIS document or invalid XRDS defined)."
msgstr "URL de perfil no vàlid (cap document YADIS)."
#: actions/remotesubscribe.php:176
-#, fuzzy
msgid "That’s a local profile! Login to subscribe."
-msgstr "Aquest és un perfil local! Entra per subscriure-t'hi."
+msgstr "Aquest és un perfil local! Inicieu una sessió per a subscriure-us-hi."
#: actions/remotesubscribe.php:183
#, fuzzy
@@ -3462,9 +3437,8 @@ msgid "You can't repeat your own notice."
msgstr "No pots registrar-te si no estàs d'acord amb la llicència."
#: actions/repeat.php:90
-#, fuzzy
msgid "You already repeated that notice."
-msgstr "Ja heu blocat l'usuari."
+msgstr "Ja havíeu repetit l'avís."
#: actions/repeat.php:114 lib/noticelist.php:675
msgid "Repeated"
@@ -3481,9 +3455,9 @@ msgid "Replies to %s"
msgstr "Respostes a %s"
#: actions/replies.php:128
-#, fuzzy, php-format
+#, php-format
msgid "Replies to %1$s, page %2$d"
-msgstr "Respostes a %1$s el %2$s!"
+msgstr "Respostes a %1$s, pàgina %2$d"
#: actions/replies.php:145
#, fuzzy, php-format
@@ -3539,9 +3513,8 @@ msgid "User doesn't have this role."
msgstr "Usuari sense perfil coincident"
#: actions/rsd.php:146 actions/version.php:157
-#, fuzzy
msgid "StatusNet"
-msgstr "S'ha suprimit l'estat."
+msgstr "StatusNet"
#: actions/sandbox.php:65 actions/unsandbox.php:65
#, fuzzy
@@ -3570,7 +3543,7 @@ msgstr "Gestiona les sessions"
#: actions/sessionsadminpanel.php:177
msgid "Whether to handle sessions ourselves."
-msgstr ""
+msgstr "Si cal gestionar les sessions nosaltres mateixos."
#: actions/sessionsadminpanel.php:181
msgid "Session debugging"
@@ -3591,14 +3564,13 @@ msgid "You must be logged in to view an application."
msgstr "Has d'haver entrat per a poder marxar d'un grup."
#: actions/showapplication.php:157
-#, fuzzy
msgid "Application profile"
-msgstr "Avís sense perfil"
+msgstr "Perfil de l'aplicació"
#. TRANS: Form input field label for application icon.
#: actions/showapplication.php:159 lib/applicationeditform.php:182
msgid "Icon"
-msgstr ""
+msgstr "Icona"
#. TRANS: Form input field label for application name.
#: actions/showapplication.php:169 actions/version.php:195
@@ -3608,9 +3580,8 @@ msgstr "Nom"
#. TRANS: Form input field label.
#: actions/showapplication.php:178 lib/applicationeditform.php:235
-#, fuzzy
msgid "Organization"
-msgstr "Paginació"
+msgstr "Organització"
#. TRANS: Form input field label.
#: actions/showapplication.php:187 actions/version.php:198
@@ -3626,11 +3597,11 @@ msgstr "Estadístiques"
#: actions/showapplication.php:203
#, php-format
msgid "Created by %1$s - %2$s access by default - %3$d users"
-msgstr ""
+msgstr "Creat per %1$s - %2$s accés per defecte - %3$d usuaris"
#: actions/showapplication.php:213
msgid "Application actions"
-msgstr ""
+msgstr "Accions d'aplicació"
#: actions/showapplication.php:236
msgid "Reset key & secret"
@@ -3657,9 +3628,8 @@ msgid "Access token URL"
msgstr ""
#: actions/showapplication.php:283
-#, fuzzy
msgid "Authorize URL"
-msgstr "Autoria"
+msgstr "Autoritza l'URL"
#: actions/showapplication.php:288
msgid ""
@@ -3684,17 +3654,17 @@ msgstr "No s'han pogut recuperar els avisos preferits."
#: actions/showfavorites.php:171
#, php-format
msgid "Feed for favorites of %s (RSS 1.0)"
-msgstr "Feed per a amics de %s"
+msgstr "Canal dels preferits de %s (RSS 1.0)"
#: actions/showfavorites.php:178
#, php-format
msgid "Feed for favorites of %s (RSS 2.0)"
-msgstr "Feed per a amics de %s"
+msgstr "Canal dels preferits de %s (RSS 2.0)"
#: actions/showfavorites.php:185
#, php-format
msgid "Feed for favorites of %s (Atom)"
-msgstr "Feed per a amics de %s"
+msgstr "Canal dels preferits de %s (Atom)"
#: actions/showfavorites.php:206
msgid ""
@@ -3835,19 +3805,18 @@ msgid "Message from %1$s on %2$s"
msgstr "Missatge de %1$s a %2$s"
#: actions/shownotice.php:90
-#, fuzzy
msgid "Notice deleted."
-msgstr "Notificació publicada"
+msgstr "S'ha suprimit l'avís."
#: actions/showstream.php:73
-#, fuzzy, php-format
+#, php-format
msgid " tagged %s"
-msgstr "Aviso etiquetats amb %s"
+msgstr " etiquetats amb %s"
#: actions/showstream.php:79
-#, fuzzy, php-format
+#, php-format
msgid "%1$s, page %2$d"
-msgstr "%s perfils blocats, pàgina %d"
+msgstr "%1$s, pàgina %2$d"
#: actions/showstream.php:122
#, fuzzy, php-format
@@ -3941,17 +3910,17 @@ msgid "You must have a valid contact email address."
msgstr "Heu de tenir una adreça electrònica de contacte vàlida"
#: actions/siteadminpanel.php:159
-#, fuzzy, php-format
+#, php-format
msgid "Unknown language \"%s\"."
-msgstr "Llengua desconeguda «%s»"
+msgstr "Llengua desconeguda «%s»."
#: actions/siteadminpanel.php:165
msgid "Minimum text limit is 0 (unlimited)."
-msgstr ""
+msgstr "El límit de text mínim és 0 (sense cap límit)."
#: actions/siteadminpanel.php:171
msgid "Dupe limit must be one or more seconds."
-msgstr ""
+msgstr "El límit de duplicats ha de ser d'un o més segons."
#: actions/siteadminpanel.php:221
msgid "General"
@@ -3998,13 +3967,14 @@ msgid "Default timezone for the site; usually UTC."
msgstr "Fus horari per defecte del lloc; normalment UTC."
#: actions/siteadminpanel.php:262
-#, fuzzy
msgid "Default language"
-msgstr "Llengua per defecte del lloc"
+msgstr "Llengua per defecte"
#: actions/siteadminpanel.php:263
msgid "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"
#: actions/siteadminpanel.php:271
msgid "Limits"
@@ -4016,7 +3986,7 @@ msgstr "Límits del text"
#: actions/siteadminpanel.php:274
msgid "Maximum number of characters for notices."
-msgstr ""
+msgstr "Nombre màxim de caràcters dels avisos."
#: actions/siteadminpanel.php:278
msgid "Dupe limit"
@@ -4029,7 +3999,6 @@ msgstr ""
"de nou."
#: actions/sitenoticeadminpanel.php:56
-#, fuzzy
msgid "Site Notice"
msgstr "Avís del lloc"
@@ -4039,27 +4008,24 @@ msgid "Edit site-wide message"
msgstr "Nou missatge"
#: actions/sitenoticeadminpanel.php:103
-#, fuzzy
msgid "Unable to save site notice."
-msgstr "No s'ha pogut guardar la teva configuració de Twitter!"
+msgstr "No s'ha pogut desar l'avís del lloc."
#: actions/sitenoticeadminpanel.php:113
msgid "Max length for the site-wide notice is 255 chars."
-msgstr ""
+msgstr "La mida màxima per a als avisos per a tot el lloc és de 255 caràcters."
#: actions/sitenoticeadminpanel.php:176
-#, fuzzy
msgid "Site notice text"
-msgstr "Avís del lloc"
+msgstr "Text de l'avís per al lloc"
#: actions/sitenoticeadminpanel.php:178
msgid "Site-wide notice text (255 chars max; HTML okay)"
-msgstr ""
+msgstr "Text d'avís per a tot el lloc (màxim 255 caràcters, es permet l'HTML)"
#: actions/sitenoticeadminpanel.php:198
-#, fuzzy
msgid "Save site notice"
-msgstr "Avís del lloc"
+msgstr "Desa l'avís del lloc"
#. TRANS: Title for SMS settings.
#: actions/smssettings.php:59
@@ -4082,9 +4048,8 @@ msgstr "L'SMS no és disponible."
#. TRANS: Form legend for SMS settings form.
#: actions/smssettings.php:111
-#, fuzzy
msgid "SMS address"
-msgstr "Adreça de missatgeria instantània"
+msgstr "Adreça SMS"
#. TRANS: Form guide in SMS settings form.
#: actions/smssettings.php:120
@@ -4500,27 +4465,27 @@ msgstr ""
#. TRANS: User admin panel title
#: actions/useradminpanel.php:59
-#, fuzzy
msgctxt "TITLE"
msgid "User"
msgstr "Usuari"
#: actions/useradminpanel.php:70
msgid "User settings for this StatusNet site."
-msgstr ""
+msgstr "Paràmetres d'usuari d'aquest lloc StatusNet."
#: actions/useradminpanel.php:149
msgid "Invalid bio limit. Must be numeric."
-msgstr ""
+msgstr "El límit de la biografia no és vàlid. Cal que sigui numèric."
#: actions/useradminpanel.php:155
msgid "Invalid welcome text. Max length is 255 characters."
msgstr ""
+"El text de benvinguda no és vàlid. La longitud màxima és de 255 caràcters."
#: actions/useradminpanel.php:165
#, php-format
msgid "Invalid default subscripton: '%1$s' is not user."
-msgstr ""
+msgstr "La subscripció per defecte no és vàlida: «%1$s» no és cap usuari."
#. TRANS: Link description in user account settings menu.
#: actions/useradminpanel.php:218 lib/accountsettingsaction.php:111
@@ -4546,7 +4511,7 @@ msgstr "Benvinguda als usuaris nous"
#: actions/useradminpanel.php:236
msgid "Welcome text for new users (Max 255 chars)."
-msgstr ""
+msgstr "Text de benvinguda per a nous usuaris (màx. 255 caràcters)."
#: actions/useradminpanel.php:241
msgid "Default subscription"
@@ -4566,7 +4531,7 @@ msgstr "S'han habilitat les invitacions"
#: actions/useradminpanel.php:258
msgid "Whether to allow users to invite new users."
-msgstr ""
+msgstr "Si es permet als usuaris invitar-ne de nous."
#: actions/userauthorization.php:105
msgid "Authorize subscription"
@@ -4834,9 +4799,8 @@ msgid "Database error inserting hashtag: %s"
msgstr "Hashtag de l'error de la base de dades:%s"
#: classes/Notice.php:245
-#, fuzzy
msgid "Problem saving notice. Too long."
-msgstr "Problema en guardar l'avís."
+msgstr "S'ha produït un problema en desar l'avís. És massa llarg."
#: classes/Notice.php:249
msgid "Problem saving notice. Unknown user."
@@ -4866,17 +4830,17 @@ msgstr "Ha estat bandejat de publicar notificacions en aquest lloc."
msgid "Problem saving notice."
msgstr "Problema en guardar l'avís."
-#: classes/Notice.php:965
+#: classes/Notice.php:967
#, fuzzy
msgid "Problem saving group inbox."
msgstr "Problema en guardar l'aví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.
-#: classes/Notice.php:1513
-#, fuzzy, php-format
+#: classes/Notice.php:1535
+#, php-format
msgid "RT @%1$s %2$s"
-msgstr "%1$s (%2$s)"
+msgstr "RT @%1$s %2$s"
#: classes/Subscription.php:74 lib/oauthstore.php:465
msgid "You have been banned from subscribing."
@@ -4896,9 +4860,8 @@ msgid "Not subscribed!"
msgstr "No estàs subscrit!"
#: classes/Subscription.php:173
-#, fuzzy
msgid "Couldn't delete self-subscription."
-msgstr "No s'ha pogut eliminar la subscripció."
+msgstr "No s'ha pogut eliminar l'autosubscripció."
#: classes/Subscription.php:200
#, fuzzy
@@ -4970,9 +4933,9 @@ msgstr "Altres"
#. TRANS: Page title. %1$s is the title, %2$s is the site name.
#: lib/action.php:145
-#, 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:161
@@ -4986,24 +4949,21 @@ msgstr "Navegació primària del lloc"
#. TRANS: Tooltip for main menu option "Personal"
#: lib/action.php:432
-#, fuzzy
msgctxt "TOOLTIP"
msgid "Personal profile and friends timeline"
msgstr "Perfil personal i línia temporal dels amics"
#. TRANS: Main menu option when logged in for access to personal profile and friends timeline
#: lib/action.php:435
-#, fuzzy
msgctxt "MENU"
msgid "Personal"
msgstr "Personal"
#. TRANS: Tooltip for main menu option "Account"
#: lib/action.php:437
-#, fuzzy
msgctxt "TOOLTIP"
msgid "Change your email, avatar, password, profile"
-msgstr "Canviar correu electrònic, avatar, contrasenya, perfil"
+msgstr "Canvia l'adreça electrònica, l'avatar, la contrasenya o el perfil"
#. TRANS: Tooltip for main menu option "Services"
#: lib/action.php:442
@@ -5081,33 +5041,28 @@ msgid "Login to the site"
msgstr "Inicia una sessió al lloc"
#: lib/action.php:481
-#, fuzzy
msgctxt "MENU"
msgid "Login"
msgstr "Inici de sessió"
#. TRANS: Tooltip for main menu option "Help"
#: lib/action.php:484
-#, fuzzy
msgctxt "TOOLTIP"
msgid "Help me!"
-msgstr "Ajuda'm"
+msgstr "Ajuda'm!"
#: lib/action.php:487
-#, fuzzy
msgctxt "MENU"
msgid "Help"
msgstr "Ajuda"
#. TRANS: Tooltip for main menu option "Search"
#: lib/action.php:490
-#, fuzzy
msgctxt "TOOLTIP"
msgid "Search for people or text"
msgstr "Cerca gent o text"
#: lib/action.php:493
-#, fuzzy
msgctxt "MENU"
msgid "Search"
msgstr "Cerca"
@@ -5364,7 +5319,7 @@ msgid "Snapshots configuration"
msgstr "Configuració dels camins"
#. TRANS: Client error 401.
-#: lib/apiauth.php:95
+#: lib/apiauth.php:113
msgid "API resource requires read-write access, but you only have read access."
msgstr ""
@@ -5920,7 +5875,7 @@ msgstr "Vés-hi"
#: lib/grantroleform.php:91
#, php-format
msgid "Grant this user the \"%s\" role"
-msgstr ""
+msgstr "Atorga a l'usuari el rol «%s»"
#: lib/groupeditform.php:163
msgid "URL of the homepage or blog of the group or topic"
@@ -6574,7 +6529,7 @@ msgstr "Membre des de"
#. TRANS: Average count of posts made per day since account registration
#: lib/profileaction.php:235
msgid "Daily average"
-msgstr ""
+msgstr "Mitjana diària"
#: lib/profileaction.php:264
msgid "All groups"
@@ -6771,7 +6726,7 @@ msgstr "Accions de l'usuari"
#: lib/userprofile.php:237
msgid "User deletion in progress..."
-msgstr ""
+msgstr "S'està suprimint l'usuari..."
#: lib/userprofile.php:263
msgid "Edit profile settings"
@@ -6794,73 +6749,70 @@ msgid "Moderate"
msgstr "Modera"
#: lib/userprofile.php:364
-#, fuzzy
msgid "User role"
-msgstr "Perfil de l'usuari"
+msgstr "Rol de l'usuari"
#: lib/userprofile.php:366
-#, fuzzy
msgctxt "role"
msgid "Administrator"
-msgstr "Administradors"
+msgstr "Administrador"
#: lib/userprofile.php:367
-#, fuzzy
msgctxt "role"
msgid "Moderator"
-msgstr "Modera"
+msgstr "Moderador"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1054
+#: lib/util.php:1083
msgid "a few seconds ago"
msgstr "fa pocs segons"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1057
+#: lib/util.php:1086
msgid "about a minute ago"
msgstr "fa un minut"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1061
+#: lib/util.php:1090
#, php-format
msgid "about %d minutes ago"
msgstr "fa %d minuts"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1064
+#: lib/util.php:1093
msgid "about an hour ago"
msgstr "fa una hora"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1068
+#: lib/util.php:1097
#, php-format
msgid "about %d hours ago"
msgstr "fa %d hores"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1071
+#: lib/util.php:1100
msgid "about a day ago"
msgstr "fa un dia"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1075
+#: lib/util.php:1104
#, php-format
msgid "about %d days ago"
msgstr "fa %d dies"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1078
+#: lib/util.php:1107
msgid "about a month ago"
msgstr "fa un mes"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1082
+#: lib/util.php:1111
#, php-format
msgid "about %d months ago"
msgstr "fa %d mesos"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1085
+#: lib/util.php:1114
msgid "about a year ago"
msgstr "fa un any"
@@ -6875,6 +6827,7 @@ msgid "%s is not a valid color! Use 3 or 6 hex chars."
msgstr "%s no és un color vàlid! Feu servir 3 o 6 caràcters hexadecimals."
#: lib/xmppmanager.php:403
-#, fuzzy, php-format
+#, php-format
msgid "Message too long - maximum is %1$d characters, you sent %2$d."
-msgstr "Missatge massa llarg - màxim és 140 caràcters, tu has enviat %d"
+msgstr ""
+"El missatge és massa llarg - el màxim és %1$d caràcters, i n'heu enviat %2$d."
diff --git a/locale/cs/LC_MESSAGES/statusnet.po b/locale/cs/LC_MESSAGES/statusnet.po
index b4efa9433..e619430aa 100644
--- a/locale/cs/LC_MESSAGES/statusnet.po
+++ b/locale/cs/LC_MESSAGES/statusnet.po
@@ -9,12 +9,12 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-12 21:47+0000\n"
-"PO-Revision-Date: 2010-04-12 21:48:21+0000\n"
+"POT-Creation-Date: 2010-04-24 14:16+0000\n"
+"PO-Revision-Date: 2010-04-26 22:16:18+0000\n"
"Language-Team: Czech\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r64984); Translate extension (2010-01-16)\n"
+"X-Generator: MediaWiki 1.17alpha (r65552); Translate extension (2010-04-25)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: cs\n"
"X-Message-Group: out-statusnet\n"
@@ -106,8 +106,8 @@ msgstr "Žádné takové oznámení."
#: actions/apidirectmessagenew.php:75 actions/apigroupcreate.php:112
#: actions/apigroupismember.php:90 actions/apigroupjoin.php:99
#: actions/apigroupleave.php:99 actions/apigrouplist.php:72
-#: actions/apistatusesupdate.php:148 actions/apisubscriptions.php:87
-#: actions/apitimelinefavorites.php:71 actions/apitimelinefriends.php:78
+#: actions/apistatusesupdate.php:239 actions/apisubscriptions.php:87
+#: actions/apitimelinefavorites.php:71 actions/apitimelinefriends.php:173
#: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79
#: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75
#: actions/favoritesrss.php:74 actions/foaf.php:40 actions/foaf.php:58
@@ -131,7 +131,7 @@ msgstr "%s a přátelé"
#. TRANS: H1 text. %1$s is user nickname
#. TRANS: Message is used as link title. %s is a user nickname.
#: actions/all.php:89 actions/all.php:181 actions/allrss.php:116
-#: actions/apitimelinefriends.php:114 actions/apitimelinehome.php:115
+#: actions/apitimelinefriends.php:209 actions/apitimelinehome.php:115
#: lib/personalgroupnav.php:100
#, php-format
msgid "%s and friends"
@@ -192,7 +192,7 @@ msgstr "%s a přátelé"
#. 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:121 actions/apitimelinefriends.php:120
+#: actions/allrss.php:121 actions/apitimelinefriends.php:215
#: actions/apitimelinehome.php:121
#, php-format
msgid "Updates from %1$s and friends on %2$s!"
@@ -214,9 +214,9 @@ msgstr ""
#: actions/apistatusesdestroy.php:102 actions/apistatusesretweets.php:112
#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:141
#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111
-#: actions/apitimelinefavorites.php:173 actions/apitimelinefriends.php:175
+#: actions/apitimelinefavorites.php:173 actions/apitimelinefriends.php:270
#: actions/apitimelinegroup.php:151 actions/apitimelinehome.php:174
-#: actions/apitimelinementions.php:173 actions/apitimelinepublic.php:151
+#: actions/apitimelinementions.php:173 actions/apitimelinepublic.php:240
#: actions/apitimelineretweetedtome.php:121
#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:160
#: actions/apitimelineuser.php:162 actions/apiusershow.php:101
@@ -234,7 +234,7 @@ msgstr "Potvrzující kód nebyl nalezen"
#: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91
#: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91
#: actions/apigroupleave.php:91 actions/apimediaupload.php:67
-#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:118
+#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:209
msgid "This method requires a POST."
msgstr ""
@@ -266,7 +266,7 @@ msgstr "Nelze uložit profil"
#: actions/apiaccountupdateprofilebackgroundimage.php:108
#: actions/apiaccountupdateprofileimage.php:97 actions/apimediaupload.php:80
-#: actions/apistatusesupdate.php:131 actions/avatarsettings.php:257
+#: actions/apistatusesupdate.php:222 actions/avatarsettings.php:257
#: actions/designadminpanel.php:123 actions/editapplication.php:118
#: actions/newapplication.php:101 actions/newnotice.php:94
#: lib/designsettings.php:283
@@ -664,18 +664,18 @@ msgstr "Obrázek nahrán"
msgid "No status with that ID found."
msgstr ""
-#: actions/apistatusesupdate.php:161 actions/newnotice.php:155
+#: actions/apistatusesupdate.php:252 actions/newnotice.php:155
#: lib/mailhandler.php:60
#, fuzzy, php-format
msgid "That's too long. Max notice size is %d chars."
msgstr "Je to příliš dlouhé. Maximální sdělení délka je 140 znaků"
-#: actions/apistatusesupdate.php:202 actions/apiusershow.php:96
+#: actions/apistatusesupdate.php:293 actions/apiusershow.php:96
#, fuzzy
msgid "Not found."
msgstr "Žádný požadavek nebyl nalezen!"
-#: actions/apistatusesupdate.php:225 actions/newnotice.php:178
+#: actions/apistatusesupdate.php:316 actions/newnotice.php:178
#, php-format
msgid "Max notice size is %d chars, including attachment URL."
msgstr ""
@@ -705,12 +705,12 @@ msgstr "%1 statusů na %2"
msgid "%1$s updates that reply to updates from %2$s / %3$s."
msgstr ""
-#: actions/apitimelinepublic.php:107 actions/publicrss.php:103
+#: actions/apitimelinepublic.php:196 actions/publicrss.php:103
#, php-format
msgid "%s public timeline"
msgstr ""
-#: actions/apitimelinepublic.php:112 actions/publicrss.php:105
+#: actions/apitimelinepublic.php:201 actions/publicrss.php:105
#, php-format
msgid "%s updates from everyone!"
msgstr ""
@@ -2343,10 +2343,14 @@ msgid ""
msgstr "Z bezpeÄnostních důvodů, prosím zadejte znovu své jméno a heslo."
#: actions/login.php:270
+#, fuzzy
+msgid "Login with your username and password."
+msgstr "Neplatné jméno nebo heslo"
+
+#: actions/login.php:273
#, fuzzy, php-format
msgid ""
-"Login with your username and password. Don't have a username yet? [Register]"
-"(%%action.register%%) a new account."
+"Don't have a username yet? [Register](%%action.register%%) a new account."
msgstr ""
"Přihlaste se pomocí vaší prezdívky a hesla. Zatím nejste zaregistrován? "
"[Registrovat](%%action.register%%) nový úÄet, nebo vyzkouÅ¡ejte [OpenID](%%"
@@ -2571,8 +2575,8 @@ msgid "Only %s URLs over plain HTTP please."
msgstr ""
#. TRANS: Client error on an API request with an unsupported data format.
-#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1069
-#: lib/apiaction.php:1098 lib/apiaction.php:1215
+#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1131
+#: lib/apiaction.php:1160 lib/apiaction.php:1277
msgid "Not a supported data format."
msgstr ""
@@ -4835,14 +4839,14 @@ msgstr ""
msgid "Problem saving notice."
msgstr "Problém při ukládání sdělení"
-#: classes/Notice.php:965
+#: classes/Notice.php:967
#, fuzzy
msgid "Problem saving group inbox."
msgstr "Problém při ukládání sdělení"
#. 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:1513
+#: classes/Notice.php:1535
#, php-format
msgid "RT @%1$s %2$s"
msgstr ""
@@ -5337,7 +5341,7 @@ msgid "Snapshots configuration"
msgstr "Potvrzení emailové adresy"
#. TRANS: Client error 401.
-#: lib/apiauth.php:95
+#: lib/apiauth.php:113
msgid "API resource requires read-write access, but you only have read access."
msgstr ""
@@ -6801,56 +6805,56 @@ msgid "Moderator"
msgstr ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1054
+#: lib/util.php:1083
msgid "a few seconds ago"
msgstr "před pár sekundami"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1057
+#: lib/util.php:1086
msgid "about a minute ago"
msgstr "asi před minutou"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1061
+#: lib/util.php:1090
#, php-format
msgid "about %d minutes ago"
msgstr "asi před %d minutami"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1064
+#: lib/util.php:1093
msgid "about an hour ago"
msgstr "asi před hodinou"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1068
+#: lib/util.php:1097
#, php-format
msgid "about %d hours ago"
msgstr "asi před %d hodinami"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1071
+#: lib/util.php:1100
msgid "about a day ago"
msgstr "asi přede dnem"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1075
+#: lib/util.php:1104
#, php-format
msgid "about %d days ago"
msgstr "před %d dny"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1078
+#: lib/util.php:1107
msgid "about a month ago"
msgstr "asi před měsícem"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1082
+#: lib/util.php:1111
#, php-format
msgid "about %d months ago"
msgstr "asi před %d mesíci"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1085
+#: lib/util.php:1114
msgid "about a year ago"
msgstr "asi před rokem"
diff --git a/locale/de/LC_MESSAGES/statusnet.po b/locale/de/LC_MESSAGES/statusnet.po
index f8a75b1a9..f0225630f 100644
--- a/locale/de/LC_MESSAGES/statusnet.po
+++ b/locale/de/LC_MESSAGES/statusnet.po
@@ -15,12 +15,12 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-12 21:47+0000\n"
-"PO-Revision-Date: 2010-04-12 21:48:26+0000\n"
+"POT-Creation-Date: 2010-04-24 14:16+0000\n"
+"PO-Revision-Date: 2010-04-26 22:16:22+0000\n"
"Language-Team: German\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r64984); Translate extension (2010-01-16)\n"
+"X-Generator: MediaWiki 1.17alpha (r65552); Translate extension (2010-04-25)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: de\n"
"X-Message-Group: out-statusnet\n"
@@ -93,7 +93,6 @@ msgstr "Speichern"
#. TRANS: Server error when page not found (404)
#: actions/all.php:64 actions/public.php:98 actions/replies.php:93
#: actions/showfavorites.php:138 actions/tag.php:52
-#, fuzzy
msgid "No such page."
msgstr "Seite nicht vorhanden"
@@ -106,8 +105,8 @@ msgstr "Seite nicht vorhanden"
#: actions/apidirectmessagenew.php:75 actions/apigroupcreate.php:112
#: actions/apigroupismember.php:90 actions/apigroupjoin.php:99
#: actions/apigroupleave.php:99 actions/apigrouplist.php:72
-#: actions/apistatusesupdate.php:148 actions/apisubscriptions.php:87
-#: actions/apitimelinefavorites.php:71 actions/apitimelinefriends.php:78
+#: actions/apistatusesupdate.php:239 actions/apisubscriptions.php:87
+#: actions/apitimelinefavorites.php:71 actions/apitimelinefriends.php:173
#: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79
#: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75
#: actions/favoritesrss.php:74 actions/foaf.php:40 actions/foaf.php:58
@@ -131,7 +130,7 @@ msgstr "%1$s und Freunde, Seite% 2$d"
#. TRANS: H1 text. %1$s is user nickname
#. TRANS: Message is used as link title. %s is a user nickname.
#: actions/all.php:89 actions/all.php:181 actions/allrss.php:116
-#: actions/apitimelinefriends.php:114 actions/apitimelinehome.php:115
+#: actions/apitimelinefriends.php:209 actions/apitimelinehome.php:115
#: lib/personalgroupnav.php:100
#, php-format
msgid "%s and friends"
@@ -201,7 +200,7 @@ msgstr "Du und Freunde"
#. 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:121 actions/apitimelinefriends.php:120
+#: actions/allrss.php:121 actions/apitimelinefriends.php:215
#: actions/apitimelinehome.php:121
#, php-format
msgid "Updates from %1$s and friends on %2$s!"
@@ -223,9 +222,9 @@ msgstr "Aktualisierungen von %1$s und Freunden auf %2$s!"
#: actions/apistatusesdestroy.php:102 actions/apistatusesretweets.php:112
#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:141
#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111
-#: actions/apitimelinefavorites.php:173 actions/apitimelinefriends.php:175
+#: actions/apitimelinefavorites.php:173 actions/apitimelinefriends.php:270
#: actions/apitimelinegroup.php:151 actions/apitimelinehome.php:174
-#: actions/apitimelinementions.php:173 actions/apitimelinepublic.php:151
+#: actions/apitimelinementions.php:173 actions/apitimelinepublic.php:240
#: actions/apitimelineretweetedtome.php:121
#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:160
#: actions/apitimelineuser.php:162 actions/apiusershow.php:101
@@ -242,7 +241,7 @@ msgstr "API-Methode nicht gefunden."
#: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91
#: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91
#: actions/apigroupleave.php:91 actions/apimediaupload.php:67
-#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:118
+#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:209
msgid "This method requires a POST."
msgstr "Diese Methode benötigt ein POST."
@@ -251,6 +250,8 @@ msgid ""
"You must specify a parameter named 'device' with a value of one of: sms, im, "
"none."
msgstr ""
+"Du musst einen Parameter mit Namen 'device' übergeben. Mögliche Werte sind: "
+"sms, im, none."
#: actions/apiaccountupdatedeliverydevice.php:132
msgid "Could not update user."
@@ -272,7 +273,7 @@ msgstr "Konnte Profil nicht speichern."
#: actions/apiaccountupdateprofilebackgroundimage.php:108
#: actions/apiaccountupdateprofileimage.php:97 actions/apimediaupload.php:80
-#: actions/apistatusesupdate.php:131 actions/avatarsettings.php:257
+#: actions/apistatusesupdate.php:222 actions/avatarsettings.php:257
#: actions/designadminpanel.php:123 actions/editapplication.php:118
#: actions/newapplication.php:101 actions/newnotice.php:94
#: lib/designsettings.php:283
@@ -454,9 +455,9 @@ msgid "Too many aliases! Maximum %d."
msgstr "Zu viele Pseudonyme! Maximale Anzahl ist %d."
#: actions/apigroupcreate.php:266
-#, fuzzy, php-format
+#, php-format
msgid "Invalid alias: \"%s\"."
-msgstr "Ungültiges Stichwort: „%s“"
+msgstr "Ungültiges Alias: „%s“"
#: actions/apigroupcreate.php:275 actions/editgroup.php:232
#: actions/newgroup.php:172
@@ -472,7 +473,6 @@ msgstr "Alias kann nicht das gleiche wie der Spitznamen sein."
#: actions/apigroupismember.php:95 actions/apigroupjoin.php:104
#: actions/apigroupleave.php:104 actions/apigroupmembership.php:91
#: actions/apigroupshow.php:82 actions/apitimelinegroup.php:91
-#, fuzzy
msgid "Group not found."
msgstr "Gruppe nicht gefunden!"
@@ -665,18 +665,18 @@ msgstr "Status gelöscht."
msgid "No status with that ID found."
msgstr "Keine Nachricht mit dieser ID gefunden."
-#: actions/apistatusesupdate.php:161 actions/newnotice.php:155
+#: actions/apistatusesupdate.php:252 actions/newnotice.php:155
#: lib/mailhandler.php:60
#, php-format
msgid "That's too long. Max notice size is %d chars."
msgstr ""
"Das war zu lang. Die Länge einer Nachricht ist auf %d Zeichen beschränkt."
-#: actions/apistatusesupdate.php:202 actions/apiusershow.php:96
+#: actions/apistatusesupdate.php:293 actions/apiusershow.php:96
msgid "Not found."
msgstr "Nicht gefunden."
-#: actions/apistatusesupdate.php:225 actions/newnotice.php:178
+#: actions/apistatusesupdate.php:316 actions/newnotice.php:178
#, php-format
msgid "Max notice size is %d chars, including attachment URL."
msgstr ""
@@ -707,12 +707,12 @@ msgstr "%1$s / Aktualisierungen erwähnen %2$s"
msgid "%1$s updates that reply to updates from %2$s / %3$s."
msgstr "Nachrichten von %1$, die auf Nachrichten von %2$ / %3$ antworten."
-#: actions/apitimelinepublic.php:107 actions/publicrss.php:103
+#: actions/apitimelinepublic.php:196 actions/publicrss.php:103
#, php-format
msgid "%s public timeline"
msgstr "%s öffentliche Zeitleiste"
-#: actions/apitimelinepublic.php:112 actions/publicrss.php:105
+#: actions/apitimelinepublic.php:201 actions/publicrss.php:105
#, php-format
msgid "%s updates from everyone!"
msgstr "%s Nachrichten von allen!"
@@ -853,7 +853,6 @@ msgstr ""
#: actions/block.php:145 actions/deleteapplication.php:154
#: actions/deletenotice.php:147 actions/deleteuser.php:152
#: actions/groupblock.php:178
-#, fuzzy
msgctxt "BUTTON"
msgid "No"
msgstr "Nein"
@@ -872,7 +871,6 @@ msgstr "Diesen Benutzer freigeben"
#: actions/block.php:152 actions/deleteapplication.php:161
#: actions/deletenotice.php:154 actions/deleteuser.php:159
#: actions/groupblock.php:185
-#, fuzzy
msgctxt "BUTTON"
msgid "Yes"
msgstr "Ja"
@@ -928,9 +926,9 @@ msgstr "Diesen Benutzer freigeben"
#. TRANS: Title for mini-posting window loaded from bookmarklet.
#: actions/bookmarklet.php:51
-#, fuzzy, php-format
+#, php-format
msgid "Post to %s"
-msgstr "Versenden an "
+msgstr "Versenden an %s"
#: actions/confirmaddress.php:75
msgid "No confirmation code."
@@ -946,7 +944,7 @@ msgstr "Dieser Bestätigungscode ist nicht für dich!"
#. TRANS: Server error for an unknow address type, which can be 'email', 'jabber', or 'sms'.
#: actions/confirmaddress.php:91
-#, fuzzy, php-format
+#, php-format
msgid "Unrecognized address type %s."
msgstr "Nicht erkannter Adresstyp %s"
@@ -1118,7 +1116,7 @@ msgid "Invalid logo URL."
msgstr "Ungültige URL für das Logo"
#: actions/designadminpanel.php:280
-#, fuzzy, php-format
+#, php-format
msgid "Theme not available: %s."
msgstr "Theme nicht verfügbar: %s"
@@ -1375,7 +1373,6 @@ msgstr "Aktuelle bestätigte E-Mail-Adresse."
#: actions/emailsettings.php:115 actions/emailsettings.php:158
#: actions/imsettings.php:116 actions/smssettings.php:124
#: actions/smssettings.php:180
-#, fuzzy
msgctxt "BUTTON"
msgid "Remove"
msgstr "Entfernen"
@@ -1394,7 +1391,6 @@ msgstr ""
#. TRANS: Button label
#: actions/emailsettings.php:127 actions/imsettings.php:131
#: actions/smssettings.php:137 lib/applicationeditform.php:357
-#, fuzzy
msgctxt "BUTTON"
msgid "Cancel"
msgstr "Abbrechen"
@@ -1409,7 +1405,6 @@ msgstr "E-Mail-Adresse, beispielsweise „Benutzername@example.org“"
#. TRANS: Button label for adding a SMS phone number in SMS settings form.
#: actions/emailsettings.php:139 actions/imsettings.php:148
#: actions/smssettings.php:162
-#, fuzzy
msgctxt "BUTTON"
msgid "Add"
msgstr "Hinzufügen"
@@ -1437,16 +1432,14 @@ 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:168 actions/smssettings.php:189
-#, fuzzy
msgctxt "BUTTON"
msgid "New"
msgstr "Neu"
#. TRANS: Form legend for e-mail preferences form.
#: actions/emailsettings.php:174
-#, fuzzy
msgid "Email preferences"
-msgstr "Einstellungen"
+msgstr "E-Mail Einstellungen"
#. TRANS: Checkbox label in e-mail preferences form.
#: actions/emailsettings.php:180
@@ -1487,9 +1480,8 @@ msgstr "MicroID für meine E-Mail-Adresse veröffentlichen."
#. TRANS: Confirmation message for successful e-mail preferences save.
#: actions/emailsettings.php:334
-#, fuzzy
msgid "Email preferences saved."
-msgstr "Design-Einstellungen gespeichert."
+msgstr "E-Mail Einstellungen gespeichert."
#. TRANS: Message given saving e-mail address without having provided one.
#: actions/emailsettings.php:353
@@ -1545,15 +1537,13 @@ msgstr "Keine ausstehende Bestätigung, die abgebrochen werden kann."
#. TRANS: Message given canceling e-mail address confirmation for the wrong e-mail address.
#: actions/emailsettings.php:424
-#, fuzzy
msgid "That is the wrong email address."
-msgstr "Das ist die falsche IM-Adresse."
+msgstr "Dies ist die falsche E-Mail Adresse"
#. TRANS: Message given after successfully canceling e-mail address confirmation.
#: actions/emailsettings.php:438
-#, fuzzy
msgid "Email confirmation cancelled."
-msgstr "Bestätigung abgebrochen."
+msgstr "E-Mail Bestätigung abgebrochen."
#. TRANS: Message given trying to remove an e-mail address that is not
#. TRANS: registered for the active user.
@@ -1563,9 +1553,8 @@ msgstr "Dies ist nicht deine E-Mail-Adresse."
#. TRANS: Message given after successfully removing a registered e-mail address.
#: actions/emailsettings.php:479
-#, fuzzy
msgid "The email address was removed."
-msgstr "Die Adresse wurde entfernt."
+msgstr "Die E-Mail Adresse wurde entfernt."
#: actions/emailsettings.php:493 actions/smssettings.php:568
msgid "No incoming email address."
@@ -1704,9 +1693,8 @@ msgid "Remote service uses unknown version of OMB protocol."
msgstr "Service nutzt unbekannte OMB-Protokollversion."
#: actions/finishremotesubscribe.php:138
-#, fuzzy
msgid "Error updating remote profile."
-msgstr "Fehler beim Aktualisieren des entfernten Profils"
+msgstr "Fehler beim Aktualisieren des entfernten Profils."
#: actions/getfile.php:79
msgid "No such file."
@@ -2029,9 +2017,8 @@ msgstr ""
#. TRANS: Form legend for IM preferences form.
#: actions/imsettings.php:155
-#, fuzzy
msgid "IM preferences"
-msgstr "Einstellungen"
+msgstr "IM Einstellungen"
#. TRANS: Checkbox label in IM preferences form.
#: actions/imsettings.php:160
@@ -2103,15 +2090,13 @@ msgstr "Das ist die falsche IM-Adresse."
#. TRANS: Server error thrown on database error canceling IM address confirmation.
#: actions/imsettings.php:397
-#, fuzzy
msgid "Couldn't delete IM confirmation."
-msgstr "Konnte E-Mail-Bestätigung nicht löschen."
+msgstr "Konnte die IM Bestätigung nicht löschen."
#. TRANS: Message given after successfully canceling IM address confirmation.
#: actions/imsettings.php:402
-#, fuzzy
msgid "IM confirmation cancelled."
-msgstr "Bestätigung abgebrochen."
+msgstr "IM Bestätigung abgebrochen."
#. TRANS: Message given trying to remove an IM address that is not
#. TRANS: registered for the active user.
@@ -2121,9 +2106,8 @@ msgstr "Dies ist nicht deine JabberID."
#. TRANS: Message given after successfully removing a registered IM address.
#: actions/imsettings.php:447
-#, fuzzy
msgid "The IM address was removed."
-msgstr "Die Adresse wurde entfernt."
+msgstr "Die IM Adresse wurde entfernt."
#: actions/inbox.php:59
#, php-format
@@ -2146,7 +2130,7 @@ msgid "Invites have been disabled."
msgstr "Einladungen wurden deaktiviert."
#: actions/invite.php:41
-#, fuzzy, php-format
+#, php-format
msgid "You must be logged in to invite other users to use %s."
msgstr "Du musst angemeldet sein, um andere Benutzer zu %s einzuladen"
@@ -2360,13 +2344,16 @@ msgstr ""
"ein, bevor die Änderungen an deinen Einstellungen übernommen werden."
#: actions/login.php:270
+msgid "Login with your username and password."
+msgstr "Mit Nutzernamen und Passwort anmelden."
+
+#: actions/login.php:273
#, php-format
msgid ""
-"Login with your username and password. Don't have a username yet? [Register]"
-"(%%action.register%%) a new account."
+"Don't have a username yet? [Register](%%action.register%%) a new account."
msgstr ""
-"Melde dich mit Nutzernamen und Passwort an. Du hast noch keinen Nutzernamen? "
-"[Registriere](%%action.register%%) ein neues Konto."
+"Du hast noch keinen Nutzernamen? [Registriere](%%action.register%%) ein "
+"neues Konto."
#: actions/makeadmin.php:92
msgid "Only an admin can make another user an admin."
@@ -2388,9 +2375,8 @@ msgid "Can't make %1$s an admin for group %2$s."
msgstr "Konnte %1$s nicht zum Administrator der Gruppe %2$s machen"
#: actions/microsummary.php:69
-#, fuzzy
msgid "No current status."
-msgstr "Kein aktueller Status"
+msgstr "Kein aktueller Status."
#: actions/newapplication.php:52
msgid "New Application"
@@ -2559,9 +2545,9 @@ msgid "You are not a user of that application."
msgstr "Du bist kein Benutzer dieses Programms."
#: actions/oauthconnectionssettings.php:186
-#, fuzzy, php-format
+#, php-format
msgid "Unable to revoke access for app: %s."
-msgstr "Kann Zugang dieses Programm nicht entfernen: "
+msgstr "Kann Zugang dieses Programm nicht entfernen: %s."
#: actions/oauthconnectionssettings.php:198
msgid "You have not authorized any applications to use your account."
@@ -2574,7 +2560,6 @@ msgstr ""
"Entwickler können die Registrierungseinstellungen ihrer Programme ändern "
#: actions/oembed.php:79 actions/shownotice.php:100
-#, fuzzy
msgid "Notice has no profile."
msgstr "Nachricht hat kein Profil"
@@ -2585,19 +2570,19 @@ msgstr "%1$s Status auf %2$s"
#. TRANS: Error message displaying attachments. %s is a raw MIME type (eg 'image/png')
#: actions/oembed.php:158
-#, fuzzy, php-format
+#, php-format
msgid "Content type %s not supported."
-msgstr "Content-Typ "
+msgstr "Content-Typ %s wird nicht untersützt."
#. TRANS: Error message displaying attachments. %s is the site's base URL.
#: actions/oembed.php:162
#, php-format
msgid "Only %s URLs over plain HTTP please."
-msgstr ""
+msgstr "Bitte nur %s URLs über einfaches HTTP."
#. TRANS: Client error on an API request with an unsupported data format.
-#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1069
-#: lib/apiaction.php:1098 lib/apiaction.php:1215
+#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1131
+#: lib/apiaction.php:1160 lib/apiaction.php:1277
msgid "Not a supported data format."
msgstr "Kein unterstütztes Datenformat."
@@ -2747,24 +2732,24 @@ msgid "Path and server settings for this StatusNet site."
msgstr "Pfad- und Serverangaben für diese StatusNet Seite."
#: actions/pathsadminpanel.php:157
-#, fuzzy, php-format
+#, php-format
msgid "Theme directory not readable: %s."
-msgstr "Theme-Verzeichnis nicht lesbar: %s"
+msgstr "Theme-Verzeichnis nicht lesbar: %s."
#: actions/pathsadminpanel.php:163
-#, fuzzy, php-format
+#, php-format
msgid "Avatar directory not writable: %s."
-msgstr "Avatar-Verzeichnis ist nicht beschreibbar: %s"
+msgstr "Avatar-Verzeichnis ist nicht beschreibbar: %s."
#: actions/pathsadminpanel.php:169
-#, fuzzy, php-format
+#, php-format
msgid "Background directory not writable: %s."
-msgstr "Hintergrund Verzeichnis ist nicht beschreibbar: %s"
+msgstr "Hintergrund-Verzeichnis ist nicht beschreibbar: %s."
#: actions/pathsadminpanel.php:177
-#, fuzzy, php-format
+#, php-format
msgid "Locales directory not readable: %s."
-msgstr "Sprachverzeichnis nicht lesbar: %s"
+msgstr "Sprachverzeichnis nicht lesbar: %s."
#: actions/pathsadminpanel.php:183
msgid "Invalid SSL server. The maximum length is 255 characters."
@@ -2905,9 +2890,9 @@ msgid "People search"
msgstr "Suche nach anderen Nutzern"
#: actions/peopletag.php:68
-#, fuzzy, php-format
+#, php-format
msgid "Not a valid people tag: %s."
-msgstr "Ungültiger Personen-Tag: %s"
+msgstr "Ungültiger Personen-Tag: %s."
#: actions/peopletag.php:142
#, php-format
@@ -2915,9 +2900,8 @@ msgid "Users self-tagged with %1$s - page %2$d"
msgstr "Benutzer die sich selbst mit %1$s getagged haben - Seite %2$d"
#: actions/postnotice.php:95
-#, fuzzy
msgid "Invalid notice content."
-msgstr "Ungültiger Nachrichteninhalt"
+msgstr "Ungültiger Nachrichteninhalt."
#: actions/postnotice.php:101
#, php-format
@@ -3066,9 +3050,9 @@ msgid "Settings saved."
msgstr "Einstellungen gespeichert."
#: actions/public.php:83
-#, fuzzy, php-format
+#, php-format
msgid "Beyond the page limit (%s)."
-msgstr "Jenseits des Seitenlimits (%s)"
+msgstr "Jenseits des Seitenlimits (%s)."
#: actions/public.php:92
msgid "Could not retrieve public stream."
@@ -3666,11 +3650,11 @@ msgstr "Programminformation"
#: actions/showapplication.php:263
msgid "Consumer key"
-msgstr ""
+msgstr "Anwender Schlüssel"
#: actions/showapplication.php:268
msgid "Consumer secret"
-msgstr ""
+msgstr "Anwender Geheimnis"
#: actions/showapplication.php:273
msgid "Request token URL"
@@ -3735,6 +3719,8 @@ msgid ""
"%s hasn't added any notices to his favorites yet. Post something interesting "
"they would add to their favorites :)"
msgstr ""
+"%s hat noch keine Nachricht zu den Favoriten hinzugefügt. Sende du doch "
+"einfach eine interessante Nachricht, damit sich daran etwas ändert :)"
#: actions/showfavorites.php:212
#, php-format
@@ -3994,7 +3980,6 @@ msgid "Minimum text limit is 0 (unlimited)."
msgstr "Minimale Textlänge ist 0 Zeichen (unbegrenzt)"
#: actions/siteadminpanel.php:171
-#, fuzzy
msgid "Dupe limit must be one or more seconds."
msgstr "Duplikatlimit muss mehr als 1 Sekunde sein"
@@ -4089,9 +4074,8 @@ msgid "Unable to save site notice."
msgstr "Konnte Seitenbenachrichtigung nicht speichern"
#: actions/sitenoticeadminpanel.php:113
-#, fuzzy
msgid "Max length for the site-wide notice is 255 chars."
-msgstr "Maximale Länge von Systembenachrichtigungen ist 255 Zeichen"
+msgstr "Maximale Länge von Systembenachrichtigungen ist 255 Zeichen."
#: actions/sitenoticeadminpanel.php:176
msgid "Site notice text"
@@ -4124,9 +4108,8 @@ msgstr "SMS ist nicht verfügbar."
#. TRANS: Form legend for SMS settings form.
#: actions/smssettings.php:111
-#, fuzzy
msgid "SMS address"
-msgstr "IM-Adresse"
+msgstr "SMS Adresse"
#. TRANS: Form guide in SMS settings form.
#: actions/smssettings.php:120
@@ -4150,7 +4133,6 @@ msgstr "Gib den Code ein, den du auf deinem Handy via SMS bekommen hast."
#. TRANS: Button label to confirm SMS confirmation code in SMS settings.
#: actions/smssettings.php:148
-#, fuzzy
msgctxt "BUTTON"
msgid "Confirm"
msgstr "Bestätigen"
@@ -4167,9 +4149,8 @@ msgstr "Telefonnummer, keine Sonder- oder Leerzeichen mit Vorwahl"
#. TRANS: Form legend for SMS preferences form.
#: actions/smssettings.php:195
-#, fuzzy
msgid "SMS preferences"
-msgstr "Einstellungen"
+msgstr "SMS Einstellungen"
#. TRANS: Checkbox label in SMS preferences form.
#: actions/smssettings.php:201
@@ -4182,9 +4163,8 @@ msgstr ""
#. TRANS: Confirmation message for successful SMS preferences save.
#: actions/smssettings.php:315
-#, fuzzy
msgid "SMS preferences saved."
-msgstr "Einstellungen gesichert."
+msgstr "SMS Einstellungen gesichert."
#. TRANS: Message given saving SMS phone number without having provided one.
#: actions/smssettings.php:338
@@ -4223,9 +4203,8 @@ msgstr "Die Bestätigungsnummer ist falsch."
#. TRANS: Message given after successfully canceling SMS phone number confirmation.
#: actions/smssettings.php:427
-#, fuzzy
msgid "SMS confirmation cancelled."
-msgstr "Bestätigung abgebrochen."
+msgstr "SMS Bestätigung abgebrochen."
#. TRANS: Message given trying to remove an SMS phone number that is not
#. TRANS: registered for the active user.
@@ -4235,9 +4214,8 @@ msgstr "Dies ist nicht deine Telefonnummer."
#. TRANS: Message given after successfully removing a registered SMS phone number.
#: actions/smssettings.php:470
-#, fuzzy
msgid "The SMS phone number was removed."
-msgstr "SMS-Telefonnummer"
+msgstr "SMS Telefonnummer wurde entfernt."
#. TRANS: Label for mobile carrier dropdown menu in SMS settings.
#: actions/smssettings.php:511
@@ -4282,23 +4260,23 @@ msgstr ""
#: actions/snapshotadminpanel.php:133
msgid "Snapshot frequency must be a number."
-msgstr ""
+msgstr "Die Snapshot-Frequenz muss eine Zahl sein."
#: actions/snapshotadminpanel.php:144
msgid "Invalid snapshot report URL."
-msgstr ""
+msgstr "Ungültige Snapshot-Berichts-URL."
#: actions/snapshotadminpanel.php:200
msgid "Randomly during web hit"
-msgstr ""
+msgstr "Zufällig während Webseitenbesuchen"
#: actions/snapshotadminpanel.php:201
msgid "In a scheduled job"
-msgstr ""
+msgstr "Als zeitlich geplanten Auftrag"
#: actions/snapshotadminpanel.php:206
msgid "Data snapshots"
-msgstr ""
+msgstr "Daten-Snapshot"
#: actions/snapshotadminpanel.php:208
msgid "When to send statistical data to status.net servers"
@@ -4310,7 +4288,7 @@ msgstr "Frequenz"
#: actions/snapshotadminpanel.php:218
msgid "Snapshots will be sent once every N web hits"
-msgstr ""
+msgstr "Snapshots werden all N Webseitenbesuche gesendet"
#: actions/snapshotadminpanel.php:226
msgid "Report URL"
@@ -4318,7 +4296,7 @@ msgstr "URL melden"
#: actions/snapshotadminpanel.php:227
msgid "Snapshots will be sent to this URL"
-msgstr ""
+msgstr "An diese Adresse werden Snapshots gesendet"
#: actions/snapshotadminpanel.php:248
msgid "Save snapshot settings"
@@ -4524,7 +4502,6 @@ msgid "User is not silenced."
msgstr "Der Benutzer ist nicht ruhig gestellt."
#: actions/unsubscribe.php:77
-#, fuzzy
msgid "No profile ID in request."
msgstr "Keine Profil-ID in der Anfrage."
@@ -4879,7 +4856,7 @@ msgstr "Konnte Nachricht nicht mit neuer URI versehen."
#. TRANS: Server exception. %s are the error details.
#: classes/Notice.php:176
-#, fuzzy, php-format
+#, php-format
msgid "Database error inserting hashtag: %s"
msgstr "Datenbankfehler beim Einfügen des Hashtags: %s"
@@ -4915,13 +4892,13 @@ msgstr ""
msgid "Problem saving notice."
msgstr "Problem bei Speichern der Nachricht."
-#: classes/Notice.php:965
+#: classes/Notice.php:967
msgid "Problem saving group inbox."
msgstr "Problem bei Speichern der Nachricht."
#. 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:1513
+#: classes/Notice.php:1535
#, php-format
msgid "RT @%1$s %2$s"
msgstr "RT @%1$s %2$s"
@@ -5205,7 +5182,7 @@ msgstr "StatusNet-Software-Lizenz"
#. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is set.
#: lib/action.php:817
-#, fuzzy, php-format
+#, php-format
msgid ""
"**%%site.name%%** is a microblogging service brought to you by [%%site."
"broughtby%%](%%site.broughtbyurl%%)."
@@ -5263,7 +5240,7 @@ msgstr ""
#: lib/action.php:871
#, php-format
msgid "All %1$s content and data are available under the %2$s license."
-msgstr ""
+msgstr "Alle Inhalte und Daten von %1$s sind unter der %2$s Lizenz verfügbar."
#. TRANS: DT element for pagination (previous/next, etc.).
#: lib/action.php:1182
@@ -5285,7 +5262,7 @@ msgstr "Vorher"
#. TRANS: Client exception thrown when a feed instance is a DOMDocument.
#: lib/activity.php:121
msgid "Expecting a root feed element but got a whole XML document."
-msgstr ""
+msgstr "root-Element eines Feeds erwartet aber ganzes XML Dokument erhalten."
#: lib/activityutils.php:208
msgid "Can't handle remote content yet."
@@ -5383,7 +5360,7 @@ msgid "Snapshots configuration"
msgstr "Snapshot Konfiguration"
#. TRANS: Client error 401.
-#: lib/apiauth.php:95
+#: lib/apiauth.php:113
msgid "API resource requires read-write access, but you only have read access."
msgstr "API-Ressource erfordert lesen/schreib Zugriff; du hast nur Leserechte."
@@ -5472,13 +5449,11 @@ msgstr "Abbrechen"
#. TRANS: Application access type
#: lib/applicationlist.php:136
-#, fuzzy
msgid "read-write"
msgstr "Lese/Schreibzugriff"
#. TRANS: Application access type
#: lib/applicationlist.php:138
-#, fuzzy
msgid "read-only"
msgstr "Schreibgeschützt"
@@ -5486,14 +5461,13 @@ msgstr "Schreibgeschützt"
#: lib/applicationlist.php:144
#, php-format
msgid "Approved %1$s - \"%2$s\" access."
-msgstr ""
+msgstr "Genehmigte %1$s - \"%2$s\" Zugriff."
#. TRANS: Button label
#: lib/applicationlist.php:159
-#, fuzzy
msgctxt "BUTTON"
msgid "Revoke"
-msgstr "Entfernen"
+msgstr "Widerrufen"
#. TRANS: DT element label in attachment list.
#: lib/attachmentlist.php:88
@@ -5604,7 +5578,7 @@ msgstr "Konnte Benutzer %s nicht der Gruppe %s hinzufügen."
#. 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.
#: lib/command.php:385
-#, fuzzy, php-format
+#, php-format
msgid "Could not remove user %1$s from group %2$s"
msgstr "Konnte Benutzer %1$s nicht aus der Gruppe %2$s entfernen."
@@ -5646,7 +5620,7 @@ msgstr ""
#. TRANS: Message given if content is too long.
#. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
#: lib/command.php:472
-#, fuzzy, php-format
+#, php-format
msgid "Message too long - maximum is %1$d characters, you sent %2$d"
msgstr ""
"Nachricht zu lang - maximal %1$d Zeichen erlaubt, du hast %2$d gesendet."
@@ -6232,9 +6206,11 @@ msgstr "SMS-Konfiguration"
#. TRANS: Main body heading for SMS-by-email address confirmation message
#: lib/mail.php:457
-#, fuzzy, php-format
+#, php-format
msgid "%s: confirm you own this phone number with this code:"
-msgstr "Warte auf die Bestätigung dieser Telefonnummer."
+msgstr ""
+"%s: bestätige mit folgendem Code, dass es sich um deine Telefonnummer "
+"handelt:"
#. TRANS: Subject for 'nudge' notification email
#: lib/mail.php:478
@@ -6356,6 +6332,9 @@ msgid ""
"\n"
"\t%s"
msgstr ""
+"Die komplette Unterhaltung kann hier gelesen werden:\n"
+"\n"
+"%s"
#: lib/mail.php:651
#, php-format
@@ -6390,6 +6369,29 @@ msgid ""
"\n"
"P.S. You can turn off these email notifications here: %8$s\n"
msgstr ""
+"%1$s (@%9$s) hat dir gerade eine Nachricht (eine '@-Antwort') auf %2$s "
+"gesendet.\n"
+"\n"
+"Die Nachricht findest du hier:\n"
+"\n"
+"%3$s\n"
+"\n"
+"Sie lautet:\n"
+"\n"
+"%4$s\n"
+"\n"
+"%5$sHier kannst du auf die Nachricht antworten:\n"
+"\n"
+"%6$s\n"
+"\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"
#: lib/mailbox.php:89
msgid "Only the user can read their own mailboxes."
@@ -6717,9 +6719,8 @@ msgid "Popular"
msgstr "Beliebte Beiträge"
#: lib/redirectingaction.php:94
-#, fuzzy
msgid "No return-to arguments."
-msgstr "Kein id Argument."
+msgstr "Kein Rückkehr Argument."
#: lib/repeatform.php:107
msgid "Repeat this notice?"
@@ -6825,12 +6826,12 @@ msgstr "Lade Freunde und Kollegen ein dir auf %s zu folgen"
#: lib/subscriberspeopleselftagcloudsection.php:48
#: lib/subscriptionspeopleselftagcloudsection.php:48
msgid "People Tagcloud as self-tagged"
-msgstr ""
+msgstr "Personen-Tagwolke, wie man sich selbst markiert hat."
#: lib/subscriberspeopletagcloudsection.php:48
#: lib/subscriptionspeopletagcloudsection.php:48
msgid "People Tagcloud as tagged"
-msgstr ""
+msgstr "Personen-Tag, wie markiert wurde"
#: lib/tagcloudsection.php:56
msgid "None"
@@ -6916,56 +6917,56 @@ msgid "Moderator"
msgstr "Moderator"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1054
+#: lib/util.php:1083
msgid "a few seconds ago"
msgstr "vor wenigen Sekunden"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1057
+#: lib/util.php:1086
msgid "about a minute ago"
msgstr "vor einer Minute"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1061
+#: lib/util.php:1090
#, php-format
msgid "about %d minutes ago"
msgstr "vor %d Minuten"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1064
+#: lib/util.php:1093
msgid "about an hour ago"
msgstr "vor einer Stunde"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1068
+#: lib/util.php:1097
#, php-format
msgid "about %d hours ago"
msgstr "vor %d Stunden"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1071
+#: lib/util.php:1100
msgid "about a day ago"
msgstr "vor einem Tag"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1075
+#: lib/util.php:1104
#, php-format
msgid "about %d days ago"
msgstr "vor %d Tagen"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1078
+#: lib/util.php:1107
msgid "about a month ago"
msgstr "vor einem Monat"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1082
+#: lib/util.php:1111
#, php-format
msgid "about %d months ago"
msgstr "vor %d Monaten"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1085
+#: lib/util.php:1114
msgid "about a year ago"
msgstr "vor einem Jahr"
diff --git a/locale/el/LC_MESSAGES/statusnet.po b/locale/el/LC_MESSAGES/statusnet.po
index 8fc8ac6c4..8fa761ae8 100644
--- a/locale/el/LC_MESSAGES/statusnet.po
+++ b/locale/el/LC_MESSAGES/statusnet.po
@@ -10,12 +10,12 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-12 21:47+0000\n"
-"PO-Revision-Date: 2010-04-12 21:48:29+0000\n"
+"POT-Creation-Date: 2010-04-24 14:16+0000\n"
+"PO-Revision-Date: 2010-04-26 22:16:29+0000\n"
"Language-Team: Greek\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r64984); Translate extension (2010-01-16)\n"
+"X-Generator: MediaWiki 1.17alpha (r65552); Translate extension (2010-04-25)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: el\n"
"X-Message-Group: out-statusnet\n"
@@ -101,8 +101,8 @@ msgstr "Δεν υπάÏχει τέτοια σελίδα"
#: actions/apidirectmessagenew.php:75 actions/apigroupcreate.php:112
#: actions/apigroupismember.php:90 actions/apigroupjoin.php:99
#: actions/apigroupleave.php:99 actions/apigrouplist.php:72
-#: actions/apistatusesupdate.php:148 actions/apisubscriptions.php:87
-#: actions/apitimelinefavorites.php:71 actions/apitimelinefriends.php:78
+#: actions/apistatusesupdate.php:239 actions/apisubscriptions.php:87
+#: actions/apitimelinefavorites.php:71 actions/apitimelinefriends.php:173
#: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79
#: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75
#: actions/favoritesrss.php:74 actions/foaf.php:40 actions/foaf.php:58
@@ -126,7 +126,7 @@ msgstr "%1$s και φίλοι, σελίδα 2%$d"
#. TRANS: H1 text. %1$s is user nickname
#. TRANS: Message is used as link title. %s is a user nickname.
#: actions/all.php:89 actions/all.php:181 actions/allrss.php:116
-#: actions/apitimelinefriends.php:114 actions/apitimelinehome.php:115
+#: actions/apitimelinefriends.php:209 actions/apitimelinehome.php:115
#: lib/personalgroupnav.php:100
#, php-format
msgid "%s and friends"
@@ -190,7 +190,7 @@ msgstr "Εσείς και οι φίλοι σας"
#. 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:121 actions/apitimelinefriends.php:120
+#: actions/allrss.php:121 actions/apitimelinefriends.php:215
#: actions/apitimelinehome.php:121
#, php-format
msgid "Updates from %1$s and friends on %2$s!"
@@ -212,9 +212,9 @@ msgstr ""
#: actions/apistatusesdestroy.php:102 actions/apistatusesretweets.php:112
#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:141
#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111
-#: actions/apitimelinefavorites.php:173 actions/apitimelinefriends.php:175
+#: actions/apitimelinefavorites.php:173 actions/apitimelinefriends.php:270
#: actions/apitimelinegroup.php:151 actions/apitimelinehome.php:174
-#: actions/apitimelinementions.php:173 actions/apitimelinepublic.php:151
+#: actions/apitimelinementions.php:173 actions/apitimelinepublic.php:240
#: actions/apitimelineretweetedtome.php:121
#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:160
#: actions/apitimelineuser.php:162 actions/apiusershow.php:101
@@ -232,7 +232,7 @@ msgstr "Η μέθοδος του ΑΡΙ δε βÏέθηκε!"
#: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91
#: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91
#: actions/apigroupleave.php:91 actions/apimediaupload.php:67
-#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:118
+#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:209
msgid "This method requires a POST."
msgstr ""
@@ -264,7 +264,7 @@ msgstr "Απέτυχε η αποθήκευση του Ï€Ïοφίλ."
#: actions/apiaccountupdateprofilebackgroundimage.php:108
#: actions/apiaccountupdateprofileimage.php:97 actions/apimediaupload.php:80
-#: actions/apistatusesupdate.php:131 actions/avatarsettings.php:257
+#: actions/apistatusesupdate.php:222 actions/avatarsettings.php:257
#: actions/designadminpanel.php:123 actions/editapplication.php:118
#: actions/newapplication.php:101 actions/newnotice.php:94
#: lib/designsettings.php:283
@@ -655,17 +655,17 @@ msgstr "Η κατάσταση διεγÏάφη."
msgid "No status with that ID found."
msgstr ""
-#: actions/apistatusesupdate.php:161 actions/newnotice.php:155
+#: actions/apistatusesupdate.php:252 actions/newnotice.php:155
#: lib/mailhandler.php:60
#, php-format
msgid "That's too long. Max notice size is %d chars."
msgstr ""
-#: actions/apistatusesupdate.php:202 actions/apiusershow.php:96
+#: actions/apistatusesupdate.php:293 actions/apiusershow.php:96
msgid "Not found."
msgstr ""
-#: actions/apistatusesupdate.php:225 actions/newnotice.php:178
+#: actions/apistatusesupdate.php:316 actions/newnotice.php:178
#, php-format
msgid "Max notice size is %d chars, including attachment URL."
msgstr ""
@@ -694,12 +694,12 @@ msgstr ""
msgid "%1$s updates that reply to updates from %2$s / %3$s."
msgstr ""
-#: actions/apitimelinepublic.php:107 actions/publicrss.php:103
+#: actions/apitimelinepublic.php:196 actions/publicrss.php:103
#, php-format
msgid "%s public timeline"
msgstr ""
-#: actions/apitimelinepublic.php:112 actions/publicrss.php:105
+#: actions/apitimelinepublic.php:201 actions/publicrss.php:105
#, php-format
msgid "%s updates from everyone!"
msgstr ""
@@ -2303,10 +2303,14 @@ msgstr ""
"σας, Ï€Ïιν αλλάξετε τις Ïυθμίσεις σας."
#: actions/login.php:270
+#, fuzzy
+msgid "Login with your username and password."
+msgstr "ΣÏνδεση με όνομα χÏήστη και κωδικό"
+
+#: actions/login.php:273
#, fuzzy, php-format
msgid ""
-"Login with your username and password. Don't have a username yet? [Register]"
-"(%%action.register%%) a new account."
+"Don't have a username yet? [Register](%%action.register%%) a new account."
msgstr ""
"Συνδεθείτε με το όνομα χÏήστη και τον κωδικό σας. Δεν έχετε όνομα χÏήστη "
"ακόμα; Κάντε [εγγÏαφή](%%action.register%%) για ένα νέο λογαÏιασμό ή "
@@ -2527,8 +2531,8 @@ msgid "Only %s URLs over plain HTTP please."
msgstr ""
#. TRANS: Client error on an API request with an unsupported data format.
-#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1069
-#: lib/apiaction.php:1098 lib/apiaction.php:1215
+#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1131
+#: lib/apiaction.php:1160 lib/apiaction.php:1277
msgid "Not a supported data format."
msgstr ""
@@ -4759,13 +4763,13 @@ msgstr ""
msgid "Problem saving notice."
msgstr ""
-#: classes/Notice.php:965
+#: classes/Notice.php:967
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:1513
+#: classes/Notice.php:1535
#, php-format
msgid "RT @%1$s %2$s"
msgstr ""
@@ -5247,7 +5251,7 @@ msgid "Snapshots configuration"
msgstr "Επιβεβαίωση διεÏθυνσης email"
#. TRANS: Client error 401.
-#: lib/apiauth.php:95
+#: lib/apiauth.php:113
msgid "API resource requires read-write access, but you only have read access."
msgstr ""
@@ -6672,56 +6676,56 @@ msgid "Moderator"
msgstr "Συντονιστής"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1054
+#: lib/util.php:1083
msgid "a few seconds ago"
msgstr ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1057
+#: lib/util.php:1086
msgid "about a minute ago"
msgstr ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1061
+#: lib/util.php:1090
#, php-format
msgid "about %d minutes ago"
msgstr ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1064
+#: lib/util.php:1093
msgid "about an hour ago"
msgstr ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1068
+#: lib/util.php:1097
#, php-format
msgid "about %d hours ago"
msgstr ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1071
+#: lib/util.php:1100
msgid "about a day ago"
msgstr ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1075
+#: lib/util.php:1104
#, php-format
msgid "about %d days ago"
msgstr ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1078
+#: lib/util.php:1107
msgid "about a month ago"
msgstr ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1082
+#: lib/util.php:1111
#, php-format
msgid "about %d months ago"
msgstr ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1085
+#: lib/util.php:1114
msgid "about a year ago"
msgstr ""
diff --git a/locale/en_GB/LC_MESSAGES/statusnet.po b/locale/en_GB/LC_MESSAGES/statusnet.po
index 38feccec7..a52c4b570 100644
--- a/locale/en_GB/LC_MESSAGES/statusnet.po
+++ b/locale/en_GB/LC_MESSAGES/statusnet.po
@@ -10,12 +10,12 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-12 21:47+0000\n"
-"PO-Revision-Date: 2010-04-12 21:48:32+0000\n"
+"POT-Creation-Date: 2010-04-24 14:16+0000\n"
+"PO-Revision-Date: 2010-04-26 22:16:33+0000\n"
"Language-Team: British English\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r64984); Translate extension (2010-01-16)\n"
+"X-Generator: MediaWiki 1.17alpha (r65552); Translate extension (2010-04-25)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: en-gb\n"
"X-Message-Group: out-statusnet\n"
@@ -44,7 +44,6 @@ msgstr "Prohibit anonymous users (not logged in) from viewing site?"
#. TRANS: Checkbox label for prohibiting anonymous users from viewing site.
#: actions/accessadminpanel.php:167
-#, fuzzy
msgctxt "LABEL"
msgid "Private"
msgstr "Private"
@@ -81,7 +80,6 @@ msgstr "Save access settings"
#: actions/accessadminpanel.php:203 actions/emailsettings.php:224
#: actions/imsettings.php:184 actions/smssettings.php:209
#: lib/applicationeditform.php:361
-#, fuzzy
msgctxt "BUTTON"
msgid "Save"
msgstr "Save"
@@ -89,9 +87,8 @@ msgstr "Save"
#. TRANS: Server error when page not found (404)
#: actions/all.php:64 actions/public.php:98 actions/replies.php:93
#: actions/showfavorites.php:138 actions/tag.php:52
-#, fuzzy
msgid "No such page."
-msgstr "No such page"
+msgstr "No such page."
#: actions/all.php:75 actions/allrss.php:68
#: actions/apiaccountupdatedeliverydevice.php:113
@@ -102,8 +99,8 @@ msgstr "No such page"
#: actions/apidirectmessagenew.php:75 actions/apigroupcreate.php:112
#: actions/apigroupismember.php:90 actions/apigroupjoin.php:99
#: actions/apigroupleave.php:99 actions/apigrouplist.php:72
-#: actions/apistatusesupdate.php:148 actions/apisubscriptions.php:87
-#: actions/apitimelinefavorites.php:71 actions/apitimelinefriends.php:78
+#: actions/apistatusesupdate.php:239 actions/apisubscriptions.php:87
+#: actions/apitimelinefavorites.php:71 actions/apitimelinefriends.php:173
#: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79
#: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75
#: actions/favoritesrss.php:74 actions/foaf.php:40 actions/foaf.php:58
@@ -127,7 +124,7 @@ msgstr "%1$s and friends, page %2$d"
#. TRANS: H1 text. %1$s is user nickname
#. TRANS: Message is used as link title. %s is a user nickname.
#: actions/all.php:89 actions/all.php:181 actions/allrss.php:116
-#: actions/apitimelinefriends.php:114 actions/apitimelinehome.php:115
+#: actions/apitimelinefriends.php:209 actions/apitimelinehome.php:115
#: lib/personalgroupnav.php:100
#, php-format
msgid "%s and friends"
@@ -194,7 +191,7 @@ msgstr "You and friends"
#. 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:121 actions/apitimelinefriends.php:120
+#: actions/allrss.php:121 actions/apitimelinefriends.php:215
#: actions/apitimelinehome.php:121
#, php-format
msgid "Updates from %1$s and friends on %2$s!"
@@ -216,9 +213,9 @@ msgstr "Updates from %1$s and friends on %2$s!"
#: actions/apistatusesdestroy.php:102 actions/apistatusesretweets.php:112
#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:141
#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111
-#: actions/apitimelinefavorites.php:173 actions/apitimelinefriends.php:175
+#: actions/apitimelinefavorites.php:173 actions/apitimelinefriends.php:270
#: actions/apitimelinegroup.php:151 actions/apitimelinehome.php:174
-#: actions/apitimelinementions.php:173 actions/apitimelinepublic.php:151
+#: actions/apitimelinementions.php:173 actions/apitimelinepublic.php:240
#: actions/apitimelineretweetedtome.php:121
#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:160
#: actions/apitimelineuser.php:162 actions/apiusershow.php:101
@@ -235,18 +232,17 @@ msgstr "API method not found."
#: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91
#: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91
#: actions/apigroupleave.php:91 actions/apimediaupload.php:67
-#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:118
+#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:209
msgid "This method requires a POST."
msgstr "This method requires a POST."
#: actions/apiaccountupdatedeliverydevice.php:105
-#, fuzzy
msgid ""
"You must specify a parameter named 'device' with a value of one of: sms, im, "
"none."
msgstr ""
"You must specify a parameter named 'device' with a value of one of: sms, im, "
-"none"
+"none."
#: actions/apiaccountupdatedeliverydevice.php:132
#, fuzzy
@@ -270,7 +266,7 @@ msgstr "Couldn't save profile."
#: actions/apiaccountupdateprofilebackgroundimage.php:108
#: actions/apiaccountupdateprofileimage.php:97 actions/apimediaupload.php:80
-#: actions/apistatusesupdate.php:131 actions/avatarsettings.php:257
+#: actions/apistatusesupdate.php:222 actions/avatarsettings.php:257
#: actions/designadminpanel.php:123 actions/editapplication.php:118
#: actions/newapplication.php:101 actions/newnotice.php:94
#: lib/designsettings.php:283
@@ -446,9 +442,9 @@ msgid "Too many aliases! Maximum %d."
msgstr "Too many aliases! Maximum %d."
#: actions/apigroupcreate.php:266
-#, fuzzy, php-format
+#, php-format
msgid "Invalid alias: \"%s\"."
-msgstr "Invalid alias: \"%s\""
+msgstr "Invalid alias: \"%s\"."
#: actions/apigroupcreate.php:275 actions/editgroup.php:232
#: actions/newgroup.php:172
@@ -464,9 +460,8 @@ msgstr "Alias can't be the same as nickname."
#: actions/apigroupismember.php:95 actions/apigroupjoin.php:104
#: actions/apigroupleave.php:104 actions/apigroupmembership.php:91
#: actions/apigroupshow.php:82 actions/apitimelinegroup.php:91
-#, fuzzy
msgid "Group not found."
-msgstr "Group not found!"
+msgstr "Group not found."
#: actions/apigroupjoin.php:110 actions/joingroup.php:100
msgid "You are already a member of that group."
@@ -498,9 +493,9 @@ msgstr "%s's groups"
#. TRANS: Meant to convey the user %2$s is a member of each of the groups listed on site %1$s
#: actions/apigrouplist.php:107
-#, fuzzy, php-format
+#, php-format
msgid "%1$s groups %2$s is a member of."
-msgstr "Groups %s is a member of"
+msgstr "%1$s groups %2$s is a member of."
#. TRANS: Message is used as a title. %s is a site name.
#. TRANS: Message is used as a page title. %s is a nick name.
@@ -657,17 +652,17 @@ msgstr "Status deleted."
msgid "No status with that ID found."
msgstr "No status with that ID found."
-#: actions/apistatusesupdate.php:161 actions/newnotice.php:155
+#: actions/apistatusesupdate.php:252 actions/newnotice.php:155
#: lib/mailhandler.php:60
#, php-format
msgid "That's too long. Max notice size is %d chars."
msgstr "That's too long. Max notice size is %d chars."
-#: actions/apistatusesupdate.php:202 actions/apiusershow.php:96
+#: actions/apistatusesupdate.php:293 actions/apiusershow.php:96
msgid "Not found."
msgstr "Not found."
-#: actions/apistatusesupdate.php:225 actions/newnotice.php:178
+#: actions/apistatusesupdate.php:316 actions/newnotice.php:178
#, php-format
msgid "Max notice size is %d chars, including attachment URL."
msgstr "Max notice size is %d chars, including attachment URL."
@@ -696,12 +691,12 @@ msgstr "%1$s / Updates mentioning %2$s"
msgid "%1$s updates that reply to updates from %2$s / %3$s."
msgstr "%1$s updates that reply to updates from %2$s / %3$s."
-#: actions/apitimelinepublic.php:107 actions/publicrss.php:103
+#: actions/apitimelinepublic.php:196 actions/publicrss.php:103
#, php-format
msgid "%s public timeline"
msgstr "%s public timeline"
-#: actions/apitimelinepublic.php:112 actions/publicrss.php:105
+#: actions/apitimelinepublic.php:201 actions/publicrss.php:105
#, php-format
msgid "%s updates from everyone!"
msgstr "%s updates from everyone!"
@@ -791,9 +786,8 @@ msgid "Crop"
msgstr "Crop"
#: actions/avatarsettings.php:305
-#, fuzzy
msgid "No file uploaded."
-msgstr "No profile specified."
+msgstr "No file uploaded."
#: actions/avatarsettings.php:332
msgid "Pick a square area of the image to be your avatar"
@@ -841,7 +835,6 @@ msgstr ""
#: actions/block.php:145 actions/deleteapplication.php:154
#: actions/deletenotice.php:147 actions/deleteuser.php:152
#: actions/groupblock.php:178
-#, fuzzy
msgctxt "BUTTON"
msgid "No"
msgstr "No"
@@ -860,7 +853,6 @@ msgstr "Do not block this user"
#: actions/block.php:152 actions/deleteapplication.php:161
#: actions/deletenotice.php:154 actions/deleteuser.php:159
#: actions/groupblock.php:185
-#, fuzzy
msgctxt "BUTTON"
msgid "Yes"
msgstr "Yes"
@@ -916,9 +908,9 @@ msgstr "Unblock this user"
#. TRANS: Title for mini-posting window loaded from bookmarklet.
#: actions/bookmarklet.php:51
-#, fuzzy, php-format
+#, php-format
msgid "Post to %s"
-msgstr "Post to "
+msgstr "Post to %s"
#: actions/confirmaddress.php:75
msgid "No confirmation code."
@@ -934,9 +926,9 @@ msgstr "That confirmation code is not for you!"
#. TRANS: Server error for an unknow address type, which can be 'email', 'jabber', or 'sms'.
#: actions/confirmaddress.php:91
-#, fuzzy, php-format
+#, php-format
msgid "Unrecognized address type %s."
-msgstr "Unrecognised address type %s"
+msgstr "Unrecognized address type %s."
#. TRANS: Client error for an already confirmed email/jabbel/sms address.
#: actions/confirmaddress.php:96
@@ -1107,9 +1099,9 @@ msgid "Invalid logo URL."
msgstr "nvalid logo URL."
#: actions/designadminpanel.php:280
-#, fuzzy, php-format
+#, php-format
msgid "Theme not available: %s."
-msgstr "Theme not available: %s"
+msgstr "Theme not available: %s."
#: actions/designadminpanel.php:376
msgid "Change logo"
@@ -1363,7 +1355,6 @@ msgstr "Current confirmed e-mail address."
#: actions/emailsettings.php:115 actions/emailsettings.php:158
#: actions/imsettings.php:116 actions/smssettings.php:124
#: actions/smssettings.php:180
-#, fuzzy
msgctxt "BUTTON"
msgid "Remove"
msgstr "Remove"
@@ -1382,7 +1373,6 @@ msgstr ""
#. TRANS: Button label
#: actions/emailsettings.php:127 actions/imsettings.php:131
#: actions/smssettings.php:137 lib/applicationeditform.php:357
-#, fuzzy
msgctxt "BUTTON"
msgid "Cancel"
msgstr "Cancel"
@@ -1397,7 +1387,6 @@ msgstr "E-mail address, like \"UserName@example.org\""
#. TRANS: Button label for adding a SMS phone number in SMS settings form.
#: actions/emailsettings.php:139 actions/imsettings.php:148
#: actions/smssettings.php:162
-#, fuzzy
msgctxt "BUTTON"
msgid "Add"
msgstr "Add"
@@ -1423,16 +1412,14 @@ msgstr "Make a new e-mail address for posting to - cancels the old one."
#. 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:168 actions/smssettings.php:189
-#, fuzzy
msgctxt "BUTTON"
msgid "New"
msgstr "New"
#. TRANS: Form legend for e-mail preferences form.
#: actions/emailsettings.php:174
-#, fuzzy
msgid "Email preferences"
-msgstr "Preferences"
+msgstr "Email preferences"
#. TRANS: Checkbox label in e-mail preferences form.
#: actions/emailsettings.php:180
@@ -1471,9 +1458,8 @@ msgstr "Publish a MicroID for my e-mail address."
#. TRANS: Confirmation message for successful e-mail preferences save.
#: actions/emailsettings.php:334
-#, fuzzy
msgid "Email preferences saved."
-msgstr "Design preferences saved."
+msgstr "Email preferences saved."
#. TRANS: Message given saving e-mail address without having provided one.
#: actions/emailsettings.php:353
@@ -1528,15 +1514,13 @@ msgstr "No pending confirmation to cancel."
#. TRANS: Message given canceling e-mail address confirmation for the wrong e-mail address.
#: actions/emailsettings.php:424
-#, fuzzy
msgid "That is the wrong email address."
-msgstr "That is the wrong IM address."
+msgstr "That is the wrong email address."
#. TRANS: Message given after successfully canceling e-mail address confirmation.
#: actions/emailsettings.php:438
-#, fuzzy
msgid "Email confirmation cancelled."
-msgstr "Confirmation cancelled."
+msgstr "Email confirmation cancelled."
#. TRANS: Message given trying to remove an e-mail address that is not
#. TRANS: registered for the active user.
@@ -1546,9 +1530,8 @@ msgstr "That is not your e-mail address."
#. TRANS: Message given after successfully removing a registered e-mail address.
#: actions/emailsettings.php:479
-#, fuzzy
msgid "The email address was removed."
-msgstr "The address was removed."
+msgstr "The email address was removed."
#: actions/emailsettings.php:493 actions/smssettings.php:568
msgid "No incoming email address."
@@ -1686,7 +1669,6 @@ msgid "Remote service uses unknown version of OMB protocol."
msgstr "Remote service uses unknown version of OMB protocol."
#: actions/finishremotesubscribe.php:138
-#, fuzzy
msgid "Error updating remote profile."
msgstr "Error updating remote profile."
@@ -1699,23 +1681,20 @@ msgid "Cannot read file."
msgstr "Cannot read file."
#: actions/grantrole.php:62 actions/revokerole.php:62
-#, fuzzy
msgid "Invalid role."
-msgstr "Invalid token."
+msgstr "Invalid role."
#: actions/grantrole.php:66 actions/revokerole.php:66
msgid "This role is reserved and cannot be set."
msgstr ""
#: actions/grantrole.php:75
-#, fuzzy
msgid "You cannot grant user roles on this site."
-msgstr "You cannot sandbox users on this site."
+msgstr "You cannot grant user roles on this site."
#: actions/grantrole.php:82
-#, fuzzy
msgid "User already has this role."
-msgstr "User is already silenced."
+msgstr "User already has this role."
#: actions/groupblock.php:71 actions/groupunblock.php:71
#: actions/makeadmin.php:71 actions/subedit.php:46
@@ -2005,9 +1984,8 @@ msgstr ""
#. TRANS: Form legend for IM preferences form.
#: actions/imsettings.php:155
-#, fuzzy
msgid "IM preferences"
-msgstr "Preferences"
+msgstr "IM preferences"
#. TRANS: Checkbox label in IM preferences form.
#: actions/imsettings.php:160
@@ -2078,15 +2056,13 @@ msgstr "That is the wrong IM address."
#. TRANS: Server error thrown on database error canceling IM address confirmation.
#: actions/imsettings.php:397
-#, fuzzy
msgid "Couldn't delete IM confirmation."
-msgstr "Couldn't delete e-mail confirmation."
+msgstr "Couldn't delete IM confirmation."
#. TRANS: Message given after successfully canceling IM address confirmation.
#: actions/imsettings.php:402
-#, fuzzy
msgid "IM confirmation cancelled."
-msgstr "Confirmation cancelled."
+msgstr "IM confirmation cancelled."
#. TRANS: Message given trying to remove an IM address that is not
#. TRANS: registered for the active user.
@@ -2096,9 +2072,8 @@ msgstr "That is not your Jabber ID."
#. TRANS: Message given after successfully removing a registered IM address.
#: actions/imsettings.php:447
-#, fuzzy
msgid "The IM address was removed."
-msgstr "The address was removed."
+msgstr "The IM address was removed."
#: actions/inbox.php:59
#, php-format
@@ -2119,9 +2094,9 @@ msgid "Invites have been disabled."
msgstr ""
#: actions/invite.php:41
-#, fuzzy, php-format
+#, php-format
msgid "You must be logged in to invite other users to use %s."
-msgstr "You must be logged in to invite other users to use %s"
+msgstr "You must be logged in to invite other users to use %s."
#: actions/invite.php:72
#, php-format
@@ -2189,7 +2164,6 @@ msgstr "Optionally add a personal message to the invitation."
#. TRANS: Send button for inviting friends
#: actions/invite.php:198
-#, fuzzy
msgctxt "BUTTON"
msgid "Send"
msgstr "Send"
@@ -2329,10 +2303,14 @@ msgstr ""
"changing your settings."
#: actions/login.php:270
-#, php-format
+#, fuzzy
+msgid "Login with your username and password."
+msgstr "Login with a username and password"
+
+#: actions/login.php:273
+#, fuzzy, php-format
msgid ""
-"Login with your username and password. Don't have a username yet? [Register]"
-"(%%action.register%%) a new account."
+"Don't have a username yet? [Register](%%action.register%%) a new account."
msgstr ""
"Login with your username and password. Don't have a username yet? [Register]"
"(%%action.register%%) a new account."
@@ -2357,9 +2335,8 @@ msgid "Can't make %1$s an admin for group %2$s."
msgstr "Can't make %1$s an admin for group %2$s."
#: actions/microsummary.php:69
-#, fuzzy
msgid "No current status."
-msgstr "No current status"
+msgstr "No current status."
#: actions/newapplication.php:52
msgid "New Application"
@@ -2536,9 +2513,8 @@ msgid "Developers can edit the registration settings for their applications "
msgstr ""
#: actions/oembed.php:79 actions/shownotice.php:100
-#, fuzzy
msgid "Notice has no profile."
-msgstr "Notice has no profile"
+msgstr "Notice has no profile."
#: actions/oembed.php:86 actions/shownotice.php:175
#, php-format
@@ -2547,9 +2523,9 @@ msgstr "%1$s's status on %2$s"
#. TRANS: Error message displaying attachments. %s is a raw MIME type (eg 'image/png')
#: actions/oembed.php:158
-#, fuzzy, php-format
+#, php-format
msgid "Content type %s not supported."
-msgstr "content type "
+msgstr "Content type %s not supported."
#. TRANS: Error message displaying attachments. %s is the site's base URL.
#: actions/oembed.php:162
@@ -2558,8 +2534,8 @@ msgid "Only %s URLs over plain HTTP please."
msgstr ""
#. TRANS: Client error on an API request with an unsupported data format.
-#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1069
-#: lib/apiaction.php:1098 lib/apiaction.php:1215
+#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1131
+#: lib/apiaction.php:1160 lib/apiaction.php:1277
msgid "Not a supported data format."
msgstr "Not a supported data format."
@@ -2708,24 +2684,24 @@ msgid "Path and server settings for this StatusNet site."
msgstr ""
#: actions/pathsadminpanel.php:157
-#, fuzzy, php-format
+#, php-format
msgid "Theme directory not readable: %s."
-msgstr "Theme directory not readable: %s"
+msgstr "Theme directory not readable: %s."
#: actions/pathsadminpanel.php:163
-#, fuzzy, php-format
+#, php-format
msgid "Avatar directory not writable: %s."
-msgstr "Theme directory not readable: %s"
+msgstr "Avatar directory not writable: %s."
#: actions/pathsadminpanel.php:169
-#, fuzzy, php-format
+#, php-format
msgid "Background directory not writable: %s."
-msgstr "Theme directory not readable: %s"
+msgstr "Background directory not writable: %s."
#: actions/pathsadminpanel.php:177
-#, fuzzy, php-format
+#, php-format
msgid "Locales directory not readable: %s."
-msgstr "Theme directory not readable: %s"
+msgstr "Locales directory not readable: %s."
#: actions/pathsadminpanel.php:183
msgid "Invalid SSL server. The maximum length is 255 characters."
@@ -2865,9 +2841,9 @@ msgid "People search"
msgstr "People Search"
#: actions/peopletag.php:68
-#, fuzzy, php-format
+#, php-format
msgid "Not a valid people tag: %s."
-msgstr "Not a valid people tag: %s"
+msgstr "Not a valid people tag: %s."
#: actions/peopletag.php:142
#, php-format
@@ -2875,9 +2851,8 @@ msgid "Users self-tagged with %1$s - page %2$d"
msgstr "Users self-tagged with %1$s - page %2$d"
#: actions/postnotice.php:95
-#, fuzzy
msgid "Invalid notice content."
-msgstr "Invalid notice content"
+msgstr "Invalid notice content."
#: actions/postnotice.php:101
#, php-format
@@ -3308,13 +3283,13 @@ msgid "Longer name, preferably your \"real\" name"
msgstr "Longer name, preferably your \"real\" name"
#: actions/register.php:494
-#, 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 ""
-" except this private data: password, email address, IM address, and phone "
-"number."
+"My text and files are available under %s except this private data: password, "
+"email address, IM address, and phone number."
#: actions/register.php:542
#, php-format
@@ -3494,14 +3469,12 @@ msgid "Replies to %1$s on %2$s!"
msgstr "Replies to %1$s on %2$s!"
#: actions/revokerole.php:75
-#, fuzzy
msgid "You cannot revoke user roles on this site."
-msgstr "You cannot silence users on this site."
+msgstr "You cannot revoke user roles on this site."
#: actions/revokerole.php:82
-#, fuzzy
msgid "User doesn't have this role."
-msgstr "User without matching profile."
+msgstr "User doesn't have this role."
#: actions/rsd.php:146 actions/version.php:157
msgid "StatusNet"
@@ -3897,9 +3870,8 @@ msgid "User is already silenced."
msgstr "User is already silenced."
#: actions/siteadminpanel.php:69
-#, fuzzy
msgid "Basic settings for this StatusNet site"
-msgstr "Design settings for this StausNet site."
+msgstr "Basic settings for this StatusNet site"
#: actions/siteadminpanel.php:133
msgid "Site name must have non-zero length."
@@ -3915,9 +3887,8 @@ msgid "Unknown language \"%s\"."
msgstr ""
#: actions/siteadminpanel.php:165
-#, fuzzy
msgid "Minimum text limit is 0 (unlimited)."
-msgstr "Minimum text limit is 140 characters."
+msgstr "Minimum text limit is 0 (unlimited)."
#: actions/siteadminpanel.php:171
msgid "Dupe limit must be one or more seconds."
@@ -3968,9 +3939,8 @@ msgid "Default timezone for the site; usually UTC."
msgstr ""
#: actions/siteadminpanel.php:262
-#, fuzzy
msgid "Default language"
-msgstr "Default site language"
+msgstr "Default language"
#: actions/siteadminpanel.php:263
msgid "Site language when autodetection from browser settings is not available"
@@ -3997,37 +3967,32 @@ msgid "How long users must wait (in seconds) to post the same thing again."
msgstr ""
#: actions/sitenoticeadminpanel.php:56
-#, fuzzy
msgid "Site Notice"
-msgstr "Site notice"
+msgstr "Site Notice"
#: actions/sitenoticeadminpanel.php:67
-#, fuzzy
msgid "Edit site-wide message"
-msgstr "New message"
+msgstr "Edit site-wide message"
#: actions/sitenoticeadminpanel.php:103
-#, fuzzy
msgid "Unable to save site notice."
-msgstr "Unable to save your design settings!"
+msgstr "Unable to save site notice."
#: actions/sitenoticeadminpanel.php:113
msgid "Max length for the site-wide notice is 255 chars."
msgstr ""
#: actions/sitenoticeadminpanel.php:176
-#, fuzzy
msgid "Site notice text"
-msgstr "Site notice"
+msgstr "Site notice text"
#: actions/sitenoticeadminpanel.php:178
msgid "Site-wide notice text (255 chars max; HTML okay)"
msgstr ""
#: actions/sitenoticeadminpanel.php:198
-#, fuzzy
msgid "Save site notice"
-msgstr "Site notice"
+msgstr "Save site notice"
#. TRANS: Title for SMS settings.
#: actions/smssettings.php:59
@@ -4043,15 +4008,13 @@ msgstr "You can receive SMS messages through e-mail from %%site.name%%."
#. 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 "This page is not available in a "
+msgstr "SMS is not available."
#. TRANS: Form legend for SMS settings form.
#: actions/smssettings.php:111
-#, fuzzy
msgid "SMS address"
-msgstr "IM address"
+msgstr "SMS address"
#. TRANS: Form guide in SMS settings form.
#: actions/smssettings.php:120
@@ -4075,7 +4038,6 @@ msgstr "Enter the code you received on your phone."
#. TRANS: Button label to confirm SMS confirmation code in SMS settings.
#: actions/smssettings.php:148
-#, fuzzy
msgctxt "BUTTON"
msgid "Confirm"
msgstr "Confirm"
@@ -4092,9 +4054,8 @@ msgstr "Phone number, no punctuation or spaces, with area code"
#. TRANS: Form legend for SMS preferences form.
#: actions/smssettings.php:195
-#, fuzzy
msgid "SMS preferences"
-msgstr "Preferences"
+msgstr "SMS preferences"
#. TRANS: Checkbox label in SMS preferences form.
#: actions/smssettings.php:201
@@ -4107,9 +4068,8 @@ msgstr ""
#. TRANS: Confirmation message for successful SMS preferences save.
#: actions/smssettings.php:315
-#, fuzzy
msgid "SMS preferences saved."
-msgstr "Preferences saved."
+msgstr "SMS preferences saved."
#. TRANS: Message given saving SMS phone number without having provided one.
#: actions/smssettings.php:338
@@ -4147,9 +4107,8 @@ msgstr "That is the wrong confirmation number."
#. TRANS: Message given after successfully canceling SMS phone number confirmation.
#: actions/smssettings.php:427
-#, fuzzy
msgid "SMS confirmation cancelled."
-msgstr "Confirmation cancelled."
+msgstr "SMS confirmation cancelled."
#. TRANS: Message given trying to remove an SMS phone number that is not
#. TRANS: registered for the active user.
@@ -4159,9 +4118,8 @@ msgstr "That is not your phone number."
#. TRANS: Message given after successfully removing a registered SMS phone number.
#: actions/smssettings.php:470
-#, fuzzy
msgid "The SMS phone number was removed."
-msgstr "SMS phone number"
+msgstr "The SMS phone number was removed."
#. TRANS: Label for mobile carrier dropdown menu in SMS settings.
#: actions/smssettings.php:511
@@ -4196,9 +4154,8 @@ msgid "Snapshots"
msgstr ""
#: actions/snapshotadminpanel.php:65
-#, fuzzy
msgid "Manage snapshot configuration"
-msgstr "Change site configuration"
+msgstr "Manage snapshot configuration"
#: actions/snapshotadminpanel.php:127
msgid "Invalid snapshot run value."
@@ -4245,9 +4202,8 @@ msgid "Snapshots will be sent to this URL"
msgstr ""
#: actions/snapshotadminpanel.php:248
-#, fuzzy
msgid "Save snapshot settings"
-msgstr "Save site settings"
+msgstr "Save snapshot settings"
#: actions/subedit.php:70
msgid "You are not subscribed to that profile."
@@ -4437,9 +4393,8 @@ msgid "User is not silenced."
msgstr "User is not silenced."
#: actions/unsubscribe.php:77
-#, fuzzy
msgid "No profile ID in request."
-msgstr "No profile id in request."
+msgstr "No profile ID in request."
#: actions/unsubscribe.php:98
msgid "Unsubscribed"
@@ -4454,7 +4409,6 @@ msgstr ""
#. TRANS: User admin panel title
#: actions/useradminpanel.php:59
-#, fuzzy
msgctxt "TITLE"
msgid "User"
msgstr "User"
@@ -4785,9 +4739,9 @@ msgstr "Could not update message with new URI."
#. TRANS: Server exception. %s are the error details.
#: classes/Notice.php:176
-#, fuzzy, php-format
+#, php-format
msgid "Database error inserting hashtag: %s"
-msgstr "DB error inserting hashtag: %s"
+msgstr "Database error inserting hashtag: %s"
#: classes/Notice.php:245
msgid "Problem saving notice. Too long."
@@ -4819,13 +4773,13 @@ msgstr "You are banned from posting notices on this site."
msgid "Problem saving notice."
msgstr "Problem saving notice."
-#: classes/Notice.php:965
+#: classes/Notice.php:967
msgid "Problem saving group inbox."
msgstr "Problem saving group inbox."
#. 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:1513
+#: classes/Notice.php:1535
#, php-format
msgid "RT @%1$s %2$s"
msgstr "RT @%1$s %2$s"
@@ -4852,9 +4806,8 @@ msgid "Couldn't delete self-subscription."
msgstr "Couldn't delete self-subscription."
#: classes/Subscription.php:200
-#, fuzzy
msgid "Couldn't delete subscription OMB token."
-msgstr "Couldn't delete subscription."
+msgstr "Couldn't delete subscription OMB token."
#: classes/Subscription.php:211
msgid "Couldn't delete subscription."
@@ -4934,28 +4887,24 @@ msgstr "Primary site navigation"
#. TRANS: Tooltip for main menu option "Personal"
#: lib/action.php:432
-#, fuzzy
msgctxt "TOOLTIP"
msgid "Personal profile and friends timeline"
-msgstr "Personal profile and friends timeline"
+msgstr "ersonal profile and friends timeline"
#. TRANS: Main menu option when logged in for access to personal profile and friends timeline
#: lib/action.php:435
-#, fuzzy
msgctxt "MENU"
msgid "Personal"
msgstr "Personal"
#. TRANS: Tooltip for main menu option "Account"
#: lib/action.php:437
-#, fuzzy
msgctxt "TOOLTIP"
msgid "Change your email, avatar, password, profile"
-msgstr "Change your e-mail, avatar, password, profile"
+msgstr "Change your email, avatar, password, profile"
#. TRANS: Tooltip for main menu option "Services"
#: lib/action.php:442
-#, fuzzy
msgctxt "TOOLTIP"
msgid "Connect to services"
msgstr "Connect to services"
@@ -4967,95 +4916,82 @@ msgstr "Connect"
#. TRANS: Tooltip for menu option "Admin"
#: lib/action.php:448
-#, fuzzy
msgctxt "TOOLTIP"
msgid "Change site configuration"
msgstr "Change site configuration"
#. TRANS: Main menu option when logged in and site admin for access to site configuration
#: lib/action.php:451
-#, fuzzy
msgctxt "MENU"
msgid "Admin"
msgstr "Admin"
#. TRANS: Tooltip for main menu option "Invite"
#: lib/action.php:455
-#, fuzzy, php-format
+#, php-format
msgctxt "TOOLTIP"
msgid "Invite friends and colleagues to join you on %s"
msgstr "Invite friends and colleagues to join you on %s"
#. TRANS: Main menu option when logged in and invitations are allowed for inviting new users
#: lib/action.php:458
-#, fuzzy
msgctxt "MENU"
msgid "Invite"
msgstr "Invite"
#. TRANS: Tooltip for main menu option "Logout"
#: lib/action.php:464
-#, fuzzy
msgctxt "TOOLTIP"
msgid "Logout from the site"
msgstr "Logout from the site"
#. TRANS: Main menu option when logged in to log out the current user
#: lib/action.php:467
-#, fuzzy
msgctxt "MENU"
msgid "Logout"
msgstr "Logout"
#. TRANS: Tooltip for main menu option "Register"
#: lib/action.php:472
-#, fuzzy
msgctxt "TOOLTIP"
msgid "Create an account"
msgstr "Create an account"
#. TRANS: Main menu option when not logged in to register a new account
#: lib/action.php:475
-#, fuzzy
msgctxt "MENU"
msgid "Register"
msgstr "Register"
#. TRANS: Tooltip for main menu option "Login"
#: lib/action.php:478
-#, fuzzy
msgctxt "TOOLTIP"
msgid "Login to the site"
msgstr "Login to the site"
#: lib/action.php:481
-#, fuzzy
msgctxt "MENU"
msgid "Login"
msgstr "Login"
#. TRANS: Tooltip for main menu option "Help"
#: lib/action.php:484
-#, fuzzy
msgctxt "TOOLTIP"
msgid "Help me!"
msgstr "Help me!"
#: lib/action.php:487
-#, fuzzy
msgctxt "MENU"
msgid "Help"
msgstr "Help"
#. TRANS: Tooltip for main menu option "Search"
#: lib/action.php:490
-#, fuzzy
msgctxt "TOOLTIP"
msgid "Search for people or text"
msgstr "Search for people or text"
#: lib/action.php:493
-#, fuzzy
msgctxt "MENU"
msgid "Search"
msgstr "Search"
@@ -5127,7 +5063,7 @@ msgstr "StatusNet software licence"
#. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is set.
#: lib/action.php:817
-#, fuzzy, php-format
+#, php-format
msgid ""
"**%%site.name%%** is a microblogging service brought to you by [%%site."
"broughtby%%](%%site.broughtbyurl%%)."
@@ -5250,7 +5186,6 @@ msgstr "Basic site configuration"
#. TRANS: Menu item for site administration
#: lib/adminpanelaction.php:351
-#, fuzzy
msgctxt "MENU"
msgid "Site"
msgstr "Site"
@@ -5262,7 +5197,6 @@ msgstr "Design configuration"
#. TRANS: Menu item for site administration
#: lib/adminpanelaction.php:359
-#, fuzzy
msgctxt "MENU"
msgid "Design"
msgstr "Design"
@@ -5294,18 +5228,16 @@ msgstr "Sessions configuration"
#. TRANS: Menu item title/tooltip
#: lib/adminpanelaction.php:397
-#, fuzzy
msgid "Edit site notice"
-msgstr "Site notice"
+msgstr "Edit site notice"
#. TRANS: Menu item title/tooltip
#: lib/adminpanelaction.php:405
-#, fuzzy
msgid "Snapshots configuration"
-msgstr "Paths configuration"
+msgstr "Snapshots configuration"
#. TRANS: Client error 401.
-#: lib/apiauth.php:95
+#: lib/apiauth.php:113
msgid "API resource requires read-write access, but you only have read access."
msgstr ""
@@ -5408,7 +5340,6 @@ msgstr ""
#. TRANS: Button label
#: lib/applicationlist.php:159
-#, fuzzy
msgctxt "BUTTON"
msgid "Revoke"
msgstr "Revoke"
@@ -5474,9 +5405,9 @@ msgstr "Could not find a user with nickname %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:147
-#, fuzzy, php-format
+#, php-format
msgid "Could not find a local user with nickname %s"
-msgstr "Could not find a user with nickname %s"
+msgstr "Could not find a local user with nickname %s"
#: lib/command.php:180
msgid "Sorry, this command is not yet implemented."
@@ -5519,9 +5450,9 @@ msgstr "Could not join user %1$s to group %2$s."
#. 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.
#: lib/command.php:385
-#, fuzzy, php-format
+#, php-format
msgid "Could not remove user %1$s from group %2$s"
-msgstr "Could not remove user %1$s to group %2$s."
+msgstr "Could not remove user %1$s to group %2$s"
#. TRANS: Whois output. %s is the full name of the queried user.
#: lib/command.php:418
@@ -5559,9 +5490,9 @@ msgstr ""
#. TRANS: Message given if content is too long.
#. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
#: lib/command.php:472
-#, fuzzy, php-format
+#, php-format
msgid "Message too long - maximum is %1$d characters, you sent %2$d"
-msgstr "Message too long - maximum is %1$d characters, you sent %2$d."
+msgstr "Message too long - maximum is %1$d characters, you sent %2$d"
#. TRANS: Message given have sent a direct message to another user.
#. TRANS: %s is the name of the other user.
@@ -5612,9 +5543,8 @@ msgid "Specify the name of the user to subscribe to"
msgstr "Specify the name of the user to subscribe to"
#: lib/command.php:628
-#, fuzzy
msgid "Can't subscribe to OMB profiles by command."
-msgstr "You are not subscribed to that profile."
+msgstr "Can't subscribe to OMB profiles by command."
#: lib/command.php:634
#, php-format
@@ -6090,9 +6020,9 @@ msgstr "SMS confirmation"
#. TRANS: Main body heading for SMS-by-email address confirmation message
#: lib/mail.php:457
-#, fuzzy, php-format
+#, php-format
msgid "%s: confirm you own this phone number with this code:"
-msgstr "Awaiting confirmation on this phone number."
+msgstr "%s: confirm you own this phone number with this code:"
#. TRANS: Subject for 'nudge' notification email
#: lib/mail.php:478
@@ -6544,9 +6474,9 @@ msgid "Repeat this notice"
msgstr "Repeat this notice"
#: lib/revokeroleform.php:91
-#, fuzzy, php-format
+#, php-format
msgid "Revoke the \"%s\" role from this user"
-msgstr "Block this user from this group"
+msgstr "Revoke the \"%s\" role from this user"
#: lib/router.php:704
msgid "No single user defined for single-user mode."
@@ -6675,9 +6605,9 @@ msgid "Unsubscribe"
msgstr "Unsubscribe"
#: lib/usernoprofileexception.php:58
-#, fuzzy, php-format
+#, php-format
msgid "User %s (%d) has no profile record."
-msgstr "User has no profile."
+msgstr "User %s (%d) has no profile record."
#: lib/userprofile.php:117
msgid "Edit Avatar"
@@ -6712,15 +6642,13 @@ msgid "Moderate"
msgstr ""
#: lib/userprofile.php:364
-#, fuzzy
msgid "User role"
-msgstr "User profile"
+msgstr "User role"
#: lib/userprofile.php:366
-#, fuzzy
msgctxt "role"
msgid "Administrator"
-msgstr "Admins"
+msgstr "Administrator"
#: lib/userprofile.php:367
msgctxt "role"
@@ -6728,56 +6656,56 @@ msgid "Moderator"
msgstr ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1054
+#: lib/util.php:1083
msgid "a few seconds ago"
msgstr "a few seconds ago"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1057
+#: lib/util.php:1086
msgid "about a minute ago"
msgstr "about a minute ago"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1061
+#: lib/util.php:1090
#, php-format
msgid "about %d minutes ago"
msgstr "about %d minutes ago"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1064
+#: lib/util.php:1093
msgid "about an hour ago"
msgstr "about an hour ago"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1068
+#: lib/util.php:1097
#, php-format
msgid "about %d hours ago"
msgstr "about %d hours ago"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1071
+#: lib/util.php:1100
msgid "about a day ago"
msgstr "about a day ago"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1075
+#: lib/util.php:1104
#, php-format
msgid "about %d days ago"
msgstr "about %d days ago"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1078
+#: lib/util.php:1107
msgid "about a month ago"
msgstr "about a month ago"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1082
+#: lib/util.php:1111
#, php-format
msgid "about %d months ago"
msgstr "about %d months ago"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1085
+#: lib/util.php:1114
msgid "about a year ago"
msgstr "about a year ago"
diff --git a/locale/es/LC_MESSAGES/statusnet.po b/locale/es/LC_MESSAGES/statusnet.po
index 39c2e95b8..4e4d4bf06 100644
--- a/locale/es/LC_MESSAGES/statusnet.po
+++ b/locale/es/LC_MESSAGES/statusnet.po
@@ -4,6 +4,7 @@
# Author@translatewiki.net: Locos epraix
# Author@translatewiki.net: McDutchie
# Author@translatewiki.net: PerroVerd
+# Author@translatewiki.net: Pertile
# Author@translatewiki.net: Peter17
# Author@translatewiki.net: Translationista
# --
@@ -13,12 +14,12 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-12 21:47+0000\n"
-"PO-Revision-Date: 2010-04-12 21:48:36+0000\n"
+"POT-Creation-Date: 2010-04-24 14:16+0000\n"
+"PO-Revision-Date: 2010-04-26 22:16:36+0000\n"
"Language-Team: Spanish\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r64984); Translate extension (2010-01-16)\n"
+"X-Generator: MediaWiki 1.17alpha (r65552); Translate extension (2010-04-25)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: es\n"
"X-Message-Group: out-statusnet\n"
@@ -102,8 +103,8 @@ msgstr "No existe tal página."
#: actions/apidirectmessagenew.php:75 actions/apigroupcreate.php:112
#: actions/apigroupismember.php:90 actions/apigroupjoin.php:99
#: actions/apigroupleave.php:99 actions/apigrouplist.php:72
-#: actions/apistatusesupdate.php:148 actions/apisubscriptions.php:87
-#: actions/apitimelinefavorites.php:71 actions/apitimelinefriends.php:78
+#: actions/apistatusesupdate.php:239 actions/apisubscriptions.php:87
+#: actions/apitimelinefavorites.php:71 actions/apitimelinefriends.php:173
#: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79
#: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75
#: actions/favoritesrss.php:74 actions/foaf.php:40 actions/foaf.php:58
@@ -127,7 +128,7 @@ msgstr "%1$s y sus amistades, página %2$d"
#. TRANS: H1 text. %1$s is user nickname
#. TRANS: Message is used as link title. %s is a user nickname.
#: actions/all.php:89 actions/all.php:181 actions/allrss.php:116
-#: actions/apitimelinefriends.php:114 actions/apitimelinehome.php:115
+#: actions/apitimelinefriends.php:209 actions/apitimelinehome.php:115
#: lib/personalgroupnav.php:100
#, php-format
msgid "%s and friends"
@@ -195,7 +196,7 @@ msgstr "Tú y tus amistades"
#. 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:121 actions/apitimelinefriends.php:120
+#: actions/allrss.php:121 actions/apitimelinefriends.php:215
#: actions/apitimelinehome.php:121
#, php-format
msgid "Updates from %1$s and friends on %2$s!"
@@ -217,9 +218,9 @@ msgstr "¡Actualizaciones de %1$s y sus amistades en %2$s!"
#: actions/apistatusesdestroy.php:102 actions/apistatusesretweets.php:112
#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:141
#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111
-#: actions/apitimelinefavorites.php:173 actions/apitimelinefriends.php:175
+#: actions/apitimelinefavorites.php:173 actions/apitimelinefriends.php:270
#: actions/apitimelinegroup.php:151 actions/apitimelinehome.php:174
-#: actions/apitimelinementions.php:173 actions/apitimelinepublic.php:151
+#: actions/apitimelinementions.php:173 actions/apitimelinepublic.php:240
#: actions/apitimelineretweetedtome.php:121
#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:160
#: actions/apitimelineuser.php:162 actions/apiusershow.php:101
@@ -236,7 +237,7 @@ msgstr "Método de API no encontrado."
#: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91
#: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91
#: actions/apigroupleave.php:91 actions/apimediaupload.php:67
-#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:118
+#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:209
msgid "This method requires a POST."
msgstr "Este método requiere un POST."
@@ -268,7 +269,7 @@ msgstr "No se pudo guardar el perfil."
#: actions/apiaccountupdateprofilebackgroundimage.php:108
#: actions/apiaccountupdateprofileimage.php:97 actions/apimediaupload.php:80
-#: actions/apistatusesupdate.php:131 actions/avatarsettings.php:257
+#: actions/apistatusesupdate.php:222 actions/avatarsettings.php:257
#: actions/designadminpanel.php:123 actions/editapplication.php:118
#: actions/newapplication.php:101 actions/newnotice.php:94
#: lib/designsettings.php:283
@@ -659,17 +660,17 @@ msgstr "Status borrado."
msgid "No status with that ID found."
msgstr "No hay estado para ese ID"
-#: actions/apistatusesupdate.php:161 actions/newnotice.php:155
+#: actions/apistatusesupdate.php:252 actions/newnotice.php:155
#: lib/mailhandler.php:60
#, php-format
msgid "That's too long. Max notice size is %d chars."
msgstr "La entrada es muy larga. El tamaño máximo es de %d caracteres."
-#: actions/apistatusesupdate.php:202 actions/apiusershow.php:96
+#: actions/apistatusesupdate.php:293 actions/apiusershow.php:96
msgid "Not found."
msgstr "No encontrado."
-#: actions/apistatusesupdate.php:225 actions/newnotice.php:178
+#: actions/apistatusesupdate.php:316 actions/newnotice.php:178
#, php-format
msgid "Max notice size is %d chars, including attachment URL."
msgstr ""
@@ -700,12 +701,12 @@ msgstr "%1$s / Actualizaciones que mencionan %2$s"
msgid "%1$s updates that reply to updates from %2$s / %3$s."
msgstr "actualizaciones de %1$s en respuesta a las de %2$s / %3$s"
-#: actions/apitimelinepublic.php:107 actions/publicrss.php:103
+#: actions/apitimelinepublic.php:196 actions/publicrss.php:103
#, php-format
msgid "%s public timeline"
msgstr "línea temporal pública de %s"
-#: actions/apitimelinepublic.php:112 actions/publicrss.php:105
+#: actions/apitimelinepublic.php:201 actions/publicrss.php:105
#, php-format
msgid "%s updates from everyone!"
msgstr "¡Actualizaciones de todos en %s!"
@@ -2331,13 +2332,16 @@ msgstr ""
"contraseña antes de cambiar tu configuración."
#: actions/login.php:270
+msgid "Login with your username and password."
+msgstr "Ingresar con tu nombre de usuario y contraseña."
+
+#: actions/login.php:273
#, php-format
msgid ""
-"Login with your username and password. Don't have a username yet? [Register]"
-"(%%action.register%%) a new account."
+"Don't have a username yet? [Register](%%action.register%%) a new account."
msgstr ""
-"Inicia sesión con tu usuario y contraseña. ¿Aún no tienes usuario? [Crea](%%"
-"action.register%%) una cuenta."
+"Aún no tienes nombre de usuario? [Registrar](%%action.register%%) una nueva "
+"cuenta."
#: actions/makeadmin.php:92
msgid "Only an admin can make another user an admin."
@@ -2563,8 +2567,8 @@ msgid "Only %s URLs over plain HTTP please."
msgstr "Solamente %s URLs sobre HTTP simples por favor."
#. TRANS: Client error on an API request with an unsupported data format.
-#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1069
-#: lib/apiaction.php:1098 lib/apiaction.php:1215
+#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1131
+#: lib/apiaction.php:1160 lib/apiaction.php:1277
msgid "Not a supported data format."
msgstr "No es un formato de dato soportado"
@@ -4873,13 +4877,13 @@ msgstr "Tienes prohibido publicar avisos en este sitio."
msgid "Problem saving notice."
msgstr "Hubo un problema al guardar el aviso."
-#: classes/Notice.php:965
+#: classes/Notice.php:967
msgid "Problem saving group inbox."
msgstr "Hubo un problema al guarda la bandeja de entrada del grupo."
#. 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:1513
+#: classes/Notice.php:1535
#, php-format
msgid "RT @%1$s %2$s"
msgstr "RT @%1$s %2$s"
@@ -5344,7 +5348,7 @@ msgid "Snapshots configuration"
msgstr "Configuración de instantáneas"
#. TRANS: Client error 401.
-#: lib/apiauth.php:95
+#: lib/apiauth.php:113
msgid "API resource requires read-write access, but you only have read access."
msgstr ""
"API requiere acceso de lectura y escritura, pero sólo tienes acceso de "
@@ -5564,9 +5568,9 @@ msgstr "No se pudo unir el usuario %s al grupo %s"
#. 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.
#: lib/command.php:385
-#, fuzzy, php-format
+#, php-format
msgid "Could not remove user %1$s from group %2$s"
-msgstr "No se pudo eliminar al usuario %1$s del grupo %2$s."
+msgstr "No se pudo eliminar al usuario %1$s del grupo %2$s"
#. TRANS: Whois output. %s is the full name of the queried user.
#: lib/command.php:418
@@ -6908,56 +6912,56 @@ msgid "Moderator"
msgstr "Moderador"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1054
+#: lib/util.php:1083
msgid "a few seconds ago"
msgstr "hace unos segundos"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1057
+#: lib/util.php:1086
msgid "about a minute ago"
msgstr "hace un minuto"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1061
+#: lib/util.php:1090
#, php-format
msgid "about %d minutes ago"
msgstr "hace %d minutos"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1064
+#: lib/util.php:1093
msgid "about an hour ago"
msgstr "hace una hora"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1068
+#: lib/util.php:1097
#, php-format
msgid "about %d hours ago"
msgstr "hace %d horas"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1071
+#: lib/util.php:1100
msgid "about a day ago"
msgstr "hace un día"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1075
+#: lib/util.php:1104
#, php-format
msgid "about %d days ago"
msgstr "hace %d días"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1078
+#: lib/util.php:1107
msgid "about a month ago"
msgstr "hace un mes"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1082
+#: lib/util.php:1111
#, php-format
msgid "about %d months ago"
msgstr "hace %d meses"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1085
+#: lib/util.php:1114
msgid "about a year ago"
msgstr "hace un año"
diff --git a/locale/fa/LC_MESSAGES/statusnet.po b/locale/fa/LC_MESSAGES/statusnet.po
index 300f8a602..76e68fda7 100644
--- a/locale/fa/LC_MESSAGES/statusnet.po
+++ b/locale/fa/LC_MESSAGES/statusnet.po
@@ -10,8 +10,8 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-12 21:47+0000\n"
-"PO-Revision-Date: 2010-04-12 21:48:42+0000\n"
+"POT-Creation-Date: 2010-04-24 14:16+0000\n"
+"PO-Revision-Date: 2010-04-26 22:16:48+0000\n"
"Last-Translator: Ahmad Sufi Mahmudi\n"
"Language-Team: Persian\n"
"MIME-Version: 1.0\n"
@@ -20,7 +20,7 @@ msgstr ""
"X-Language-Code: fa\n"
"X-Message-Group: out-statusnet\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: MediaWiki 1.17alpha (r64984); Translate extension (2010-01-16)\n"
+"X-Generator: MediaWiki 1.17alpha (r65552); Translate extension (2010-04-25)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
#. TRANS: Page title
@@ -102,8 +102,8 @@ msgstr "چنین صÙحه‌ای وجود ندارد"
#: actions/apidirectmessagenew.php:75 actions/apigroupcreate.php:112
#: actions/apigroupismember.php:90 actions/apigroupjoin.php:99
#: actions/apigroupleave.php:99 actions/apigrouplist.php:72
-#: actions/apistatusesupdate.php:148 actions/apisubscriptions.php:87
-#: actions/apitimelinefavorites.php:71 actions/apitimelinefriends.php:78
+#: actions/apistatusesupdate.php:239 actions/apisubscriptions.php:87
+#: actions/apitimelinefavorites.php:71 actions/apitimelinefriends.php:173
#: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79
#: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75
#: actions/favoritesrss.php:74 actions/foaf.php:40 actions/foaf.php:58
@@ -127,7 +127,7 @@ msgstr "%s کاربران مسدود شده، صÙحه‌ی %d"
#. TRANS: H1 text. %1$s is user nickname
#. TRANS: Message is used as link title. %s is a user nickname.
#: actions/all.php:89 actions/all.php:181 actions/allrss.php:116
-#: actions/apitimelinefriends.php:114 actions/apitimelinehome.php:115
+#: actions/apitimelinefriends.php:209 actions/apitimelinehome.php:115
#: lib/personalgroupnav.php:100
#, php-format
msgid "%s and friends"
@@ -193,7 +193,7 @@ msgstr "شما و دوستان"
#. 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:121 actions/apitimelinefriends.php:120
+#: actions/allrss.php:121 actions/apitimelinefriends.php:215
#: actions/apitimelinehome.php:121
#, php-format
msgid "Updates from %1$s and friends on %2$s!"
@@ -215,9 +215,9 @@ msgstr "به روز رسانی از %1$ و دوستان در %2$"
#: actions/apistatusesdestroy.php:102 actions/apistatusesretweets.php:112
#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:141
#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111
-#: actions/apitimelinefavorites.php:173 actions/apitimelinefriends.php:175
+#: actions/apitimelinefavorites.php:173 actions/apitimelinefriends.php:270
#: actions/apitimelinegroup.php:151 actions/apitimelinehome.php:174
-#: actions/apitimelinementions.php:173 actions/apitimelinepublic.php:151
+#: actions/apitimelinementions.php:173 actions/apitimelinepublic.php:240
#: actions/apitimelineretweetedtome.php:121
#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:160
#: actions/apitimelineuser.php:162 actions/apiusershow.php:101
@@ -234,7 +234,7 @@ msgstr "رابط مورد نظر پیدا نشد."
#: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91
#: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91
#: actions/apigroupleave.php:91 actions/apimediaupload.php:67
-#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:118
+#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:209
msgid "This method requires a POST."
msgstr "برای استÙاده از این روش باید اطلاعات را به صورت پست بÙرستید"
@@ -265,7 +265,7 @@ msgstr "نمی‌توان شناس‌نامه را ذخیره کرد."
#: actions/apiaccountupdateprofilebackgroundimage.php:108
#: actions/apiaccountupdateprofileimage.php:97 actions/apimediaupload.php:80
-#: actions/apistatusesupdate.php:131 actions/avatarsettings.php:257
+#: actions/apistatusesupdate.php:222 actions/avatarsettings.php:257
#: actions/designadminpanel.php:123 actions/editapplication.php:118
#: actions/newapplication.php:101 actions/newnotice.php:94
#: lib/designsettings.php:283
@@ -650,17 +650,17 @@ msgstr "وضعیت حذ٠شد."
msgid "No status with that ID found."
msgstr "هیچ وضعیتی با آن شناسه یاÙت نشد."
-#: actions/apistatusesupdate.php:161 actions/newnotice.php:155
+#: actions/apistatusesupdate.php:252 actions/newnotice.php:155
#: lib/mailhandler.php:60
#, php-format
msgid "That's too long. Max notice size is %d chars."
msgstr "خیلی طولانی است. حداکثر طول مجاز پیام %d حر٠است."
-#: actions/apistatusesupdate.php:202 actions/apiusershow.php:96
+#: actions/apistatusesupdate.php:293 actions/apiusershow.php:96
msgid "Not found."
msgstr "یاÙت نشد."
-#: actions/apistatusesupdate.php:225 actions/newnotice.php:178
+#: actions/apistatusesupdate.php:316 actions/newnotice.php:178
#, php-format
msgid "Max notice size is %d chars, including attachment URL."
msgstr "حداکثر طول پیام %d حر٠است که شامل ضمیمه نیز می‌باشد"
@@ -689,12 +689,12 @@ msgstr "%$1s / به روز رسانی های شامل %2$s"
msgid "%1$s updates that reply to updates from %2$s / %3$s."
msgstr "%1$s به روز رسانی هایی که در پاسخ به $2$s / %3$s"
-#: actions/apitimelinepublic.php:107 actions/publicrss.php:103
+#: actions/apitimelinepublic.php:196 actions/publicrss.php:103
#, php-format
msgid "%s public timeline"
msgstr "%s خط‌زمانی عمومی"
-#: actions/apitimelinepublic.php:112 actions/publicrss.php:105
+#: actions/apitimelinepublic.php:201 actions/publicrss.php:105
#, php-format
msgid "%s updates from everyone!"
msgstr "%s به روز رسانی های عموم"
@@ -2314,10 +2314,14 @@ msgstr ""
"دوباره وارد نمایید."
#: actions/login.php:270
-#, php-format
+#, fuzzy
+msgid "Login with your username and password."
+msgstr "وارد شدن با یک نام کاربری و کلمه ی عبور"
+
+#: actions/login.php:273
+#, fuzzy, php-format
msgid ""
-"Login with your username and password. Don't have a username yet? [Register]"
-"(%%action.register%%) a new account."
+"Don't have a username yet? [Register](%%action.register%%) a new account."
msgstr ""
"با نام‌کاربری و گذزواژه‌ی خود وارد شوید. نام‌کاربری ندارید؟ یک نام‌کاربری [ثبت ]"
"(%%action.register%%) کنید."
@@ -2550,8 +2554,8 @@ msgid "Only %s URLs over plain HTTP please."
msgstr ""
#. TRANS: Client error on an API request with an unsupported data format.
-#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1069
-#: lib/apiaction.php:1098 lib/apiaction.php:1215
+#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1131
+#: lib/apiaction.php:1160 lib/apiaction.php:1277
msgid "Not a supported data format."
msgstr "یک قالب دادهٔ پشتیبانی‌شده نیست."
@@ -4764,14 +4768,14 @@ msgstr "شما از Ùرستادن پست در این سایت مردود شدی
msgid "Problem saving notice."
msgstr "مشکل در ذخیره کردن آگهی."
-#: classes/Notice.php:965
+#: classes/Notice.php:967
#, fuzzy
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:1513
+#: classes/Notice.php:1535
#, php-format
msgid "RT @%1$s %2$s"
msgstr ""
@@ -5250,7 +5254,7 @@ msgid "Snapshots configuration"
msgstr "پیکره بندی اصلی سایت"
#. TRANS: Client error 401.
-#: lib/apiauth.php:95
+#: lib/apiauth.php:113
msgid "API resource requires read-write access, but you only have read access."
msgstr ""
@@ -6673,56 +6677,56 @@ msgid "Moderator"
msgstr ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1054
+#: lib/util.php:1083
msgid "a few seconds ago"
msgstr "چند ثانیه پیش"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1057
+#: lib/util.php:1086
msgid "about a minute ago"
msgstr "حدود یک دقیقه پیش"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1061
+#: lib/util.php:1090
#, php-format
msgid "about %d minutes ago"
msgstr "حدود %d دقیقه پیش"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1064
+#: lib/util.php:1093
msgid "about an hour ago"
msgstr "حدود یک ساعت پیش"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1068
+#: lib/util.php:1097
#, php-format
msgid "about %d hours ago"
msgstr "حدود %d ساعت پیش"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1071
+#: lib/util.php:1100
msgid "about a day ago"
msgstr "حدود یک روز پیش"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1075
+#: lib/util.php:1104
#, php-format
msgid "about %d days ago"
msgstr "حدود %d روز پیش"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1078
+#: lib/util.php:1107
msgid "about a month ago"
msgstr "حدود یک ماه پیش"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1082
+#: lib/util.php:1111
#, php-format
msgid "about %d months ago"
msgstr "حدود %d ماه پیش"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1085
+#: lib/util.php:1114
msgid "about a year ago"
msgstr "حدود یک سال پیش"
diff --git a/locale/fi/LC_MESSAGES/statusnet.po b/locale/fi/LC_MESSAGES/statusnet.po
index 9020ccaeb..b015ccdbe 100644
--- a/locale/fi/LC_MESSAGES/statusnet.po
+++ b/locale/fi/LC_MESSAGES/statusnet.po
@@ -10,12 +10,12 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-12 21:47+0000\n"
-"PO-Revision-Date: 2010-04-12 21:48:39+0000\n"
+"POT-Creation-Date: 2010-04-24 14:16+0000\n"
+"PO-Revision-Date: 2010-04-26 22:16:45+0000\n"
"Language-Team: Finnish\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r64984); Translate extension (2010-01-16)\n"
+"X-Generator: MediaWiki 1.17alpha (r65552); Translate extension (2010-04-25)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: fi\n"
"X-Message-Group: out-statusnet\n"
@@ -108,8 +108,8 @@ msgstr "Sivua ei ole."
#: actions/apidirectmessagenew.php:75 actions/apigroupcreate.php:112
#: actions/apigroupismember.php:90 actions/apigroupjoin.php:99
#: actions/apigroupleave.php:99 actions/apigrouplist.php:72
-#: actions/apistatusesupdate.php:148 actions/apisubscriptions.php:87
-#: actions/apitimelinefavorites.php:71 actions/apitimelinefriends.php:78
+#: actions/apistatusesupdate.php:239 actions/apisubscriptions.php:87
+#: actions/apitimelinefavorites.php:71 actions/apitimelinefriends.php:173
#: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79
#: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75
#: actions/favoritesrss.php:74 actions/foaf.php:40 actions/foaf.php:58
@@ -133,7 +133,7 @@ msgstr "%s ja kaverit, sivu %d"
#. TRANS: H1 text. %1$s is user nickname
#. TRANS: Message is used as link title. %s is a user nickname.
#: actions/all.php:89 actions/all.php:181 actions/allrss.php:116
-#: actions/apitimelinefriends.php:114 actions/apitimelinehome.php:115
+#: actions/apitimelinefriends.php:209 actions/apitimelinehome.php:115
#: lib/personalgroupnav.php:100
#, php-format
msgid "%s and friends"
@@ -199,7 +199,7 @@ msgstr "Sinä ja kaverit"
#. 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:121 actions/apitimelinefriends.php:120
+#: actions/allrss.php:121 actions/apitimelinefriends.php:215
#: actions/apitimelinehome.php:121
#, php-format
msgid "Updates from %1$s and friends on %2$s!"
@@ -221,9 +221,9 @@ msgstr "Käyttäjän %1$s ja kavereiden päivitykset palvelussa %2$s!"
#: actions/apistatusesdestroy.php:102 actions/apistatusesretweets.php:112
#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:141
#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111
-#: actions/apitimelinefavorites.php:173 actions/apitimelinefriends.php:175
+#: actions/apitimelinefavorites.php:173 actions/apitimelinefriends.php:270
#: actions/apitimelinegroup.php:151 actions/apitimelinehome.php:174
-#: actions/apitimelinementions.php:173 actions/apitimelinepublic.php:151
+#: actions/apitimelinementions.php:173 actions/apitimelinepublic.php:240
#: actions/apitimelineretweetedtome.php:121
#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:160
#: actions/apitimelineuser.php:162 actions/apiusershow.php:101
@@ -241,7 +241,7 @@ msgstr "API-metodia ei löytynyt!"
#: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91
#: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91
#: actions/apigroupleave.php:91 actions/apimediaupload.php:67
-#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:118
+#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:209
msgid "This method requires a POST."
msgstr "Tämä metodi edellyttää POST sanoman."
@@ -273,7 +273,7 @@ msgstr "Ei voitu tallentaa profiilia."
#: actions/apiaccountupdateprofilebackgroundimage.php:108
#: actions/apiaccountupdateprofileimage.php:97 actions/apimediaupload.php:80
-#: actions/apistatusesupdate.php:131 actions/avatarsettings.php:257
+#: actions/apistatusesupdate.php:222 actions/avatarsettings.php:257
#: actions/designadminpanel.php:123 actions/editapplication.php:118
#: actions/newapplication.php:101 actions/newnotice.php:94
#: lib/designsettings.php:283
@@ -674,17 +674,17 @@ msgstr "Päivitys poistettu."
msgid "No status with that ID found."
msgstr "Käyttäjätunnukselle ei löytynyt statusviestiä."
-#: actions/apistatusesupdate.php:161 actions/newnotice.php:155
+#: actions/apistatusesupdate.php:252 actions/newnotice.php:155
#: lib/mailhandler.php:60
#, php-format
msgid "That's too long. Max notice size is %d chars."
msgstr "Päivitys on liian pitkä. Maksimipituus on %d merkkiä."
-#: actions/apistatusesupdate.php:202 actions/apiusershow.php:96
+#: actions/apistatusesupdate.php:293 actions/apiusershow.php:96
msgid "Not found."
msgstr "Ei löytynyt."
-#: actions/apistatusesupdate.php:225 actions/newnotice.php:178
+#: actions/apistatusesupdate.php:316 actions/newnotice.php:178
#, php-format
msgid "Max notice size is %d chars, including attachment URL."
msgstr "Maksimikoko päivitykselle on %d merkkiä, mukaan lukien URL-osoite."
@@ -714,12 +714,12 @@ msgid "%1$s updates that reply to updates from %2$s / %3$s."
msgstr ""
"%1$s -päivitykset, jotka on vastauksia käyttäjän %2$s / %3$s päivityksiin."
-#: actions/apitimelinepublic.php:107 actions/publicrss.php:103
+#: actions/apitimelinepublic.php:196 actions/publicrss.php:103
#, php-format
msgid "%s public timeline"
msgstr "%s julkinen aikajana"
-#: actions/apitimelinepublic.php:112 actions/publicrss.php:105
+#: actions/apitimelinepublic.php:201 actions/publicrss.php:105
#, php-format
msgid "%s updates from everyone!"
msgstr "%s päivitykset kaikilta!"
@@ -2382,10 +2382,14 @@ msgstr ""
"asetuksiesi muuttamista."
#: actions/login.php:270
+#, fuzzy
+msgid "Login with your username and password."
+msgstr "Kirjaudu sisään käyttäjätunnuksella ja salasanalla"
+
+#: actions/login.php:273
#, fuzzy, php-format
msgid ""
-"Login with your username and password. Don't have a username yet? [Register]"
-"(%%action.register%%) a new account."
+"Don't have a username yet? [Register](%%action.register%%) a new account."
msgstr ""
"Kirjaud sisään käyttäjätunnuksella ja salasanalla. Ei vielä "
"käyttäjätunnusta? [Rekisteröi](%%action.register%%) käyttäjätunnus tai "
@@ -2618,8 +2622,8 @@ msgid "Only %s URLs over plain HTTP please."
msgstr ""
#. TRANS: Client error on an API request with an unsupported data format.
-#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1069
-#: lib/apiaction.php:1098 lib/apiaction.php:1215
+#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1131
+#: lib/apiaction.php:1160 lib/apiaction.php:1277
msgid "Not a supported data format."
msgstr "Tuo ei ole tuettu tietomuoto."
@@ -4938,14 +4942,14 @@ msgstr "Päivityksesi tähän palveluun on estetty."
msgid "Problem saving notice."
msgstr "Ongelma päivityksen tallentamisessa."
-#: classes/Notice.php:965
+#: classes/Notice.php:967
#, fuzzy
msgid "Problem saving group inbox."
msgstr "Ongelma päivityksen tallentamisessa."
#. 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:1513
+#: classes/Notice.php:1535
#, fuzzy, php-format
msgid "RT @%1$s %2$s"
msgstr "%1$s (%2$s)"
@@ -5443,7 +5447,7 @@ msgid "Snapshots configuration"
msgstr "SMS vahvistus"
#. TRANS: Client error 401.
-#: lib/apiauth.php:95
+#: lib/apiauth.php:113
msgid "API resource requires read-write access, but you only have read access."
msgstr ""
@@ -6916,56 +6920,56 @@ msgid "Moderator"
msgstr ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1054
+#: lib/util.php:1083
msgid "a few seconds ago"
msgstr "muutama sekunti sitten"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1057
+#: lib/util.php:1086
msgid "about a minute ago"
msgstr "noin minuutti sitten"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1061
+#: lib/util.php:1090
#, php-format
msgid "about %d minutes ago"
msgstr "noin %d minuuttia sitten"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1064
+#: lib/util.php:1093
msgid "about an hour ago"
msgstr "noin tunti sitten"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1068
+#: lib/util.php:1097
#, php-format
msgid "about %d hours ago"
msgstr "noin %d tuntia sitten"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1071
+#: lib/util.php:1100
msgid "about a day ago"
msgstr "noin päivä sitten"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1075
+#: lib/util.php:1104
#, php-format
msgid "about %d days ago"
msgstr "noin %d päivää sitten"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1078
+#: lib/util.php:1107
msgid "about a month ago"
msgstr "noin kuukausi sitten"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1082
+#: lib/util.php:1111
#, php-format
msgid "about %d months ago"
msgstr "noin %d kuukautta sitten"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1085
+#: lib/util.php:1114
msgid "about a year ago"
msgstr "noin vuosi sitten"
diff --git a/locale/fr/LC_MESSAGES/statusnet.po b/locale/fr/LC_MESSAGES/statusnet.po
index 1d2bbcdae..07c850bdd 100644
--- a/locale/fr/LC_MESSAGES/statusnet.po
+++ b/locale/fr/LC_MESSAGES/statusnet.po
@@ -7,6 +7,7 @@
# Author@translatewiki.net: Julien C
# Author@translatewiki.net: McDutchie
# Author@translatewiki.net: Peter17
+# Author@translatewiki.net: Y-M D
# --
# This file is distributed under the same license as the StatusNet package.
#
@@ -14,12 +15,12 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-12 21:47+0000\n"
-"PO-Revision-Date: 2010-04-12 21:48:46+0000\n"
+"POT-Creation-Date: 2010-04-24 14:16+0000\n"
+"PO-Revision-Date: 2010-04-26 22:16:52+0000\n"
"Language-Team: French\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r64984); Translate extension (2010-01-16)\n"
+"X-Generator: MediaWiki 1.17alpha (r65552); Translate extension (2010-04-25)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: fr\n"
"X-Message-Group: out-statusnet\n"
@@ -103,8 +104,8 @@ msgstr "Page non trouvée."
#: actions/apidirectmessagenew.php:75 actions/apigroupcreate.php:112
#: actions/apigroupismember.php:90 actions/apigroupjoin.php:99
#: actions/apigroupleave.php:99 actions/apigrouplist.php:72
-#: actions/apistatusesupdate.php:148 actions/apisubscriptions.php:87
-#: actions/apitimelinefavorites.php:71 actions/apitimelinefriends.php:78
+#: actions/apistatusesupdate.php:239 actions/apisubscriptions.php:87
+#: actions/apitimelinefavorites.php:71 actions/apitimelinefriends.php:173
#: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79
#: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75
#: actions/favoritesrss.php:74 actions/foaf.php:40 actions/foaf.php:58
@@ -128,7 +129,7 @@ msgstr "%1$s et ses amis, page %2$d"
#. TRANS: H1 text. %1$s is user nickname
#. TRANS: Message is used as link title. %s is a user nickname.
#: actions/all.php:89 actions/all.php:181 actions/allrss.php:116
-#: actions/apitimelinefriends.php:114 actions/apitimelinehome.php:115
+#: actions/apitimelinefriends.php:209 actions/apitimelinehome.php:115
#: lib/personalgroupnav.php:100
#, php-format
msgid "%s and friends"
@@ -197,7 +198,7 @@ msgstr "Vous et vos amis"
#. 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:121 actions/apitimelinefriends.php:120
+#: actions/allrss.php:121 actions/apitimelinefriends.php:215
#: actions/apitimelinehome.php:121
#, php-format
msgid "Updates from %1$s and friends on %2$s!"
@@ -219,9 +220,9 @@ msgstr "Statuts de %1$s et ses amis dans %2$s!"
#: actions/apistatusesdestroy.php:102 actions/apistatusesretweets.php:112
#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:141
#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111
-#: actions/apitimelinefavorites.php:173 actions/apitimelinefriends.php:175
+#: actions/apitimelinefavorites.php:173 actions/apitimelinefriends.php:270
#: actions/apitimelinegroup.php:151 actions/apitimelinehome.php:174
-#: actions/apitimelinementions.php:173 actions/apitimelinepublic.php:151
+#: actions/apitimelinementions.php:173 actions/apitimelinepublic.php:240
#: actions/apitimelineretweetedtome.php:121
#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:160
#: actions/apitimelineuser.php:162 actions/apiusershow.php:101
@@ -238,7 +239,7 @@ msgstr "Méthode API non trouvée !"
#: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91
#: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91
#: actions/apigroupleave.php:91 actions/apimediaupload.php:67
-#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:118
+#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:209
msgid "This method requires a POST."
msgstr "Ce processus requiert un POST."
@@ -270,7 +271,7 @@ msgstr "Impossible d’enregistrer le profil."
#: actions/apiaccountupdateprofilebackgroundimage.php:108
#: actions/apiaccountupdateprofileimage.php:97 actions/apimediaupload.php:80
-#: actions/apistatusesupdate.php:131 actions/avatarsettings.php:257
+#: actions/apistatusesupdate.php:222 actions/avatarsettings.php:257
#: actions/designadminpanel.php:123 actions/editapplication.php:118
#: actions/newapplication.php:101 actions/newnotice.php:94
#: lib/designsettings.php:283
@@ -667,17 +668,17 @@ msgstr "Statut supprimé."
msgid "No status with that ID found."
msgstr "Aucun statut trouvé avec cet identifiant."
-#: actions/apistatusesupdate.php:161 actions/newnotice.php:155
+#: actions/apistatusesupdate.php:252 actions/newnotice.php:155
#: lib/mailhandler.php:60
#, php-format
msgid "That's too long. Max notice size is %d chars."
msgstr "C’est trop long ! La taille maximale de l’avis est de %d caractères."
-#: actions/apistatusesupdate.php:202 actions/apiusershow.php:96
+#: actions/apistatusesupdate.php:293 actions/apiusershow.php:96
msgid "Not found."
msgstr "Non trouvé."
-#: actions/apistatusesupdate.php:225 actions/newnotice.php:178
+#: actions/apistatusesupdate.php:316 actions/newnotice.php:178
#, php-format
msgid "Max notice size is %d chars, including attachment URL."
msgstr ""
@@ -708,12 +709,12 @@ msgstr "%1$s / Mises à jour mentionnant %2$s"
msgid "%1$s updates that reply to updates from %2$s / %3$s."
msgstr "%1$s statuts en réponses aux statuts de %2$s / %3$s."
-#: actions/apitimelinepublic.php:107 actions/publicrss.php:103
+#: actions/apitimelinepublic.php:196 actions/publicrss.php:103
#, php-format
msgid "%s public timeline"
msgstr "Activité publique %s"
-#: actions/apitimelinepublic.php:112 actions/publicrss.php:105
+#: actions/apitimelinepublic.php:201 actions/publicrss.php:105
#, php-format
msgid "%s updates from everyone!"
msgstr "%s statuts de tout le monde !"
@@ -1541,7 +1542,7 @@ msgstr "Cette adresse de messagerie électronique est erronée."
#. TRANS: Message given after successfully canceling e-mail address confirmation.
#: actions/emailsettings.php:438
msgid "Email confirmation cancelled."
-msgstr "Courrier électronique de confirmation annulé."
+msgstr "Confirmation de courrier électronique annulée."
#. TRANS: Message given trying to remove an e-mail address that is not
#. TRANS: registered for the active user.
@@ -2348,14 +2349,16 @@ msgstr ""
"votre mot de passe afin d’enregistrer vos préférences."
#: actions/login.php:270
+msgid "Login with your username and password."
+msgstr "Ouvrez une session avec un identifiant et un mot de passe."
+
+#: actions/login.php:273
#, php-format
msgid ""
-"Login with your username and password. Don't have a username yet? [Register]"
-"(%%action.register%%) a new account."
+"Don't have a username yet? [Register](%%action.register%%) a new account."
msgstr ""
-"Ouvrez une session avec votre identifiant et votre mot de passe. Vous n’avez "
-"pas encore d’identifiant ? [Créez-vous](%%action.register%%) un nouveau "
-"compte."
+"Vous n’avez pas encore d’identifiant ? [Créez-vous](%%action.register%%) un "
+"nouveau compte."
#: actions/makeadmin.php:92
msgid "Only an admin can make another user an admin."
@@ -2584,8 +2587,8 @@ msgid "Only %s URLs over plain HTTP please."
msgstr "Veuillez n'utiliser que des URL HTTP complètes en %s."
#. TRANS: Client error on an API request with an unsupported data format.
-#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1069
-#: lib/apiaction.php:1098 lib/apiaction.php:1215
+#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1131
+#: lib/apiaction.php:1160 lib/apiaction.php:1277
msgid "Not a supported data format."
msgstr "Format de données non supporté."
@@ -4904,20 +4907,20 @@ msgstr "Il vous est interdit de poster des avis sur ce site."
msgid "Problem saving notice."
msgstr "Problème lors de l’enregistrement de l’avis."
-#: classes/Notice.php:965
+#: classes/Notice.php:967
msgid "Problem saving group inbox."
msgstr "Problème lors de l’enregistrement de la boîte de réception du groupe."
#. 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:1513
+#: classes/Notice.php:1535
#, php-format
msgid "RT @%1$s %2$s"
msgstr "RT @%1$s %2$s"
#: classes/Subscription.php:74 lib/oauthstore.php:465
msgid "You have been banned from subscribing."
-msgstr "Il vous avez été interdit de vous abonner."
+msgstr "Il vous a été interdit de vous abonner."
#: classes/Subscription.php:78
msgid "Already subscribed!"
@@ -5372,7 +5375,7 @@ msgid "Snapshots configuration"
msgstr "Configuration des instantanés"
#. TRANS: Client error 401.
-#: lib/apiauth.php:95
+#: lib/apiauth.php:113
msgid "API resource requires read-write access, but you only have read access."
msgstr ""
"La ressource de l’API a besoin de l’accès en lecture et en écriture, mais "
@@ -5592,9 +5595,9 @@ msgstr "Impossible d’inscrire l’utilisateur %1$s au groupe %2$s"
#. 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.
#: lib/command.php:385
-#, fuzzy, php-format
+#, php-format
msgid "Could not remove user %1$s from group %2$s"
-msgstr "Impossible de retirer l’utilisateur %1$s du groupe %2$s."
+msgstr "Impossible de retirer l’utilisateur %1$s du groupe %2$s"
#. TRANS: Whois output. %s is the full name of the queried user.
#: lib/command.php:418
@@ -6942,56 +6945,56 @@ msgid "Moderator"
msgstr "Modérateur"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1054
+#: lib/util.php:1083
msgid "a few seconds ago"
msgstr "il y a quelques secondes"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1057
+#: lib/util.php:1086
msgid "about a minute ago"
msgstr "il y a 1 minute"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1061
+#: lib/util.php:1090
#, php-format
msgid "about %d minutes ago"
msgstr "il y a %d minutes"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1064
+#: lib/util.php:1093
msgid "about an hour ago"
msgstr "il y a 1 heure"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1068
+#: lib/util.php:1097
#, php-format
msgid "about %d hours ago"
msgstr "il y a %d heures"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1071
+#: lib/util.php:1100
msgid "about a day ago"
msgstr "il y a 1 jour"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1075
+#: lib/util.php:1104
#, php-format
msgid "about %d days ago"
msgstr "il y a %d jours"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1078
+#: lib/util.php:1107
msgid "about a month ago"
msgstr "il y a 1 mois"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1082
+#: lib/util.php:1111
#, php-format
msgid "about %d months ago"
msgstr "il y a %d mois"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1085
+#: lib/util.php:1114
msgid "about a year ago"
msgstr "il y a environ 1 an"
diff --git a/locale/ga/LC_MESSAGES/statusnet.po b/locale/ga/LC_MESSAGES/statusnet.po
index 7504570c1..d16b9d2d9 100644
--- a/locale/ga/LC_MESSAGES/statusnet.po
+++ b/locale/ga/LC_MESSAGES/statusnet.po
@@ -8,12 +8,12 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-12 21:47+0000\n"
-"PO-Revision-Date: 2010-04-12 21:48:50+0000\n"
+"POT-Creation-Date: 2010-04-24 14:16+0000\n"
+"PO-Revision-Date: 2010-04-26 22:16:55+0000\n"
"Language-Team: Irish\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r64984); Translate extension (2010-01-16)\n"
+"X-Generator: MediaWiki 1.17alpha (r65552); Translate extension (2010-04-25)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: ga\n"
"X-Message-Group: out-statusnet\n"
@@ -107,8 +107,8 @@ msgstr "Non existe a etiqueta."
#: actions/apidirectmessagenew.php:75 actions/apigroupcreate.php:112
#: actions/apigroupismember.php:90 actions/apigroupjoin.php:99
#: actions/apigroupleave.php:99 actions/apigrouplist.php:72
-#: actions/apistatusesupdate.php:148 actions/apisubscriptions.php:87
-#: actions/apitimelinefavorites.php:71 actions/apitimelinefriends.php:78
+#: actions/apistatusesupdate.php:239 actions/apisubscriptions.php:87
+#: actions/apitimelinefavorites.php:71 actions/apitimelinefriends.php:173
#: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79
#: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75
#: actions/favoritesrss.php:74 actions/foaf.php:40 actions/foaf.php:58
@@ -132,7 +132,7 @@ msgstr "%s e amigos"
#. TRANS: H1 text. %1$s is user nickname
#. TRANS: Message is used as link title. %s is a user nickname.
#: actions/all.php:89 actions/all.php:181 actions/allrss.php:116
-#: actions/apitimelinefriends.php:114 actions/apitimelinehome.php:115
+#: actions/apitimelinefriends.php:209 actions/apitimelinehome.php:115
#: lib/personalgroupnav.php:100
#, php-format
msgid "%s and friends"
@@ -193,7 +193,7 @@ msgstr "%s e amigos"
#. 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:121 actions/apitimelinefriends.php:120
+#: actions/allrss.php:121 actions/apitimelinefriends.php:215
#: actions/apitimelinehome.php:121
#, php-format
msgid "Updates from %1$s and friends on %2$s!"
@@ -215,9 +215,9 @@ msgstr "Actualizacións dende %1$s e amigos en %2$s!"
#: actions/apistatusesdestroy.php:102 actions/apistatusesretweets.php:112
#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:141
#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111
-#: actions/apitimelinefavorites.php:173 actions/apitimelinefriends.php:175
+#: actions/apitimelinefavorites.php:173 actions/apitimelinefriends.php:270
#: actions/apitimelinegroup.php:151 actions/apitimelinehome.php:174
-#: actions/apitimelinementions.php:173 actions/apitimelinepublic.php:151
+#: actions/apitimelinementions.php:173 actions/apitimelinepublic.php:240
#: actions/apitimelineretweetedtome.php:121
#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:160
#: actions/apitimelineuser.php:162 actions/apiusershow.php:101
@@ -235,7 +235,7 @@ msgstr "Método da API non atopado"
#: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91
#: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91
#: actions/apigroupleave.php:91 actions/apimediaupload.php:67
-#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:118
+#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:209
msgid "This method requires a POST."
msgstr "Este método require un POST."
@@ -267,7 +267,7 @@ msgstr "Non se puido gardar o perfil."
#: actions/apiaccountupdateprofilebackgroundimage.php:108
#: actions/apiaccountupdateprofileimage.php:97 actions/apimediaupload.php:80
-#: actions/apistatusesupdate.php:131 actions/avatarsettings.php:257
+#: actions/apistatusesupdate.php:222 actions/avatarsettings.php:257
#: actions/designadminpanel.php:123 actions/editapplication.php:118
#: actions/newapplication.php:101 actions/newnotice.php:94
#: lib/designsettings.php:283
@@ -669,18 +669,18 @@ msgstr "Avatar actualizado."
msgid "No status with that ID found."
msgstr "Non existe ningún estado con esa ID atopada."
-#: actions/apistatusesupdate.php:161 actions/newnotice.php:155
+#: actions/apistatusesupdate.php:252 actions/newnotice.php:155
#: lib/mailhandler.php:60
#, fuzzy, php-format
msgid "That's too long. Max notice size is %d chars."
msgstr ""
"Iso é demasiado longo. O tamaño máximo para un chío é de 140 caracteres."
-#: actions/apistatusesupdate.php:202 actions/apiusershow.php:96
+#: actions/apistatusesupdate.php:293 actions/apiusershow.php:96
msgid "Not found."
msgstr "Non atopado"
-#: actions/apistatusesupdate.php:225 actions/newnotice.php:178
+#: actions/apistatusesupdate.php:316 actions/newnotice.php:178
#, php-format
msgid "Max notice size is %d chars, including attachment URL."
msgstr ""
@@ -710,12 +710,12 @@ msgstr "%1$s / Chíos que respostan a %2$s"
msgid "%1$s updates that reply to updates from %2$s / %3$s."
msgstr "Hai %1$s chíos en resposta a chíos dende %2$s / %3$s."
-#: actions/apitimelinepublic.php:107 actions/publicrss.php:103
+#: actions/apitimelinepublic.php:196 actions/publicrss.php:103
#, php-format
msgid "%s public timeline"
msgstr "Liña de tempo pública de %s"
-#: actions/apitimelinepublic.php:112 actions/publicrss.php:105
+#: actions/apitimelinepublic.php:201 actions/publicrss.php:105
#, php-format
msgid "%s updates from everyone!"
msgstr "%s chíos de calquera!"
@@ -2412,10 +2412,14 @@ msgstr ""
"contrasinal antes de cambiar as túas preferenzas."
#: actions/login.php:270
+#, fuzzy
+msgid "Login with your username and password."
+msgstr "Accede co teu nome de usuario e contrasinal."
+
+#: actions/login.php:273
#, fuzzy, php-format
msgid ""
-"Login with your username and password. Don't have a username yet? [Register]"
-"(%%action.register%%) a new account."
+"Don't have a username yet? [Register](%%action.register%%) a new account."
msgstr ""
"Accede co teu nome de usuario e contrasinal. ¿Non tes un todavía?? [Rexistra]"
"(%%action.register%%) unha nova conta, ou accede co teu enderezo [OpenID](%%"
@@ -2647,8 +2651,8 @@ msgid "Only %s URLs over plain HTTP please."
msgstr ""
#. TRANS: Client error on an API request with an unsupported data format.
-#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1069
-#: lib/apiaction.php:1098 lib/apiaction.php:1215
+#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1131
+#: lib/apiaction.php:1160 lib/apiaction.php:1277
msgid "Not a supported data format."
msgstr "Non é un formato de datos soportado."
@@ -4993,14 +4997,14 @@ msgstr "Tes restrinxido o envio de chíos neste sitio."
msgid "Problem saving notice."
msgstr "Aconteceu un erro ó gardar o chío."
-#: classes/Notice.php:965
+#: classes/Notice.php:967
#, fuzzy
msgid "Problem saving group inbox."
msgstr "Aconteceu un erro ó gardar o chío."
#. 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:1513
+#: classes/Notice.php:1535
#, fuzzy, php-format
msgid "RT @%1$s %2$s"
msgstr "%1$s (%2$s)"
@@ -5502,7 +5506,7 @@ msgid "Snapshots configuration"
msgstr "Confirmación de SMS"
#. TRANS: Client error 401.
-#: lib/apiauth.php:95
+#: lib/apiauth.php:113
msgid "API resource requires read-write access, but you only have read access."
msgstr ""
@@ -7083,56 +7087,56 @@ msgid "Moderator"
msgstr ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1054
+#: lib/util.php:1083
msgid "a few seconds ago"
msgstr "fai uns segundos"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1057
+#: lib/util.php:1086
msgid "about a minute ago"
msgstr "fai un minuto"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1061
+#: lib/util.php:1090
#, php-format
msgid "about %d minutes ago"
msgstr "fai %d minutos"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1064
+#: lib/util.php:1093
msgid "about an hour ago"
msgstr "fai unha hora"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1068
+#: lib/util.php:1097
#, php-format
msgid "about %d hours ago"
msgstr "fai %d horas"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1071
+#: lib/util.php:1100
msgid "about a day ago"
msgstr "fai un día"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1075
+#: lib/util.php:1104
#, php-format
msgid "about %d days ago"
msgstr "fai %d días"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1078
+#: lib/util.php:1107
msgid "about a month ago"
msgstr "fai un mes"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1082
+#: lib/util.php:1111
#, php-format
msgid "about %d months ago"
msgstr "fai %d meses"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1085
+#: lib/util.php:1114
msgid "about a year ago"
msgstr "fai un ano"
diff --git a/locale/gl/LC_MESSAGES/statusnet.po b/locale/gl/LC_MESSAGES/statusnet.po
index a63edfbb0..ee17dbd29 100644
--- a/locale/gl/LC_MESSAGES/statusnet.po
+++ b/locale/gl/LC_MESSAGES/statusnet.po
@@ -9,12 +9,12 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-12 21:47+0000\n"
-"PO-Revision-Date: 2010-04-12 21:48:53+0000\n"
+"POT-Creation-Date: 2010-04-24 14:16+0000\n"
+"PO-Revision-Date: 2010-04-26 22:17:07+0000\n"
"Language-Team: Galician\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r64984); Translate extension (2010-01-16)\n"
+"X-Generator: MediaWiki 1.17alpha (r65552); Translate extension (2010-04-25)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: gl\n"
"X-Message-Group: out-statusnet\n"
@@ -98,8 +98,8 @@ msgstr "Esa páxina non existe."
#: actions/apidirectmessagenew.php:75 actions/apigroupcreate.php:112
#: actions/apigroupismember.php:90 actions/apigroupjoin.php:99
#: actions/apigroupleave.php:99 actions/apigrouplist.php:72
-#: actions/apistatusesupdate.php:148 actions/apisubscriptions.php:87
-#: actions/apitimelinefavorites.php:71 actions/apitimelinefriends.php:78
+#: actions/apistatusesupdate.php:239 actions/apisubscriptions.php:87
+#: actions/apitimelinefavorites.php:71 actions/apitimelinefriends.php:173
#: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79
#: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75
#: actions/favoritesrss.php:74 actions/foaf.php:40 actions/foaf.php:58
@@ -123,7 +123,7 @@ msgstr "%1$s e amigos, páxina %2$d"
#. TRANS: H1 text. %1$s is user nickname
#. TRANS: Message is used as link title. %s is a user nickname.
#: actions/all.php:89 actions/all.php:181 actions/allrss.php:116
-#: actions/apitimelinefriends.php:114 actions/apitimelinehome.php:115
+#: actions/apitimelinefriends.php:209 actions/apitimelinehome.php:115
#: lib/personalgroupnav.php:100
#, php-format
msgid "%s and friends"
@@ -191,7 +191,7 @@ msgstr "Vostede e mailos seus amigos"
#. 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:121 actions/apitimelinefriends.php:120
+#: actions/allrss.php:121 actions/apitimelinefriends.php:215
#: actions/apitimelinehome.php:121
#, php-format
msgid "Updates from %1$s and friends on %2$s!"
@@ -213,9 +213,9 @@ msgstr "Actualizacións de %1$s e amigos en %2$s!"
#: actions/apistatusesdestroy.php:102 actions/apistatusesretweets.php:112
#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:141
#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111
-#: actions/apitimelinefavorites.php:173 actions/apitimelinefriends.php:175
+#: actions/apitimelinefavorites.php:173 actions/apitimelinefriends.php:270
#: actions/apitimelinegroup.php:151 actions/apitimelinehome.php:174
-#: actions/apitimelinementions.php:173 actions/apitimelinepublic.php:151
+#: actions/apitimelinementions.php:173 actions/apitimelinepublic.php:240
#: actions/apitimelineretweetedtome.php:121
#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:160
#: actions/apitimelineuser.php:162 actions/apiusershow.php:101
@@ -232,7 +232,7 @@ msgstr "Non se atopou o método da API."
#: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91
#: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91
#: actions/apigroupleave.php:91 actions/apimediaupload.php:67
-#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:118
+#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:209
msgid "This method requires a POST."
msgstr "Este método require un POST."
@@ -264,7 +264,7 @@ msgstr "Non se puido gardar o perfil."
#: actions/apiaccountupdateprofilebackgroundimage.php:108
#: actions/apiaccountupdateprofileimage.php:97 actions/apimediaupload.php:80
-#: actions/apistatusesupdate.php:131 actions/avatarsettings.php:257
+#: actions/apistatusesupdate.php:222 actions/avatarsettings.php:257
#: actions/designadminpanel.php:123 actions/editapplication.php:118
#: actions/newapplication.php:101 actions/newnotice.php:94
#: lib/designsettings.php:283
@@ -656,17 +656,17 @@ msgstr "Borrouse o estado."
msgid "No status with that ID found."
msgstr "Non se atopou ningún estado con esa ID."
-#: actions/apistatusesupdate.php:161 actions/newnotice.php:155
+#: actions/apistatusesupdate.php:252 actions/newnotice.php:155
#: lib/mailhandler.php:60
#, php-format
msgid "That's too long. Max notice size is %d chars."
msgstr "Iso é longo de máis. A nota non pode exceder os %d caracteres."
-#: actions/apistatusesupdate.php:202 actions/apiusershow.php:96
+#: actions/apistatusesupdate.php:293 actions/apiusershow.php:96
msgid "Not found."
msgstr "Non se atopou."
-#: actions/apistatusesupdate.php:225 actions/newnotice.php:178
+#: actions/apistatusesupdate.php:316 actions/newnotice.php:178
#, php-format
msgid "Max notice size is %d chars, including attachment URL."
msgstr ""
@@ -697,12 +697,12 @@ msgstr "%1$s / Actualizacións que mencionan %2$s"
msgid "%1$s updates that reply to updates from %2$s / %3$s."
msgstr "%1$s actualizacións que responden a actualizacións de %2$s / %3$s."
-#: actions/apitimelinepublic.php:107 actions/publicrss.php:103
+#: actions/apitimelinepublic.php:196 actions/publicrss.php:103
#, php-format
msgid "%s public timeline"
msgstr "Liña do tempo pública de %s"
-#: actions/apitimelinepublic.php:112 actions/publicrss.php:105
+#: actions/apitimelinepublic.php:201 actions/publicrss.php:105
#, php-format
msgid "%s updates from everyone!"
msgstr "%s actualizacións de todos!"
@@ -2231,7 +2231,7 @@ msgid ""
msgstr ""
"%1$s convidouno a unirse a el en %2$s (%3$s).\n"
"\n"
-"%2$s é un servizo de microblogging que lle permite estar ao día coas persoas "
+"%2$s é un servizo de microblogue que lle permite estar ao día coas persoas "
"que coñece e coas que lle interesen.\n"
"\n"
"Tamén pode compartir novas persoais, pensamentos ou a súa vida en liña con "
@@ -2330,13 +2330,16 @@ msgstr ""
"contrasinal antes de cambiar a súa configuración."
#: actions/login.php:270
+msgid "Login with your username and password."
+msgstr "Identifíquese co seu nome de usuario e contrasinal."
+
+#: actions/login.php:273
#, php-format
msgid ""
-"Login with your username and password. Don't have a username yet? [Register]"
-"(%%action.register%%) a new account."
+"Don't have a username yet? [Register](%%action.register%%) a new account."
msgstr ""
-"Identifíquese co seu nome de usuario e contrasinal. Aínda non ten un nome de "
-"usuario? [Rexistre](%%action.register%%) unha conta nova."
+"Aínda non ten un nome de usuario? [Rexistre](%%action.register%%) unha conta "
+"nova."
#: actions/makeadmin.php:92
msgid "Only an admin can make another user an admin."
@@ -2560,8 +2563,8 @@ msgid "Only %s URLs over plain HTTP please."
msgstr "Só %s enderezos URL sobre HTTP simple."
#. TRANS: Client error on an API request with an unsupported data format.
-#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1069
-#: lib/apiaction.php:1098 lib/apiaction.php:1215
+#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1131
+#: lib/apiaction.php:1160 lib/apiaction.php:1277
msgid "Not a supported data format."
msgstr "Non se soporta ese formato de datos."
@@ -3088,11 +3091,11 @@ msgid ""
"tool. [Join now](%%action.register%%) to share notices about yourself with "
"friends, family, and colleagues! ([Read more](%%doc.help%%))"
msgstr ""
-"Isto é %%site.name%%, un servizo de [microblogging](http://en.wikipedia.org/"
-"wiki/Microblogging) baseado na ferramenta de software libre [StatusNet]"
-"(http://status.net/). [Únase agora](%%action.register%%) para compartir "
-"notas persoais cos amigos, a familia e os compañeiros! ([Ler máis](%%doc.help"
-"%%))"
+"Isto é %%site.name%%, un servizo de [microblogue](http://en.wikipedia.org/"
+"wiki/Microblogging) (en inglés) baseado na ferramenta de software libre "
+"[StatusNet](http://status.net/). [Únase agora](%%action.register%%) para "
+"compartir notas persoais cos amigos, a familia e os compañeiros! ([Máis "
+"información](%%doc.help%%))"
#: actions/public.php:247
#, php-format
@@ -3101,9 +3104,9 @@ msgid ""
"blogging) service based on the Free Software [StatusNet](http://status.net/) "
"tool."
msgstr ""
-"Isto é %%site.name%%, un servizo de [microblogging](http://en.wikipedia.org/"
-"wiki/Microblogging) baseado na ferramenta de software libre [StatusNet]"
-"(http://status.net/)."
+"Isto é %%site.name%%, un servizo de [microblogue](http://en.wikipedia.org/"
+"wiki/Microblogging) (en inglés) baseado na ferramenta de software libre "
+"[StatusNet](http://status.net/)."
#: actions/publictagcloud.php:57
msgid "Public tag cloud"
@@ -3419,7 +3422,7 @@ msgstr "URL do perfil"
#: actions/remotesubscribe.php:134
msgid "URL of your profile on another compatible microblogging service"
-msgstr "URL do seu perfil noutro servizo de microblogging compatible"
+msgstr "URL do seu perfil noutro servizo de microblogue compatible"
#: actions/remotesubscribe.php:137 lib/subscribeform.php:139
#: lib/userprofile.php:406
@@ -3509,6 +3512,8 @@ msgid ""
"You can engage other users in a conversation, subscribe to more people or "
"[join groups](%%action.groups%%)."
msgstr ""
+"Pode conversar con outros usuarios, subscribirse a máis xente ou [unirse a "
+"grupos](%%action.groups%%)."
#: actions/replies.php:206
#, php-format
@@ -3516,174 +3521,182 @@ msgid ""
"You can try to [nudge %1$s](../%2$s) or [post something to his or her "
"attention](%%%%action.newnotice%%%%?status_textarea=%3$s)."
msgstr ""
+"Pode probar a [facerlle un aceno a %1$s](../%2$s) ou [publicar algo dirixido "
+"a el ou ela](%%%%action.newnotice%%%%?status_textarea=%3$s)."
#: actions/repliesrss.php:72
#, php-format
msgid "Replies to %1$s on %2$s!"
-msgstr ""
+msgstr "Respostas a %1$s en %2$s!"
#: actions/revokerole.php:75
msgid "You cannot revoke user roles on this site."
-msgstr ""
+msgstr "Non pode revogar os roles dos usuarios neste sitio."
#: actions/revokerole.php:82
msgid "User doesn't have this role."
-msgstr ""
+msgstr "O usuario non ten este rol."
#: actions/rsd.php:146 actions/version.php:157
msgid "StatusNet"
-msgstr ""
+msgstr "StatusNet"
#: actions/sandbox.php:65 actions/unsandbox.php:65
msgid "You cannot sandbox users on this site."
-msgstr ""
+msgstr "Non pode illar usuarios neste sitio."
#: actions/sandbox.php:72
msgid "User is already sandboxed."
-msgstr ""
+msgstr "O usuario xa está illado."
#. TRANS: Menu item for site administration
#: actions/sessionsadminpanel.php:54 actions/sessionsadminpanel.php:170
#: lib/adminpanelaction.php:391
msgid "Sessions"
-msgstr ""
+msgstr "Sesións"
#: actions/sessionsadminpanel.php:65
msgid "Session settings for this StatusNet site."
-msgstr ""
+msgstr "Configuración da sesión para este sitio StatusNet."
#: actions/sessionsadminpanel.php:175
msgid "Handle sessions"
-msgstr ""
+msgstr "Manexar as sesións"
#: actions/sessionsadminpanel.php:177
msgid "Whether to handle sessions ourselves."
-msgstr ""
+msgstr "Manexar ou non as sesións nós mesmos."
#: actions/sessionsadminpanel.php:181
msgid "Session debugging"
-msgstr ""
+msgstr "Depuración da sesión"
#: actions/sessionsadminpanel.php:183
msgid "Turn on debugging output for sessions."
-msgstr ""
+msgstr "Activar a saída de depuración para as sesións."
#: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
#: actions/useradminpanel.php:294
msgid "Save site settings"
-msgstr ""
+msgstr "Gardar a configuración do sitio"
#: actions/showapplication.php:82
msgid "You must be logged in to view an application."
-msgstr ""
+msgstr "Debe estar identificado para ver unha aplicación."
#: actions/showapplication.php:157
msgid "Application profile"
-msgstr ""
+msgstr "Perfil da aplicación"
#. TRANS: Form input field label for application icon.
#: actions/showapplication.php:159 lib/applicationeditform.php:182
msgid "Icon"
-msgstr ""
+msgstr "Icona"
#. TRANS: Form input field label for application name.
#: actions/showapplication.php:169 actions/version.php:195
#: lib/applicationeditform.php:199
msgid "Name"
-msgstr ""
+msgstr "Nome"
#. TRANS: Form input field label.
#: actions/showapplication.php:178 lib/applicationeditform.php:235
msgid "Organization"
-msgstr ""
+msgstr "Organización"
#. TRANS: Form input field label.
#: actions/showapplication.php:187 actions/version.php:198
#: lib/applicationeditform.php:216 lib/groupeditform.php:172
msgid "Description"
-msgstr ""
+msgstr "Descrición"
#: actions/showapplication.php:192 actions/showgroup.php:444
#: lib/profileaction.php:187
msgid "Statistics"
-msgstr ""
+msgstr "Estatísticas"
#: actions/showapplication.php:203
#, php-format
msgid "Created by %1$s - %2$s access by default - %3$d users"
-msgstr ""
+msgstr "Creado por %1$s - acceso %2$s por defecto - %3$d usuarios"
#: actions/showapplication.php:213
msgid "Application actions"
-msgstr ""
+msgstr "Accións da aplicación"
#: actions/showapplication.php:236
msgid "Reset key & secret"
-msgstr ""
+msgstr "Restablecer o contrasinal ou a pregunta secreta"
#: actions/showapplication.php:261
msgid "Application info"
-msgstr ""
+msgstr "Información da aplicación"
#: actions/showapplication.php:263
msgid "Consumer key"
-msgstr ""
+msgstr "Clave do consumidor"
#: actions/showapplication.php:268
msgid "Consumer secret"
-msgstr ""
+msgstr "Pregunta secreta do consumidor"
#: actions/showapplication.php:273
msgid "Request token URL"
-msgstr ""
+msgstr "Solicitar un URL de pase"
#: actions/showapplication.php:278
msgid "Access token URL"
-msgstr ""
+msgstr "Acceder ao URL do pase"
#: actions/showapplication.php:283
msgid "Authorize URL"
-msgstr ""
+msgstr "Autorizar o URL"
#: actions/showapplication.php:288
msgid ""
"Note: We support HMAC-SHA1 signatures. We do not support the plaintext "
"signature method."
msgstr ""
+"Nota: sopórtanse as sinaturas HMAC-SHA1. Non se soporta o método de asinado "
+"con texto sinxelo."
#: actions/showapplication.php:309
msgid "Are you sure you want to reset your consumer key and secret?"
msgstr ""
+"Seguro que quere restablecer a súa clave e maila súa pregunta secreta de "
+"consumidor?"
#: actions/showfavorites.php:79
#, php-format
msgid "%1$s's favorite notices, page %2$d"
-msgstr ""
+msgstr "Notas favoritas de %1$s, páxina %2$d"
#: actions/showfavorites.php:132
msgid "Could not retrieve favorite notices."
-msgstr ""
+msgstr "Non se puideron obter as notas favoritas."
#: actions/showfavorites.php:171
#, php-format
msgid "Feed for favorites of %s (RSS 1.0)"
-msgstr ""
+msgstr "Fonte de novas dos favoritos de %s (RSS 1.0)"
#: actions/showfavorites.php:178
#, php-format
msgid "Feed for favorites of %s (RSS 2.0)"
-msgstr ""
+msgstr "Fonte de novas dos favoritos de %s (RSS 2.0)"
#: actions/showfavorites.php:185
#, php-format
msgid "Feed for favorites of %s (Atom)"
-msgstr ""
+msgstr "Fonte de novas dos favoritos de %s (Atom)"
#: 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."
msgstr ""
+"Aínda non escolleu ningunha nota favorita. Prema no botón de nota favorita "
+"naquelas notas que lle gusten para marcalas para logo ou para salientalas."
#: actions/showfavorites.php:208
#, php-format
@@ -3691,6 +3704,8 @@ msgid ""
"%s hasn't added any notices to his favorites yet. Post something interesting "
"they would add to their favorites :)"
msgstr ""
+"%s aínda non marcou ningunha nota como favorita. Publique algo interesante "
+"que poida querer engadir aos seus favoritos :)"
#: actions/showfavorites.php:212
#, php-format
@@ -3699,80 +3714,83 @@ msgid ""
"account](%%%%action.register%%%%) and then post something interesting they "
"would add to their favorites :)"
msgstr ""
+"%s aínda non marcou ningunha nota como favorita. Por que non [rexistrar unha "
+"conta](%%%%action.register%%%%) e publicar algo interesante que puidese "
+"querer engadir aos seus favoritos? :)"
#: actions/showfavorites.php:243
msgid "This is a way to share what you like."
-msgstr ""
+msgstr "Isto é un modo de compartir o que lle gusta."
#: actions/showgroup.php:82 lib/groupnav.php:86
#, php-format
msgid "%s group"
-msgstr ""
+msgstr "Grupo %s"
#: actions/showgroup.php:84
#, php-format
msgid "%1$s group, page %2$d"
-msgstr ""
+msgstr "Grupo %1$s, páxina %2$d"
#: actions/showgroup.php:227
msgid "Group profile"
-msgstr ""
+msgstr "Perfil do grupo"
#: actions/showgroup.php:272 actions/tagother.php:118
#: actions/userauthorization.php:175 lib/userprofile.php:178
msgid "URL"
-msgstr ""
+msgstr "URL"
#: actions/showgroup.php:283 actions/tagother.php:128
#: actions/userauthorization.php:187 lib/userprofile.php:195
msgid "Note"
-msgstr ""
+msgstr "Nota"
#: actions/showgroup.php:293 lib/groupeditform.php:184
msgid "Aliases"
-msgstr ""
+msgstr "Pseudónimos"
#: actions/showgroup.php:302
msgid "Group actions"
-msgstr ""
+msgstr "Accións do grupo"
#: actions/showgroup.php:338
#, php-format
msgid "Notice feed for %s group (RSS 1.0)"
-msgstr ""
+msgstr "Fonte de novas das notas do grupo %s (RSS 1.0)"
#: actions/showgroup.php:344
#, php-format
msgid "Notice feed for %s group (RSS 2.0)"
-msgstr ""
+msgstr "Fonte de novas das notas do grupo %s (RSS 2.0)"
#: actions/showgroup.php:350
#, php-format
msgid "Notice feed for %s group (Atom)"
-msgstr ""
+msgstr "Fonte de novas das notas do grupo %s (Atom)"
#: actions/showgroup.php:355
#, php-format
msgid "FOAF for %s group"
-msgstr ""
+msgstr "Amigo dun amigo para o grupo %s"
#: actions/showgroup.php:393 actions/showgroup.php:453 lib/groupnav.php:91
msgid "Members"
-msgstr ""
+msgstr "Membros"
#: actions/showgroup.php:398 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 ""
+msgstr "(Ningún)"
#: actions/showgroup.php:404
msgid "All members"
-msgstr ""
+msgstr "Todos os membros"
#: actions/showgroup.php:447
msgid "Created"
-msgstr ""
+msgstr "Creado"
#: actions/showgroup.php:463
#, php-format
@@ -3783,6 +3801,12 @@ msgid ""
"their life and interests. [Join now](%%%%action.register%%%%) to become part "
"of this group and many more! ([Read more](%%%%doc.help%%%%))"
msgstr ""
+"**%s** é un grupo de usuarios de %%%%site.name%%%%, un servizo de "
+"[microblogue](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. "
+"[Únase agora](%%%%action.register%%%%) para pasar a formar parte deste grupo "
+"e de moitos máis! ([Máis información](%%%%doc.help%%%%))"
#: actions/showgroup.php:469
#, php-format
@@ -3792,78 +3816,84 @@ msgid ""
"[StatusNet](http://status.net/) tool. Its members share short messages about "
"their life and interests. "
msgstr ""
+"**%s** é un grupo de usuarios de %%%%site.name%%%%, un servizo de "
+"[microblogue](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. "
#: actions/showgroup.php:497
msgid "Admins"
-msgstr ""
+msgstr "Administradores"
#: actions/showmessage.php:81
msgid "No such message."
-msgstr ""
+msgstr "Non se atopou esa mensaxe."
#: actions/showmessage.php:98
msgid "Only the sender and recipient may read this message."
-msgstr ""
+msgstr "Esta mensaxe só a poden ler o destinatario e mais o remitente."
#: actions/showmessage.php:108
#, php-format
msgid "Message to %1$s on %2$s"
-msgstr ""
+msgstr "Mensaxe a %1$s en %2$s"
#: actions/showmessage.php:113
#, php-format
msgid "Message from %1$s on %2$s"
-msgstr ""
+msgstr "Mensaxe de %1$s en %2$s"
#: actions/shownotice.php:90
msgid "Notice deleted."
-msgstr ""
+msgstr "Borrouse a nota."
#: actions/showstream.php:73
#, php-format
msgid " tagged %s"
-msgstr ""
+msgstr " etiquetouse %s"
#: actions/showstream.php:79
#, php-format
msgid "%1$s, page %2$d"
-msgstr ""
+msgstr "%1$s, páxina %2$d"
#: actions/showstream.php:122
#, php-format
msgid "Notice feed for %1$s tagged %2$s (RSS 1.0)"
-msgstr ""
+msgstr "Fonte de novas das notas para %1$s etiquetadas con %2$s (RSS 1.0)"
#: actions/showstream.php:129
#, php-format
msgid "Notice feed for %s (RSS 1.0)"
-msgstr ""
+msgstr "Fonte de novas das notas para %s (RSS 1.0)"
#: actions/showstream.php:136
#, php-format
msgid "Notice feed for %s (RSS 2.0)"
-msgstr ""
+msgstr "Fonte de novas das notas para %s (RSS 2.0)"
#: actions/showstream.php:143
#, php-format
msgid "Notice feed for %s (Atom)"
-msgstr ""
+msgstr "Fonte de novas das notas para %s (Atom)"
#: actions/showstream.php:148
#, php-format
msgid "FOAF for %s"
-msgstr ""
+msgstr "Amigo dun amigo para %s"
#: actions/showstream.php:200
#, php-format
msgid "This is the timeline for %1$s but %2$s hasn't posted anything yet."
-msgstr ""
+msgstr "Esta é a liña do tempo para %1$s pero %2$s aínda non publicou nada."
#: actions/showstream.php:205
msgid ""
"Seen anything interesting recently? You haven't posted any notices yet, now "
"would be a good time to start :)"
msgstr ""
+"Viu algo interesante hoxe? Aínda non publicou ningunha nota, este sería un "
+"bo momento para comezar :)"
#: actions/showstream.php:207
#, php-format
@@ -3871,6 +3901,8 @@ msgid ""
"You can try to nudge %1$s or [post something to his or her attention](%%%%"
"action.newnotice%%%%?status_textarea=%2$s)."
msgstr ""
+"Pode probar a facerlle un aceno a %1$s ou [publicar algo dirixido a el ou "
+"ela](%%%%action.newnotice%%%%?status_textarea=%2$s)."
#: actions/showstream.php:243
#, php-format
@@ -3880,6 +3912,11 @@ msgid ""
"[StatusNet](http://status.net/) tool. [Join now](%%%%action.register%%%%) to "
"follow **%s**'s notices and many more! ([Read more](%%%%doc.help%%%%))"
msgstr ""
+"**%s** ten unha conta en %%%%site.name%%%%, un servizo de [microblogue]"
+"(http://en.wikipedia.org/wiki/Microblogging) (en inglés) baseado na "
+"ferramenta de software libre [StatusNet](http://status.net/). [Únase agora](%"
+"%%%action.register%%%%) para seguir as notas de **%s** e de moita máis "
+"xente! ([Máis información](%%%%doc.help%%%%))"
#: actions/showstream.php:248
#, php-format
@@ -3888,191 +3925,198 @@ msgid ""
"wikipedia.org/wiki/Micro-blogging) service based on the Free Software "
"[StatusNet](http://status.net/) tool. "
msgstr ""
+"**%s** ten unha conta en %%%%site.name%%%%, un servizo de [microblogue]"
+"(http://en.wikipedia.org/wiki/Microblogging) (en inglés) baseado na "
+"ferramenta de software libre [StatusNet](http://status.net/). "
#: actions/showstream.php:305
#, php-format
msgid "Repeat of %s"
-msgstr ""
+msgstr "Repeticións de %s"
#: actions/silence.php:65 actions/unsilence.php:65
msgid "You cannot silence users on this site."
-msgstr ""
+msgstr "Non pode silenciar usuarios neste sitio."
#: actions/silence.php:72
msgid "User is already silenced."
-msgstr ""
+msgstr "O usuario xa está silenciado."
#: actions/siteadminpanel.php:69
msgid "Basic settings for this StatusNet site"
-msgstr ""
+msgstr "Configuración básica para este sitio StatusNet"
#: actions/siteadminpanel.php:133
msgid "Site name must have non-zero length."
-msgstr ""
+msgstr "O nome do sitio non pode quedar baleiro."
#: actions/siteadminpanel.php:141
msgid "You must have a valid contact email address."
-msgstr ""
+msgstr "Ten que ter un enderezo de correo electrónico de contacto correcto."
#: actions/siteadminpanel.php:159
#, php-format
msgid "Unknown language \"%s\"."
-msgstr ""
+msgstr "Non se coñece a lingua \"%s\"."
#: actions/siteadminpanel.php:165
msgid "Minimum text limit is 0 (unlimited)."
-msgstr ""
+msgstr "O límite mínimo de texto é 0 (ilimitado)."
#: actions/siteadminpanel.php:171
msgid "Dupe limit must be one or more seconds."
-msgstr ""
+msgstr "O tempo límite de repetición debe ser de 1 ou máis segundos."
#: actions/siteadminpanel.php:221
msgid "General"
-msgstr ""
+msgstr "Xeral"
#: actions/siteadminpanel.php:224
msgid "Site name"
-msgstr ""
+msgstr "Nome do sitio"
#: actions/siteadminpanel.php:225
msgid "The name of your site, like \"Yourcompany Microblog\""
msgstr ""
+"O nome do seu sitio, como por exemplo \"O microblogue da miña empresa\""
#: actions/siteadminpanel.php:229
msgid "Brought by"
-msgstr ""
+msgstr "Publicado por"
#: actions/siteadminpanel.php:230
msgid "Text used for credits link in footer of each page"
-msgstr ""
+msgstr "Texto utilizado para a ligazón aos créditos ao pé de cada páxina"
#: actions/siteadminpanel.php:234
msgid "Brought by URL"
-msgstr ""
+msgstr "URL do publicador"
#: actions/siteadminpanel.php:235
msgid "URL used for credits link in footer of each page"
-msgstr ""
+msgstr "URL utilizado para a ligazón aos créditos ao pé de cada páxina"
#: actions/siteadminpanel.php:239
msgid "Contact email address for your site"
-msgstr ""
+msgstr "Enderezo de correo electrónico de contacto para o seu sitio"
#: actions/siteadminpanel.php:245
msgid "Local"
-msgstr ""
+msgstr "Local"
#: actions/siteadminpanel.php:256
msgid "Default timezone"
-msgstr ""
+msgstr "Fuso horario por defecto"
#: actions/siteadminpanel.php:257
msgid "Default timezone for the site; usually UTC."
-msgstr ""
+msgstr "Fuso horario por defecto para este sitio. Adoita poñerse o UTC."
#: actions/siteadminpanel.php:262
msgid "Default language"
-msgstr ""
+msgstr "Lingua por defecto"
#: actions/siteadminpanel.php:263
msgid "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"
#: actions/siteadminpanel.php:271
msgid "Limits"
-msgstr ""
+msgstr "Límites"
#: actions/siteadminpanel.php:274
msgid "Text limit"
-msgstr ""
+msgstr "Límite de texto"
#: actions/siteadminpanel.php:274
msgid "Maximum number of characters for notices."
-msgstr ""
+msgstr "Número máximo de caracteres para as notas."
#: actions/siteadminpanel.php:278
msgid "Dupe limit"
-msgstr ""
+msgstr "Tempo límite de repetición"
#: actions/siteadminpanel.php:278
msgid "How long users must wait (in seconds) to post the same thing again."
msgstr ""
+"Tempo (en segundos) que teñen que agardar os usuarios para publicar unha "
+"nota de novo."
#: actions/sitenoticeadminpanel.php:56
msgid "Site Notice"
-msgstr ""
+msgstr "Nota do sitio"
#: actions/sitenoticeadminpanel.php:67
msgid "Edit site-wide message"
-msgstr ""
+msgstr "Editar a mensaxe global do sitio"
#: actions/sitenoticeadminpanel.php:103
msgid "Unable to save site notice."
-msgstr ""
+msgstr "Non se puido gardar a nota do sitio."
#: actions/sitenoticeadminpanel.php:113
msgid "Max length for the site-wide notice is 255 chars."
-msgstr ""
+msgstr "O tamaño máximo da nota global do sitio é de 255 caracteres."
#: actions/sitenoticeadminpanel.php:176
msgid "Site notice text"
-msgstr ""
+msgstr "Texto da nota do sitio"
#: actions/sitenoticeadminpanel.php:178
msgid "Site-wide notice text (255 chars max; HTML okay)"
msgstr ""
+"Texto da nota global do sitio (255 caracteres como máximo, pode conter HTML)"
#: actions/sitenoticeadminpanel.php:198
msgid "Save site notice"
-msgstr ""
+msgstr "Gardar a nota do sitio"
#. TRANS: Title for SMS settings.
#: actions/smssettings.php:59
msgid "SMS settings"
-msgstr ""
+msgstr "Configuración dos SMS"
#. 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 ""
+msgstr "Pode recibir mensaxes SMS de %%site.name%% por correo electrónico."
#. TRANS: Message given in the SMS settings if SMS is not enabled on the site.
#: actions/smssettings.php:97
msgid "SMS is not available."
-msgstr ""
+msgstr "Os SMS non están dispoñibles."
#. TRANS: Form legend for SMS settings form.
#: actions/smssettings.php:111
-#, fuzzy
msgid "SMS address"
-msgstr "Enderezo de mensaxería instantánea"
+msgstr "Enderezo dos SMS"
#. TRANS: Form guide in SMS settings form.
#: actions/smssettings.php:120
msgid "Current confirmed SMS-enabled phone number."
-msgstr ""
+msgstr "Número de teléfono cos SMS activados confirmado actualmente."
#. TRANS: Form guide in IM settings form.
#: actions/smssettings.php:133
msgid "Awaiting confirmation on this phone number."
-msgstr ""
+msgstr "Agardando pola confirmación do número de teléfono."
#. TRANS: Field label for SMS address input in SMS settings form.
#: actions/smssettings.php:142
msgid "Confirmation code"
-msgstr ""
+msgstr "Código de confirmación"
#. TRANS: Form field instructions in SMS settings form.
#: actions/smssettings.php:144
msgid "Enter the code you received on your phone."
-msgstr ""
+msgstr "Introduza o código que recibiu no teléfono."
#. TRANS: Button label to confirm SMS confirmation code in SMS settings.
#: actions/smssettings.php:148
-#, fuzzy
msgctxt "BUTTON"
msgid "Confirm"
msgstr "Confirmar"
@@ -4080,18 +4124,19 @@ msgstr "Confirmar"
#. TRANS: Field label for SMS phone number input in SMS settings form.
#: actions/smssettings.php:153
msgid "SMS phone number"
-msgstr ""
+msgstr "Número de teléfono para os SMS"
#. TRANS: SMS phone number input field instructions in SMS settings form.
#: actions/smssettings.php:156
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"
#. TRANS: Form legend for SMS preferences form.
#: actions/smssettings.php:195
-#, fuzzy
msgid "SMS preferences"
-msgstr "Preferencias"
+msgstr "Preferencias dos SMS"
#. TRANS: Checkbox label in SMS preferences form.
#: actions/smssettings.php:201
@@ -4099,32 +4144,33 @@ msgid ""
"Send me notices through SMS; I understand I may incur exorbitant charges "
"from my carrier."
msgstr ""
+"Enviádeme notas por SMS. Comprendo que isto podería supoñerme uns custos "
+"exorbitantes na factura da miña compañía."
#. TRANS: Confirmation message for successful SMS preferences save.
#: actions/smssettings.php:315
-#, fuzzy
msgid "SMS preferences saved."
-msgstr "Gardáronse as preferencias."
+msgstr "Gardáronse as preferencias dos SMS."
#. TRANS: Message given saving SMS phone number without having provided one.
#: actions/smssettings.php:338
msgid "No phone number."
-msgstr ""
+msgstr "Non hai ningún número de teléfono."
#. TRANS: Message given saving SMS phone number without having selected a carrier.
#: actions/smssettings.php:344
msgid "No carrier selected."
-msgstr ""
+msgstr "Non se escolleu unha compañía."
#. TRANS: Message given saving SMS phone number that is already set.
#: actions/smssettings.php:352
msgid "That is already your phone number."
-msgstr ""
+msgstr "Ese xa é o seu número de teléfono."
#. TRANS: Message given saving SMS phone number that is already set for another user.
#: actions/smssettings.php:356
msgid "That phone number already belongs to another user."
-msgstr ""
+msgstr "Ese número de teléfono xa pertence a outro usuario."
#. TRANS: Message given saving valid SMS phone number that is to be confirmed.
#: actions/smssettings.php:384
@@ -4132,39 +4178,39 @@ 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 ""
+"Enviouse un código de confirmación ao número de teléfono que engadiu. "
+"Comprobe no seu teléfono o código e as instrucións para utilizalo."
#. TRANS: Message given canceling SMS phone number confirmation for the wrong phone number.
#: actions/smssettings.php:413
msgid "That is the wrong confirmation number."
-msgstr ""
+msgstr "Ese número de confirmación é incorrecto."
#. TRANS: Message given after successfully canceling SMS phone number confirmation.
#: actions/smssettings.php:427
-#, fuzzy
msgid "SMS confirmation cancelled."
-msgstr "Cancelouse a confirmación."
+msgstr "Cancelouse a confirmación para os SMS."
#. TRANS: Message given trying to remove an SMS phone number that is not
#. TRANS: registered for the active user.
#: actions/smssettings.php:448
msgid "That is not your phone number."
-msgstr ""
+msgstr "Ese número de teléfono non é seu."
#. TRANS: Message given after successfully removing a registered SMS phone number.
#: actions/smssettings.php:470
-#, fuzzy
msgid "The SMS phone number was removed."
-msgstr "Borrouse o enderezo."
+msgstr "Borrouse o número de teléfono para os SMS."
#. TRANS: Label for mobile carrier dropdown menu in SMS settings.
#: actions/smssettings.php:511
msgid "Mobile carrier"
-msgstr ""
+msgstr "Compañía"
#. TRANS: Default option for mobile carrier dropdown menu in SMS settings.
#: actions/smssettings.php:516
msgid "Select a carrier"
-msgstr ""
+msgstr "Escolla unha compañía"
#. TRANS: Form instructions for mobile carrier dropdown menu in SMS settings.
#. TRANS: %s is an administrative contact's e-mail address.
@@ -4174,123 +4220,128 @@ 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 ""
+"Compañía de telecomunicacións coa que contratou o seu móbil. Se sabe "
+"dalgunha compañía que permita SMS sobre correo electrónico pero non aparece "
+"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.
#: actions/smssettings.php:548
msgid "No code entered"
-msgstr ""
+msgstr "Non se introduciu ningún código"
#. TRANS: Menu item for site administration
#: actions/snapshotadminpanel.php:54 actions/snapshotadminpanel.php:196
#: lib/adminpanelaction.php:407
msgid "Snapshots"
-msgstr ""
+msgstr "Instantáneas"
#: actions/snapshotadminpanel.php:65
msgid "Manage snapshot configuration"
-msgstr ""
+msgstr "Xestione a configuración das instantáneas"
#: actions/snapshotadminpanel.php:127
msgid "Invalid snapshot run value."
-msgstr ""
+msgstr "Valor de execución da instantánea incorrecto."
#: actions/snapshotadminpanel.php:133
msgid "Snapshot frequency must be a number."
-msgstr ""
+msgstr "A frecuencia das instantáneas debe ser un número."
#: actions/snapshotadminpanel.php:144
msgid "Invalid snapshot report URL."
-msgstr ""
+msgstr "URL de envío das instantáneas incorrecto."
#: actions/snapshotadminpanel.php:200
msgid "Randomly during web hit"
-msgstr ""
+msgstr "Ao chou durante o acceso á rede"
#: actions/snapshotadminpanel.php:201
msgid "In a scheduled job"
-msgstr ""
+msgstr "Nun proceso programado"
#: actions/snapshotadminpanel.php:206
msgid "Data snapshots"
-msgstr ""
+msgstr "Instantáneas de datos"
#: actions/snapshotadminpanel.php:208
msgid "When to send statistical data to status.net servers"
-msgstr ""
+msgstr "Cando enviar información estatística aos servidores status.net"
#: actions/snapshotadminpanel.php:217
msgid "Frequency"
-msgstr ""
+msgstr "Frecuencia"
#: actions/snapshotadminpanel.php:218
msgid "Snapshots will be sent once every N web hits"
-msgstr ""
+msgstr "As instantáneas enviaranse unha vez cada N accesos á rede"
#: actions/snapshotadminpanel.php:226
msgid "Report URL"
-msgstr ""
+msgstr "URL de envío"
#: actions/snapshotadminpanel.php:227
msgid "Snapshots will be sent to this URL"
-msgstr ""
+msgstr "As instantáneas enviaranse a este URL"
#: actions/snapshotadminpanel.php:248
msgid "Save snapshot settings"
-msgstr ""
+msgstr "Gardar a configuración das instantáneas"
#: actions/subedit.php:70
msgid "You are not subscribed to that profile."
-msgstr ""
+msgstr "Non está subscrito a ese perfil."
#: actions/subedit.php:83 classes/Subscription.php:132
msgid "Could not save subscription."
-msgstr ""
+msgstr "Non se puido gardar a subscrición."
#: actions/subscribe.php:77
msgid "This action only accepts POST requests."
-msgstr ""
+msgstr "Esta acción só permite solicitudes POST."
#: actions/subscribe.php:107
msgid "No such profile."
-msgstr ""
+msgstr "Non existe ese perfil."
#: actions/subscribe.php:117
msgid "You cannot subscribe to an OMB 0.1 remote profile with this action."
-msgstr ""
+msgstr "Non se pode subscribir a un perfil remoto OMB 0.1 con esta acción."
#: actions/subscribe.php:145
msgid "Subscribed"
-msgstr ""
+msgstr "Subscrito"
#: actions/subscribers.php:50
#, php-format
msgid "%s subscribers"
-msgstr ""
+msgstr "%s subscritores"
#: actions/subscribers.php:52
#, php-format
msgid "%1$s subscribers, page %2$d"
-msgstr ""
+msgstr "%1$s subscritores, páxina %2$d"
#: actions/subscribers.php:63
msgid "These are the people who listen to your notices."
-msgstr ""
+msgstr "Estas son as persoas que seguen as súas notas."
#: actions/subscribers.php:67
#, php-format
msgid "These are the people who listen to %s's notices."
-msgstr ""
+msgstr "Estas son as persoas que están seguindo as notas de %s."
#: actions/subscribers.php:108
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"
#: actions/subscribers.php:110
#, php-format
msgid "%s has no subscribers. Want to be the first?"
-msgstr ""
+msgstr "%s non ten subscritores. Quere ser o primeiro?"
#: actions/subscribers.php:114
#, php-format
@@ -4298,25 +4349,27 @@ msgid ""
"%s has no subscribers. Why not [register an account](%%%%action.register%%%"
"%) and be the first?"
msgstr ""
+"%s non ten subscritores. Por que non [rexistrar unha conta](%%%%action."
+"register%%%%) e ser o primeiro?"
#: actions/subscriptions.php:52
#, php-format
msgid "%s subscriptions"
-msgstr ""
+msgstr "%s subscricións"
#: actions/subscriptions.php:54
#, php-format
msgid "%1$s subscriptions, page %2$d"
-msgstr ""
+msgstr "%1$s subscricións, páxina %2$d"
#: actions/subscriptions.php:65
msgid "These are the people whose notices you listen to."
-msgstr ""
+msgstr "Estas son as persoas cuxas notas segue."
#: actions/subscriptions.php:69
#, php-format
msgid "These are the people whose notices %s listens to."
-msgstr ""
+msgstr "Estas son as persoas cuxas notas segue %s."
#: actions/subscriptions.php:126
#, php-format
@@ -4327,188 +4380,200 @@ msgid ""
"featured%%). If you're a [Twitter user](%%action.twittersettings%%), you can "
"automatically subscribe to people you already follow there."
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í."
#: actions/subscriptions.php:128 actions/subscriptions.php:132
#, php-format
msgid "%s is not listening to anyone."
-msgstr ""
+msgstr "%s non está seguindo a ninguén."
#: actions/subscriptions.php:208
msgid "Jabber"
-msgstr ""
+msgstr "Jabber"
#: actions/subscriptions.php:222 lib/connectsettingsaction.php:115
msgid "SMS"
-msgstr ""
+msgstr "SMS"
#: actions/tag.php:69
#, php-format
msgid "Notices tagged with %1$s, page %2$d"
-msgstr ""
+msgstr "Notas etiquetadas con %1$s, páxina %2$d"
#: actions/tag.php:87
#, php-format
msgid "Notice feed for tag %s (RSS 1.0)"
-msgstr ""
+msgstr "Fonte de novas das notas para a etiqueta %s (RSS 1.0)"
#: actions/tag.php:93
#, php-format
msgid "Notice feed for tag %s (RSS 2.0)"
-msgstr ""
+msgstr "Fonte de novas das notas para a etiqueta %s (RSS 2.0)"
#: actions/tag.php:99
#, php-format
msgid "Notice feed for tag %s (Atom)"
-msgstr ""
+msgstr "Fonte de novas das notas para a etiqueta %s (Atom)"
#: actions/tagother.php:39
msgid "No ID argument."
-msgstr ""
+msgstr "Sen argumento ID."
#: actions/tagother.php:65
#, php-format
msgid "Tag %s"
-msgstr ""
+msgstr "Etiqueta %s"
#: actions/tagother.php:77 lib/userprofile.php:76
msgid "User profile"
-msgstr ""
+msgstr "Perfil do usuario"
#: actions/tagother.php:81 actions/userauthorization.php:132
#: lib/userprofile.php:103
msgid "Photo"
-msgstr ""
+msgstr "Fotografía"
#: actions/tagother.php:141
msgid "Tag user"
-msgstr ""
+msgstr "Etiquetar ao usuario"
#: actions/tagother.php:151
msgid ""
"Tags for this user (letters, numbers, -, ., and _), comma- or space- "
"separated"
msgstr ""
+"Etiquetas para este usuario (letras, números, -, ., e _), separadas por "
+"comas ou espazos en branco"
#: actions/tagother.php:193
msgid ""
"You can only tag people you are subscribed to or who are subscribed to you."
msgstr ""
+"Só pode etiquetar a xente á que estea subscrito ou que estean subscritos a "
+"vostede."
#: actions/tagother.php:200
msgid "Could not save tags."
-msgstr ""
+msgstr "Non se puideron gardar as etiquetas."
#: actions/tagother.php:236
msgid "Use this form to add tags to your subscribers or subscriptions."
msgstr ""
+"Utilice este formulario para engadir etiquetas aos seus subscritores ou "
+"subscricións."
#: actions/tagrss.php:35
msgid "No such tag."
-msgstr ""
+msgstr "Esa etiqueta non existe."
#: actions/twitapitrends.php:85
msgid "API method under construction."
-msgstr ""
+msgstr "Método API en desenvolvemento."
#: actions/unblock.php:59
msgid "You haven't blocked that user."
-msgstr ""
+msgstr "Non bloqueou a ese usuario."
#: actions/unsandbox.php:72
msgid "User is not sandboxed."
-msgstr ""
+msgstr "O usuario non está illado."
#: actions/unsilence.php:72
msgid "User is not silenced."
-msgstr ""
+msgstr "O usuario non está silenciado."
#: actions/unsubscribe.php:77
-#, fuzzy
msgid "No profile ID in request."
-msgstr "Non se solicitou ningún pase."
+msgstr "à solicitude fáltalle o ID do perfil."
#: actions/unsubscribe.php:98
msgid "Unsubscribed"
-msgstr ""
+msgstr "Cancelouse a subscrición"
#: actions/updateprofile.php:64 actions/userauthorization.php:337
#, 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\"."
#. TRANS: User admin panel title
#: actions/useradminpanel.php:59
msgctxt "TITLE"
msgid "User"
-msgstr ""
+msgstr "Usuario"
#: actions/useradminpanel.php:70
msgid "User settings for this StatusNet site."
-msgstr ""
+msgstr "Preferencias de usuario para este sitio StatusNet."
#: actions/useradminpanel.php:149
msgid "Invalid bio limit. Must be numeric."
-msgstr ""
+msgstr "Límite da biografía incorrecto. Debe ser numérico."
#: actions/useradminpanel.php:155
msgid "Invalid welcome text. Max length is 255 characters."
-msgstr ""
+msgstr "Texto de benvida incorrecto. A extensión máxima é de 255 caracteres."
#: actions/useradminpanel.php:165
#, php-format
msgid "Invalid default subscripton: '%1$s' is not user."
-msgstr ""
+msgstr "Subscrición por defecto incorrecta. \"%1$s\" non é un usuario."
#. TRANS: Link description in user account settings menu.
#: actions/useradminpanel.php:218 lib/accountsettingsaction.php:111
#: lib/personalgroupnav.php:109
msgid "Profile"
-msgstr ""
+msgstr "Perfil"
#: actions/useradminpanel.php:222
msgid "Bio Limit"
-msgstr ""
+msgstr "Límite da biografía"
#: actions/useradminpanel.php:223
msgid "Maximum length of a profile bio in characters."
-msgstr ""
+msgstr "Extensión máxima da biografía dun perfil en caracteres."
#: actions/useradminpanel.php:231
msgid "New users"
-msgstr ""
+msgstr "Novos usuarios"
#: actions/useradminpanel.php:235
msgid "New user welcome"
-msgstr ""
+msgstr "Nova benvida para os usuarios"
#: actions/useradminpanel.php:236
msgid "Welcome text for new users (Max 255 chars)."
-msgstr ""
+msgstr "Texto de benvida para os novos usuarios (255 caracteres como máximo)."
#: actions/useradminpanel.php:241
msgid "Default subscription"
-msgstr ""
+msgstr "Subscrición por defecto"
#: actions/useradminpanel.php:242
msgid "Automatically subscribe new users to this user."
-msgstr ""
+msgstr "Subscribir automaticamente aos novos usuarios a este usuario."
#: actions/useradminpanel.php:251
msgid "Invitations"
-msgstr ""
+msgstr "Invitacións"
#: actions/useradminpanel.php:256
msgid "Invitations enabled"
-msgstr ""
+msgstr "Activáronse as invitacións"
#: actions/useradminpanel.php:258
msgid "Whether to allow users to invite new users."
-msgstr ""
+msgstr "Permitir ou non que os usuarios poidan invitar a novos usuarios."
#: actions/userauthorization.php:105
msgid "Authorize subscription"
-msgstr ""
+msgstr "Autorizar a subscrición"
#: actions/userauthorization.php:110
msgid ""
@@ -4516,35 +4581,38 @@ msgid ""
"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\"."
#: actions/userauthorization.php:196 actions/version.php:165
msgid "License"
-msgstr ""
+msgstr "Licenza"
#: actions/userauthorization.php:217
msgid "Accept"
-msgstr ""
+msgstr "Aceptar"
#: actions/userauthorization.php:218 lib/subscribeform.php:115
#: lib/subscribeform.php:139
msgid "Subscribe to this user"
-msgstr ""
+msgstr "Subscribirse a este usuario"
#: actions/userauthorization.php:219
msgid "Reject"
-msgstr ""
+msgstr "Rexeitar"
#: actions/userauthorization.php:220
msgid "Reject this subscription"
-msgstr ""
+msgstr "Rexeitar esta subscrición"
#: actions/userauthorization.php:232
msgid "No authorization request!"
-msgstr ""
+msgstr "Non se solicitou a autorización!"
#: actions/userauthorization.php:254
msgid "Subscription authorized"
-msgstr ""
+msgstr "Autorizouse a subscrición"
#: actions/userauthorization.php:256
msgid ""
@@ -4552,10 +4620,13 @@ msgid ""
"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 é:"
#: actions/userauthorization.php:266
msgid "Subscription rejected"
-msgstr ""
+msgstr "Rexeitouse a subscrición"
#: actions/userauthorization.php:268
msgid ""
@@ -4563,75 +4634,80 @@ msgid ""
"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."
#: actions/userauthorization.php:303
#, php-format
msgid "Listener URI ‘%s’ not found here."
-msgstr ""
+msgstr "Non se atopou o URI do seguidor, \"%s\", aquí."
#: actions/userauthorization.php:308
#, php-format
msgid "Listenee URI ‘%s’ is too long."
-msgstr ""
+msgstr "O URI do seguidor, \"%s\", é longo de máis."
#: actions/userauthorization.php:314
#, php-format
msgid "Listenee URI ‘%s’ is a local user."
-msgstr ""
+msgstr "O URI do seguidor, \"%s\", é dun usuario local."
#: actions/userauthorization.php:329
#, php-format
msgid "Profile URL ‘%s’ is for a local user."
-msgstr ""
+msgstr "O URL do perfil, \"%s\", pertence a un usuario local."
#: actions/userauthorization.php:345
#, php-format
msgid "Avatar URL ‘%s’ is not valid."
-msgstr ""
+msgstr "O URL do avatar, \"%s\", é incorrecto."
#: actions/userauthorization.php:350
#, php-format
msgid "Can’t read avatar URL ‘%s’."
-msgstr ""
+msgstr "Non se puido ler o URL do avatar, \"%s\"."
#: actions/userauthorization.php:355
#, php-format
msgid "Wrong image type for avatar URL ‘%s’."
-msgstr ""
+msgstr "O tipo de imaxe do URL do avatar, \"%s\", é incorrecto."
#: actions/userdesignsettings.php:76 lib/designsettings.php:65
msgid "Profile design"
-msgstr ""
+msgstr "Deseño do perfil"
#: actions/userdesignsettings.php:87 lib/designsettings.php:76
msgid ""
"Customize the way your profile looks with a background image and a colour "
"palette of your choice."
msgstr ""
+"Personalice a aparencia do seu perfil cunha imaxe de fondo e unha paleta de "
+"cores escollida por vostede."
#: actions/userdesignsettings.php:282
msgid "Enjoy your hotdog!"
-msgstr ""
+msgstr "Bo proveito!"
#. TRANS: Message is used as a page title. %1$s is a nick name, %2$d is a page number.
#: actions/usergroups.php:66
#, php-format
msgid "%1$s groups, page %2$d"
-msgstr ""
+msgstr "%1$s grupos, páxina %2$d"
#: actions/usergroups.php:132
msgid "Search for more groups"
-msgstr ""
+msgstr "Buscar máis grupos"
#: actions/usergroups.php:159
#, php-format
msgid "%s is not a member of any group."
-msgstr ""
+msgstr "%s non pertence a ningún grupo."
#: actions/usergroups.php:164
#, php-format
msgid "Try [searching for groups](%%action.groupsearch%%) and joining them."
-msgstr ""
+msgstr "Probe a [buscar grupos](%%action.groupsearch%%) e unirse a eles."
#. 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.
@@ -4642,12 +4718,12 @@ msgstr ""
#: lib/atomusernoticefeed.php:75
#, php-format
msgid "Updates from %1$s on %2$s!"
-msgstr ""
+msgstr "Actualizacións de %1$s en %2$s!"
#: actions/version.php:73
#, php-format
msgid "StatusNet %s"
-msgstr ""
+msgstr "%s de StatusNet"
#: actions/version.php:153
#, php-format
@@ -4655,10 +4731,12 @@ msgid ""
"This site is powered by %1$s version %2$s, Copyright 2008-2010 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."
#: actions/version.php:161
msgid "Contributors"
-msgstr ""
+msgstr "Colaboradores"
#: actions/version.php:168
msgid ""
@@ -4667,6 +4745,10 @@ msgid ""
"Software Foundation, either version 3 of the License, or (at your option) "
"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 "
+"Software Foundation, versión 3 ou calquera versión posterior (a elección do "
+"usuario) da licenza. "
#: actions/version.php:174
msgid ""
@@ -4675,6 +4757,10 @@ msgid ""
"FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License "
"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. "
#: actions/version.php:180
#, php-format
@@ -4682,19 +4768,21 @@ msgid ""
"You should have received a copy of the GNU Affero General Public License "
"along with this program. If not, see %s."
msgstr ""
+"Debeu recibir unha copia da Licenza Pública Xeral Affero de GNU xunto co "
+"programa. En caso contrario, vexa %s."
#: actions/version.php:189
msgid "Plugins"
-msgstr ""
+msgstr "Complementos"
#. TRANS: Secondary navigation menu option leading to version information on the StatusNet site.
#: actions/version.php:196 lib/action.php:779
msgid "Version"
-msgstr ""
+msgstr "Versión"
#: actions/version.php:197
msgid "Author(s)"
-msgstr ""
+msgstr "Autores"
#: classes/File.php:169
#, php-format
@@ -4702,371 +4790,376 @@ msgid ""
"No file may be larger than %d bytes and the file you sent was %d bytes. Try "
"to upload a smaller version."
msgstr ""
+"Ningún ficheiro pode superar os %d bytes e o que enviou ocupaba %d. Probe a "
+"subir un ficheiro máis pequeno."
#: classes/File.php:179
#, php-format
msgid "A file this large would exceed your user quota of %d bytes."
msgstr ""
+"Un ficheiro deste tamaño excedería a súa cota de usuario, que é de %d bytes."
#: classes/File.php:186
#, php-format
msgid "A file this large would exceed your monthly quota of %d bytes."
-msgstr ""
+msgstr "Un ficheiro deste tamaño excedería a súa cota mensual de %d bytes."
#: classes/Group_member.php:41
msgid "Group join failed."
-msgstr ""
+msgstr "Non se puido unir ao grupo."
#: classes/Group_member.php:53
msgid "Not part of group."
-msgstr ""
+msgstr "Non forma parte do grupo."
#: classes/Group_member.php:60
msgid "Group leave failed."
-msgstr ""
+msgstr "Non se puido deixar o grupo."
#: classes/Local_group.php:41
msgid "Could not update local group."
-msgstr ""
+msgstr "Non se puido actualizar o grupo local."
#: classes/Login_token.php:76
#, php-format
msgid "Could not create login token for %s"
-msgstr ""
+msgstr "Non se puido crear un pase de sesión para %s"
#: classes/Message.php:45
msgid "You are banned from sending direct messages."
-msgstr ""
+msgstr "Prohibíuselle enviar mensaxes directas de momento."
#: classes/Message.php:61
msgid "Could not insert message."
-msgstr ""
+msgstr "Non se puido inserir a mensaxe."
#: classes/Message.php:71
msgid "Could not update message with new URI."
-msgstr ""
+msgstr "Non se puido actualizar a mensaxe co novo URI."
#. TRANS: Server exception. %s are the error details.
#: classes/Notice.php:176
-#, fuzzy, php-format
+#, php-format
msgid "Database error inserting hashtag: %s"
-msgstr ""
-"Houbo un erro na base de datos ao intentar inserir o usuario da aplicación "
-"OAuth."
+msgstr "Houbo un erro na base de datos ao intentar inserir a etiqueta: %s"
#: classes/Notice.php:245
msgid "Problem saving notice. Too long."
-msgstr ""
+msgstr "Houbo un problema ao gardar a nota. É longa de máis."
#: classes/Notice.php:249
msgid "Problem saving notice. Unknown user."
-msgstr ""
+msgstr "Houbo un problema ao gardar a nota. Descoñécese o usuario."
#: classes/Notice.php:254
msgid ""
"Too many notices too fast; take a breather and post again in a few minutes."
msgstr ""
+"Escribiu demasiadas notas en moi pouco tempo. Tómese un respiro e volva "
+"publicar nuns minutos."
#: classes/Notice.php:260
msgid ""
"Too many duplicate messages too quickly; take a breather and post again in a "
"few minutes."
msgstr ""
+"Repetiu demasiadas mensaxes en moi pouco tempo. Tómese un respiro e volva "
+"publicar nuns minutos."
#: classes/Notice.php:266
msgid "You are banned from posting notices on this site."
-msgstr ""
+msgstr "Prohibíuselle publicar notas neste sitio de momento."
#: classes/Notice.php:332 classes/Notice.php:358
msgid "Problem saving notice."
-msgstr ""
+msgstr "Houbo un problema ao gardar a nota."
-#: classes/Notice.php:965
+#: classes/Notice.php:967
msgid "Problem saving group inbox."
-msgstr ""
+msgstr "Houbo un problema ao gardar a caixa de entrada do grupo."
#. 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:1513
+#: classes/Notice.php:1535
#, php-format
msgid "RT @%1$s %2$s"
-msgstr ""
+msgstr "â™» @%1$s %2$s"
#: classes/Subscription.php:74 lib/oauthstore.php:465
msgid "You have been banned from subscribing."
-msgstr ""
+msgstr "Prohibíuselle realizar subscricións de momento."
#: classes/Subscription.php:78
msgid "Already subscribed!"
-msgstr ""
+msgstr "Xa está subscrito!"
#: classes/Subscription.php:82
msgid "User has blocked you."
-msgstr ""
+msgstr "O usuario bloqueouno."
#: classes/Subscription.php:167
msgid "Not subscribed!"
-msgstr ""
+msgstr "Non está subscrito!"
#: classes/Subscription.php:173
msgid "Couldn't delete self-subscription."
-msgstr ""
+msgstr "Non se puido borrar a subscrición a si mesmo."
#: classes/Subscription.php:200
msgid "Couldn't delete subscription OMB token."
-msgstr ""
+msgstr "Non se puido borrar o pase de subscrición OMB."
#: classes/Subscription.php:211
msgid "Couldn't delete subscription."
-msgstr ""
+msgstr "Non se puido borrar a subscrición."
#: classes/User.php:363
#, php-format
msgid "Welcome to %1$s, @%2$s!"
-msgstr ""
+msgstr "Benvido a %1$s, @%2$s!"
#: classes/User_group.php:480
msgid "Could not create group."
-msgstr ""
+msgstr "Non se puido crear o grupo."
#: classes/User_group.php:489
msgid "Could not set group URI."
-msgstr ""
+msgstr "Non se puido establecer o URI do grupo."
#: classes/User_group.php:510
msgid "Could not set group membership."
-msgstr ""
+msgstr "Non se puido establecer a pertenza ao grupo."
#: classes/User_group.php:524
msgid "Could not save local group info."
-msgstr ""
+msgstr "Non se puido gardar a información do grupo local."
#. TRANS: Link title attribute in user account settings menu.
#: lib/accountsettingsaction.php:109
msgid "Change your profile settings"
-msgstr ""
+msgstr "Cambie a configuración do seu perfil"
#. TRANS: Link title attribute in user account settings menu.
#: lib/accountsettingsaction.php:116
msgid "Upload an avatar"
-msgstr ""
+msgstr "Cargue un avatar"
#. TRANS: Link title attribute in user account settings menu.
#: lib/accountsettingsaction.php:123
msgid "Change your password"
-msgstr ""
+msgstr "Cambie o seu contrasinal"
#. TRANS: Link title attribute in user account settings menu.
#: lib/accountsettingsaction.php:130
msgid "Change email handling"
-msgstr ""
+msgstr "Cambie a xestión do correo electrónico"
#. TRANS: Link title attribute in user account settings menu.
#: lib/accountsettingsaction.php:137
msgid "Design your profile"
-msgstr ""
+msgstr "Deseñe o seu perfil"
#. TRANS: Link title attribute in user account settings menu.
#: lib/accountsettingsaction.php:144
msgid "Other options"
-msgstr ""
+msgstr "Outras opcións"
#. TRANS: Link description in user account settings menu.
#: lib/accountsettingsaction.php:146
msgid "Other"
-msgstr ""
+msgstr "Outros"
#. TRANS: Page title. %1$s is the title, %2$s is the site name.
#: lib/action.php:145
#, php-format
msgid "%1$s - %2$s"
-msgstr ""
+msgstr "%1$s - %2$s"
#. TRANS: Page title for a page without a title set.
#: lib/action.php:161
msgid "Untitled page"
-msgstr ""
+msgstr "Páxina sen título"
#. TRANS: DT element for primary navigation menu. String is hidden in default CSS.
#: lib/action.php:426
msgid "Primary site navigation"
-msgstr ""
+msgstr "Navegación principal do sitio"
#. TRANS: Tooltip for main menu option "Personal"
#: lib/action.php:432
msgctxt "TOOLTIP"
msgid "Personal profile and friends timeline"
-msgstr ""
+msgstr "Liña do tempo do perfil persoal e os amigos"
#. TRANS: Main menu option when logged in for access to personal profile and friends timeline
#: lib/action.php:435
msgctxt "MENU"
msgid "Personal"
-msgstr ""
+msgstr "Persoal"
#. TRANS: Tooltip for main menu option "Account"
#: lib/action.php:437
msgctxt "TOOLTIP"
msgid "Change your email, avatar, password, profile"
-msgstr ""
+msgstr "Cambie o seu correo electrónico, avatar, contrasinal ou perfil"
#. TRANS: Tooltip for main menu option "Services"
#: lib/action.php:442
msgctxt "TOOLTIP"
msgid "Connect to services"
-msgstr ""
+msgstr "Conectarse aos servizos"
#. TRANS: Main menu option when logged in and connection are possible for access to options to connect to other services
#: lib/action.php:445
msgid "Connect"
-msgstr ""
+msgstr "Conectarse"
#. TRANS: Tooltip for menu option "Admin"
#: lib/action.php:448
msgctxt "TOOLTIP"
msgid "Change site configuration"
-msgstr ""
+msgstr "Cambiar a configuración do sitio"
#. TRANS: Main menu option when logged in and site admin for access to site configuration
#: lib/action.php:451
msgctxt "MENU"
msgid "Admin"
-msgstr ""
+msgstr "Administrador"
#. TRANS: Tooltip for main menu option "Invite"
#: lib/action.php:455
#, php-format
msgctxt "TOOLTIP"
msgid "Invite friends and colleagues to join you on %s"
-msgstr ""
+msgstr "Convide a amigos e compañeiros a unírselle en %s"
#. TRANS: Main menu option when logged in and invitations are allowed for inviting new users
#: lib/action.php:458
msgctxt "MENU"
msgid "Invite"
-msgstr ""
+msgstr "Convidar"
#. TRANS: Tooltip for main menu option "Logout"
#: lib/action.php:464
msgctxt "TOOLTIP"
msgid "Logout from the site"
-msgstr ""
+msgstr "Saír ao anonimato"
#. TRANS: Main menu option when logged in to log out the current user
#: lib/action.php:467
msgctxt "MENU"
msgid "Logout"
-msgstr ""
+msgstr "Saír"
#. TRANS: Tooltip for main menu option "Register"
#: lib/action.php:472
msgctxt "TOOLTIP"
msgid "Create an account"
-msgstr ""
+msgstr "Crear unha conta"
#. TRANS: Main menu option when not logged in to register a new account
#: lib/action.php:475
msgctxt "MENU"
msgid "Register"
-msgstr ""
+msgstr "Rexistrarse"
#. TRANS: Tooltip for main menu option "Login"
#: lib/action.php:478
msgctxt "TOOLTIP"
msgid "Login to the site"
-msgstr ""
+msgstr "Identificarse no sitio"
#: lib/action.php:481
msgctxt "MENU"
msgid "Login"
-msgstr ""
+msgstr "Identificarse"
#. TRANS: Tooltip for main menu option "Help"
#: lib/action.php:484
msgctxt "TOOLTIP"
msgid "Help me!"
-msgstr ""
+msgstr "Axuda!"
#: lib/action.php:487
msgctxt "MENU"
msgid "Help"
-msgstr ""
+msgstr "Axuda"
#. TRANS: Tooltip for main menu option "Search"
#: lib/action.php:490
msgctxt "TOOLTIP"
msgid "Search for people or text"
-msgstr ""
+msgstr "Buscar persoas ou palabras"
#: lib/action.php:493
msgctxt "MENU"
msgid "Search"
-msgstr ""
+msgstr "Buscar"
#. TRANS: DT element for site notice. String is hidden in default CSS.
#. TRANS: Menu item for site administration
#: lib/action.php:515 lib/adminpanelaction.php:399
msgid "Site notice"
-msgstr ""
+msgstr "Nota do sitio"
#. TRANS: DT element for local views block. String is hidden in default CSS.
#: lib/action.php:582
msgid "Local views"
-msgstr ""
+msgstr "Vistas locais"
#. TRANS: DT element for page notice. String is hidden in default CSS.
#: lib/action.php:649
msgid "Page notice"
-msgstr ""
+msgstr "Nota da páxina"
#. TRANS: DT element for secondary navigation menu. String is hidden in default CSS.
#: lib/action.php:752
msgid "Secondary site navigation"
-msgstr ""
+msgstr "Navegación secundaria do sitio"
#. TRANS: Secondary navigation menu option leading to help on StatusNet.
#: lib/action.php:758
msgid "Help"
-msgstr ""
+msgstr "Axuda"
#. TRANS: Secondary navigation menu option leading to text about StatusNet site.
#: lib/action.php:761
msgid "About"
-msgstr ""
+msgstr "Acerca de"
#. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
#: lib/action.php:764
msgid "FAQ"
-msgstr ""
+msgstr "Preguntas máis frecuentes"
#. TRANS: Secondary navigation menu option leading to Terms of Service.
#: lib/action.php:769
msgid "TOS"
-msgstr ""
+msgstr "Condicións do servicio"
#. TRANS: Secondary navigation menu option leading to privacy policy.
#: lib/action.php:773
msgid "Privacy"
-msgstr ""
+msgstr "Protección de datos"
#. TRANS: Secondary navigation menu option.
#: lib/action.php:776
msgid "Source"
-msgstr ""
+msgstr "Código fonte"
#. TRANS: Secondary navigation menu option leading to contact information on the StatusNet site.
#: lib/action.php:782
msgid "Contact"
-msgstr ""
+msgstr "Contacto"
#: lib/action.php:784
msgid "Badge"
-msgstr ""
+msgstr "Insignia"
#. TRANS: DT element for StatusNet software license.
#: lib/action.php:813
msgid "StatusNet software license"
-msgstr ""
+msgstr "Licenza do software StatusNet"
#. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is set.
#: lib/action.php:817
@@ -5075,12 +5168,14 @@ msgid ""
"**%%site.name%%** is a microblogging service brought to you by [%%site."
"broughtby%%](%%site.broughtbyurl%%)."
msgstr ""
+"**%%site.name%%** é un servizo de microblogue ofrecido por [%%site.broughtby%"
+"%](%%site.broughtbyurl%%)."
#. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set.
#: lib/action.php:820
#, php-format
msgid "**%%site.name%%** is a microblogging service."
-msgstr ""
+msgstr "**%%site.name%%** é un servizo de microblogue."
#. TRANS: Second sentence of the StatusNet site license. Mentions the StatusNet source code license.
#: lib/action.php:824
@@ -5090,18 +5185,21 @@ msgid ""
"s, available under the [GNU Affero General Public License](http://www.fsf."
"org/licensing/licenses/agpl-3.0.html)."
msgstr ""
+"Utiliza a versión %s do software de microblogue [StatusNet](http://status."
+"net/), dispoñible baixo a [Licenza Pública Xeral Affero de GNU](http://www."
+"fsf.org/licensing/licenses/agpl-3.0.html) (en inglés)."
#. TRANS: DT element for StatusNet site content license.
#: lib/action.php:840
msgid "Site content license"
-msgstr ""
+msgstr "Licenza dos contidos do sitio"
#. TRANS: Content license displayed when license is set to 'private'.
#. TRANS: %1$s is the site name.
#: lib/action.php:847
#, php-format
msgid "Content and data of %1$s are private and confidential."
-msgstr ""
+msgstr "O contido e os datos de %1$s son privados e confidenciais."
#. TRANS: Content license displayed when license is set to 'allrightsreserved'.
#. TRANS: %1$s is the copyright owner.
@@ -5109,215 +5207,224 @@ msgstr ""
#, php-format
msgid "Content and data copyright by %1$s. All rights reserved."
msgstr ""
+"Os contidos e datos son propiedade intelectual de %1$s. Quedan reservados "
+"todos os dereitos."
#. TRANS: Content license displayed when license is set to 'allrightsreserved' and no owner is set.
#: lib/action.php:858
msgid "Content and data copyright by contributors. All rights reserved."
msgstr ""
+"Os contidos e datos son propiedade intelectual dos colaboradores. Quedan "
+"reservados todos os dereitos."
#. TRANS: license message in footer. %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:871
#, php-format
msgid "All %1$s content and data are available under the %2$s license."
msgstr ""
+"Todos os contidos e datos de %1$s están dispoñibles baixo a licenza %2$s."
#. TRANS: DT element for pagination (previous/next, etc.).
#: lib/action.php:1182
msgid "Pagination"
-msgstr ""
+msgstr "Paxinación"
#. TRANS: Pagination message to go to a page displaying information more in the
#. TRANS: present than the currently displayed information.
#: lib/action.php:1193
msgid "After"
-msgstr ""
+msgstr "Posteriores"
#. TRANS: Pagination message to go to a page displaying information more in the
#. TRANS: past than the currently displayed information.
#: lib/action.php:1203
msgid "Before"
-msgstr ""
+msgstr "Anteriores"
#. TRANS: Client exception thrown when a feed instance is a DOMDocument.
#: lib/activity.php:121
msgid "Expecting a root feed element but got a whole XML document."
msgstr ""
+"Esperábase unha fonte de novas raíz pero recibiuse un documento XML completo."
#: lib/activityutils.php:208
msgid "Can't handle remote content yet."
-msgstr ""
+msgstr "Aínda non é posible manexar contidos remotos."
#: lib/activityutils.php:236
msgid "Can't handle embedded XML content yet."
-msgstr ""
+msgstr "Aínda non se poden manexar contidos XML integrados."
#: lib/activityutils.php:240
msgid "Can't handle embedded Base64 content yet."
-msgstr ""
+msgstr "Aínda non se poden manexar contidos Base64."
#. TRANS: Client error message thrown when a user tries to change admin settings but has no access rights.
#: lib/adminpanelaction.php:98
msgid "You cannot make changes to this site."
-msgstr ""
+msgstr "Non pode realizar cambios neste sitio."
#. TRANS: Client error message throw when a certain panel's settings cannot be changed.
#: lib/adminpanelaction.php:110
msgid "Changes to that panel are not allowed."
-msgstr ""
+msgstr "Non se permite realizar cambios nese panel."
#. TRANS: Client error message.
#: lib/adminpanelaction.php:229
msgid "showForm() not implemented."
-msgstr ""
+msgstr "showForm() non está integrado."
#. TRANS: Client error message
#: lib/adminpanelaction.php:259
msgid "saveSettings() not implemented."
-msgstr ""
+msgstr "saveSettings() non está integrado."
#. TRANS: Client error message thrown if design settings could not be deleted in
#. TRANS: the admin panel Design.
#: lib/adminpanelaction.php:284
msgid "Unable to delete design setting."
-msgstr ""
+msgstr "Non se puido borrar a configuración do deseño."
#. TRANS: Menu item title/tooltip
#: lib/adminpanelaction.php:349
msgid "Basic site configuration"
-msgstr ""
+msgstr "Configuración básica do sitio"
#. TRANS: Menu item for site administration
#: lib/adminpanelaction.php:351
msgctxt "MENU"
msgid "Site"
-msgstr ""
+msgstr "Sitio"
#. TRANS: Menu item title/tooltip
#: lib/adminpanelaction.php:357
msgid "Design configuration"
-msgstr ""
+msgstr "Configuración do deseño"
#. TRANS: Menu item for site administration
#: lib/adminpanelaction.php:359
msgctxt "MENU"
msgid "Design"
-msgstr ""
+msgstr "Deseño"
#. TRANS: Menu item title/tooltip
#: lib/adminpanelaction.php:365
msgid "User configuration"
-msgstr ""
+msgstr "Configuración do usuario"
#. TRANS: Menu item for site administration
#: lib/adminpanelaction.php:367 lib/personalgroupnav.php:115
msgid "User"
-msgstr ""
+msgstr "Usuario"
#. TRANS: Menu item title/tooltip
#: lib/adminpanelaction.php:373
msgid "Access configuration"
-msgstr ""
+msgstr "Configuración de acceso"
#. TRANS: Menu item title/tooltip
#: lib/adminpanelaction.php:381
msgid "Paths configuration"
-msgstr ""
+msgstr "Configuración das rutas"
#. TRANS: Menu item title/tooltip
#: lib/adminpanelaction.php:389
msgid "Sessions configuration"
-msgstr ""
+msgstr "Configuración das sesións"
#. TRANS: Menu item title/tooltip
#: lib/adminpanelaction.php:397
msgid "Edit site notice"
-msgstr ""
+msgstr "Modificar a nota do sitio"
#. TRANS: Menu item title/tooltip
#: lib/adminpanelaction.php:405
msgid "Snapshots configuration"
-msgstr ""
+msgstr "Configuración das instantáneas"
#. TRANS: Client error 401.
-#: lib/apiauth.php:95
+#: lib/apiauth.php:113
msgid "API resource requires read-write access, but you only have read access."
msgstr ""
+"O recurso API precisa permisos de lectura e escritura, pero só dispón de "
+"permisos de lectura."
#. TRANS: Form legend.
#: lib/applicationeditform.php:137
msgid "Edit application"
-msgstr ""
+msgstr "Modificar a aplicación"
#. TRANS: Form guide.
#: lib/applicationeditform.php:187
msgid "Icon for this application"
-msgstr ""
+msgstr "Icona para esta aplicación"
#. TRANS: Form input field instructions.
#: lib/applicationeditform.php:209
#, php-format
msgid "Describe your application in %d characters"
-msgstr ""
+msgstr "Describa a súa aplicación en %d caracteres"
#. TRANS: Form input field instructions.
#: lib/applicationeditform.php:213
msgid "Describe your application"
-msgstr ""
+msgstr "Describa a súa aplicación"
#. TRANS: Form input field instructions.
#: lib/applicationeditform.php:224
msgid "URL of the homepage of this application"
-msgstr ""
+msgstr "URL do sitio web desta aplicación"
#. TRANS: Form input field label.
#: lib/applicationeditform.php:226
msgid "Source URL"
-msgstr ""
+msgstr "URL de orixe"
#. TRANS: Form input field instructions.
#: lib/applicationeditform.php:233
msgid "Organization responsible for this application"
-msgstr ""
+msgstr "Organización responsable desta aplicación"
#. TRANS: Form input field instructions.
#: lib/applicationeditform.php:242
msgid "URL for the homepage of the organization"
-msgstr ""
+msgstr "URL do sitio web da organización"
#. TRANS: Form input field instructions.
#: lib/applicationeditform.php:251
msgid "URL to redirect to after authentication"
-msgstr ""
+msgstr "URL ao que ir tras a autenticación"
#. TRANS: Radio button label for application type
#: lib/applicationeditform.php:278
msgid "Browser"
-msgstr ""
+msgstr "Navegador"
#. TRANS: Radio button label for application type
#: lib/applicationeditform.php:295
msgid "Desktop"
-msgstr ""
+msgstr "Escritorio"
#. TRANS: Form guide.
#: lib/applicationeditform.php:297
msgid "Type of application, browser or desktop"
-msgstr ""
+msgstr "Tipo de aplicación, de navegador ou de escritorio"
#. TRANS: Radio button label for access type.
#: lib/applicationeditform.php:320
msgid "Read-only"
-msgstr ""
+msgstr "Lectura"
#. TRANS: Radio button label for access type.
#: lib/applicationeditform.php:339
msgid "Read-write"
-msgstr ""
+msgstr "Lectura e escritura"
#. TRANS: Form guide.
#: lib/applicationeditform.php:341
msgid "Default access for this application: read-only, or read-write"
msgstr ""
+"Permisos por defecto para esta aplicación: lectura ou lectura e escritura"
#. TRANS: Submit button title
#: lib/applicationeditform.php:359
@@ -5327,105 +5434,104 @@ msgstr "Cancelar"
#. TRANS: Application access type
#: lib/applicationlist.php:136
msgid "read-write"
-msgstr ""
+msgstr "lectura e escritura"
#. TRANS: Application access type
#: lib/applicationlist.php:138
msgid "read-only"
-msgstr ""
+msgstr "lectura"
#. TRANS: Used in application list. %1$s is a modified date, %2$s is access type (read-write or read-only)
#: lib/applicationlist.php:144
#, php-format
msgid "Approved %1$s - \"%2$s\" access."
-msgstr ""
+msgstr "Aprobado o %1$s - permisos de \"%2$s\"."
#. TRANS: Button label
#: lib/applicationlist.php:159
-#, fuzzy
msgctxt "BUTTON"
msgid "Revoke"
-msgstr "Borrar"
+msgstr "Revogar"
#. TRANS: DT element label in attachment list.
#: lib/attachmentlist.php:88
msgid "Attachments"
-msgstr ""
+msgstr "Ficheiros anexos"
#. TRANS: DT element label in attachment list item.
#: lib/attachmentlist.php:265
msgid "Author"
-msgstr ""
+msgstr "Autor"
#. TRANS: DT element label in attachment list item.
#: lib/attachmentlist.php:279
msgid "Provider"
-msgstr ""
+msgstr "Provedor"
#: lib/attachmentnoticesection.php:67
msgid "Notices where this attachment appears"
-msgstr ""
+msgstr "Notas nas que se anexou este ficheiro"
#: lib/attachmenttagcloudsection.php:48
msgid "Tags for this attachment"
-msgstr ""
+msgstr "Etiquetas para este ficheiro"
#: lib/authenticationplugin.php:220 lib/authenticationplugin.php:225
msgid "Password changing failed"
-msgstr ""
+msgstr "Non se puido cambiar o contrasinal"
#: lib/authenticationplugin.php:235
msgid "Password changing is not allowed"
-msgstr ""
+msgstr "Non se permite cambiar o contrasinal"
#: lib/channel.php:157 lib/channel.php:177
msgid "Command results"
-msgstr ""
+msgstr "Resultados da orde"
#: lib/channel.php:229 lib/mailhandler.php:142
msgid "Command complete"
-msgstr ""
+msgstr "Completouse a orde"
#: lib/channel.php:240
msgid "Command failed"
-msgstr ""
+msgstr "A orde fallou"
#: lib/command.php:83 lib/command.php:105
msgid "Notice with that id does not exist"
-msgstr ""
+msgstr "Non hai ningunha nota con esa id"
#: lib/command.php:99 lib/command.php:596
msgid "User has no last notice"
-msgstr ""
+msgstr "O usuario non ten ningunha última nota"
#. 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:127
#, php-format
msgid "Could not find a user with nickname %s"
-msgstr ""
+msgstr "Non se deu atopado ningún usuario co alcume %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:147
#, php-format
msgid "Could not find a local user with nickname %s"
-msgstr ""
+msgstr "Non se deu atopado ningún usuario local co alcume %s"
#: lib/command.php:180
msgid "Sorry, this command is not yet implemented."
-msgstr ""
+msgstr "Esta orde aínda non está integrada."
#: lib/command.php:225
msgid "It does not make a lot of sense to nudge yourself!"
-msgstr ""
+msgstr "Non ten sentido ningún facerse un aceno a un mesmo!"
#. TRANS: Message given having nudged another user.
#. TRANS: %s is the nickname of the user that was nudged.
#: lib/command.php:234
#, php-format
msgid "Nudge sent to %s"
-msgstr ""
+msgstr "Fíxoselle un aceno a %s"
#: lib/command.php:260
#, php-format
@@ -5434,54 +5540,57 @@ msgid ""
"Subscribers: %2$s\n"
"Notices: %3$s"
msgstr ""
+"Subscricións: %1$s\n"
+"Subscritores: %2$s\n"
+"Notas: %3$s"
#: lib/command.php:302
msgid "Notice marked as fave."
-msgstr ""
+msgstr "Marcouse a nota como favorita."
#: lib/command.php:323
msgid "You are already a member of that group"
-msgstr ""
+msgstr "Xa forma parte dese grupo"
#. 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.
#: lib/command.php:339
-#, fuzzy, php-format
+#, 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."
+msgstr "Non se puido meter ao usuario %1$s no grupo %2$s"
#. 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.
#: lib/command.php:385
-#, fuzzy, php-format
+#, php-format
msgid "Could not remove user %1$s from group %2$s"
-msgstr "O usuario %1$s non se puido eliminar do grupo %2$s."
+msgstr "Non se puido eliminar ao usuario %1$s do grupo %2$s"
#. TRANS: Whois output. %s is the full name of the queried user.
#: lib/command.php:418
#, php-format
msgid "Fullname: %s"
-msgstr ""
+msgstr "Nome completo: %s"
#. TRANS: Whois output. %s is the location of the queried user.
#. TRANS: Profile info line in new-subscriber notification e-mail
#: lib/command.php:422 lib/mail.php:263
#, php-format
msgid "Location: %s"
-msgstr ""
+msgstr "Localidade: %s"
#. TRANS: Whois output. %s is the homepage of the queried user.
#. TRANS: Profile info line in new-subscriber notification e-mail
#: lib/command.php:426 lib/mail.php:266
#, php-format
msgid "Homepage: %s"
-msgstr ""
+msgstr "Sitio web: %s"
#. TRANS: Whois output. %s is the bio information of the queried user.
#: lib/command.php:430
#, php-format
msgid "About: %s"
-msgstr ""
+msgstr "Acerca de: %s"
#: lib/command.php:457
#, php-format
@@ -5489,117 +5598,120 @@ msgid ""
"%s is a remote profile; you can only send direct messages to users on the "
"same server."
msgstr ""
+"%s é un perfil remoto. Só pode enviarlle mensaxes persoais aos usuarios do "
+"mesmo servidor."
#. TRANS: Message given if content is too long.
#. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
#: lib/command.php:472
#, php-format
msgid "Message too long - maximum is %1$d characters, you sent %2$d"
-msgstr ""
+msgstr "A mensaxe é longa de máis. O límite son %1$d caracteres, e enviou %2$d"
#. TRANS: Message given have sent a direct message to another user.
#. TRANS: %s is the name of the other user.
#: lib/command.php:492
#, php-format
msgid "Direct message to %s sent"
-msgstr ""
+msgstr "Envióuselle a mensaxe directa a %s"
#: lib/command.php:494
msgid "Error sending direct message."
-msgstr ""
+msgstr "Houbo un erro ao enviar a mensaxe directa."
#: lib/command.php:514
msgid "Cannot repeat your own notice"
-msgstr ""
+msgstr "Non pode repetir unha nota propia"
#: lib/command.php:519
msgid "Already repeated that notice"
-msgstr ""
+msgstr "Xa repetiu esa nota"
#. 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:529
#, php-format
msgid "Notice from %s repeated"
-msgstr ""
+msgstr "Repetiuse a nota de %s"
#: lib/command.php:531
msgid "Error repeating notice."
-msgstr ""
+msgstr "Houbo un erro ao repetir a nota."
#: lib/command.php:562
#, php-format
msgid "Notice too long - maximum is %d characters, you sent %d"
-msgstr ""
+msgstr "A nota é longa de máis. O límite son %d caracteres, e enviou %d"
#: lib/command.php:571
#, php-format
msgid "Reply to %s sent"
-msgstr ""
+msgstr "Enviouse a resposta a %s"
#: lib/command.php:573
msgid "Error saving notice."
-msgstr ""
+msgstr "Houbo un erro ao gardar a nota."
#: lib/command.php:620
msgid "Specify the name of the user to subscribe to"
-msgstr ""
+msgstr "Introduza o nome do usuario ao que quere subscribirse"
#: lib/command.php:628
msgid "Can't subscribe to OMB profiles by command."
-msgstr ""
+msgstr "Non se pode subscribir aos perfís OMB cunha orde."
#: lib/command.php:634
#, php-format
msgid "Subscribed to %s"
-msgstr ""
+msgstr "Subscribiuse a %s"
#: lib/command.php:655 lib/command.php:754
msgid "Specify the name of the user to unsubscribe from"
-msgstr ""
+msgstr "Introduza o nome do usuario ao que quer deixar de estar subscrito"
#: lib/command.php:664
#, php-format
msgid "Unsubscribed from %s"
-msgstr ""
+msgstr "Cancelar a subscrición a %s"
#: lib/command.php:682 lib/command.php:705
msgid "Command not yet implemented."
-msgstr ""
+msgstr "Aínda non se integrou esa orde."
#: lib/command.php:685
msgid "Notification off."
-msgstr ""
+msgstr "Desactivar a notificación."
#: lib/command.php:687
msgid "Can't turn off notification."
-msgstr ""
+msgstr "Non se pode desactivar a notificación."
#: lib/command.php:708
msgid "Notification on."
-msgstr ""
+msgstr "Activar a notificación."
#: lib/command.php:710
msgid "Can't turn on notification."
-msgstr ""
+msgstr "Non se pode activar a notificación."
#: lib/command.php:723
msgid "Login command is disabled"
-msgstr ""
+msgstr "A orde de identificación está desactivada"
#: lib/command.php:734
#, php-format
msgid "This link is useable only once, and is good for only 2 minutes: %s"
msgstr ""
+"Esta ligazón só se pode utilizar unha vez, e só nos próximos dous minutos: %s"
#: lib/command.php:761
#, php-format
msgid "Unsubscribed %s"
-msgstr ""
+msgstr "Cancelou a subscrición a %s"
#: lib/command.php:778
msgid "You are not subscribed to anyone."
-msgstr ""
+msgstr "Non está subscrito a ninguén."
#: lib/command.php:780
msgid "You are subscribed to this person:"
@@ -5609,7 +5721,7 @@ msgstr[1] "Vostede está subscrito a estas persoas:"
#: lib/command.php:800
msgid "No one is subscribed to you."
-msgstr ""
+msgstr "Non hai ninguén subscrito a vostede."
#: lib/command.php:802
msgid "This person is subscribed to you:"
@@ -5619,7 +5731,7 @@ msgstr[1] "Estas persoas están subscritas a vostede:"
#: lib/command.php:822
msgid "You are not a member of any groups."
-msgstr ""
+msgstr "Non forma parte de ningún grupo."
#: lib/command.php:824
msgid "You are a member of this group:"
@@ -5668,26 +5780,64 @@ msgid ""
"tracks - not yet implemented.\n"
"tracking - not yet implemented.\n"
msgstr ""
+"Ordes:\n"
+"on - activa as notificacións\n"
+"off - desactiva as notificacións\n"
+"help - amosa esta axuda\n"
+"follow <alcume> - subscribirse ao usuario\n"
+"groups - lista os grupos nos que está\n"
+"subscriptions - lista a xente á que segue\n"
+"subscribers - lista a xente que o segue\n"
+"leave <alcume> - cancela a subscrición ao usuario\n"
+"d <alcume> <texto> - mensaxe directa a un usuario\n"
+"get <alcume> - obter a última nota do usuario\n"
+"whois <alcume> - obtén a información do perfil do usuario\n"
+"lose <alcume> - facer que o usuario deixe de seguilo\n"
+"fav <alcume> - marcar como “favorita†a última nota do usuario\n"
+"fav #<id da nota> - marcar como “favorita†a nota coa id indicada\n"
+"repeat #<id da nota> - repetir a nota doa id indicada\n"
+"repeat <alcume> - repetir a última nota do usuario\n"
+"reply #<id da nota> - responder a unha nota coa id indicada\n"
+"reply <alcume> - responder á última nota do usuario\n"
+"join <grupo> - unirse ao grupo indicado\n"
+"login - obter un enderezo para identificarse na interface web\n"
+"drop <grupo> - deixar o grupo indicado\n"
+"stats - obter as súas estatísticas\n"
+"stop - idéntico a “offâ€\n"
+"quit - idéntico a “offâ€\n"
+"sub <alcume> - idéntico a “followâ€\n"
+"unsub <alcume> - idéntico a “leaveâ€\n"
+"last <alcume> - idéntico a “getâ€\n"
+"on <alcume> - aínda non se integrou\n"
+"off <alcume> - aínda non se integrou\n"
+"nudge <alcume> - facerlle un aceno ao usuario indicado\n"
+"invite <número de teléfono> - aínda non se integrou\n"
+"track <palabra> - aínda non se integrou\n"
+"untrack <palabra> - aínda non se integrou\n"
+"track off - aínda non se integrou\n"
+"untrack all - aínda non se integrou\n"
+"tracks - aínda non se integrou\n"
+"tracking - aínda non se integrou\n"
#: lib/common.php:135
msgid "No configuration file found. "
-msgstr ""
+msgstr "Non se atopou ningún ficheiro de configuración. "
#: lib/common.php:136
msgid "I looked for configuration files in the following places: "
-msgstr ""
+msgstr "Buscáronse ficheiros de configuración nos seguintes lugares: "
#: lib/common.php:138
msgid "You may wish to run the installer to fix this."
-msgstr ""
+msgstr "Pode que queira executar o instalador para arranxalo."
#: lib/common.php:139
msgid "Go to the installer."
-msgstr ""
+msgstr "Ir ao instalador."
#: lib/connectsettingsaction.php:110
msgid "IM"
-msgstr ""
+msgstr "MI"
#: lib/connectsettingsaction.php:111
msgid "Updates by instant messenger (IM)"
@@ -5695,76 +5845,78 @@ msgstr ""
#: lib/connectsettingsaction.php:116
msgid "Updates by SMS"
-msgstr ""
+msgstr "Actualizacións por SMS"
#: lib/connectsettingsaction.php:120
msgid "Connections"
-msgstr ""
+msgstr "Conexións"
#: lib/connectsettingsaction.php:121
msgid "Authorized connected applications"
-msgstr ""
+msgstr "Aplicacións conectadas autorizadas"
#: lib/dberroraction.php:60
msgid "Database error"
-msgstr ""
+msgstr "Houbo un erro na base de datos"
#: lib/designsettings.php:105
msgid "Upload file"
-msgstr ""
+msgstr "Cargar un ficheiro"
#: lib/designsettings.php:109
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 "
+"2 MiB."
#: lib/designsettings.php:418
msgid "Design defaults restored."
-msgstr ""
+msgstr "Restableceuse o deseño por defecto."
#: lib/disfavorform.php:114 lib/disfavorform.php:140
msgid "Disfavor this notice"
-msgstr ""
+msgstr "Desmarcar esta nota como favorita"
#: lib/favorform.php:114 lib/favorform.php:140
msgid "Favor this notice"
-msgstr ""
+msgstr "Marcar esta nota como favorita"
#: lib/favorform.php:140
msgid "Favor"
-msgstr ""
+msgstr "Marcar como favorito"
#: lib/feed.php:85
msgid "RSS 1.0"
-msgstr ""
+msgstr "RSS 1.0"
#: lib/feed.php:87
msgid "RSS 2.0"
-msgstr ""
+msgstr "RSS 2.0"
#: lib/feed.php:89
msgid "Atom"
-msgstr ""
+msgstr "Atom"
#: lib/feed.php:91
msgid "FOAF"
-msgstr ""
+msgstr "FOAF"
#: lib/feedlist.php:64
msgid "Export data"
-msgstr ""
+msgstr "Exportar os datos"
#: lib/galleryaction.php:121
msgid "Filter tags"
-msgstr ""
+msgstr "Filtrar etiquetas"
#: lib/galleryaction.php:131
msgid "All"
-msgstr ""
+msgstr "Todas"
#: lib/galleryaction.php:139
msgid "Select tag to filter"
-msgstr ""
+msgstr "Escolla unha etiqueta a filtrar"
#: lib/galleryaction.php:140
msgid "Tag"
@@ -5772,157 +5924,161 @@ msgstr "Etiqueta"
#: lib/galleryaction.php:141
msgid "Choose a tag to narrow list"
-msgstr ""
+msgstr "Escolla unha etiqueta para reducir a lista"
#: lib/galleryaction.php:143
msgid "Go"
-msgstr ""
+msgstr "Continuar"
#: lib/grantroleform.php:91
#, php-format
msgid "Grant this user the \"%s\" role"
-msgstr ""
+msgstr "Atribuírlle a este usuario o rol «%s»"
#: lib/groupeditform.php:163
msgid "URL of the homepage or blog of the group or topic"
-msgstr ""
+msgstr "URL do sitio web persoal ou blogue do grupo ou tema"
#: lib/groupeditform.php:168
msgid "Describe the group or topic"
-msgstr ""
+msgstr "Describa o grupo ou o tema"
#: lib/groupeditform.php:170
#, php-format
msgid "Describe the group or topic in %d characters"
-msgstr ""
+msgstr "Describa o grupo ou o tema en %d caracteres"
#: lib/groupeditform.php:179
msgid ""
"Location for the group, if any, like \"City, State (or Region), Country\""
msgstr ""
+"Localidade do grupo, e a ten, como por exemplo «Cidade, Provincia, "
+"Comunidade, País»."
#: lib/groupeditform.php:187
#, php-format
msgid "Extra nicknames for the group, comma- or space- separated, max %d"
msgstr ""
+"Alcumes adicionais para o grupo, separados por comas ou espazos, %d como "
+"máximo"
#: lib/groupnav.php:85
msgid "Group"
-msgstr ""
+msgstr "Grupo"
#: lib/groupnav.php:101
msgid "Blocked"
-msgstr ""
+msgstr "Bloqueado"
#: lib/groupnav.php:102
#, php-format
msgid "%s blocked users"
-msgstr ""
+msgstr "%s usuarios bloqueados"
#: lib/groupnav.php:108
#, php-format
msgid "Edit %s group properties"
-msgstr ""
+msgstr "Modificar as propiedades do grupo %s"
#: lib/groupnav.php:113
msgid "Logo"
-msgstr ""
+msgstr "Logotipo"
#: lib/groupnav.php:114
#, php-format
msgid "Add or edit %s logo"
-msgstr ""
+msgstr "Engadir ou modificar o logotipo de %s"
#: lib/groupnav.php:120
#, php-format
msgid "Add or edit %s design"
-msgstr ""
+msgstr "Engadir ou modificar o deseño de %s"
#: lib/groupsbymemberssection.php:71
msgid "Groups with most members"
-msgstr ""
+msgstr "Grupos con máis membros"
#: lib/groupsbypostssection.php:71
msgid "Groups with most posts"
-msgstr ""
+msgstr "Grupos con máis notas"
#: lib/grouptagcloudsection.php:56
#, php-format
msgid "Tags in %s group's notices"
-msgstr ""
+msgstr "Etiquetas nas notas do grupo %s"
#. TRANS: Client exception 406
#: lib/htmloutputter.php:104
msgid "This page is not available in a media type you accept"
-msgstr ""
+msgstr "Esta páxina non está dispoñible nun formato axeitado para vostede"
#: lib/imagefile.php:72
msgid "Unsupported image file format."
-msgstr ""
+msgstr "Non se soporta o formato da imaxe."
#: lib/imagefile.php:88
#, php-format
msgid "That file is too big. The maximum file size is %s."
-msgstr ""
+msgstr "Ese ficheiro é grande de máis. O tamaño máximo por ficheiro son %s."
#: lib/imagefile.php:93
msgid "Partial upload."
-msgstr ""
+msgstr "Carga parcial."
#: lib/imagefile.php:101 lib/mediafile.php:170
msgid "System error uploading file."
-msgstr ""
+msgstr "Houbo un erro no sistema ao cargar o ficheiro."
#: lib/imagefile.php:109
msgid "Not an image or corrupt file."
-msgstr ""
+msgstr "O ficheiro está mal ou non é unha imaxe."
#: lib/imagefile.php:122
msgid "Lost our file."
-msgstr ""
+msgstr "Perdeuse o noso ficheiro."
#: lib/imagefile.php:163 lib/imagefile.php:224
msgid "Unknown file type"
-msgstr ""
+msgstr "Non se coñece o tipo de ficheiro"
#: lib/imagefile.php:244
msgid "MB"
-msgstr ""
+msgstr "MiB"
#: lib/imagefile.php:246
msgid "kB"
-msgstr ""
+msgstr "KiB"
#: lib/jabber.php:387
#, php-format
msgid "[%s]"
-msgstr ""
+msgstr "[%s]"
#: lib/jabber.php:567
#, php-format
msgid "Unknown inbox source %d."
-msgstr ""
+msgstr "Non se coñece a fonte %d da caixa de entrada."
#: lib/joinform.php:114
msgid "Join"
-msgstr ""
+msgstr "Unirse"
#: lib/leaveform.php:114
msgid "Leave"
-msgstr ""
+msgstr "Deixar"
#: lib/logingroupnav.php:80
msgid "Login with a username and password"
-msgstr ""
+msgstr "Identificarse cun nome de usuario e contrasinal"
#: lib/logingroupnav.php:86
msgid "Sign up for a new account"
-msgstr ""
+msgstr "Rexistrar unha conta nova"
#. TRANS: Subject for address confirmation email
#: lib/mail.php:174
msgid "Email address confirmation"
-msgstr ""
+msgstr "Confirmación do enderezo de correo electrónico"
#. TRANS: Body for address confirmation email.
#: lib/mail.php:177
@@ -5941,12 +6097,24 @@ msgid ""
"Thanks for your time, \n"
"%s\n"
msgstr ""
+"Ola, %s:\n"
+"\n"
+"Alguén acaba de introducir este enderezo de correo electrónico en %s.\n"
+"\n"
+"Se foi vostede, e quere confirmalo, utilice o seguinte URL:\n"
+"\n"
+"%s\n"
+"\n"
+"En caso contrario, simplemente ignore esta mensaxe.\n"
+"\n"
+"Grazas polo seu tempo, \n"
+"%s\n"
#. TRANS: Subject of new-subscriber notification e-mail
#: lib/mail.php:243
#, php-format
msgid "%1$s is now listening to your notices on %2$s."
-msgstr ""
+msgstr "Agora %1$s segue as súas notas en %2$s."
#. TRANS: Main body of new-subscriber notification e-mail
#: lib/mail.php:249
@@ -5963,18 +6131,29 @@ msgid ""
"----\n"
"Change your email address or notification options at %8$s\n"
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"
+"\n"
+"----\n"
+"Modifique o seu enderezo de correo electrónico ou as súas preferencias de "
+"notificación en %8$s\n"
#. TRANS: Profile info line in new-subscriber notification e-mail
#: lib/mail.php:269
#, php-format
msgid "Bio: %s"
-msgstr ""
+msgstr "Biografía: %s"
#. TRANS: Subject of notification mail for new posting email address
#: lib/mail.php:298
#, php-format
msgid "New email address for posting to %s"
-msgstr ""
+msgstr "Novo enderezo de correo electrónico para publicar en %s"
#. TRANS: Body of notification mail for new posting email address
#: lib/mail.php:302
@@ -5989,29 +6168,38 @@ msgid ""
"Faithfully yours,\n"
"%4$s"
msgstr ""
+"Ten un novo enderezo de correo electrónico para publicar en %1$s.\n"
+"\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"
#. TRANS: Subject line for SMS-by-email notification messages
#: lib/mail.php:427
#, php-format
msgid "%s status"
-msgstr ""
+msgstr "Estado de %s"
#. TRANS: Subject line for SMS-by-email address confirmation message
#: lib/mail.php:454
msgid "SMS confirmation"
-msgstr ""
+msgstr "Confirmación dos SMS"
#. TRANS: Main body heading for SMS-by-email address confirmation message
#: lib/mail.php:457
#, php-format
msgid "%s: confirm you own this phone number with this code:"
msgstr ""
+"%s: utilice o seguinte código para confirmar que o número de teléfono é seu:"
#. TRANS: Subject for 'nudge' notification email
#: lib/mail.php:478
#, php-format
msgid "You've been nudged by %s"
-msgstr ""
+msgstr "%s fíxolle un aceno"
#. TRANS: Body for 'nudge' notification email
#: lib/mail.php:483
@@ -6029,12 +6217,23 @@ msgid ""
"With kind regards,\n"
"%4$s\n"
msgstr ""
+"%1$s (%2$s) pregúntase que estivo a facer vostede estes días, e convídao a "
+"publicar algunha nova.\n"
+"\n"
+"Así que anímese, conte algo :)\n"
+"\n"
+"%3$s\n"
+"\n"
+"Non responda a esta mensaxe, non lle chegará ao remitente.\n"
+"\n"
+"Atentamente,\n"
+"%4$s\n"
#. TRANS: Subject for direct-message notification email
#: lib/mail.php:530
#, php-format
msgid "New private message from %s"
-msgstr ""
+msgstr "Nova mensaxe privada de %s"
#. TRANS: Body for direct-message notification email
#: lib/mail.php:535
@@ -6055,12 +6254,26 @@ msgid ""
"With kind regards,\n"
"%5$s\n"
msgstr ""
+"%1$s (%2$s) envioulle unha mensaxe privada:\n"
+"\n"
+"------------------------------------------------------\n"
+"%3$s\n"
+"------------------------------------------------------\n"
+"\n"
+"Pode responder á mensaxe aquí:\n"
+"\n"
+"%4$s\n"
+"\n"
+"Non responda a este correo, non lle chegará ao remitente.\n"
+"\n"
+"Atentamente,\n"
+"%5$s\n"
#. TRANS: Subject for favorite notification email
#: lib/mail.php:583
#, php-format
msgid "%s (@%s) added your notice as a favorite"
-msgstr ""
+msgstr "%s (@%s) marcou a súa nota como favorita"
#. TRANS: Body for favorite notification email
#: lib/mail.php:586
@@ -6083,6 +6296,23 @@ msgid ""
"Faithfully yours,\n"
"%6$s\n"
msgstr ""
+"%1$s (@%7$s) acaba de marcar a súa nota en %2$s coma unha das súas "
+"favoritas.\n"
+"\n"
+"O URL da súa nota é:\n"
+"\n"
+"%3$s\n"
+"\n"
+"O texto da nota di:\n"
+"\n"
+"%4$s\n"
+"\n"
+"Pode ver a lista das notas favoritas de %1$s en:\n"
+"\n"
+"%5$s\n"
+"\n"
+"Atentamente,\n"
+"%6$s\n"
#. TRANS: Line in @-reply notification e-mail. %s is conversation URL.
#: lib/mail.php:645
@@ -6092,11 +6322,14 @@ msgid ""
"\n"
"\t%s"
msgstr ""
+"Pode ler a conversación completa en:\n"
+"\n"
+"%s"
#: lib/mail.php:651
#, php-format
msgid "%s (@%s) sent a notice to your attention"
-msgstr ""
+msgstr "%s (@%s) enviou unha nota á súa atención"
#. TRANS: Body of @-reply notification e-mail.
#: lib/mail.php:654
@@ -6125,210 +6358,240 @@ msgid ""
"\n"
"P.S. You can turn off these email notifications here: %8$s\n"
msgstr ""
+"%1$s (@%9$s) acaba de enviar unha nota á súa atención (un “respost@â€) en %2"
+"$s.\n"
+"\n"
+"A nota está en:\n"
+"\n"
+"%3$s\n"
+"\n"
+"Di:\n"
+"\n"
+"%4$s\n"
+"\n"
+"%5$sPode responder en:\n"
+"\n"
+"%6$s\n"
+"\n"
+"A lista de todas as notas á súa @tención 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"
#: lib/mailbox.php:89
msgid "Only the user can read their own mailboxes."
-msgstr ""
+msgstr "Só o usuario pode ler as súas caixas de entrada."
#: lib/mailbox.php:139
msgid ""
"You have no private messages. You can send private message to engage other "
"users in conversation. People can send you messages for your eyes only."
msgstr ""
+"Non ten mensaxes privadas. Pode enviar mensaxes privadas para conversar con "
+"outros usuarios. A xente pode enviarlle mensaxes para que só as lea vostede."
#: lib/mailbox.php:227 lib/noticelist.php:494
msgid "from"
-msgstr ""
+msgstr "de"
#: lib/mailhandler.php:37
msgid "Could not parse message."
-msgstr ""
+msgstr "Non se puido analizar a mensaxe."
#: lib/mailhandler.php:42
msgid "Not a registered user."
-msgstr ""
+msgstr "Non está rexistrado."
#: lib/mailhandler.php:46
msgid "Sorry, that is not your incoming email address."
-msgstr ""
+msgstr "Ese non é o seu enderezo de correo electrónico para recibir correos."
#: lib/mailhandler.php:50
msgid "Sorry, no incoming email allowed."
-msgstr ""
+msgstr "Non se permite recibir correo electrónico."
#: lib/mailhandler.php:228
#, php-format
msgid "Unsupported message type: %s"
-msgstr ""
+msgstr "Non se soporta o tipo de mensaxe %s"
#: lib/mediafile.php:98 lib/mediafile.php:123
msgid "There was a database error while saving your file. Please try again."
msgstr ""
+"Houbo un erro na base de datos ao gardar o seu ficheiro. Volva intentalo."
#: lib/mediafile.php:142
msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini."
-msgstr ""
+msgstr "O ficheiro subido supera a directiva upload_max_filesize no php.ini."
#: lib/mediafile.php:147
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."
#: lib/mediafile.php:152
msgid "The uploaded file was only partially uploaded."
-msgstr ""
+msgstr "O ficheiro só se subiu parcialmente."
#: lib/mediafile.php:159
msgid "Missing a temporary folder."
-msgstr ""
+msgstr "Falta un cartafol temporal."
#: lib/mediafile.php:162
msgid "Failed to write file to disk."
-msgstr ""
+msgstr "Non se puido escribir o ficheiro en disco."
#: lib/mediafile.php:165
msgid "File upload stopped by extension."
-msgstr ""
+msgstr "Interrompeuse a carga do ficheiro por mor da extensión."
#: lib/mediafile.php:179 lib/mediafile.php:216
msgid "File exceeds user's quota."
-msgstr ""
+msgstr "O ficheiro supera a cota do usuario."
#: lib/mediafile.php:196 lib/mediafile.php:233
msgid "File could not be moved to destination directory."
-msgstr ""
+msgstr "Non se puido mover o ficheiro ao directorio de destino."
#: lib/mediafile.php:201 lib/mediafile.php:237
msgid "Could not determine file's MIME type."
-msgstr ""
+msgstr "Non se puido determinar o tipo MIME do ficheiro."
#: lib/mediafile.php:270
#, php-format
msgid " Try using another %s format."
-msgstr ""
+msgstr "Inténteo utilizando outro formato %s."
#: lib/mediafile.php:275
#, php-format
msgid "%s is not a supported file type on this server."
-msgstr ""
+msgstr "Neste servidor non se soporta o tipo de ficheiro %s."
#: lib/messageform.php:120
msgid "Send a direct notice"
-msgstr ""
+msgstr "Enviar unha nota directa"
#: lib/messageform.php:146
msgid "To"
-msgstr ""
+msgstr "a"
#: lib/messageform.php:159 lib/noticeform.php:185
msgid "Available characters"
-msgstr ""
+msgstr "Caracteres dispoñibles"
#: lib/messageform.php:178 lib/noticeform.php:236
msgctxt "Send button for sending notice"
msgid "Send"
-msgstr ""
+msgstr "Enviar"
#: lib/noticeform.php:160
msgid "Send a notice"
-msgstr ""
+msgstr "Enviar unha nota"
#: lib/noticeform.php:173
#, php-format
msgid "What's up, %s?"
-msgstr ""
+msgstr "Que hai de novo, %s?"
#: lib/noticeform.php:192
msgid "Attach"
-msgstr ""
+msgstr "Anexar"
#: lib/noticeform.php:196
msgid "Attach a file"
-msgstr ""
+msgstr "Anexar un ficheiro"
#: lib/noticeform.php:212
msgid "Share my location"
-msgstr ""
+msgstr "Publicar a miña localidade"
#: lib/noticeform.php:215
msgid "Do not share my location"
-msgstr ""
+msgstr "Non publicar a miña localidade"
#: lib/noticeform.php:216
msgid ""
"Sorry, retrieving your geo location is taking longer than expected, please "
"try again later"
msgstr ""
+"Estase tardando máis do esperado en obter a súa xeolocalización, vólvao "
+"intentar máis tarde."
#. TRANS: Used in coordinates as abbreviation of north
#: lib/noticelist.php:430
msgid "N"
-msgstr ""
+msgstr "N"
#. TRANS: Used in coordinates as abbreviation of south
#: lib/noticelist.php:432
msgid "S"
-msgstr ""
+msgstr "S"
#. TRANS: Used in coordinates as abbreviation of east
#: lib/noticelist.php:434
msgid "E"
-msgstr ""
+msgstr "L"
#. TRANS: Used in coordinates as abbreviation of west
#: lib/noticelist.php:436
msgid "W"
-msgstr ""
+msgstr "O"
#: lib/noticelist.php:438
#, 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 \"s% 4% 5 $ u $ ½% 6 $ u' 7% $ u\" 8% $ s"
#: lib/noticelist.php:447
msgid "at"
-msgstr ""
+msgstr "en"
#: lib/noticelist.php:567
msgid "in context"
-msgstr ""
+msgstr "no contexto"
#: lib/noticelist.php:602
msgid "Repeated by"
-msgstr ""
+msgstr "Repetida por"
#: lib/noticelist.php:629
msgid "Reply to this notice"
-msgstr ""
+msgstr "Responder a esta nota"
#: lib/noticelist.php:630
msgid "Reply"
-msgstr ""
+msgstr "Responder"
#: lib/noticelist.php:674
msgid "Notice repeated"
-msgstr ""
+msgstr "Repetiuse a nota"
#: lib/nudgeform.php:116
msgid "Nudge this user"
-msgstr ""
+msgstr "Facerlle un aceno a este usuario"
#: lib/nudgeform.php:128
msgid "Nudge"
-msgstr ""
+msgstr "Facer un aceno"
#: lib/nudgeform.php:128
msgid "Send a nudge to this user"
-msgstr ""
+msgstr "Facerlle un aceno a este usuario"
#: lib/oauthstore.php:283
msgid "Error inserting new profile"
-msgstr ""
+msgstr "Houbo un erro ao inserir o novo perfil"
#: lib/oauthstore.php:291
msgid "Error inserting avatar"
-msgstr ""
+msgstr "Houbo un erro ao inserir o avatar"
#: lib/oauthstore.php:306
msgid "Error updating remote profile"
@@ -6336,117 +6599,117 @@ msgstr "Houbo un erro ao actualizar o perfil remoto"
#: lib/oauthstore.php:311
msgid "Error inserting remote profile"
-msgstr ""
+msgstr "Houbo un erro ao inserir o perfil remoto"
#: lib/oauthstore.php:345
msgid "Duplicate notice"
-msgstr ""
+msgstr "Nota duplicada"
#: lib/oauthstore.php:490
msgid "Couldn't insert new subscription."
-msgstr ""
+msgstr "Non se puido inserir unha subscrición nova."
#: lib/personalgroupnav.php:99
msgid "Personal"
-msgstr ""
+msgstr "Persoal"
#: lib/personalgroupnav.php:104
msgid "Replies"
-msgstr ""
+msgstr "Respostas"
#: lib/personalgroupnav.php:114
msgid "Favorites"
-msgstr ""
+msgstr "Favoritas"
#: lib/personalgroupnav.php:125
msgid "Inbox"
-msgstr ""
+msgstr "Caixa de entrada"
#: lib/personalgroupnav.php:126
msgid "Your incoming messages"
-msgstr ""
+msgstr "As mensaxes recibidas"
#: lib/personalgroupnav.php:130
msgid "Outbox"
-msgstr ""
+msgstr "Caixa de saída"
#: lib/personalgroupnav.php:131
msgid "Your sent messages"
-msgstr ""
+msgstr "As mensaxes enviadas"
#: lib/personaltagcloudsection.php:56
#, php-format
msgid "Tags in %s's notices"
-msgstr ""
+msgstr "Etiquetas nas notas de %s"
#: lib/plugin.php:114
msgid "Unknown"
-msgstr ""
+msgstr "Descoñecida"
#: lib/profileaction.php:109 lib/profileaction.php:205 lib/subgroupnav.php:82
msgid "Subscriptions"
-msgstr ""
+msgstr "Subscricións"
#: lib/profileaction.php:126
msgid "All subscriptions"
-msgstr ""
+msgstr "Todas as subscricións"
#: lib/profileaction.php:144 lib/profileaction.php:214 lib/subgroupnav.php:90
msgid "Subscribers"
-msgstr ""
+msgstr "Subscritores"
#: lib/profileaction.php:161
msgid "All subscribers"
-msgstr ""
+msgstr "Todos os subscritores"
#: lib/profileaction.php:191
msgid "User ID"
-msgstr ""
+msgstr "ID do usuario"
#: lib/profileaction.php:196
msgid "Member since"
-msgstr ""
+msgstr "Membro dende"
#. TRANS: Average count of posts made per day since account registration
#: lib/profileaction.php:235
msgid "Daily average"
-msgstr ""
+msgstr "Media diaria"
#: lib/profileaction.php:264
msgid "All groups"
-msgstr ""
+msgstr "Todos os grupos"
#: lib/profileformaction.php:114
msgid "Unimplemented method."
-msgstr ""
+msgstr "Aínda non se implantou o método."
#: lib/publicgroupnav.php:78
msgid "Public"
-msgstr ""
+msgstr "Públicas"
#: lib/publicgroupnav.php:82
msgid "User groups"
-msgstr ""
+msgstr "Grupos do usuario"
#: lib/publicgroupnav.php:84 lib/publicgroupnav.php:85
msgid "Recent tags"
-msgstr ""
+msgstr "Últimas etiquetas"
#: lib/publicgroupnav.php:88
msgid "Featured"
-msgstr ""
+msgstr "Salientadas"
#: lib/publicgroupnav.php:92
msgid "Popular"
-msgstr ""
+msgstr "Populares"
#: lib/redirectingaction.php:94
msgid "No return-to arguments."
-msgstr ""
+msgstr "Sen argumentos “return-toâ€."
#: lib/repeatform.php:107
msgid "Repeat this notice?"
-msgstr ""
+msgstr "Quere repetir esta nova?"
#: lib/repeatform.php:132
msgid "Yes"
@@ -6454,255 +6717,256 @@ msgstr "Si"
#: lib/repeatform.php:132
msgid "Repeat this notice"
-msgstr ""
+msgstr "Repetir esta nova"
#: lib/revokeroleform.php:91
#, php-format
msgid "Revoke the \"%s\" role from this user"
-msgstr ""
+msgstr "Revogarlle o rol “%s†a este usuario"
#: lib/router.php:704
msgid "No single user defined for single-user mode."
-msgstr ""
+msgstr "Non se estableceu ningún usuario único para o modo de usuario único."
#: lib/sandboxform.php:67
msgid "Sandbox"
-msgstr ""
+msgstr "Illar"
#: lib/sandboxform.php:78
msgid "Sandbox this user"
-msgstr ""
+msgstr "Illar a este usuario"
#: lib/searchaction.php:120
msgid "Search site"
-msgstr ""
+msgstr "Buscar no sitio"
#: lib/searchaction.php:126
msgid "Keyword(s)"
-msgstr ""
+msgstr "Termos de busca"
#: lib/searchaction.php:127
msgid "Search"
-msgstr ""
+msgstr "Buscar"
#: lib/searchaction.php:162
msgid "Search help"
-msgstr ""
+msgstr "Buscar na axuda"
#: lib/searchgroupnav.php:80
msgid "People"
-msgstr ""
+msgstr "Xente"
#: lib/searchgroupnav.php:81
msgid "Find people on this site"
-msgstr ""
+msgstr "Atopar xente neste sitio"
#: lib/searchgroupnav.php:83
msgid "Find content of notices"
-msgstr ""
+msgstr "Buscar nos contidos das notas"
#: lib/searchgroupnav.php:85
msgid "Find groups on this site"
-msgstr ""
+msgstr "Buscar grupos neste sitio"
#: lib/section.php:89
msgid "Untitled section"
-msgstr ""
+msgstr "Sección sen título"
#: lib/section.php:106
msgid "More..."
-msgstr ""
+msgstr "Máis..."
#: lib/silenceform.php:67
msgid "Silence"
-msgstr ""
+msgstr "Silenciar"
#: lib/silenceform.php:78
msgid "Silence this user"
-msgstr ""
+msgstr "Silenciar a este usuario"
#: lib/subgroupnav.php:83
#, php-format
msgid "People %s subscribes to"
-msgstr ""
+msgstr "Persoas ás que está subscrito %s"
#: lib/subgroupnav.php:91
#, php-format
msgid "People subscribed to %s"
-msgstr ""
+msgstr "Persoas subscritas a %s"
#: lib/subgroupnav.php:99
#, php-format
msgid "Groups %s is a member of"
-msgstr ""
+msgstr "Grupos aos que pertence %s"
#: lib/subgroupnav.php:105
msgid "Invite"
-msgstr ""
+msgstr "Convidar"
#: lib/subgroupnav.php:106
#, php-format
msgid "Invite friends and colleagues to join you on %s"
-msgstr ""
+msgstr "Convida a amigos e compañeiros a unírseche en %s"
#: lib/subscriberspeopleselftagcloudsection.php:48
#: lib/subscriptionspeopleselftagcloudsection.php:48
msgid "People Tagcloud as self-tagged"
-msgstr ""
+msgstr "Nube de etiquetas que as persoas se puxeron a si mesmas"
#: lib/subscriberspeopletagcloudsection.php:48
#: lib/subscriptionspeopletagcloudsection.php:48
msgid "People Tagcloud as tagged"
-msgstr ""
+msgstr "Nube de etiquetas que lle puxo a outras persoas"
#: lib/tagcloudsection.php:56
msgid "None"
-msgstr ""
+msgstr "Ningún"
#: lib/topposterssection.php:74
msgid "Top posters"
-msgstr ""
+msgstr "Os que máis publican"
#: lib/unsandboxform.php:69
msgid "Unsandbox"
-msgstr ""
+msgstr "Deixar de illar"
#: lib/unsandboxform.php:80
msgid "Unsandbox this user"
-msgstr ""
+msgstr "Deixar de illar a este usuario"
#: lib/unsilenceform.php:67
msgid "Unsilence"
-msgstr ""
+msgstr "Dar voz"
#: lib/unsilenceform.php:78
msgid "Unsilence this user"
-msgstr ""
+msgstr "Darlle voz a este usuario"
#: lib/unsubscribeform.php:113 lib/unsubscribeform.php:137
msgid "Unsubscribe from this user"
-msgstr ""
+msgstr "Cancelar a subscrición a este usuario"
#: lib/unsubscribeform.php:137
msgid "Unsubscribe"
-msgstr ""
+msgstr "Cancelar a subscrición"
#: lib/usernoprofileexception.php:58
#, php-format
msgid "User %s (%d) has no profile record."
-msgstr ""
+msgstr "O usuario %s (%d) non ten perfil."
#: lib/userprofile.php:117
msgid "Edit Avatar"
-msgstr ""
+msgstr "Modificar o avatar"
#: lib/userprofile.php:234 lib/userprofile.php:248
msgid "User actions"
-msgstr ""
+msgstr "Accións do usuario"
#: lib/userprofile.php:237
msgid "User deletion in progress..."
-msgstr ""
+msgstr "Procedendo a borrar o usuario..."
#: lib/userprofile.php:263
msgid "Edit profile settings"
-msgstr ""
+msgstr "Modificar a configuración do perfil"
#: lib/userprofile.php:264
msgid "Edit"
-msgstr ""
+msgstr "Modificar"
#: lib/userprofile.php:287
msgid "Send a direct message to this user"
-msgstr ""
+msgstr "Enviarlle unha mensaxe directa a este usuario"
#: lib/userprofile.php:288
msgid "Message"
-msgstr ""
+msgstr "Mensaxe"
#: lib/userprofile.php:326
msgid "Moderate"
-msgstr ""
+msgstr "Moderar"
#: lib/userprofile.php:364
msgid "User role"
-msgstr ""
+msgstr "Rol do usuario"
#: lib/userprofile.php:366
msgctxt "role"
msgid "Administrator"
-msgstr ""
+msgstr "Administrador"
#: lib/userprofile.php:367
msgctxt "role"
msgid "Moderator"
-msgstr ""
+msgstr "Moderador"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1054
+#: lib/util.php:1083
msgid "a few seconds ago"
-msgstr ""
+msgstr "hai uns segundos"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1057
+#: lib/util.php:1086
msgid "about a minute ago"
-msgstr ""
+msgstr "hai como un minuto"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1061
+#: lib/util.php:1090
#, php-format
msgid "about %d minutes ago"
-msgstr ""
+msgstr "hai como %d minutos"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1064
+#: lib/util.php:1093
msgid "about an hour ago"
-msgstr ""
+msgstr "hai como unha hora"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1068
+#: lib/util.php:1097
#, php-format
msgid "about %d hours ago"
-msgstr ""
+msgstr "hai como %d horas"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1071
+#: lib/util.php:1100
msgid "about a day ago"
-msgstr ""
+msgstr "hai como un día"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1075
+#: lib/util.php:1104
#, php-format
msgid "about %d days ago"
-msgstr ""
+msgstr "hai como %d días"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1078
+#: lib/util.php:1107
msgid "about a month ago"
-msgstr ""
+msgstr "hai como un mes"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1082
+#: lib/util.php:1111
#, php-format
msgid "about %d months ago"
-msgstr ""
+msgstr "hai como %d meses"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1085
+#: lib/util.php:1114
msgid "about a year ago"
-msgstr ""
+msgstr "hai como un ano"
#: lib/webcolor.php:82
#, php-format
msgid "%s is not a valid color!"
-msgstr ""
+msgstr "%s non é unha cor correcta!"
#: lib/webcolor.php:123
#, php-format
msgid "%s is not a valid color! Use 3 or 6 hex chars."
-msgstr ""
+msgstr "%s non é unha cor correcta! Use 3 ou 6 caracteres hexadecimais."
#: lib/xmppmanager.php:403
#, php-format
msgid "Message too long - maximum is %1$d characters, you sent %2$d."
msgstr ""
+"A mensaxe é longa de máis, o límite de caracteres é de %1$d, e enviou %2$d."
diff --git a/locale/he/LC_MESSAGES/statusnet.po b/locale/he/LC_MESSAGES/statusnet.po
index 05d408781..857ce5a2c 100644
--- a/locale/he/LC_MESSAGES/statusnet.po
+++ b/locale/he/LC_MESSAGES/statusnet.po
@@ -7,12 +7,12 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-12 21:47+0000\n"
-"PO-Revision-Date: 2010-04-12 21:48:56+0000\n"
+"POT-Creation-Date: 2010-04-24 14:16+0000\n"
+"PO-Revision-Date: 2010-04-26 22:17:10+0000\n"
"Language-Team: Hebrew\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r64984); Translate extension (2010-01-16)\n"
+"X-Generator: MediaWiki 1.17alpha (r65552); Translate extension (2010-04-25)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: he\n"
"X-Message-Group: out-statusnet\n"
@@ -104,8 +104,8 @@ msgstr "×ין הודעה כזו."
#: actions/apidirectmessagenew.php:75 actions/apigroupcreate.php:112
#: actions/apigroupismember.php:90 actions/apigroupjoin.php:99
#: actions/apigroupleave.php:99 actions/apigrouplist.php:72
-#: actions/apistatusesupdate.php:148 actions/apisubscriptions.php:87
-#: actions/apitimelinefavorites.php:71 actions/apitimelinefriends.php:78
+#: actions/apistatusesupdate.php:239 actions/apisubscriptions.php:87
+#: actions/apitimelinefavorites.php:71 actions/apitimelinefriends.php:173
#: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79
#: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75
#: actions/favoritesrss.php:74 actions/foaf.php:40 actions/foaf.php:58
@@ -129,7 +129,7 @@ msgstr "%s וחברי×"
#. TRANS: H1 text. %1$s is user nickname
#. TRANS: Message is used as link title. %s is a user nickname.
#: actions/all.php:89 actions/all.php:181 actions/allrss.php:116
-#: actions/apitimelinefriends.php:114 actions/apitimelinehome.php:115
+#: actions/apitimelinefriends.php:209 actions/apitimelinehome.php:115
#: lib/personalgroupnav.php:100
#, php-format
msgid "%s and friends"
@@ -190,7 +190,7 @@ 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:121 actions/apitimelinefriends.php:120
+#: actions/allrss.php:121 actions/apitimelinefriends.php:215
#: actions/apitimelinehome.php:121
#, php-format
msgid "Updates from %1$s and friends on %2$s!"
@@ -212,9 +212,9 @@ msgstr ""
#: actions/apistatusesdestroy.php:102 actions/apistatusesretweets.php:112
#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:141
#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111
-#: actions/apitimelinefavorites.php:173 actions/apitimelinefriends.php:175
+#: actions/apitimelinefavorites.php:173 actions/apitimelinefriends.php:270
#: actions/apitimelinegroup.php:151 actions/apitimelinehome.php:174
-#: actions/apitimelinementions.php:173 actions/apitimelinepublic.php:151
+#: actions/apitimelinementions.php:173 actions/apitimelinepublic.php:240
#: actions/apitimelineretweetedtome.php:121
#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:160
#: actions/apitimelineuser.php:162 actions/apiusershow.php:101
@@ -232,7 +232,7 @@ msgstr "קוד ×”×ישור ×œ× × ×ž×¦×."
#: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91
#: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91
#: actions/apigroupleave.php:91 actions/apimediaupload.php:67
-#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:118
+#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:209
msgid "This method requires a POST."
msgstr ""
@@ -264,7 +264,7 @@ msgstr "שמירת הפרופיל נכשלה."
#: actions/apiaccountupdateprofilebackgroundimage.php:108
#: actions/apiaccountupdateprofileimage.php:97 actions/apimediaupload.php:80
-#: actions/apistatusesupdate.php:131 actions/avatarsettings.php:257
+#: actions/apistatusesupdate.php:222 actions/avatarsettings.php:257
#: actions/designadminpanel.php:123 actions/editapplication.php:118
#: actions/newapplication.php:101 actions/newnotice.php:94
#: lib/designsettings.php:283
@@ -661,18 +661,18 @@ msgstr "התמונה עודכנה."
msgid "No status with that ID found."
msgstr ""
-#: actions/apistatusesupdate.php:161 actions/newnotice.php:155
+#: actions/apistatusesupdate.php:252 actions/newnotice.php:155
#: lib/mailhandler.php:60
#, fuzzy, php-format
msgid "That's too long. Max notice size is %d chars."
msgstr "×–×” ×רוך מידי. ×ורך מירבי להודעה ×”×•× 140 ×ותיות."
-#: actions/apistatusesupdate.php:202 actions/apiusershow.php:96
+#: actions/apistatusesupdate.php:293 actions/apiusershow.php:96
#, fuzzy
msgid "Not found."
msgstr "×œ× × ×ž×¦×"
-#: actions/apistatusesupdate.php:225 actions/newnotice.php:178
+#: actions/apistatusesupdate.php:316 actions/newnotice.php:178
#, php-format
msgid "Max notice size is %d chars, including attachment URL."
msgstr ""
@@ -702,12 +702,12 @@ msgstr "הסטטוס של %1$s ב-%2$s "
msgid "%1$s updates that reply to updates from %2$s / %3$s."
msgstr ""
-#: actions/apitimelinepublic.php:107 actions/publicrss.php:103
+#: actions/apitimelinepublic.php:196 actions/publicrss.php:103
#, php-format
msgid "%s public timeline"
msgstr ""
-#: actions/apitimelinepublic.php:112 actions/publicrss.php:105
+#: actions/apitimelinepublic.php:201 actions/publicrss.php:105
#, php-format
msgid "%s updates from everyone!"
msgstr ""
@@ -2351,10 +2351,14 @@ msgid ""
msgstr "לצרכי ×בטחה, הכנס מחדש ×ת ×©× ×”×ž×©×ª×ž×© והסיסמה לפני שתשנה ×ת ההגדרות."
#: actions/login.php:270
+#, fuzzy
+msgid "Login with your username and password."
+msgstr "×©× ×”×ž×©×ª×ž×© ×ו הסיסמה ×œ× ×—×•×§×™×™×"
+
+#: actions/login.php:273
#, fuzzy, php-format
msgid ""
-"Login with your username and password. Don't have a username yet? [Register]"
-"(%%action.register%%) a new account."
+"Don't have a username yet? [Register](%%action.register%%) a new account."
msgstr ""
"היכנס בעזרת ×©× ×”×ž×©×ª×ž×© והסיסמה שלך. עדיין ×ין לך ×©× ×ž×©×ª×ž×©? [הרש×](%%action."
"register%%) לחשבון "
@@ -2579,8 +2583,8 @@ msgid "Only %s URLs over plain HTTP please."
msgstr ""
#. TRANS: Client error on an API request with an unsupported data format.
-#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1069
-#: lib/apiaction.php:1098 lib/apiaction.php:1215
+#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1131
+#: lib/apiaction.php:1160 lib/apiaction.php:1277
msgid "Not a supported data format."
msgstr ""
@@ -4838,14 +4842,14 @@ msgstr ""
msgid "Problem saving notice."
msgstr "בעיה בשמירת ההודעה."
-#: classes/Notice.php:965
+#: classes/Notice.php:967
#, fuzzy
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:1513
+#: classes/Notice.php:1535
#, php-format
msgid "RT @%1$s %2$s"
msgstr ""
@@ -5339,7 +5343,7 @@ msgid "Snapshots configuration"
msgstr "הרשמות"
#. TRANS: Client error 401.
-#: lib/apiauth.php:95
+#: lib/apiauth.php:113
msgid "API resource requires read-write access, but you only have read access."
msgstr ""
@@ -6807,56 +6811,56 @@ msgid "Moderator"
msgstr ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1054
+#: lib/util.php:1083
msgid "a few seconds ago"
msgstr "לפני מספר שניות"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1057
+#: lib/util.php:1086
msgid "about a minute ago"
msgstr "לפני כדקה"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1061
+#: lib/util.php:1090
#, php-format
msgid "about %d minutes ago"
msgstr "לפני כ-%d דקות"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1064
+#: lib/util.php:1093
msgid "about an hour ago"
msgstr "לפני כשעה"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1068
+#: lib/util.php:1097
#, php-format
msgid "about %d hours ago"
msgstr "לפני כ-%d שעות"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1071
+#: lib/util.php:1100
msgid "about a day ago"
msgstr "לפני כיו×"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1075
+#: lib/util.php:1104
#, php-format
msgid "about %d days ago"
msgstr "לפני ×›-%d ימי×"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1078
+#: lib/util.php:1107
msgid "about a month ago"
msgstr "לפני כחודש"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1082
+#: lib/util.php:1111
#, php-format
msgid "about %d months ago"
msgstr "לפני ×›-%d חודשי×"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1085
+#: lib/util.php:1114
msgid "about a year ago"
msgstr "לפני כשנה"
diff --git a/locale/hsb/LC_MESSAGES/statusnet.po b/locale/hsb/LC_MESSAGES/statusnet.po
index dc063eec9..5d226be60 100644
--- a/locale/hsb/LC_MESSAGES/statusnet.po
+++ b/locale/hsb/LC_MESSAGES/statusnet.po
@@ -9,12 +9,12 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-12 21:47+0000\n"
-"PO-Revision-Date: 2010-04-12 21:48:59+0000\n"
+"POT-Creation-Date: 2010-04-24 14:16+0000\n"
+"PO-Revision-Date: 2010-04-26 22:17:21+0000\n"
"Language-Team: Dutch\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r64984); Translate extension (2010-01-16)\n"
+"X-Generator: MediaWiki 1.17alpha (r65552); Translate extension (2010-04-25)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: hsb\n"
"X-Message-Group: out-statusnet\n"
@@ -87,9 +87,8 @@ msgstr "Składować"
#. TRANS: Server error when page not found (404)
#: actions/all.php:64 actions/public.php:98 actions/replies.php:93
#: actions/showfavorites.php:138 actions/tag.php:52
-#, fuzzy
msgid "No such page."
-msgstr "Strona njeeksistuje"
+msgstr "Strona njeeksistuje."
#: actions/all.php:75 actions/allrss.php:68
#: actions/apiaccountupdatedeliverydevice.php:113
@@ -100,8 +99,8 @@ msgstr "Strona njeeksistuje"
#: actions/apidirectmessagenew.php:75 actions/apigroupcreate.php:112
#: actions/apigroupismember.php:90 actions/apigroupjoin.php:99
#: actions/apigroupleave.php:99 actions/apigrouplist.php:72
-#: actions/apistatusesupdate.php:148 actions/apisubscriptions.php:87
-#: actions/apitimelinefavorites.php:71 actions/apitimelinefriends.php:78
+#: actions/apistatusesupdate.php:239 actions/apisubscriptions.php:87
+#: actions/apitimelinefavorites.php:71 actions/apitimelinefriends.php:173
#: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79
#: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75
#: actions/favoritesrss.php:74 actions/foaf.php:40 actions/foaf.php:58
@@ -125,7 +124,7 @@ msgstr "%1$s a přećeljo, strona %2$d"
#. TRANS: H1 text. %1$s is user nickname
#. TRANS: Message is used as link title. %s is a user nickname.
#: actions/all.php:89 actions/all.php:181 actions/allrss.php:116
-#: actions/apitimelinefriends.php:114 actions/apitimelinehome.php:115
+#: actions/apitimelinefriends.php:209 actions/apitimelinehome.php:115
#: lib/personalgroupnav.php:100
#, php-format
msgid "%s and friends"
@@ -185,7 +184,7 @@ msgstr "Ty a přećeljo"
#. 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:121 actions/apitimelinefriends.php:120
+#: actions/allrss.php:121 actions/apitimelinefriends.php:215
#: actions/apitimelinehome.php:121
#, php-format
msgid "Updates from %1$s and friends on %2$s!"
@@ -207,9 +206,9 @@ msgstr ""
#: actions/apistatusesdestroy.php:102 actions/apistatusesretweets.php:112
#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:141
#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111
-#: actions/apitimelinefavorites.php:173 actions/apitimelinefriends.php:175
+#: actions/apitimelinefavorites.php:173 actions/apitimelinefriends.php:270
#: actions/apitimelinegroup.php:151 actions/apitimelinehome.php:174
-#: actions/apitimelinementions.php:173 actions/apitimelinepublic.php:151
+#: actions/apitimelinementions.php:173 actions/apitimelinepublic.php:240
#: actions/apitimelineretweetedtome.php:121
#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:160
#: actions/apitimelineuser.php:162 actions/apiusershow.php:101
@@ -226,7 +225,7 @@ msgstr "API-metoda njenamakana."
#: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91
#: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91
#: actions/apigroupleave.php:91 actions/apimediaupload.php:67
-#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:118
+#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:209
msgid "This method requires a POST."
msgstr "Tuta metoda wužaduje sej POST."
@@ -256,7 +255,7 @@ msgstr "Profil njeje so składować dał."
#: actions/apiaccountupdateprofilebackgroundimage.php:108
#: actions/apiaccountupdateprofileimage.php:97 actions/apimediaupload.php:80
-#: actions/apistatusesupdate.php:131 actions/avatarsettings.php:257
+#: actions/apistatusesupdate.php:222 actions/avatarsettings.php:257
#: actions/designadminpanel.php:123 actions/editapplication.php:118
#: actions/newapplication.php:101 actions/newnotice.php:94
#: lib/designsettings.php:283
@@ -430,9 +429,9 @@ msgid "Too many aliases! Maximum %d."
msgstr "Přewjele aliasow! Maksimum: %d."
#: actions/apigroupcreate.php:266
-#, fuzzy, php-format
+#, php-format
msgid "Invalid alias: \"%s\"."
-msgstr "Njepłaćiwy alias: \"%s\""
+msgstr "Njepłaćiwy alias: \"%s\"."
#: actions/apigroupcreate.php:275 actions/editgroup.php:232
#: actions/newgroup.php:172
@@ -448,9 +447,8 @@ msgstr "Alias njemóže samsny kaž přimjeno być."
#: actions/apigroupismember.php:95 actions/apigroupjoin.php:104
#: actions/apigroupleave.php:104 actions/apigroupmembership.php:91
#: actions/apigroupshow.php:82 actions/apitimelinegroup.php:91
-#, fuzzy
msgid "Group not found."
-msgstr "Skupina njenamakana!"
+msgstr "Skupina njenamakana."
#: actions/apigroupjoin.php:110 actions/joingroup.php:100
msgid "You are already a member of that group."
@@ -636,17 +634,17 @@ msgstr "Status zniÄeny."
msgid "No status with that ID found."
msgstr "Žadyn status z tym ID namakany."
-#: actions/apistatusesupdate.php:161 actions/newnotice.php:155
+#: actions/apistatusesupdate.php:252 actions/newnotice.php:155
#: lib/mailhandler.php:60
#, php-format
msgid "That's too long. Max notice size is %d chars."
msgstr "To je předołho. Maksimalna wulkosć zdźělenki je %d znamješkow."
-#: actions/apistatusesupdate.php:202 actions/apiusershow.php:96
+#: actions/apistatusesupdate.php:293 actions/apiusershow.php:96
msgid "Not found."
msgstr "Njenamakany."
-#: actions/apistatusesupdate.php:225 actions/newnotice.php:178
+#: actions/apistatusesupdate.php:316 actions/newnotice.php:178
#, php-format
msgid "Max notice size is %d chars, including attachment URL."
msgstr ""
@@ -675,12 +673,12 @@ msgstr ""
msgid "%1$s updates that reply to updates from %2$s / %3$s."
msgstr ""
-#: actions/apitimelinepublic.php:107 actions/publicrss.php:103
+#: actions/apitimelinepublic.php:196 actions/publicrss.php:103
#, php-format
msgid "%s public timeline"
msgstr ""
-#: actions/apitimelinepublic.php:112 actions/publicrss.php:105
+#: actions/apitimelinepublic.php:201 actions/publicrss.php:105
#, php-format
msgid "%s updates from everyone!"
msgstr ""
@@ -817,7 +815,6 @@ msgstr ""
#: actions/block.php:145 actions/deleteapplication.php:154
#: actions/deletenotice.php:147 actions/deleteuser.php:152
#: actions/groupblock.php:178
-#, fuzzy
msgctxt "BUTTON"
msgid "No"
msgstr "NÄ›"
@@ -836,7 +833,6 @@ msgstr "Tutoho wužiwarja njeblokować"
#: actions/block.php:152 actions/deleteapplication.php:161
#: actions/deletenotice.php:154 actions/deleteuser.php:159
#: actions/groupblock.php:185
-#, fuzzy
msgctxt "BUTTON"
msgid "Yes"
msgstr "Haj"
@@ -892,9 +888,9 @@ msgstr ""
#. TRANS: Title for mini-posting window loaded from bookmarklet.
#: actions/bookmarklet.php:51
-#, fuzzy, php-format
+#, php-format
msgid "Post to %s"
-msgstr "skupiny na %s"
+msgstr "Na %s pósłać"
#: actions/confirmaddress.php:75
msgid "No confirmation code."
@@ -910,9 +906,9 @@ msgstr "Tutón wobkrućenski kod njeje za tebje!"
#. TRANS: Server error for an unknow address type, which can be 'email', 'jabber', or 'sms'.
#: actions/confirmaddress.php:91
-#, fuzzy, php-format
+#, php-format
msgid "Unrecognized address type %s."
-msgstr "Njespóznany adresowy typ %s"
+msgstr "Njespóznaty adresowy typ %s."
#. TRANS: Client error for an already confirmed email/jabbel/sms address.
#: actions/confirmaddress.php:96
@@ -1076,9 +1072,9 @@ msgid "Invalid logo URL."
msgstr "Njepłaćiwy logowy URL."
#: actions/designadminpanel.php:280
-#, fuzzy, php-format
+#, php-format
msgid "Theme not available: %s."
-msgstr "Å at njesteji k dispoziciji: %s"
+msgstr "Å at njesteji k dispoziciji: %s."
#: actions/designadminpanel.php:376
msgid "Change logo"
@@ -1230,7 +1226,7 @@ msgstr "Wopisanje je trěbne."
#: actions/editapplication.php:194
msgid "Source URL is too long."
-msgstr ""
+msgstr "Žórłowy URL je předołhi."
#: actions/editapplication.php:200 actions/newapplication.php:185
msgid "Source URL is not valid."
@@ -1331,7 +1327,6 @@ msgstr "Aktualna wobkrućena e-mejlowa adresa."
#: actions/emailsettings.php:115 actions/emailsettings.php:158
#: actions/imsettings.php:116 actions/smssettings.php:124
#: actions/smssettings.php:180
-#, fuzzy
msgctxt "BUTTON"
msgid "Remove"
msgstr "Wotstronić"
@@ -1348,7 +1343,6 @@ msgstr ""
#. TRANS: Button label
#: actions/emailsettings.php:127 actions/imsettings.php:131
#: actions/smssettings.php:137 lib/applicationeditform.php:357
-#, fuzzy
msgctxt "BUTTON"
msgid "Cancel"
msgstr "Přetorhnyć"
@@ -1363,7 +1357,6 @@ msgstr "E-mejlowa adresa, kaž na př. \"WužiwarskeMjeno@example.org\""
#. TRANS: Button label for adding a SMS phone number in SMS settings form.
#: actions/emailsettings.php:139 actions/imsettings.php:148
#: actions/smssettings.php:162
-#, fuzzy
msgctxt "BUTTON"
msgid "Add"
msgstr "Přidać"
@@ -1389,16 +1382,14 @@ 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:168 actions/smssettings.php:189
-#, fuzzy
msgctxt "BUTTON"
msgid "New"
msgstr "Nowy"
#. TRANS: Form legend for e-mail preferences form.
#: actions/emailsettings.php:174
-#, fuzzy
msgid "Email preferences"
-msgstr "Nastajenja"
+msgstr "E-mejlowe nastajenja"
#. TRANS: Checkbox label in e-mail preferences form.
#: actions/emailsettings.php:180
@@ -1437,9 +1428,8 @@ msgstr "MicroID za moju e-mejlowu adresu publikować"
#. TRANS: Confirmation message for successful e-mail preferences save.
#: actions/emailsettings.php:334
-#, fuzzy
msgid "Email preferences saved."
-msgstr "Designowe nastajenja składowane."
+msgstr "E-mejlowe nastajenja składowane."
#. TRANS: Message given saving e-mail address without having provided one.
#: actions/emailsettings.php:353
@@ -1492,15 +1482,13 @@ msgstr ""
#. TRANS: Message given canceling e-mail address confirmation for the wrong e-mail address.
#: actions/emailsettings.php:424
-#, fuzzy
msgid "That is the wrong email address."
-msgstr "to je wopaÄna IM-adresa."
+msgstr "To je wopaÄna e-mejlowa adresa."
#. TRANS: Message given after successfully canceling e-mail address confirmation.
#: actions/emailsettings.php:438
-#, fuzzy
msgid "Email confirmation cancelled."
-msgstr "Wobkrućenje přetorhnjene."
+msgstr "E-mejlowe wobkrućenje přetorhnjene."
#. TRANS: Message given trying to remove an e-mail address that is not
#. TRANS: registered for the active user.
@@ -1510,9 +1498,8 @@ msgstr "To njeje twoja e-mejlowa adresa."
#. TRANS: Message given after successfully removing a registered e-mail address.
#: actions/emailsettings.php:479
-#, fuzzy
msgid "The email address was removed."
-msgstr "Adresa bu wotstronjena."
+msgstr "E-mejlowa adresa bu wotstronjena."
#: actions/emailsettings.php:493 actions/smssettings.php:568
msgid "No incoming email address."
@@ -1645,9 +1632,8 @@ msgid "Remote service uses unknown version of OMB protocol."
msgstr ""
#: actions/finishremotesubscribe.php:138
-#, fuzzy
msgid "Error updating remote profile."
-msgstr "Zmylk při zasunjenju zdaleneho profila"
+msgstr "Zmylk při aktualizaciji zdaleneho profila."
#: actions/getfile.php:79
msgid "No such file."
@@ -1782,7 +1768,7 @@ msgstr ""
#: actions/groupmembers.php:100 lib/groupnav.php:92
#, php-format
msgid "%s group members"
-msgstr ""
+msgstr "%s skupinskich ÄÅ‚onow"
#: actions/groupmembers.php:103
#, php-format
@@ -1803,11 +1789,11 @@ msgstr "Blokować"
#: actions/groupmembers.php:487
msgid "Make user an admin of the group"
-msgstr ""
+msgstr "Wužiwarja k administratorej skupiny Äinić"
#: actions/groupmembers.php:519
msgid "Make Admin"
-msgstr ""
+msgstr "Za administratora pomjenować"
#: actions/groupmembers.php:519
msgid "Make this user an admin"
@@ -1888,7 +1874,7 @@ msgstr ""
#: actions/groupunblock.php:95
msgid "User is not blocked from group."
-msgstr ""
+msgstr "Wužiwar njeje zablokowany za skupinu."
#: actions/groupunblock.php:128 actions/unblock.php:86
msgid "Error removing the block."
@@ -1944,9 +1930,8 @@ msgstr ""
#. TRANS: Form legend for IM preferences form.
#: actions/imsettings.php:155
-#, fuzzy
msgid "IM preferences"
-msgstr "Nastajenja"
+msgstr "IM-nastajenja"
#. TRANS: Checkbox label in IM preferences form.
#: actions/imsettings.php:160
@@ -2014,15 +1999,13 @@ msgstr "to je wopaÄna IM-adresa."
#. TRANS: Server error thrown on database error canceling IM address confirmation.
#: actions/imsettings.php:397
-#, fuzzy
msgid "Couldn't delete IM confirmation."
-msgstr "Abonoment njeje so daÅ‚ zniÄić."
+msgstr "IM-wobkrućenje njeda so zhašeć."
#. TRANS: Message given after successfully canceling IM address confirmation.
#: actions/imsettings.php:402
-#, fuzzy
msgid "IM confirmation cancelled."
-msgstr "Wobkrućenje přetorhnjene."
+msgstr "IM-wobkrućenje přetorhnjene."
#. TRANS: Message given trying to remove an IM address that is not
#. TRANS: registered for the active user.
@@ -2032,9 +2015,8 @@ msgstr "To njeje twój ID Jabber."
#. TRANS: Message given after successfully removing a registered IM address.
#: actions/imsettings.php:447
-#, fuzzy
msgid "The IM address was removed."
-msgstr "Adresa bu wotstronjena."
+msgstr "IM-adresa bu wotstronjena."
#: actions/inbox.php:59
#, php-format
@@ -2055,9 +2037,11 @@ msgid "Invites have been disabled."
msgstr "Přeprošenja buchu znjemóžnjene."
#: actions/invite.php:41
-#, fuzzy, php-format
+#, php-format
msgid "You must be logged in to invite other users to use %s."
-msgstr "Dyrbiš přizjewjeny być, zo by skupinu wobdźěłał."
+msgstr ""
+"Dyrbiš přizjewjeny być, zo by druheho wužiwarja přeprosył, zo by wón %s "
+"wužiwał."
#: actions/invite.php:72
#, php-format
@@ -2234,10 +2218,13 @@ msgid ""
msgstr ""
#: actions/login.php:270
+msgid "Login with your username and password."
+msgstr "Přizjewjenje z twojim wužiwarskim mjenom a hesłom."
+
+#: actions/login.php:273
#, php-format
msgid ""
-"Login with your username and password. Don't have a username yet? [Register]"
-"(%%action.register%%) a new account."
+"Don't have a username yet? [Register](%%action.register%%) a new account."
msgstr ""
#: actions/makeadmin.php:92
@@ -2260,9 +2247,8 @@ msgid "Can't make %1$s an admin for group %2$s."
msgstr "Njeje móžno %1$S k administratorej w skupinje %2$s Äinić."
#: actions/microsummary.php:69
-#, fuzzy
msgid "No current status."
-msgstr "Žadyn aktualny status"
+msgstr "Žadyn aktualny status."
#: actions/newapplication.php:52
msgid "New Application"
@@ -2278,7 +2264,7 @@ msgstr "Wužij tutón formular, zo by nowu aplikaciju registrował."
#: actions/newapplication.php:176
msgid "Source URL is required."
-msgstr ""
+msgstr "Žórłowy URL je trěbny."
#: actions/newapplication.php:258 actions/newapplication.php:267
msgid "Could not create application."
@@ -2368,7 +2354,7 @@ msgstr ""
#: actions/noticesearchrss.php:96
#, php-format
msgid "Updates with \"%s\""
-msgstr ""
+msgstr "Aktualizacije z \"%s\""
#: actions/noticesearchrss.php:98
#, php-format
@@ -2407,7 +2393,7 @@ msgstr ""
#: actions/oauthconnectionssettings.php:72
msgid "Connected applications"
-msgstr ""
+msgstr "Zwjazane aplikacije"
#: actions/oauthconnectionssettings.php:83
msgid "You have allowed the following applications to access you account."
@@ -2431,9 +2417,8 @@ msgid "Developers can edit the registration settings for their applications "
msgstr ""
#: actions/oembed.php:79 actions/shownotice.php:100
-#, fuzzy
msgid "Notice has no profile."
-msgstr "Zdźělenka nima profil"
+msgstr "Zdźělenka nima profil."
#: actions/oembed.php:86 actions/shownotice.php:175
#, php-format
@@ -2444,7 +2429,7 @@ msgstr ""
#: actions/oembed.php:158
#, php-format
msgid "Content type %s not supported."
-msgstr ""
+msgstr "Wobsahowy typ %s so njepodpěruje."
#. TRANS: Error message displaying attachments. %s is the site's base URL.
#: actions/oembed.php:162
@@ -2453,8 +2438,8 @@ msgid "Only %s URLs over plain HTTP please."
msgstr ""
#. TRANS: Client error on an API request with an unsupported data format.
-#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1069
-#: lib/apiaction.php:1098 lib/apiaction.php:1215
+#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1131
+#: lib/apiaction.php:1160 lib/apiaction.php:1277
msgid "Not a supported data format."
msgstr "Njeje podpěrany datowy format."
@@ -2583,11 +2568,11 @@ msgstr "WopaÄne stare hesÅ‚o"
#: actions/passwordsettings.php:181
msgid "Error saving user; invalid."
-msgstr ""
+msgstr "Zmylk při składowanju wužiwarja; njepłaćiwy."
#: actions/passwordsettings.php:186 actions/recoverpassword.php:381
msgid "Can't save new password."
-msgstr ""
+msgstr "Nowe hesło njeda so składować."
#: actions/passwordsettings.php:192 actions/recoverpassword.php:211
msgid "Password saved."
@@ -2603,19 +2588,19 @@ msgid "Path and server settings for this StatusNet site."
msgstr "Šćežka a serwerowe nastajenja za tute sydło StatusNet."
#: actions/pathsadminpanel.php:157
-#, fuzzy, php-format
+#, php-format
msgid "Theme directory not readable: %s."
-msgstr "Å at njesteji k dispoziciji: %s"
+msgstr "Å atowy zapis njeda so Äitać: %s"
#: actions/pathsadminpanel.php:163
-#, fuzzy, php-format
+#, php-format
msgid "Avatar directory not writable: %s."
-msgstr "Awatarowy zapis"
+msgstr "Do awataroweho zapisa njeda so pisać: %s."
#: actions/pathsadminpanel.php:169
-#, fuzzy, php-format
+#, php-format
msgid "Background directory not writable: %s."
-msgstr "Pozadkowy zapis"
+msgstr "Do pozadkoweho zapisa njeda so pisać: %s."
#: actions/pathsadminpanel.php:177
#, php-format
@@ -2758,9 +2743,9 @@ msgid "People search"
msgstr "Za ludźimi pytać"
#: actions/peopletag.php:68
-#, fuzzy, php-format
+#, php-format
msgid "Not a valid people tag: %s."
-msgstr "Njepłaćiwa e-mejlowa adresa."
+msgstr "NjepÅ‚aćiwa wosobowa tafliÄka: %s."
#: actions/peopletag.php:142
#, php-format
@@ -2768,9 +2753,8 @@ msgid "Users self-tagged with %1$s - page %2$d"
msgstr ""
#: actions/postnotice.php:95
-#, fuzzy
msgid "Invalid notice content."
-msgstr "Njepłaćiwy wobsah zdźělenki"
+msgstr "Njepłaćiwy wobsah zdźělenki."
#: actions/postnotice.php:101
#, php-format
@@ -2898,7 +2882,7 @@ msgstr "Nastajenja městna njedachu so składować."
#: actions/profilesettings.php:375
msgid "Couldn't save profile."
-msgstr ""
+msgstr "Profil njeda so składować."
#: actions/profilesettings.php:383
msgid "Couldn't save tags."
@@ -3051,6 +3035,7 @@ msgstr ""
#: actions/recoverpassword.php:193
msgid "Your nickname on this server, or your registered email address."
msgstr ""
+"Twoje přimjeno na tutym serwerje abo twoje zregistrowana e-mejlowa adresa."
#: actions/recoverpassword.php:199 actions/recoverpassword.php:200
msgid "Recover"
@@ -3533,7 +3518,7 @@ msgstr ""
#: actions/showgroup.php:82 lib/groupnav.php:86
#, php-format
msgid "%s group"
-msgstr ""
+msgstr "skupina %s"
#: actions/showgroup.php:84
#, php-format
@@ -3872,9 +3857,8 @@ msgstr "SMS k dispoziciji njesteji."
#. TRANS: Form legend for SMS settings form.
#: actions/smssettings.php:111
-#, fuzzy
msgid "SMS address"
-msgstr "IM-adresa"
+msgstr "SMS-adresa"
#. TRANS: Form guide in SMS settings form.
#: actions/smssettings.php:120
@@ -3898,7 +3882,6 @@ msgstr ""
#. TRANS: Button label to confirm SMS confirmation code in SMS settings.
#: actions/smssettings.php:148
-#, fuzzy
msgctxt "BUTTON"
msgid "Confirm"
msgstr "Wobkrućić"
@@ -3915,9 +3898,8 @@ msgstr ""
#. TRANS: Form legend for SMS preferences form.
#: actions/smssettings.php:195
-#, fuzzy
msgid "SMS preferences"
-msgstr "Nastajenja"
+msgstr "SMS-nastajenja"
#. TRANS: Checkbox label in SMS preferences form.
#: actions/smssettings.php:201
@@ -3928,9 +3910,8 @@ msgstr ""
#. TRANS: Confirmation message for successful SMS preferences save.
#: actions/smssettings.php:315
-#, fuzzy
msgid "SMS preferences saved."
-msgstr "Nastajenja składowane."
+msgstr "SMS-nastajenja składowane."
#. TRANS: Message given saving SMS phone number without having provided one.
#: actions/smssettings.php:338
@@ -3966,21 +3947,19 @@ msgstr ""
#. TRANS: Message given after successfully canceling SMS phone number confirmation.
#: actions/smssettings.php:427
-#, fuzzy
msgid "SMS confirmation cancelled."
-msgstr "Wobkrućenje přetorhnjene."
+msgstr "SMS-wobkrućenje přetorhnjene."
#. TRANS: Message given trying to remove an SMS phone number that is not
#. TRANS: registered for the active user.
#: actions/smssettings.php:448
msgid "That is not your phone number."
-msgstr ""
+msgstr "To twoje telefonowe ÄisÅ‚o njeje."
#. TRANS: Message given after successfully removing a registered SMS phone number.
#: actions/smssettings.php:470
-#, fuzzy
msgid "The SMS phone number was removed."
-msgstr "SMS telefonowe ÄisÅ‚o"
+msgstr "Telefonowe ÄisÅ‚o za SMS bu wotstronjene."
#. TRANS: Label for mobile carrier dropdown menu in SMS settings.
#: actions/smssettings.php:511
@@ -4249,9 +4228,8 @@ msgid "User is not silenced."
msgstr ""
#: actions/unsubscribe.php:77
-#, fuzzy
msgid "No profile ID in request."
-msgstr "Žadyn profil z tym ID."
+msgstr "Žadyn profilowy ID w naprašowanju."
#: actions/unsubscribe.php:98
msgid "Unsubscribed"
@@ -4574,9 +4552,9 @@ msgstr ""
#. TRANS: Server exception. %s are the error details.
#: classes/Notice.php:176
-#, fuzzy, php-format
+#, php-format
msgid "Database error inserting hashtag: %s"
-msgstr "Zmylk datoweje banki při zasunjenju wužiwarja OAuth-aplikacije."
+msgstr "Zmylk datoweje banki pÅ™i zasunjenju haÅ¡eje tafliÄki: %s"
#: classes/Notice.php:245
msgid "Problem saving notice. Too long."
@@ -4605,13 +4583,13 @@ msgstr ""
msgid "Problem saving notice."
msgstr ""
-#: classes/Notice.php:965
+#: classes/Notice.php:967
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:1513
+#: classes/Notice.php:1535
#, php-format
msgid "RT @%1$s %2$s"
msgstr ""
@@ -5063,7 +5041,7 @@ msgid "Snapshots configuration"
msgstr "Konfiguracija wobrazowkowych fotow"
#. TRANS: Client error 401.
-#: lib/apiauth.php:95
+#: lib/apiauth.php:113
msgid "API resource requires read-write access, but you only have read access."
msgstr ""
@@ -5116,7 +5094,7 @@ msgstr ""
#. TRANS: Radio button label for application type
#: lib/applicationeditform.php:278
msgid "Browser"
-msgstr ""
+msgstr "Wobhladowak"
#. TRANS: Radio button label for application type
#: lib/applicationeditform.php:295
@@ -5166,7 +5144,6 @@ msgstr ""
#. TRANS: Button label
#: lib/applicationlist.php:159
-#, fuzzy
msgctxt "BUTTON"
msgid "Revoke"
msgstr "Wotwołać"
@@ -5277,9 +5254,9 @@ msgstr "Njebě móžno wužiwarja %1$s skupinje %2%s přidać."
#. 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.
#: lib/command.php:385
-#, fuzzy, php-format
+#, php-format
msgid "Could not remove user %1$s from group %2$s"
-msgstr "Njebě móžno wužiwarja %1$s ze skupiny %2$s wotstronić."
+msgstr "Njebě móžno, wužiwarja %1$s ze skupiny %2$s wotstronić"
#. TRANS: Whois output. %s is the full name of the queried user.
#: lib/command.php:418
@@ -5582,7 +5559,7 @@ msgstr "FOAF"
#: lib/feedlist.php:64
msgid "Export data"
-msgstr ""
+msgstr "Daty eksportować"
#: lib/galleryaction.php:121
msgid "Filter tags"
@@ -6359,7 +6336,7 @@ msgstr ""
#: lib/subgroupnav.php:91
#, php-format
msgid "People subscribed to %s"
-msgstr ""
+msgstr "Ludźo, kotřiž su %s abonowali"
#: lib/subgroupnav.php:99
#, php-format
@@ -6469,56 +6446,56 @@ msgid "Moderator"
msgstr ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1054
+#: lib/util.php:1083
msgid "a few seconds ago"
msgstr "před něšto sekundami"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1057
+#: lib/util.php:1086
msgid "about a minute ago"
msgstr "před něhdźe jednej mjeńšinu"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1061
+#: lib/util.php:1090
#, php-format
msgid "about %d minutes ago"
msgstr "před %d mjeńšinami"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1064
+#: lib/util.php:1093
msgid "about an hour ago"
msgstr "před něhdźe jednej hodźinu"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1068
+#: lib/util.php:1097
#, php-format
msgid "about %d hours ago"
msgstr "před něhdźe %d hodźinami"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1071
+#: lib/util.php:1100
msgid "about a day ago"
msgstr "před něhdźe jednym dnjom"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1075
+#: lib/util.php:1104
#, php-format
msgid "about %d days ago"
msgstr "před něhdźe %d dnjemi"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1078
+#: lib/util.php:1107
msgid "about a month ago"
msgstr "před něhdźe jednym měsacom"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1082
+#: lib/util.php:1111
#, php-format
msgid "about %d months ago"
msgstr "před něhdźe %d měsacami"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1085
+#: lib/util.php:1114
msgid "about a year ago"
msgstr "před něhdźe jednym lětom"
diff --git a/locale/ia/LC_MESSAGES/statusnet.po b/locale/ia/LC_MESSAGES/statusnet.po
index cda28819e..62ec146c3 100644
--- a/locale/ia/LC_MESSAGES/statusnet.po
+++ b/locale/ia/LC_MESSAGES/statusnet.po
@@ -8,12 +8,12 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-12 21:47+0000\n"
-"PO-Revision-Date: 2010-04-12 21:49:04+0000\n"
+"POT-Creation-Date: 2010-04-24 14:16+0000\n"
+"PO-Revision-Date: 2010-04-26 22:17:24+0000\n"
"Language-Team: Interlingua\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r64984); Translate extension (2010-01-16)\n"
+"X-Generator: MediaWiki 1.17alpha (r65552); Translate extension (2010-04-25)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: ia\n"
"X-Message-Group: out-statusnet\n"
@@ -85,9 +85,8 @@ msgstr "Salveguardar"
#. TRANS: Server error when page not found (404)
#: actions/all.php:64 actions/public.php:98 actions/replies.php:93
#: actions/showfavorites.php:138 actions/tag.php:52
-#, fuzzy
msgid "No such page."
-msgstr "Pagina non existe"
+msgstr "Pagina non existe."
#: actions/all.php:75 actions/allrss.php:68
#: actions/apiaccountupdatedeliverydevice.php:113
@@ -98,8 +97,8 @@ msgstr "Pagina non existe"
#: actions/apidirectmessagenew.php:75 actions/apigroupcreate.php:112
#: actions/apigroupismember.php:90 actions/apigroupjoin.php:99
#: actions/apigroupleave.php:99 actions/apigrouplist.php:72
-#: actions/apistatusesupdate.php:148 actions/apisubscriptions.php:87
-#: actions/apitimelinefavorites.php:71 actions/apitimelinefriends.php:78
+#: actions/apistatusesupdate.php:239 actions/apisubscriptions.php:87
+#: actions/apitimelinefavorites.php:71 actions/apitimelinefriends.php:173
#: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79
#: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75
#: actions/favoritesrss.php:74 actions/foaf.php:40 actions/foaf.php:58
@@ -123,7 +122,7 @@ msgstr "%1$s e amicos, pagina %2$d"
#. TRANS: H1 text. %1$s is user nickname
#. TRANS: Message is used as link title. %s is a user nickname.
#: actions/all.php:89 actions/all.php:181 actions/allrss.php:116
-#: actions/apitimelinefriends.php:114 actions/apitimelinehome.php:115
+#: actions/apitimelinefriends.php:209 actions/apitimelinehome.php:115
#: lib/personalgroupnav.php:100
#, php-format
msgid "%s and friends"
@@ -191,7 +190,7 @@ msgstr "Tu e amicos"
#. 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:121 actions/apitimelinefriends.php:120
+#: actions/allrss.php:121 actions/apitimelinefriends.php:215
#: actions/apitimelinehome.php:121
#, php-format
msgid "Updates from %1$s and friends on %2$s!"
@@ -213,9 +212,9 @@ msgstr "Actualisationes de %1$s e su amicos in %2$s!"
#: actions/apistatusesdestroy.php:102 actions/apistatusesretweets.php:112
#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:141
#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111
-#: actions/apitimelinefavorites.php:173 actions/apitimelinefriends.php:175
+#: actions/apitimelinefavorites.php:173 actions/apitimelinefriends.php:270
#: actions/apitimelinegroup.php:151 actions/apitimelinehome.php:174
-#: actions/apitimelinementions.php:173 actions/apitimelinepublic.php:151
+#: actions/apitimelinementions.php:173 actions/apitimelinepublic.php:240
#: actions/apitimelineretweetedtome.php:121
#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:160
#: actions/apitimelineuser.php:162 actions/apiusershow.php:101
@@ -232,18 +231,17 @@ msgstr "Methodo API non trovate."
#: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91
#: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91
#: actions/apigroupleave.php:91 actions/apimediaupload.php:67
-#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:118
+#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:209
msgid "This method requires a POST."
msgstr "Iste methodo require un POST."
#: actions/apiaccountupdatedeliverydevice.php:105
-#, fuzzy
msgid ""
"You must specify a parameter named 'device' with a value of one of: sms, im, "
"none."
msgstr ""
"Tu debe specificar un parametro nominate 'device' con un del valores: sms, "
-"im, none"
+"im, none."
#: actions/apiaccountupdatedeliverydevice.php:132
msgid "Could not update user."
@@ -265,7 +263,7 @@ msgstr "Non poteva salveguardar le profilo."
#: actions/apiaccountupdateprofilebackgroundimage.php:108
#: actions/apiaccountupdateprofileimage.php:97 actions/apimediaupload.php:80
-#: actions/apistatusesupdate.php:131 actions/avatarsettings.php:257
+#: actions/apistatusesupdate.php:222 actions/avatarsettings.php:257
#: actions/designadminpanel.php:123 actions/editapplication.php:118
#: actions/newapplication.php:101 actions/newnotice.php:94
#: lib/designsettings.php:283
@@ -441,9 +439,9 @@ msgid "Too many aliases! Maximum %d."
msgstr "Troppo de aliases! Maximo: %d."
#: actions/apigroupcreate.php:266
-#, fuzzy, php-format
+#, php-format
msgid "Invalid alias: \"%s\"."
-msgstr "Alias invalide: \"%s\""
+msgstr "Alias invalide: \"%s\"."
#: actions/apigroupcreate.php:275 actions/editgroup.php:232
#: actions/newgroup.php:172
@@ -459,9 +457,8 @@ msgstr "Le alias non pote esser identic al pseudonymo."
#: actions/apigroupismember.php:95 actions/apigroupjoin.php:104
#: actions/apigroupleave.php:104 actions/apigroupmembership.php:91
#: actions/apigroupshow.php:82 actions/apitimelinegroup.php:91
-#, fuzzy
msgid "Group not found."
-msgstr "Gruppo non trovate!"
+msgstr "Gruppo non trovate."
#: actions/apigroupjoin.php:110 actions/joingroup.php:100
msgid "You are already a member of that group."
@@ -493,9 +490,9 @@ msgstr "Gruppos de %s"
#. TRANS: Meant to convey the user %2$s is a member of each of the groups listed on site %1$s
#: actions/apigrouplist.php:107
-#, fuzzy, php-format
+#, php-format
msgid "%1$s groups %2$s is a member of."
-msgstr "Gruppos del quales %s es membro"
+msgstr "Gruppos de %1$s del quales %2$s es membro."
#. TRANS: Message is used as a title. %s is a site name.
#. TRANS: Message is used as a page title. %s is a nick name.
@@ -655,18 +652,18 @@ msgstr "Stato delite."
msgid "No status with that ID found."
msgstr "Nulle stato trovate con iste ID."
-#: actions/apistatusesupdate.php:161 actions/newnotice.php:155
+#: actions/apistatusesupdate.php:252 actions/newnotice.php:155
#: lib/mailhandler.php:60
#, php-format
msgid "That's too long. Max notice size is %d chars."
msgstr ""
"Isto es troppo longe. Le longitude maximal del notas es %d characteres."
-#: actions/apistatusesupdate.php:202 actions/apiusershow.php:96
+#: actions/apistatusesupdate.php:293 actions/apiusershow.php:96
msgid "Not found."
msgstr "Non trovate."
-#: actions/apistatusesupdate.php:225 actions/newnotice.php:178
+#: actions/apistatusesupdate.php:316 actions/newnotice.php:178
#, php-format
msgid "Max notice size is %d chars, including attachment URL."
msgstr ""
@@ -698,12 +695,12 @@ msgid "%1$s updates that reply to updates from %2$s / %3$s."
msgstr ""
"Actualisationes de %1$s que responde al actualisationes de %2$s / %3$s."
-#: actions/apitimelinepublic.php:107 actions/publicrss.php:103
+#: actions/apitimelinepublic.php:196 actions/publicrss.php:103
#, php-format
msgid "%s public timeline"
msgstr "Chronologia public de %s"
-#: actions/apitimelinepublic.php:112 actions/publicrss.php:105
+#: actions/apitimelinepublic.php:201 actions/publicrss.php:105
#, php-format
msgid "%s updates from everyone!"
msgstr "Actualisationes de totes in %s!"
@@ -843,7 +840,6 @@ msgstr ""
#: actions/block.php:145 actions/deleteapplication.php:154
#: actions/deletenotice.php:147 actions/deleteuser.php:152
#: actions/groupblock.php:178
-#, fuzzy
msgctxt "BUTTON"
msgid "No"
msgstr "No"
@@ -862,7 +858,6 @@ msgstr "Non blocar iste usator"
#: actions/block.php:152 actions/deleteapplication.php:161
#: actions/deletenotice.php:154 actions/deleteuser.php:159
#: actions/groupblock.php:185
-#, fuzzy
msgctxt "BUTTON"
msgid "Yes"
msgstr "Si"
@@ -918,9 +913,9 @@ msgstr "Disblocar iste usator"
#. TRANS: Title for mini-posting window loaded from bookmarklet.
#: actions/bookmarklet.php:51
-#, fuzzy, php-format
+#, php-format
msgid "Post to %s"
-msgstr "Publicar in "
+msgstr "Publicar in %s"
#: actions/confirmaddress.php:75
msgid "No confirmation code."
@@ -936,9 +931,9 @@ msgstr "Iste codice de confirmation non es pro te!"
#. TRANS: Server error for an unknow address type, which can be 'email', 'jabber', or 'sms'.
#: actions/confirmaddress.php:91
-#, fuzzy, php-format
+#, php-format
msgid "Unrecognized address type %s."
-msgstr "Typo de adresse %s non recognoscite"
+msgstr "Le typo de adresse %s non es recognoscite."
#. TRANS: Client error for an already confirmed email/jabbel/sms address.
#: actions/confirmaddress.php:96
@@ -1109,9 +1104,9 @@ msgid "Invalid logo URL."
msgstr "URL de logotypo invalide."
#: actions/designadminpanel.php:280
-#, fuzzy, php-format
+#, php-format
msgid "Theme not available: %s."
-msgstr "Thema non disponibile: %s"
+msgstr "Thema non disponibile: %s."
#: actions/designadminpanel.php:376
msgid "Change logo"
@@ -1365,7 +1360,6 @@ msgstr "Adresse de e-mail actualmente confirmate."
#: actions/emailsettings.php:115 actions/emailsettings.php:158
#: actions/imsettings.php:116 actions/smssettings.php:124
#: actions/smssettings.php:180
-#, fuzzy
msgctxt "BUTTON"
msgid "Remove"
msgstr "Remover"
@@ -1384,7 +1378,6 @@ msgstr ""
#. TRANS: Button label
#: actions/emailsettings.php:127 actions/imsettings.php:131
#: actions/smssettings.php:137 lib/applicationeditform.php:357
-#, fuzzy
msgctxt "BUTTON"
msgid "Cancel"
msgstr "Cancellar"
@@ -1399,7 +1392,6 @@ msgstr "Le adresse de e-mail, como \"nomine@example.org\""
#. TRANS: Button label for adding a SMS phone number in SMS settings form.
#: actions/emailsettings.php:139 actions/imsettings.php:148
#: actions/smssettings.php:162
-#, fuzzy
msgctxt "BUTTON"
msgid "Add"
msgstr "Adder"
@@ -1426,16 +1418,14 @@ 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:168 actions/smssettings.php:189
-#, fuzzy
msgctxt "BUTTON"
msgid "New"
msgstr "Nove"
#. TRANS: Form legend for e-mail preferences form.
#: actions/emailsettings.php:174
-#, fuzzy
msgid "Email preferences"
-msgstr "Preferentias"
+msgstr "Preferentias de e-mail"
#. TRANS: Checkbox label in e-mail preferences form.
#: actions/emailsettings.php:180
@@ -1474,9 +1464,8 @@ msgstr "Publicar un MicroID pro mi adresse de e-mail."
#. TRANS: Confirmation message for successful e-mail preferences save.
#: actions/emailsettings.php:334
-#, fuzzy
msgid "Email preferences saved."
-msgstr "Preferentias de apparentia salveguardate."
+msgstr "Preferentias de e-mail salveguardate."
#. TRANS: Message given saving e-mail address without having provided one.
#: actions/emailsettings.php:353
@@ -1532,15 +1521,13 @@ msgstr "Nulle confirmation pendente a cancellar."
#. TRANS: Message given canceling e-mail address confirmation for the wrong e-mail address.
#: actions/emailsettings.php:424
-#, fuzzy
msgid "That is the wrong email address."
-msgstr "Iste adresse de messageria instantanee es erronee."
+msgstr "Iste adresse de e-mail es erronee."
#. TRANS: Message given after successfully canceling e-mail address confirmation.
#: actions/emailsettings.php:438
-#, fuzzy
msgid "Email confirmation cancelled."
-msgstr "Confirmation cancellate."
+msgstr "Confirmation de e-mail cancellate."
#. TRANS: Message given trying to remove an e-mail address that is not
#. TRANS: registered for the active user.
@@ -1550,9 +1537,8 @@ msgstr "Isto non es tu adresse de e-mail."
#. TRANS: Message given after successfully removing a registered e-mail address.
#: actions/emailsettings.php:479
-#, fuzzy
msgid "The email address was removed."
-msgstr "Le adresse ha essite removite."
+msgstr "Le adresse de e-mail ha essite removite."
#: actions/emailsettings.php:493 actions/smssettings.php:568
msgid "No incoming email address."
@@ -1690,9 +1676,8 @@ msgid "Remote service uses unknown version of OMB protocol."
msgstr "Le servicio remote usa un version incognite del protocollo OMB."
#: actions/finishremotesubscribe.php:138
-#, fuzzy
msgid "Error updating remote profile."
-msgstr "Error in actualisar le profilo remote"
+msgstr "Error durante le actualisation del profilo remote."
#: actions/getfile.php:79
msgid "No such file."
@@ -2012,9 +1997,8 @@ msgstr ""
#. TRANS: Form legend for IM preferences form.
#: actions/imsettings.php:155
-#, fuzzy
msgid "IM preferences"
-msgstr "Preferentias"
+msgstr "Preferentias de messageria instantanee"
#. TRANS: Checkbox label in IM preferences form.
#: actions/imsettings.php:160
@@ -2086,15 +2070,13 @@ msgstr "Iste adresse de messageria instantanee es erronee."
#. TRANS: Server error thrown on database error canceling IM address confirmation.
#: actions/imsettings.php:397
-#, fuzzy
msgid "Couldn't delete IM confirmation."
-msgstr "Non poteva deler confirmation de e-mail."
+msgstr "Non poteva deler confirmation de messageria instantanee."
#. TRANS: Message given after successfully canceling IM address confirmation.
#: actions/imsettings.php:402
-#, fuzzy
msgid "IM confirmation cancelled."
-msgstr "Confirmation cancellate."
+msgstr "Confirmation de messageria instantanee cancellate."
#. TRANS: Message given trying to remove an IM address that is not
#. TRANS: registered for the active user.
@@ -2104,9 +2086,8 @@ msgstr "Isto non es tu ID de Jabber."
#. TRANS: Message given after successfully removing a registered IM address.
#: actions/imsettings.php:447
-#, fuzzy
msgid "The IM address was removed."
-msgstr "Le adresse ha essite removite."
+msgstr "Le adresse de messageria instantanee ha essite removite."
#: actions/inbox.php:59
#, php-format
@@ -2129,9 +2110,9 @@ msgid "Invites have been disabled."
msgstr "Le invitationes ha essite disactivate."
#: actions/invite.php:41
-#, fuzzy, php-format
+#, php-format
msgid "You must be logged in to invite other users to use %s."
-msgstr "Tu debe aperir un session pro invitar altere usatores a usar %s"
+msgstr "Tu debe aperir un session pro invitar altere usatores a usar %s."
#: actions/invite.php:72
#, php-format
@@ -2342,13 +2323,15 @@ msgstr ""
"contrasigno ante de cambiar tu configurationes."
#: actions/login.php:270
+msgid "Login with your username and password."
+msgstr "Aperi un session con tu nomine de usator e contrasigno."
+
+#: actions/login.php:273
#, php-format
msgid ""
-"Login with your username and password. Don't have a username yet? [Register]"
-"(%%action.register%%) a new account."
+"Don't have a username yet? [Register](%%action.register%%) a new account."
msgstr ""
-"Aperi un session con tu nomine de usator e contrasigno. Non ha ancora un "
-"nomine de usator? [Crea](%%action.register%%) un nove conto."
+"Non ha ancora un nomine de usator? [Crea](%%action.register%%) un nove conto."
#: actions/makeadmin.php:92
msgid "Only an admin can make another user an admin."
@@ -2370,9 +2353,8 @@ msgid "Can't make %1$s an admin for group %2$s."
msgstr "Non pote facer %1$s administrator del gruppo %2$s."
#: actions/microsummary.php:69
-#, fuzzy
msgid "No current status."
-msgstr "Nulle stato actual"
+msgstr "Nulle stato actual."
#: actions/newapplication.php:52
msgid "New Application"
@@ -2539,9 +2521,9 @@ msgid "You are not a user of that application."
msgstr "Tu non es usator de iste application."
#: actions/oauthconnectionssettings.php:186
-#, fuzzy, php-format
+#, php-format
msgid "Unable to revoke access for app: %s."
-msgstr "Impossibile revocar le accesso del application: "
+msgstr "Impossibile revocar le accesso del application: %s."
#: actions/oauthconnectionssettings.php:198
msgid "You have not authorized any applications to use your account."
@@ -2554,9 +2536,8 @@ msgstr ""
"applicationes "
#: actions/oembed.php:79 actions/shownotice.php:100
-#, fuzzy
msgid "Notice has no profile."
-msgstr "Le nota ha nulle profilo"
+msgstr "Le nota ha nulle profilo."
#: actions/oembed.php:86 actions/shownotice.php:175
#, php-format
@@ -2565,19 +2546,19 @@ msgstr "Le stato de %1$s in %2$s"
#. TRANS: Error message displaying attachments. %s is a raw MIME type (eg 'image/png')
#: actions/oembed.php:158
-#, fuzzy, php-format
+#, php-format
msgid "Content type %s not supported."
-msgstr "typo de contento "
+msgstr "Le typo de contento %s non es supportate."
#. TRANS: Error message displaying attachments. %s is the site's base URL.
#: actions/oembed.php:162
#, php-format
msgid "Only %s URLs over plain HTTP please."
-msgstr ""
+msgstr "Solmente le URLs %s es permittite super HTTP simple."
#. TRANS: Client error on an API request with an unsupported data format.
-#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1069
-#: lib/apiaction.php:1098 lib/apiaction.php:1215
+#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1131
+#: lib/apiaction.php:1160 lib/apiaction.php:1277
msgid "Not a supported data format."
msgstr "Formato de datos non supportate."
@@ -2727,24 +2708,24 @@ msgid "Path and server settings for this StatusNet site."
msgstr "Configuration de cammino e servitor pro iste sito StatusNet."
#: actions/pathsadminpanel.php:157
-#, fuzzy, php-format
+#, php-format
msgid "Theme directory not readable: %s."
-msgstr "Directorio de thema non legibile: %s"
+msgstr "Directorio de thema non legibile: %s."
#: actions/pathsadminpanel.php:163
-#, fuzzy, php-format
+#, php-format
msgid "Avatar directory not writable: %s."
-msgstr "Directorio de avatar non scriptibile: %s"
+msgstr "Directorio de avatar non scriptibile: %s."
#: actions/pathsadminpanel.php:169
-#, fuzzy, php-format
+#, php-format
msgid "Background directory not writable: %s."
-msgstr "Directorio de fundo non scriptibile: %s"
+msgstr "Directorio de fundo non scriptibile: %s."
#: actions/pathsadminpanel.php:177
-#, fuzzy, php-format
+#, php-format
msgid "Locales directory not readable: %s."
-msgstr "Directorio de localitates non scriptibile: %s"
+msgstr "Directorio de localitates non scriptibile: %s."
#: actions/pathsadminpanel.php:183
msgid "Invalid SSL server. The maximum length is 255 characters."
@@ -2884,9 +2865,9 @@ msgid "People search"
msgstr "Recerca de personas"
#: actions/peopletag.php:68
-#, fuzzy, php-format
+#, php-format
msgid "Not a valid people tag: %s."
-msgstr "Etiquetta de personas invalide: %s"
+msgstr "Etiquetta de personas invalide: %s."
#: actions/peopletag.php:142
#, php-format
@@ -2894,9 +2875,8 @@ msgid "Users self-tagged with %1$s - page %2$d"
msgstr "Usatores auto-etiquettate con %1$s - pagina %2$d"
#: actions/postnotice.php:95
-#, fuzzy
msgid "Invalid notice content."
-msgstr "Le contento del nota es invalide"
+msgstr "Le contento del nota es invalide."
#: actions/postnotice.php:101
#, php-format
@@ -3043,9 +3023,9 @@ msgid "Settings saved."
msgstr "Preferentias confirmate."
#: actions/public.php:83
-#, fuzzy, php-format
+#, php-format
msgid "Beyond the page limit (%s)."
-msgstr "Ultra le limite de pagina (%s)"
+msgstr "Ultra le limite de pagina (%s)."
#: actions/public.php:92
msgid "Could not retrieve public stream."
@@ -3305,7 +3285,6 @@ msgid "Invalid username or password."
msgstr "Nomine de usator o contrasigno invalide."
#: actions/register.php:343
-#, fuzzy
msgid ""
"With this form you can create a new account. You can then post notices and "
"link up to friends and colleagues. "
@@ -3342,13 +3321,14 @@ msgid "Longer name, preferably your \"real\" name"
msgstr "Nomine plus longe, preferibilemente tu nomine \"real\""
#: actions/register.php:494
-#, 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 ""
-" excepte iste datos private: contrasigno, adresse de e-mail, adresse de "
-"messageria instantanee, numero de telephono."
+"Mi texto e files es disponibile sub %s excepte iste datos private: "
+"contrasigno, adresse de e-mail, adresse de messageria instantanee, numero de "
+"telephono."
#: actions/register.php:542
#, php-format
@@ -3965,9 +3945,8 @@ msgid "Minimum text limit is 0 (unlimited)."
msgstr "Le limite minimal del texto es 0 (illimitate)."
#: actions/siteadminpanel.php:171
-#, fuzzy
msgid "Dupe limit must be one or more seconds."
-msgstr "Le limite de duplicatos debe esser 1 o plus secundas."
+msgstr "Le limite de duplicatos debe esser un o plus secundas."
#: actions/siteadminpanel.php:221
msgid "General"
@@ -4058,9 +4037,8 @@ msgid "Unable to save site notice."
msgstr "Impossibile salveguardar le aviso del sito."
#: actions/sitenoticeadminpanel.php:113
-#, fuzzy
msgid "Max length for the site-wide notice is 255 chars."
-msgstr "Le longitude maxime del aviso a tote le sito es 255 characteres"
+msgstr "Le longitude maxime del aviso a tote le sito es 255 characteres."
#: actions/sitenoticeadminpanel.php:176
msgid "Site notice text"
@@ -4094,9 +4072,8 @@ msgstr "SMS non es disponibile."
#. TRANS: Form legend for SMS settings form.
#: actions/smssettings.php:111
-#, fuzzy
msgid "SMS address"
-msgstr "Adresse de messageria instantanee"
+msgstr "Adresse SMS"
#. TRANS: Form guide in SMS settings form.
#: actions/smssettings.php:120
@@ -4120,7 +4097,6 @@ msgstr "Entra le codice que tu ha recipite in tu telephono."
#. TRANS: Button label to confirm SMS confirmation code in SMS settings.
#: actions/smssettings.php:148
-#, fuzzy
msgctxt "BUTTON"
msgid "Confirm"
msgstr "Confirmar"
@@ -4137,9 +4113,8 @@ msgstr "Numero de telephono, sin punctuation o spatios, con indicativo"
#. TRANS: Form legend for SMS preferences form.
#: actions/smssettings.php:195
-#, fuzzy
msgid "SMS preferences"
-msgstr "Preferentias"
+msgstr "Preferentias de SMS"
#. TRANS: Checkbox label in SMS preferences form.
#: actions/smssettings.php:201
@@ -4152,9 +4127,8 @@ msgstr ""
#. TRANS: Confirmation message for successful SMS preferences save.
#: actions/smssettings.php:315
-#, fuzzy
msgid "SMS preferences saved."
-msgstr "Preferentias confirmate."
+msgstr "Preferentias de SMS confirmate."
#. TRANS: Message given saving SMS phone number without having provided one.
#: actions/smssettings.php:338
@@ -4192,9 +4166,8 @@ msgstr "Iste codice de confirmation es incorrecte."
#. TRANS: Message given after successfully canceling SMS phone number confirmation.
#: actions/smssettings.php:427
-#, fuzzy
msgid "SMS confirmation cancelled."
-msgstr "Confirmation cancellate."
+msgstr "Confirmation de SMS cancellate."
#. TRANS: Message given trying to remove an SMS phone number that is not
#. TRANS: registered for the active user.
@@ -4204,9 +4177,8 @@ msgstr "Isto non es tu numero de telephono."
#. TRANS: Message given after successfully removing a registered SMS phone number.
#: actions/smssettings.php:470
-#, fuzzy
msgid "The SMS phone number was removed."
-msgstr "Numero de telephono pro SMS"
+msgstr "Le numero de telephono pro SMS ha essite removite."
#. TRANS: Label for mobile carrier dropdown menu in SMS settings.
#: actions/smssettings.php:511
@@ -4258,7 +4230,6 @@ msgid "Invalid snapshot report URL."
msgstr "Le URL pro reportar instantaneos es invalide."
#: actions/snapshotadminpanel.php:200
-#, fuzzy
msgid "Randomly during web hit"
msgstr "Aleatorimente durante un accesso web"
@@ -4494,7 +4465,6 @@ msgid "User is not silenced."
msgstr "Le usator non es silentiate."
#: actions/unsubscribe.php:77
-#, fuzzy
msgid "No profile ID in request."
msgstr "Nulle ID de profilo in requesta."
@@ -4846,7 +4816,7 @@ msgstr "Non poteva actualisar message con nove URI."
#. TRANS: Server exception. %s are the error details.
#: classes/Notice.php:176
-#, fuzzy, php-format
+#, php-format
msgid "Database error inserting hashtag: %s"
msgstr "Error in base de datos durante insertion del marca (hashtag): %s"
@@ -4881,13 +4851,13 @@ msgstr "Il te es prohibite publicar notas in iste sito."
msgid "Problem saving notice."
msgstr "Problema salveguardar nota."
-#: classes/Notice.php:965
+#: classes/Notice.php:967
msgid "Problem saving group inbox."
msgstr "Problema salveguardar le cassa de entrata del gruppo."
#. 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:1513
+#: classes/Notice.php:1535
#, php-format
msgid "RT @%1$s %2$s"
msgstr "RT @%1$s %2$s"
@@ -5170,13 +5140,13 @@ msgstr "Licentia del software StatusNet"
#. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is set.
#: lib/action.php:817
-#, fuzzy, php-format
+#, php-format
msgid ""
"**%%site.name%%** is a microblogging service brought to you by [%%site."
"broughtby%%](%%site.broughtbyurl%%)."
msgstr ""
"**%%site.name%%** es un servicio de microblog offerite per [%%site.broughtby%"
-"%](%%site.broughtbyurl%%). "
+"%](%%site.broughtbyurl%%)."
#. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set.
#: lib/action.php:820
@@ -5225,7 +5195,7 @@ msgstr ""
#: lib/action.php:871
#, php-format
msgid "All %1$s content and data are available under the %2$s license."
-msgstr ""
+msgstr "Tote le contento e datos de %1$s es disponibile sub le licentia %2$s."
#. TRANS: DT element for pagination (previous/next, etc.).
#: lib/action.php:1182
@@ -5347,7 +5317,7 @@ msgid "Snapshots configuration"
msgstr "Configuration del instantaneos"
#. TRANS: Client error 401.
-#: lib/apiauth.php:95
+#: lib/apiauth.php:113
msgid "API resource requires read-write access, but you only have read access."
msgstr ""
"Le ressource de API require accesso pro lectura e scriptura, ma tu ha "
@@ -5438,25 +5408,22 @@ msgstr "Cancellar"
#. TRANS: Application access type
#: lib/applicationlist.php:136
-#, fuzzy
msgid "read-write"
-msgstr "Lectura e scriptura"
+msgstr "lectura-scriptura"
#. TRANS: Application access type
#: lib/applicationlist.php:138
-#, fuzzy
msgid "read-only"
-msgstr "Lectura solmente"
+msgstr "lectura solmente"
#. TRANS: Used in application list. %1$s is a modified date, %2$s is access type (read-write or read-only)
#: lib/applicationlist.php:144
#, php-format
msgid "Approved %1$s - \"%2$s\" access."
-msgstr ""
+msgstr "Accesso \"%2$s\" approbate le %1$s."
#. TRANS: Button label
#: lib/applicationlist.php:159
-#, fuzzy
msgctxt "BUTTON"
msgid "Revoke"
msgstr "Revocar"
@@ -5570,9 +5537,9 @@ msgstr "Non poteva inscriber le usator %1$s in le gruppo %2$s."
#. 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.
#: lib/command.php:385
-#, fuzzy, php-format
+#, php-format
msgid "Could not remove user %1$s from group %2$s"
-msgstr "Non poteva remover le usator %1$s del gruppo %2$s."
+msgstr "Non poteva remover le usator %1$s del gruppo %2$s"
#. TRANS: Whois output. %s is the full name of the queried user.
#: lib/command.php:418
@@ -5612,9 +5579,9 @@ msgstr ""
#. TRANS: Message given if content is too long.
#. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
#: lib/command.php:472
-#, fuzzy, php-format
+#, php-format
msgid "Message too long - maximum is %1$d characters, you sent %2$d"
-msgstr "Message troppo longe - maximo es %1$d characteres, tu inviava %2$d."
+msgstr "Message troppo longe - maximo es %1$d characteres, tu inviava %2$d"
#. TRANS: Message given have sent a direct message to another user.
#. TRANS: %s is the name of the other user.
@@ -6196,9 +6163,9 @@ msgstr "Confirmation SMS"
#. TRANS: Main body heading for SMS-by-email address confirmation message
#: lib/mail.php:457
-#, fuzzy, php-format
+#, php-format
msgid "%s: confirm you own this phone number with this code:"
-msgstr "Iste numero de telephono attende confirmation."
+msgstr "%s: confirma que tu possede iste numero de telephono con iste codice:"
#. TRANS: Subject for 'nudge' notification email
#: lib/mail.php:478
@@ -6327,6 +6294,9 @@ msgid ""
"\n"
"\t%s"
msgstr ""
+"Le conversation complete pote esser legite hic:\n"
+"\n"
+"%s"
#: lib/mail.php:651
#, php-format
@@ -6360,6 +6330,28 @@ msgid ""
"\n"
"P.S. You can turn off these email notifications here: %8$s\n"
msgstr ""
+"%1$s (@%9$s) ha inviate un nota a tu attention (un '@-responsa') in %2$s.\n"
+"\n"
+"Le nota es hic:\n"
+"\n"
+"%3$s\n"
+"\n"
+"Illo dice:\n"
+"\n"
+"%4$s\n"
+"\n"
+"%5$sTu pote responder hic:\n"
+"\n"
+"%6$s\n"
+"\n"
+"Le lista de tote le @-responsas pro te es hic:\n"
+"\n"
+"%7$s\n"
+"\n"
+"Cordialmente,\n"
+"%2$s\n"
+"\n"
+"P.S. Tu pote disactivar iste notificationes electronic hic: %8$s\n"
#: lib/mailbox.php:89
msgid "Only the user can read their own mailboxes."
@@ -6883,56 +6875,56 @@ msgid "Moderator"
msgstr "Moderator"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1054
+#: lib/util.php:1083
msgid "a few seconds ago"
msgstr "alcun secundas retro"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1057
+#: lib/util.php:1086
msgid "about a minute ago"
msgstr "circa un minuta retro"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1061
+#: lib/util.php:1090
#, php-format
msgid "about %d minutes ago"
msgstr "circa %d minutas retro"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1064
+#: lib/util.php:1093
msgid "about an hour ago"
msgstr "circa un hora retro"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1068
+#: lib/util.php:1097
#, php-format
msgid "about %d hours ago"
msgstr "circa %d horas retro"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1071
+#: lib/util.php:1100
msgid "about a day ago"
msgstr "circa un die retro"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1075
+#: lib/util.php:1104
#, php-format
msgid "about %d days ago"
msgstr "circa %d dies retro"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1078
+#: lib/util.php:1107
msgid "about a month ago"
msgstr "circa un mense retro"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1082
+#: lib/util.php:1111
#, php-format
msgid "about %d months ago"
msgstr "circa %d menses retro"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1085
+#: lib/util.php:1114
msgid "about a year ago"
msgstr "circa un anno retro"
diff --git a/locale/is/LC_MESSAGES/statusnet.po b/locale/is/LC_MESSAGES/statusnet.po
index 731a94868..34f87d244 100644
--- a/locale/is/LC_MESSAGES/statusnet.po
+++ b/locale/is/LC_MESSAGES/statusnet.po
@@ -8,12 +8,12 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-12 21:47+0000\n"
-"PO-Revision-Date: 2010-04-12 21:49:07+0000\n"
+"POT-Creation-Date: 2010-04-24 14:16+0000\n"
+"PO-Revision-Date: 2010-04-26 22:17:27+0000\n"
"Language-Team: Icelandic\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r64984); Translate extension (2010-01-16)\n"
+"X-Generator: MediaWiki 1.17alpha (r65552); Translate extension (2010-04-25)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: is\n"
"X-Message-Group: out-statusnet\n"
@@ -107,8 +107,8 @@ msgstr "Ekkert þannig merki."
#: actions/apidirectmessagenew.php:75 actions/apigroupcreate.php:112
#: actions/apigroupismember.php:90 actions/apigroupjoin.php:99
#: actions/apigroupleave.php:99 actions/apigrouplist.php:72
-#: actions/apistatusesupdate.php:148 actions/apisubscriptions.php:87
-#: actions/apitimelinefavorites.php:71 actions/apitimelinefriends.php:78
+#: actions/apistatusesupdate.php:239 actions/apisubscriptions.php:87
+#: actions/apitimelinefavorites.php:71 actions/apitimelinefriends.php:173
#: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79
#: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75
#: actions/favoritesrss.php:74 actions/foaf.php:40 actions/foaf.php:58
@@ -132,7 +132,7 @@ msgstr "%s og vinirnir, síða %d"
#. TRANS: H1 text. %1$s is user nickname
#. TRANS: Message is used as link title. %s is a user nickname.
#: actions/all.php:89 actions/all.php:181 actions/allrss.php:116
-#: actions/apitimelinefriends.php:114 actions/apitimelinehome.php:115
+#: actions/apitimelinefriends.php:209 actions/apitimelinehome.php:115
#: lib/personalgroupnav.php:100
#, php-format
msgid "%s and friends"
@@ -192,7 +192,7 @@ msgstr ""
#. 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:121 actions/apitimelinefriends.php:120
+#: actions/allrss.php:121 actions/apitimelinefriends.php:215
#: actions/apitimelinehome.php:121
#, php-format
msgid "Updates from %1$s and friends on %2$s!"
@@ -214,9 +214,9 @@ msgstr "Færslur frá %1$s og vinum á %2$s!"
#: actions/apistatusesdestroy.php:102 actions/apistatusesretweets.php:112
#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:141
#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111
-#: actions/apitimelinefavorites.php:173 actions/apitimelinefriends.php:175
+#: actions/apitimelinefavorites.php:173 actions/apitimelinefriends.php:270
#: actions/apitimelinegroup.php:151 actions/apitimelinehome.php:174
-#: actions/apitimelinementions.php:173 actions/apitimelinepublic.php:151
+#: actions/apitimelinementions.php:173 actions/apitimelinepublic.php:240
#: actions/apitimelineretweetedtome.php:121
#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:160
#: actions/apitimelineuser.php:162 actions/apiusershow.php:101
@@ -234,7 +234,7 @@ msgstr "Aðferð í forritsskilum fannst ekki!"
#: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91
#: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91
#: actions/apigroupleave.php:91 actions/apimediaupload.php:67
-#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:118
+#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:209
msgid "This method requires a POST."
msgstr "Þessi aðferð krefst POST."
@@ -266,7 +266,7 @@ msgstr "Gat ekki vistað persónulega síðu."
#: actions/apiaccountupdateprofilebackgroundimage.php:108
#: actions/apiaccountupdateprofileimage.php:97 actions/apimediaupload.php:80
-#: actions/apistatusesupdate.php:131 actions/avatarsettings.php:257
+#: actions/apistatusesupdate.php:222 actions/avatarsettings.php:257
#: actions/designadminpanel.php:123 actions/editapplication.php:118
#: actions/newapplication.php:101 actions/newnotice.php:94
#: lib/designsettings.php:283
@@ -662,17 +662,17 @@ msgstr ""
msgid "No status with that ID found."
msgstr "Engin staða með þessu kenni fannst."
-#: actions/apistatusesupdate.php:161 actions/newnotice.php:155
+#: actions/apistatusesupdate.php:252 actions/newnotice.php:155
#: lib/mailhandler.php:60
#, fuzzy, php-format
msgid "That's too long. Max notice size is %d chars."
msgstr "Þetta er of langt. Hámarkslengd babls er 140 tákn."
-#: actions/apistatusesupdate.php:202 actions/apiusershow.php:96
+#: actions/apistatusesupdate.php:293 actions/apiusershow.php:96
msgid "Not found."
msgstr "Fannst ekki."
-#: actions/apistatusesupdate.php:225 actions/newnotice.php:178
+#: actions/apistatusesupdate.php:316 actions/newnotice.php:178
#, php-format
msgid "Max notice size is %d chars, including attachment URL."
msgstr ""
@@ -702,12 +702,12 @@ msgstr ""
msgid "%1$s updates that reply to updates from %2$s / %3$s."
msgstr "%1$s færslur sem svara færslum frá %2$s / %3$s."
-#: actions/apitimelinepublic.php:107 actions/publicrss.php:103
+#: actions/apitimelinepublic.php:196 actions/publicrss.php:103
#, php-format
msgid "%s public timeline"
msgstr "Almenningsrás %s"
-#: actions/apitimelinepublic.php:112 actions/publicrss.php:105
+#: actions/apitimelinepublic.php:201 actions/publicrss.php:105
#, php-format
msgid "%s updates from everyone!"
msgstr "%s færslur frá öllum!"
@@ -2364,10 +2364,14 @@ msgstr ""
"lykilorð áður en þú breytir stillingunum þínum."
#: actions/login.php:270
+#, fuzzy
+msgid "Login with your username and password."
+msgstr "Skráðu þig inn með notendanafni og lykilorði"
+
+#: actions/login.php:273
#, fuzzy, php-format
msgid ""
-"Login with your username and password. Don't have a username yet? [Register]"
-"(%%action.register%%) a new account."
+"Don't have a username yet? [Register](%%action.register%%) a new account."
msgstr ""
"Skráðu þig inn með notendanafninu þínu og lykilorði. Ertu ekki með "
"notendanafn? [Nýskráðu þig](%%action.register%%) eða prófaðu [OpenID](%%"
@@ -2599,8 +2603,8 @@ msgid "Only %s URLs over plain HTTP please."
msgstr ""
#. TRANS: Client error on an API request with an unsupported data format.
-#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1069
-#: lib/apiaction.php:1098 lib/apiaction.php:1215
+#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1131
+#: lib/apiaction.php:1160 lib/apiaction.php:1277
msgid "Not a supported data format."
msgstr "Enginn stuðningur við gagnasnið."
@@ -4888,14 +4892,14 @@ msgstr "Það hefur verið lagt bann við babli frá þér á þessari síðu."
msgid "Problem saving notice."
msgstr "Vandamál komu upp við að vista babl."
-#: classes/Notice.php:965
+#: classes/Notice.php:967
#, fuzzy
msgid "Problem saving group inbox."
msgstr "Vandamál komu upp við að vista babl."
#. 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:1513
+#: classes/Notice.php:1535
#, fuzzy, php-format
msgid "RT @%1$s %2$s"
msgstr "%1$s (%2$s)"
@@ -5392,7 +5396,7 @@ msgid "Snapshots configuration"
msgstr "SMS staðfesting"
#. TRANS: Client error 401.
-#: lib/apiauth.php:95
+#: lib/apiauth.php:113
msgid "API resource requires read-write access, but you only have read access."
msgstr ""
@@ -6844,56 +6848,56 @@ msgid "Moderator"
msgstr ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1054
+#: lib/util.php:1083
msgid "a few seconds ago"
msgstr "fyrir nokkrum sekúndum"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1057
+#: lib/util.php:1086
msgid "about a minute ago"
msgstr "fyrir um einni mínútu síðan"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1061
+#: lib/util.php:1090
#, php-format
msgid "about %d minutes ago"
msgstr "fyrir um %d mínútum síðan"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1064
+#: lib/util.php:1093
msgid "about an hour ago"
msgstr "fyrir um einum klukkutíma síðan"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1068
+#: lib/util.php:1097
#, php-format
msgid "about %d hours ago"
msgstr "fyrir um %d klukkutímum síðan"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1071
+#: lib/util.php:1100
msgid "about a day ago"
msgstr "fyrir um einum degi síðan"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1075
+#: lib/util.php:1104
#, php-format
msgid "about %d days ago"
msgstr "fyrir um %d dögum síðan"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1078
+#: lib/util.php:1107
msgid "about a month ago"
msgstr "fyrir um einum mánuði síðan"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1082
+#: lib/util.php:1111
#, php-format
msgid "about %d months ago"
msgstr "fyrir um %d mánuðum síðan"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1085
+#: lib/util.php:1114
msgid "about a year ago"
msgstr "fyrir um einu ári síðan"
diff --git a/locale/it/LC_MESSAGES/statusnet.po b/locale/it/LC_MESSAGES/statusnet.po
index b3aa969ae..de429fe9b 100644
--- a/locale/it/LC_MESSAGES/statusnet.po
+++ b/locale/it/LC_MESSAGES/statusnet.po
@@ -9,12 +9,12 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-12 21:47+0000\n"
-"PO-Revision-Date: 2010-04-12 21:49:10+0000\n"
+"POT-Creation-Date: 2010-04-24 14:16+0000\n"
+"PO-Revision-Date: 2010-04-26 22:17:37+0000\n"
"Language-Team: Italian\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r64984); Translate extension (2010-01-16)\n"
+"X-Generator: MediaWiki 1.17alpha (r65552); Translate extension (2010-04-25)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: it\n"
"X-Message-Group: out-statusnet\n"
@@ -100,8 +100,8 @@ msgstr "Pagina inesistente."
#: actions/apidirectmessagenew.php:75 actions/apigroupcreate.php:112
#: actions/apigroupismember.php:90 actions/apigroupjoin.php:99
#: actions/apigroupleave.php:99 actions/apigrouplist.php:72
-#: actions/apistatusesupdate.php:148 actions/apisubscriptions.php:87
-#: actions/apitimelinefavorites.php:71 actions/apitimelinefriends.php:78
+#: actions/apistatusesupdate.php:239 actions/apisubscriptions.php:87
+#: actions/apitimelinefavorites.php:71 actions/apitimelinefriends.php:173
#: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79
#: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75
#: actions/favoritesrss.php:74 actions/foaf.php:40 actions/foaf.php:58
@@ -125,7 +125,7 @@ msgstr "%1$s e amici, pagina %2$d"
#. TRANS: H1 text. %1$s is user nickname
#. TRANS: Message is used as link title. %s is a user nickname.
#: actions/all.php:89 actions/all.php:181 actions/allrss.php:116
-#: actions/apitimelinefriends.php:114 actions/apitimelinehome.php:115
+#: actions/apitimelinefriends.php:209 actions/apitimelinehome.php:115
#: lib/personalgroupnav.php:100
#, php-format
msgid "%s and friends"
@@ -194,7 +194,7 @@ msgstr "Tu e i tuoi amici"
#. 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:121 actions/apitimelinefriends.php:120
+#: actions/allrss.php:121 actions/apitimelinefriends.php:215
#: actions/apitimelinehome.php:121
#, php-format
msgid "Updates from %1$s and friends on %2$s!"
@@ -216,9 +216,9 @@ msgstr "Messaggi da %1$s e amici su %2$s!"
#: actions/apistatusesdestroy.php:102 actions/apistatusesretweets.php:112
#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:141
#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111
-#: actions/apitimelinefavorites.php:173 actions/apitimelinefriends.php:175
+#: actions/apitimelinefavorites.php:173 actions/apitimelinefriends.php:270
#: actions/apitimelinegroup.php:151 actions/apitimelinehome.php:174
-#: actions/apitimelinementions.php:173 actions/apitimelinepublic.php:151
+#: actions/apitimelinementions.php:173 actions/apitimelinepublic.php:240
#: actions/apitimelineretweetedtome.php:121
#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:160
#: actions/apitimelineuser.php:162 actions/apiusershow.php:101
@@ -235,7 +235,7 @@ msgstr "Metodo delle API non trovato."
#: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91
#: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91
#: actions/apigroupleave.php:91 actions/apimediaupload.php:67
-#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:118
+#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:209
msgid "This method requires a POST."
msgstr "Questo metodo richiede POST."
@@ -267,7 +267,7 @@ msgstr "Impossibile salvare il profilo."
#: actions/apiaccountupdateprofilebackgroundimage.php:108
#: actions/apiaccountupdateprofileimage.php:97 actions/apimediaupload.php:80
-#: actions/apistatusesupdate.php:131 actions/avatarsettings.php:257
+#: actions/apistatusesupdate.php:222 actions/avatarsettings.php:257
#: actions/designadminpanel.php:123 actions/editapplication.php:118
#: actions/newapplication.php:101 actions/newnotice.php:94
#: lib/designsettings.php:283
@@ -656,17 +656,17 @@ msgstr "Messaggio eliminato."
msgid "No status with that ID found."
msgstr "Nessuno stato trovato con quel ID."
-#: actions/apistatusesupdate.php:161 actions/newnotice.php:155
+#: actions/apistatusesupdate.php:252 actions/newnotice.php:155
#: lib/mailhandler.php:60
#, php-format
msgid "That's too long. Max notice size is %d chars."
msgstr "Troppo lungo. Lunghezza massima %d caratteri."
-#: actions/apistatusesupdate.php:202 actions/apiusershow.php:96
+#: actions/apistatusesupdate.php:293 actions/apiusershow.php:96
msgid "Not found."
msgstr "Non trovato."
-#: actions/apistatusesupdate.php:225 actions/newnotice.php:178
+#: actions/apistatusesupdate.php:316 actions/newnotice.php:178
#, php-format
msgid "Max notice size is %d chars, including attachment URL."
msgstr ""
@@ -696,12 +696,12 @@ msgstr "%1$s / Messaggi che citano %2$s"
msgid "%1$s updates that reply to updates from %2$s / %3$s."
msgstr "%1$s messaggi in risposta a quelli da %2$s / %3$s"
-#: actions/apitimelinepublic.php:107 actions/publicrss.php:103
+#: actions/apitimelinepublic.php:196 actions/publicrss.php:103
#, php-format
msgid "%s public timeline"
msgstr "Attività pubblica di %s"
-#: actions/apitimelinepublic.php:112 actions/publicrss.php:105
+#: actions/apitimelinepublic.php:201 actions/publicrss.php:105
#, php-format
msgid "%s updates from everyone!"
msgstr "Aggiornamenti di %s da tutti!"
@@ -841,7 +841,6 @@ msgstr ""
#: actions/block.php:145 actions/deleteapplication.php:154
#: actions/deletenotice.php:147 actions/deleteuser.php:152
#: actions/groupblock.php:178
-#, fuzzy
msgctxt "BUTTON"
msgid "No"
msgstr "No"
@@ -860,7 +859,6 @@ msgstr "Non bloccare questo utente"
#: actions/block.php:152 actions/deleteapplication.php:161
#: actions/deletenotice.php:154 actions/deleteuser.php:159
#: actions/groupblock.php:185
-#, fuzzy
msgctxt "BUTTON"
msgid "Yes"
msgstr "Sì"
@@ -1362,7 +1360,6 @@ msgstr "Indirizzo email attualmente confermato."
#: actions/emailsettings.php:115 actions/emailsettings.php:158
#: actions/imsettings.php:116 actions/smssettings.php:124
#: actions/smssettings.php:180
-#, fuzzy
msgctxt "BUTTON"
msgid "Remove"
msgstr "Rimuovi"
@@ -1396,7 +1393,6 @@ msgstr "Indirizzo email, del tipo \"nomeutente@example.org\""
#. TRANS: Button label for adding a SMS phone number in SMS settings form.
#: actions/emailsettings.php:139 actions/imsettings.php:148
#: actions/smssettings.php:162
-#, fuzzy
msgctxt "BUTTON"
msgid "Add"
msgstr "Aggiungi"
@@ -1424,16 +1420,14 @@ 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:168 actions/smssettings.php:189
-#, fuzzy
msgctxt "BUTTON"
msgid "New"
msgstr "Nuovo"
#. TRANS: Form legend for e-mail preferences form.
#: actions/emailsettings.php:174
-#, fuzzy
msgid "Email preferences"
-msgstr "Preferenze"
+msgstr "Preferenze dell'email"
#. TRANS: Checkbox label in e-mail preferences form.
#: actions/emailsettings.php:180
@@ -1473,9 +1467,8 @@ msgstr "Pubblica un MicroID per il mio indirizzo email"
#. TRANS: Confirmation message for successful e-mail preferences save.
#: actions/emailsettings.php:334
-#, fuzzy
msgid "Email preferences saved."
-msgstr "Preferenze dell'aspetto salvate."
+msgstr "Preferenze dell'email salvate."
#. TRANS: Message given saving e-mail address without having provided one.
#: actions/emailsettings.php:353
@@ -1531,15 +1524,13 @@ msgstr "Nessuna conferma da annullare."
#. TRANS: Message given canceling e-mail address confirmation for the wrong e-mail address.
#: actions/emailsettings.php:424
-#, fuzzy
msgid "That is the wrong email address."
-msgstr "Quello è l'indirizzo di messaggistica sbagliato."
+msgstr "Quello è l'indirizzo email sbagliato."
#. TRANS: Message given after successfully canceling e-mail address confirmation.
#: actions/emailsettings.php:438
-#, fuzzy
msgid "Email confirmation cancelled."
-msgstr "Conferma annullata."
+msgstr "Conferma dell'email annullata."
#. TRANS: Message given trying to remove an e-mail address that is not
#. TRANS: registered for the active user.
@@ -1549,9 +1540,8 @@ msgstr "Quello non è il tuo indirizzo email."
#. TRANS: Message given after successfully removing a registered e-mail address.
#: actions/emailsettings.php:479
-#, fuzzy
msgid "The email address was removed."
-msgstr "L'indirizzo è stato rimosso."
+msgstr "L'indirizzo email è stato rimosso."
#: actions/emailsettings.php:493 actions/smssettings.php:568
msgid "No incoming email address."
@@ -2013,9 +2003,8 @@ msgstr ""
#. TRANS: Form legend for IM preferences form.
#: actions/imsettings.php:155
-#, fuzzy
msgid "IM preferences"
-msgstr "Preferenze"
+msgstr "Preferenze messaggistica"
#. TRANS: Checkbox label in IM preferences form.
#: actions/imsettings.php:160
@@ -2085,15 +2074,13 @@ msgstr "Quello è l'indirizzo di messaggistica sbagliato."
#. TRANS: Server error thrown on database error canceling IM address confirmation.
#: actions/imsettings.php:397
-#, fuzzy
msgid "Couldn't delete IM confirmation."
-msgstr "Impossibile eliminare l'email di conferma."
+msgstr "Impossibile eliminare la conferma della messaggistica."
#. TRANS: Message given after successfully canceling IM address confirmation.
#: actions/imsettings.php:402
-#, fuzzy
msgid "IM confirmation cancelled."
-msgstr "Conferma annullata."
+msgstr "Conferma della messaggistica annullata."
#. TRANS: Message given trying to remove an IM address that is not
#. TRANS: registered for the active user.
@@ -2103,9 +2090,8 @@ msgstr "Quello non è il tuo ID di Jabber."
#. TRANS: Message given after successfully removing a registered IM address.
#: actions/imsettings.php:447
-#, fuzzy
msgid "The IM address was removed."
-msgstr "L'indirizzo è stato rimosso."
+msgstr "L'indirizzo di messaggistica è stato rimosso."
#: actions/inbox.php:59
#, php-format
@@ -2337,13 +2323,15 @@ msgstr ""
"la tua password prima di modificare le impostazioni."
#: actions/login.php:270
+msgid "Login with your username and password."
+msgstr "Accedi con nome utente e password."
+
+#: actions/login.php:273
#, php-format
msgid ""
-"Login with your username and password. Don't have a username yet? [Register]"
-"(%%action.register%%) a new account."
+"Don't have a username yet? [Register](%%action.register%%) a new account."
msgstr ""
-"Accedi col tuo nome utente e password. Non hai ancora un nome utente? [Crea]"
-"(%%action.register%%) un nuovo account."
+"Non hai ancora un nome utente? [Crea](%%action.register%%) un nuovo account."
#: actions/makeadmin.php:92
msgid "Only an admin can make another user an admin."
@@ -2567,8 +2555,8 @@ msgid "Only %s URLs over plain HTTP please."
msgstr "Solo URL %s attraverso HTTP semplice."
#. TRANS: Client error on an API request with an unsupported data format.
-#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1069
-#: lib/apiaction.php:1098 lib/apiaction.php:1215
+#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1131
+#: lib/apiaction.php:1160 lib/apiaction.php:1277
msgid "Not a supported data format."
msgstr "Non è un formato di dati supportato."
@@ -2598,7 +2586,7 @@ msgstr "Accorcia gli URL con"
#: actions/othersettings.php:117
msgid "Automatic shortening service to use."
-msgstr "Servizio di autoriduzione da usare."
+msgstr "Servizio di autoriduzione da usare"
#: actions/othersettings.php:122
msgid "View profile designs"
@@ -2606,7 +2594,7 @@ msgstr "Visualizza aspetto"
#: actions/othersettings.php:123
msgid "Show or hide profile designs."
-msgstr "Mostra o nasconde gli aspetti del profilo."
+msgstr "Mostra o nasconde gli aspetti del profilo"
#: actions/othersettings.php:153
msgid "URL shortening service is too long (max 50 chars)."
@@ -4081,9 +4069,8 @@ msgstr "Il servizio SMS non è disponibile."
#. TRANS: Form legend for SMS settings form.
#: actions/smssettings.php:111
-#, fuzzy
msgid "SMS address"
-msgstr "Indirizzo di messaggistica istantanea"
+msgstr "Indirizzo SMS"
#. TRANS: Form guide in SMS settings form.
#: actions/smssettings.php:120
@@ -4107,7 +4094,6 @@ msgstr "Inserisci il codice che hai ricevuto sul tuo telefono."
#. TRANS: Button label to confirm SMS confirmation code in SMS settings.
#: actions/smssettings.php:148
-#, fuzzy
msgctxt "BUTTON"
msgid "Confirm"
msgstr "Conferma"
@@ -4124,9 +4110,8 @@ msgstr "Numero di telefono, senza punteggiatura o spazi, con il prefisso"
#. TRANS: Form legend for SMS preferences form.
#: actions/smssettings.php:195
-#, fuzzy
msgid "SMS preferences"
-msgstr "Preferenze"
+msgstr "Preferenze dell'SMS"
#. TRANS: Checkbox label in SMS preferences form.
#: actions/smssettings.php:201
@@ -4139,9 +4124,8 @@ msgstr ""
#. TRANS: Confirmation message for successful SMS preferences save.
#: actions/smssettings.php:315
-#, fuzzy
msgid "SMS preferences saved."
-msgstr "Preferenze salvate."
+msgstr "Preferenze dell'SMS salvate."
#. TRANS: Message given saving SMS phone number without having provided one.
#: actions/smssettings.php:338
@@ -4180,9 +4164,8 @@ msgstr "Quello è il numero di conferma errato."
#. TRANS: Message given after successfully canceling SMS phone number confirmation.
#: actions/smssettings.php:427
-#, fuzzy
msgid "SMS confirmation cancelled."
-msgstr "Conferma annullata."
+msgstr "Conferma dell'SMS annullata."
#. TRANS: Message given trying to remove an SMS phone number that is not
#. TRANS: registered for the active user.
@@ -4192,9 +4175,8 @@ msgstr "Quello non è il tuo numero di telefono."
#. TRANS: Message given after successfully removing a registered SMS phone number.
#: actions/smssettings.php:470
-#, fuzzy
msgid "The SMS phone number was removed."
-msgstr "Numero di telefono per SMS"
+msgstr "Il numero di telefono per SMS è stato rimosso."
#. TRANS: Label for mobile carrier dropdown menu in SMS settings.
#: actions/smssettings.php:511
@@ -4869,13 +4851,13 @@ msgstr "Ti è proibito inviare messaggi su questo sito."
msgid "Problem saving notice."
msgstr "Problema nel salvare il messaggio."
-#: classes/Notice.php:965
+#: classes/Notice.php:967
msgid "Problem saving group inbox."
msgstr "Problema nel salvare la casella della posta del gruppo."
#. 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:1513
+#: classes/Notice.php:1535
#, php-format
msgid "RT @%1$s %2$s"
msgstr "RT @%1$s %2$s"
@@ -5337,7 +5319,7 @@ msgid "Snapshots configuration"
msgstr "Configurazione snapshot"
#. TRANS: Client error 401.
-#: lib/apiauth.php:95
+#: lib/apiauth.php:113
msgid "API resource requires read-write access, but you only have read access."
msgstr ""
"Le risorse API richiedono accesso lettura-scrittura, ma si dispone del solo "
@@ -5556,9 +5538,9 @@ msgstr "Impossibile iscrivere l'utente %1$s al gruppo %2$s."
#. 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.
#: lib/command.php:385
-#, fuzzy, php-format
+#, php-format
msgid "Could not remove user %1$s from group %2$s"
-msgstr "Impossibile rimuovere l'utente %1$s dal gruppo %2$s."
+msgstr "Impossibile rimuovere l'utente %1$s dal gruppo %2$s"
#. TRANS: Whois output. %s is the full name of the queried user.
#: lib/command.php:418
@@ -5598,9 +5580,9 @@ msgstr ""
#. TRANS: Message given if content is too long.
#. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
#: lib/command.php:472
-#, fuzzy, php-format
+#, php-format
msgid "Message too long - maximum is %1$d characters, you sent %2$d"
-msgstr "Messaggio troppo lungo: massimo %1$d caratteri, inviati %2$d."
+msgstr "Messaggio troppo lungo: massimo %1$d caratteri, inviati %2$d"
#. TRANS: Message given have sent a direct message to another user.
#. TRANS: %s is the name of the other user.
@@ -6354,6 +6336,29 @@ msgid ""
"\n"
"P.S. You can turn off these email notifications here: %8$s\n"
msgstr ""
+"%1$s (@%9$s) ti ha appena inviato un messaggio (una \"@-risposta\") su %2"
+"$s.\n"
+"\n"
+"Il messaggio è qui:\n"
+"\n"
+"%3$s\n"
+"\n"
+"E dice:\n"
+"\n"
+"%4$s\n"
+"\n"
+"%5$sPuoi rispondere qui:\n"
+"\n"
+"%6$s\n"
+"\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"
#: lib/mailbox.php:89
msgid "Only the user can read their own mailboxes."
@@ -6876,56 +6881,56 @@ msgid "Moderator"
msgstr "Moderatore"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1054
+#: lib/util.php:1083
msgid "a few seconds ago"
msgstr "pochi secondi fa"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1057
+#: lib/util.php:1086
msgid "about a minute ago"
msgstr "circa un minuto fa"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1061
+#: lib/util.php:1090
#, php-format
msgid "about %d minutes ago"
msgstr "circa %d minuti fa"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1064
+#: lib/util.php:1093
msgid "about an hour ago"
msgstr "circa un'ora fa"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1068
+#: lib/util.php:1097
#, php-format
msgid "about %d hours ago"
msgstr "circa %d ore fa"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1071
+#: lib/util.php:1100
msgid "about a day ago"
msgstr "circa un giorno fa"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1075
+#: lib/util.php:1104
#, php-format
msgid "about %d days ago"
msgstr "circa %d giorni fa"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1078
+#: lib/util.php:1107
msgid "about a month ago"
msgstr "circa un mese fa"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1082
+#: lib/util.php:1111
#, php-format
msgid "about %d months ago"
msgstr "circa %d mesi fa"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1085
+#: lib/util.php:1114
msgid "about a year ago"
msgstr "circa un anno fa"
diff --git a/locale/ja/LC_MESSAGES/statusnet.po b/locale/ja/LC_MESSAGES/statusnet.po
index d70e8262d..76ca28c24 100644
--- a/locale/ja/LC_MESSAGES/statusnet.po
+++ b/locale/ja/LC_MESSAGES/statusnet.po
@@ -10,12 +10,12 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-12 21:47+0000\n"
-"PO-Revision-Date: 2010-04-12 21:49:13+0000\n"
+"POT-Creation-Date: 2010-04-24 14:16+0000\n"
+"PO-Revision-Date: 2010-04-26 22:17:40+0000\n"
"Language-Team: Japanese\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r64984); Translate extension (2010-01-16)\n"
+"X-Generator: MediaWiki 1.17alpha (r65552); Translate extension (2010-04-25)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: ja\n"
"X-Message-Group: out-statusnet\n"
@@ -102,8 +102,8 @@ msgstr "ãã®ã‚ˆã†ãªãƒšãƒ¼ã‚¸ã¯ã‚ã‚Šã¾ã›ã‚“。"
#: actions/apidirectmessagenew.php:75 actions/apigroupcreate.php:112
#: actions/apigroupismember.php:90 actions/apigroupjoin.php:99
#: actions/apigroupleave.php:99 actions/apigrouplist.php:72
-#: actions/apistatusesupdate.php:148 actions/apisubscriptions.php:87
-#: actions/apitimelinefavorites.php:71 actions/apitimelinefriends.php:78
+#: actions/apistatusesupdate.php:239 actions/apisubscriptions.php:87
+#: actions/apitimelinefavorites.php:71 actions/apitimelinefriends.php:173
#: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79
#: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75
#: actions/favoritesrss.php:74 actions/foaf.php:40 actions/foaf.php:58
@@ -127,7 +127,7 @@ msgstr "%1$s ã¨å‹äººã€ãƒšãƒ¼ã‚¸ %2$d"
#. TRANS: H1 text. %1$s is user nickname
#. TRANS: Message is used as link title. %s is a user nickname.
#: actions/all.php:89 actions/all.php:181 actions/allrss.php:116
-#: actions/apitimelinefriends.php:114 actions/apitimelinehome.php:115
+#: actions/apitimelinefriends.php:209 actions/apitimelinehome.php:115
#: lib/personalgroupnav.php:100
#, php-format
msgid "%s and friends"
@@ -193,7 +193,7 @@ msgstr "ã‚ãªãŸã¨å‹äºº"
#. 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:121 actions/apitimelinefriends.php:120
+#: actions/allrss.php:121 actions/apitimelinefriends.php:215
#: actions/apitimelinehome.php:121
#, php-format
msgid "Updates from %1$s and friends on %2$s!"
@@ -215,9 +215,9 @@ msgstr "%2$s ã« %1$s ã¨å‹äººã‹ã‚‰ã®æ›´æ–°ãŒã‚ã‚Šã¾ã™ï¼"
#: actions/apistatusesdestroy.php:102 actions/apistatusesretweets.php:112
#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:141
#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111
-#: actions/apitimelinefavorites.php:173 actions/apitimelinefriends.php:175
+#: actions/apitimelinefavorites.php:173 actions/apitimelinefriends.php:270
#: actions/apitimelinegroup.php:151 actions/apitimelinehome.php:174
-#: actions/apitimelinementions.php:173 actions/apitimelinepublic.php:151
+#: actions/apitimelinementions.php:173 actions/apitimelinepublic.php:240
#: actions/apitimelineretweetedtome.php:121
#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:160
#: actions/apitimelineuser.php:162 actions/apiusershow.php:101
@@ -234,7 +234,7 @@ msgstr "API メソッドãŒè¦‹ã¤ã‹ã‚Šã¾ã›ã‚“。"
#: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91
#: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91
#: actions/apigroupleave.php:91 actions/apimediaupload.php:67
-#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:118
+#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:209
msgid "This method requires a POST."
msgstr "ã“ã®ãƒ¡ã‚½ãƒƒãƒ‰ã«ã¯ POST ãŒå¿…è¦ã§ã™ã€‚"
@@ -267,7 +267,7 @@ msgstr "プロフィールをä¿å­˜ã§ãã¾ã›ã‚“ã§ã—ãŸã€‚"
#: actions/apiaccountupdateprofilebackgroundimage.php:108
#: actions/apiaccountupdateprofileimage.php:97 actions/apimediaupload.php:80
-#: actions/apistatusesupdate.php:131 actions/avatarsettings.php:257
+#: actions/apistatusesupdate.php:222 actions/avatarsettings.php:257
#: actions/designadminpanel.php:123 actions/editapplication.php:118
#: actions/newapplication.php:101 actions/newnotice.php:94
#: lib/designsettings.php:283
@@ -654,17 +654,17 @@ msgstr "ステータスを削除ã—ã¾ã—ãŸã€‚"
msgid "No status with that ID found."
msgstr "ãã®ï¼©ï¼¤ã§ã®ã‚¹ãƒ†ãƒ¼ã‚¿ã‚¹ã¯ã‚ã‚Šã¾ã›ã‚“。"
-#: actions/apistatusesupdate.php:161 actions/newnotice.php:155
+#: actions/apistatusesupdate.php:252 actions/newnotice.php:155
#: lib/mailhandler.php:60
#, php-format
msgid "That's too long. Max notice size is %d chars."
msgstr "é•·ã™ãŽã¾ã™ã€‚ã¤ã¶ã‚„ãã¯æœ€å¤§ 140 å­—ã¾ã§ã§ã™ã€‚"
-#: actions/apistatusesupdate.php:202 actions/apiusershow.php:96
+#: actions/apistatusesupdate.php:293 actions/apiusershow.php:96
msgid "Not found."
msgstr "見ã¤ã‹ã‚Šã¾ã›ã‚“。"
-#: actions/apistatusesupdate.php:225 actions/newnotice.php:178
+#: actions/apistatusesupdate.php:316 actions/newnotice.php:178
#, php-format
msgid "Max notice size is %d chars, including attachment URL."
msgstr "ã¤ã¶ã‚„ã㯠URL ã‚’å«ã‚ã¦æœ€å¤§ %d å­—ã¾ã§ã§ã™ã€‚"
@@ -693,12 +693,12 @@ msgstr "%1$s / %2$s ã«ã¤ã„ã¦æ›´æ–°"
msgid "%1$s updates that reply to updates from %2$s / %3$s."
msgstr "%2$s ã‹ã‚‰ã‚¢ãƒƒãƒ—デートã«ç­”ãˆã‚‹ %1$s アップデート"
-#: actions/apitimelinepublic.php:107 actions/publicrss.php:103
+#: actions/apitimelinepublic.php:196 actions/publicrss.php:103
#, php-format
msgid "%s public timeline"
msgstr "%s ã®ãƒ‘ブリックタイムライン"
-#: actions/apitimelinepublic.php:112 actions/publicrss.php:105
+#: actions/apitimelinepublic.php:201 actions/publicrss.php:105
#, php-format
msgid "%s updates from everyone!"
msgstr "皆ã‹ã‚‰ã® %s アップデート!"
@@ -2341,10 +2341,14 @@ msgstr ""
"ã¦ä¸‹ã•ã„。"
#: actions/login.php:270
-#, php-format
+#, fuzzy
+msgid "Login with your username and password."
+msgstr "ユーザåã¨ãƒ‘スワードã§ãƒ­ã‚°ã‚¤ãƒ³"
+
+#: actions/login.php:273
+#, fuzzy, php-format
msgid ""
-"Login with your username and password. Don't have a username yet? [Register]"
-"(%%action.register%%) a new account."
+"Don't have a username yet? [Register](%%action.register%%) a new account."
msgstr ""
"ユーザåã¨ãƒ‘スワードã§ã€ãƒ­ã‚°ã‚¤ãƒ³ã—ã¦ãã ã•ã„。 ã¾ã ãƒ¦ãƒ¼ã‚¶åã‚’æŒã£ã¦ã„ã¾ã›ã‚“"
"ã‹? æ–°ã—ã„アカウントを [登録](%%action.register%%)。"
@@ -2572,8 +2576,8 @@ msgid "Only %s URLs over plain HTTP please."
msgstr ""
#. TRANS: Client error on an API request with an unsupported data format.
-#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1069
-#: lib/apiaction.php:1098 lib/apiaction.php:1215
+#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1131
+#: lib/apiaction.php:1160 lib/apiaction.php:1277
msgid "Not a supported data format."
msgstr "サãƒãƒ¼ãƒˆã•ã‚Œã¦ã„ãªã„データ形å¼ã€‚"
@@ -4880,13 +4884,13 @@ msgstr "ã‚ãªãŸã¯ã“ã®ã‚µã‚¤ãƒˆã§ã¤ã¶ã‚„ãを投稿ã™ã‚‹ã®ãŒç¦æ­¢ã•
msgid "Problem saving notice."
msgstr "ã¤ã¶ã‚„ãã‚’ä¿å­˜ã™ã‚‹éš›ã«å•é¡ŒãŒç™ºç”Ÿã—ã¾ã—ãŸã€‚"
-#: classes/Notice.php:965
+#: classes/Notice.php:967
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:1513
+#: classes/Notice.php:1535
#, php-format
msgid "RT @%1$s %2$s"
msgstr ""
@@ -5367,7 +5371,7 @@ msgid "Snapshots configuration"
msgstr "パス設定"
#. TRANS: Client error 401.
-#: lib/apiauth.php:95
+#: lib/apiauth.php:113
msgid "API resource requires read-write access, but you only have read access."
msgstr ""
"APIリソースã¯èª­ã¿æ›¸ãアクセスãŒå¿…è¦ã§ã™ã€ã—ã‹ã—ã‚ãªãŸã¯èª­ã¿ã‚¢ã‚¯ã‚»ã‚¹ã—ã‹æŒã£ã¦"
@@ -6870,56 +6874,56 @@ msgid "Moderator"
msgstr "管ç†"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1054
+#: lib/util.php:1083
msgid "a few seconds ago"
msgstr "数秒å‰"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1057
+#: lib/util.php:1086
msgid "about a minute ago"
msgstr "ç´„ 1 分å‰"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1061
+#: lib/util.php:1090
#, php-format
msgid "about %d minutes ago"
msgstr "ç´„ %d 分å‰"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1064
+#: lib/util.php:1093
msgid "about an hour ago"
msgstr "ç´„ 1 時間å‰"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1068
+#: lib/util.php:1097
#, php-format
msgid "about %d hours ago"
msgstr "ç´„ %d 時間å‰"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1071
+#: lib/util.php:1100
msgid "about a day ago"
msgstr "ç´„ 1 æ—¥å‰"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1075
+#: lib/util.php:1104
#, php-format
msgid "about %d days ago"
msgstr "ç´„ %d æ—¥å‰"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1078
+#: lib/util.php:1107
msgid "about a month ago"
msgstr "ç´„ 1 ヵ月å‰"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1082
+#: lib/util.php:1111
#, php-format
msgid "about %d months ago"
msgstr "ç´„ %d ヵ月å‰"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1085
+#: lib/util.php:1114
msgid "about a year ago"
msgstr "ç´„ 1 å¹´å‰"
diff --git a/locale/ko/LC_MESSAGES/statusnet.po b/locale/ko/LC_MESSAGES/statusnet.po
index cdd7d77a5..841192041 100644
--- a/locale/ko/LC_MESSAGES/statusnet.po
+++ b/locale/ko/LC_MESSAGES/statusnet.po
@@ -8,12 +8,12 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-12 21:47+0000\n"
-"PO-Revision-Date: 2010-04-12 21:49:16+0000\n"
+"POT-Creation-Date: 2010-04-24 14:16+0000\n"
+"PO-Revision-Date: 2010-04-26 22:17:43+0000\n"
"Language-Team: Korean\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r64984); Translate extension (2010-01-16)\n"
+"X-Generator: MediaWiki 1.17alpha (r65552); Translate extension (2010-04-25)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: ko\n"
"X-Message-Group: out-statusnet\n"
@@ -85,7 +85,6 @@ msgstr "저장"
#. TRANS: Server error when page not found (404)
#: actions/all.php:64 actions/public.php:98 actions/replies.php:93
#: actions/showfavorites.php:138 actions/tag.php:52
-#, fuzzy
msgid "No such page."
msgstr "해당하는 페ì´ì§€ ì—†ìŒ"
@@ -98,8 +97,8 @@ msgstr "해당하는 페ì´ì§€ ì—†ìŒ"
#: actions/apidirectmessagenew.php:75 actions/apigroupcreate.php:112
#: actions/apigroupismember.php:90 actions/apigroupjoin.php:99
#: actions/apigroupleave.php:99 actions/apigrouplist.php:72
-#: actions/apistatusesupdate.php:148 actions/apisubscriptions.php:87
-#: actions/apitimelinefavorites.php:71 actions/apitimelinefriends.php:78
+#: actions/apistatusesupdate.php:239 actions/apisubscriptions.php:87
+#: actions/apitimelinefavorites.php:71 actions/apitimelinefriends.php:173
#: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79
#: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75
#: actions/favoritesrss.php:74 actions/foaf.php:40 actions/foaf.php:58
@@ -123,7 +122,7 @@ msgstr "%s ë° ì¹œêµ¬ë“¤, %d 페ì´ì§€"
#. TRANS: H1 text. %1$s is user nickname
#. TRANS: Message is used as link title. %s is a user nickname.
#: actions/all.php:89 actions/all.php:181 actions/allrss.php:116
-#: actions/apitimelinefriends.php:114 actions/apitimelinehome.php:115
+#: actions/apitimelinefriends.php:209 actions/apitimelinehome.php:115
#: lib/personalgroupnav.php:100
#, php-format
msgid "%s and friends"
@@ -185,7 +184,7 @@ msgstr "당신 ë° ì¹œêµ¬ë“¤"
#. 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:121 actions/apitimelinefriends.php:120
+#: actions/allrss.php:121 actions/apitimelinefriends.php:215
#: actions/apitimelinehome.php:121
#, php-format
msgid "Updates from %1$s and friends on %2$s!"
@@ -207,9 +206,9 @@ msgstr "%2$sì— ìžˆëŠ” %1$s ë° ì¹œêµ¬ë“¤ì˜ ì—…ë°ì´íŠ¸!"
#: actions/apistatusesdestroy.php:102 actions/apistatusesretweets.php:112
#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:141
#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111
-#: actions/apitimelinefavorites.php:173 actions/apitimelinefriends.php:175
+#: actions/apitimelinefavorites.php:173 actions/apitimelinefriends.php:270
#: actions/apitimelinegroup.php:151 actions/apitimelinehome.php:174
-#: actions/apitimelinementions.php:173 actions/apitimelinepublic.php:151
+#: actions/apitimelinementions.php:173 actions/apitimelinepublic.php:240
#: actions/apitimelineretweetedtome.php:121
#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:160
#: actions/apitimelineuser.php:162 actions/apiusershow.php:101
@@ -226,7 +225,7 @@ msgstr "API 메서드 발견 안 ë¨."
#: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91
#: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91
#: actions/apigroupleave.php:91 actions/apimediaupload.php:67
-#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:118
+#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:209
msgid "This method requires a POST."
msgstr "ì´ ë©”ì„œë“œëŠ” POST를 요구합니다."
@@ -256,7 +255,7 @@ msgstr "í”„ë¡œí•„ì„ ì €ìž¥ í•  수 없습니다."
#: actions/apiaccountupdateprofilebackgroundimage.php:108
#: actions/apiaccountupdateprofileimage.php:97 actions/apimediaupload.php:80
-#: actions/apistatusesupdate.php:131 actions/avatarsettings.php:257
+#: actions/apistatusesupdate.php:222 actions/avatarsettings.php:257
#: actions/designadminpanel.php:123 actions/editapplication.php:118
#: actions/newapplication.php:101 actions/newnotice.php:94
#: lib/designsettings.php:283
@@ -645,17 +644,17 @@ msgstr "ì‚­ì œëœ ì†Œì‹ìž…니다."
msgid "No status with that ID found."
msgstr "ë°œê²¬ëœ IDì˜ ìƒíƒœê°€ 없습니다."
-#: actions/apistatusesupdate.php:161 actions/newnotice.php:155
+#: actions/apistatusesupdate.php:252 actions/newnotice.php:155
#: lib/mailhandler.php:60
#, php-format
msgid "That's too long. Max notice size is %d chars."
msgstr "너무 ê¹ë‹ˆë‹¤. í†µì§€ì˜ ìµœëŒ€ 길ì´ëŠ” %d ê¸€ìž ìž…ë‹ˆë‹¤."
-#: actions/apistatusesupdate.php:202 actions/apiusershow.php:96
+#: actions/apistatusesupdate.php:293 actions/apiusershow.php:96
msgid "Not found."
msgstr "ì°¾ì„ ìˆ˜ê°€ 없습니다."
-#: actions/apistatusesupdate.php:225 actions/newnotice.php:178
+#: actions/apistatusesupdate.php:316 actions/newnotice.php:178
#, php-format
msgid "Max notice size is %d chars, including attachment URL."
msgstr "소ì‹ì˜ 최대 길ì´ëŠ” 첨부 URLì„ í¬í•¨í•˜ì—¬ %d 글ìžìž…니다."
@@ -684,12 +683,12 @@ msgstr "%1$s / %2$sì—게 답신 ì—…ë°ì´íŠ¸"
msgid "%1$s updates that reply to updates from %2$s / %3$s."
msgstr "%1$së‹˜ì´ %2$s/%3$sì˜ ì—…ë°ì´íŠ¸ì— 답변했습니다."
-#: actions/apitimelinepublic.php:107 actions/publicrss.php:103
+#: actions/apitimelinepublic.php:196 actions/publicrss.php:103
#, php-format
msgid "%s public timeline"
msgstr "%s 공개 타임ë¼ì¸"
-#: actions/apitimelinepublic.php:112 actions/publicrss.php:105
+#: actions/apitimelinepublic.php:201 actions/publicrss.php:105
#, php-format
msgid "%s updates from everyone!"
msgstr "모ë‘ë¡œë¶€í„°ì˜ ì—…ë°ì´íŠ¸ %sê°œ!"
@@ -995,9 +994,8 @@ msgid "There was a problem with your session token."
msgstr "ë‹¹ì‹ ì˜ ì„¸ì…˜í† í°ê´€ë ¨ 문제가 있습니다."
#: actions/deleteapplication.php:123 actions/deleteapplication.php:147
-#, fuzzy
msgid "Delete application"
-msgstr "그러한 통지는 없습니다."
+msgstr "ì‘용프로그램 ì‚­ì œ"
#: actions/deleteapplication.php:149
msgid ""
@@ -1654,9 +1652,8 @@ msgid "No notice."
msgstr "새로운 통지"
#: actions/file.php:42
-#, fuzzy
msgid "No attachments."
-msgstr "그러한 문서는 없습니다."
+msgstr "첨부문서 ì—†ìŒ"
#: actions/file.php:51
#, fuzzy
@@ -2338,10 +2335,14 @@ msgstr ""
"ë³´ì•ˆì„ ìœ„í•´ ì„¸íŒ…ì„ ì €ìž¥í•˜ê¸° ì „ì— ê³„ì •ê³¼ 비밀 번호를 다시 ìž…ë ¥ í•´ 주십시오."
#: actions/login.php:270
+#, fuzzy
+msgid "Login with your username and password."
+msgstr "ì‚¬ìš©ìž ì´ë¦„ê³¼ 비밀번호로 로그ì¸"
+
+#: actions/login.php:273
#, fuzzy, php-format
msgid ""
-"Login with your username and password. Don't have a username yet? [Register]"
-"(%%action.register%%) a new account."
+"Don't have a username yet? [Register](%%action.register%%) a new account."
msgstr ""
"ê·€í•˜ì˜ ê³„ì •ê³¼ 비밀 번호로 ë¡œê·¸ì¸ í•˜ì„¸ìš”. ê³„ì •ì´ ì•„ì§ ì—†ìœ¼ì„¸ìš”? [가입](%%"
"action.register%%) 새 ê³„ì •ì„ ìƒì„± ë˜ëŠ” [OpenID](%%action.openidlogin%%)를 사"
@@ -2571,8 +2572,8 @@ msgid "Only %s URLs over plain HTTP please."
msgstr ""
#. TRANS: Client error on an API request with an unsupported data format.
-#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1069
-#: lib/apiaction.php:1098 lib/apiaction.php:1215
+#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1131
+#: lib/apiaction.php:1160 lib/apiaction.php:1277
msgid "Not a supported data format."
msgstr "지ì›í•˜ëŠ” 형ì‹ì˜ ë°ì´í„°ê°€ 아닙니다."
@@ -4863,14 +4864,14 @@ msgstr "ì´ ì‚¬ì´íŠ¸ì— 게시글 í¬ìŠ¤íŒ…으로부터 ë‹¹ì‹ ì€ ê¸ˆì§€ë˜ì—ˆì
msgid "Problem saving notice."
msgstr "통지를 ì €ìž¥í•˜ëŠ”ë° ë¬¸ì œê°€ ë°œìƒí–ˆìŠµë‹ˆë‹¤."
-#: classes/Notice.php:965
+#: classes/Notice.php:967
#, fuzzy
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:1513
+#: classes/Notice.php:1535
#, fuzzy, php-format
msgid "RT @%1$s %2$s"
msgstr "%1$s (%2$s)"
@@ -5366,7 +5367,7 @@ msgid "Snapshots configuration"
msgstr "SMS ì¸ì¦"
#. TRANS: Client error 401.
-#: lib/apiauth.php:95
+#: lib/apiauth.php:113
msgid "API resource requires read-write access, but you only have read access."
msgstr ""
@@ -6822,56 +6823,56 @@ msgid "Moderator"
msgstr ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1054
+#: lib/util.php:1083
msgid "a few seconds ago"
msgstr "몇 초 전"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1057
+#: lib/util.php:1086
msgid "about a minute ago"
msgstr "1분 전"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1061
+#: lib/util.php:1090
#, php-format
msgid "about %d minutes ago"
msgstr "%d분 전"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1064
+#: lib/util.php:1093
msgid "about an hour ago"
msgstr "1시간 전"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1068
+#: lib/util.php:1097
#, php-format
msgid "about %d hours ago"
msgstr "%d시간 전"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1071
+#: lib/util.php:1100
msgid "about a day ago"
msgstr "하루 전"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1075
+#: lib/util.php:1104
#, php-format
msgid "about %d days ago"
msgstr "%dì¼ ì „"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1078
+#: lib/util.php:1107
msgid "about a month ago"
msgstr "1달 전"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1082
+#: lib/util.php:1111
#, php-format
msgid "about %d months ago"
msgstr "%d달 전"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1085
+#: lib/util.php:1114
msgid "about a year ago"
msgstr "1ë…„ ì „"
diff --git a/locale/mk/LC_MESSAGES/statusnet.po b/locale/mk/LC_MESSAGES/statusnet.po
index 0d377eefa..76cd8f711 100644
--- a/locale/mk/LC_MESSAGES/statusnet.po
+++ b/locale/mk/LC_MESSAGES/statusnet.po
@@ -9,12 +9,12 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-12 21:47+0000\n"
-"PO-Revision-Date: 2010-04-12 21:49:19+0000\n"
+"POT-Creation-Date: 2010-04-24 14:16+0000\n"
+"PO-Revision-Date: 2010-04-26 22:17:47+0000\n"
"Language-Team: Macedonian\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r64984); Translate extension (2010-01-16)\n"
+"X-Generator: MediaWiki 1.17alpha (r65552); Translate extension (2010-04-25)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: mk\n"
"X-Message-Group: out-statusnet\n"
@@ -100,8 +100,8 @@ msgstr "Ðема таква Ñтраница."
#: actions/apidirectmessagenew.php:75 actions/apigroupcreate.php:112
#: actions/apigroupismember.php:90 actions/apigroupjoin.php:99
#: actions/apigroupleave.php:99 actions/apigrouplist.php:72
-#: actions/apistatusesupdate.php:148 actions/apisubscriptions.php:87
-#: actions/apitimelinefavorites.php:71 actions/apitimelinefriends.php:78
+#: actions/apistatusesupdate.php:239 actions/apisubscriptions.php:87
+#: actions/apitimelinefavorites.php:71 actions/apitimelinefriends.php:173
#: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79
#: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75
#: actions/favoritesrss.php:74 actions/foaf.php:40 actions/foaf.php:58
@@ -125,7 +125,7 @@ msgstr "%1$s и пријателите, ÑÑ‚Ñ€. %2$d"
#. TRANS: H1 text. %1$s is user nickname
#. TRANS: Message is used as link title. %s is a user nickname.
#: actions/all.php:89 actions/all.php:181 actions/allrss.php:116
-#: actions/apitimelinefriends.php:114 actions/apitimelinehome.php:115
+#: actions/apitimelinefriends.php:209 actions/apitimelinehome.php:115
#: lib/personalgroupnav.php:100
#, php-format
msgid "%s and friends"
@@ -194,7 +194,7 @@ msgstr "Вие и пријателите"
#. 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:121 actions/apitimelinefriends.php:120
+#: actions/allrss.php:121 actions/apitimelinefriends.php:215
#: actions/apitimelinehome.php:121
#, php-format
msgid "Updates from %1$s and friends on %2$s!"
@@ -216,9 +216,9 @@ msgstr "Подновувања од %1$s и пријатели на %2$s!"
#: actions/apistatusesdestroy.php:102 actions/apistatusesretweets.php:112
#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:141
#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111
-#: actions/apitimelinefavorites.php:173 actions/apitimelinefriends.php:175
+#: actions/apitimelinefavorites.php:173 actions/apitimelinefriends.php:270
#: actions/apitimelinegroup.php:151 actions/apitimelinehome.php:174
-#: actions/apitimelinementions.php:173 actions/apitimelinepublic.php:151
+#: actions/apitimelinementions.php:173 actions/apitimelinepublic.php:240
#: actions/apitimelineretweetedtome.php:121
#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:160
#: actions/apitimelineuser.php:162 actions/apiusershow.php:101
@@ -235,7 +235,7 @@ msgstr "API методот не е пронајден."
#: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91
#: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91
#: actions/apigroupleave.php:91 actions/apimediaupload.php:67
-#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:118
+#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:209
msgid "This method requires a POST."
msgstr "Овој метод бара POST."
@@ -267,7 +267,7 @@ msgstr "Ðе може да Ñе зачува профил."
#: actions/apiaccountupdateprofilebackgroundimage.php:108
#: actions/apiaccountupdateprofileimage.php:97 actions/apimediaupload.php:80
-#: actions/apistatusesupdate.php:131 actions/avatarsettings.php:257
+#: actions/apistatusesupdate.php:222 actions/avatarsettings.php:257
#: actions/designadminpanel.php:123 actions/editapplication.php:118
#: actions/newapplication.php:101 actions/newnotice.php:94
#: lib/designsettings.php:283
@@ -656,17 +656,17 @@ msgstr "СтатуÑот е избришан."
msgid "No status with that ID found."
msgstr "Ðема пронајдено ÑÑ‚Ð°Ñ‚ÑƒÑ Ñо тој ID."
-#: actions/apistatusesupdate.php:161 actions/newnotice.php:155
+#: actions/apistatusesupdate.php:252 actions/newnotice.php:155
#: lib/mailhandler.php:60
#, php-format
msgid "That's too long. Max notice size is %d chars."
msgstr "Ова е предолго. МакÑималната дозволена должина изнеÑува %d знаци."
-#: actions/apistatusesupdate.php:202 actions/apiusershow.php:96
+#: actions/apistatusesupdate.php:293 actions/apiusershow.php:96
msgid "Not found."
msgstr "Ðе е пронајдено."
-#: actions/apistatusesupdate.php:225 actions/newnotice.php:178
+#: actions/apistatusesupdate.php:316 actions/newnotice.php:178
#, php-format
msgid "Max notice size is %d chars, including attachment URL."
msgstr ""
@@ -697,12 +697,12 @@ msgstr "%1$s / Подновувања кои Ñпоменуваат %2$s"
msgid "%1$s updates that reply to updates from %2$s / %3$s."
msgstr "%1$s подновувања коишто Ñе одговор на подновувањата од %2$s / %3$s."
-#: actions/apitimelinepublic.php:107 actions/publicrss.php:103
+#: actions/apitimelinepublic.php:196 actions/publicrss.php:103
#, php-format
msgid "%s public timeline"
msgstr "Јавна иÑторија на %s"
-#: actions/apitimelinepublic.php:112 actions/publicrss.php:105
+#: actions/apitimelinepublic.php:201 actions/publicrss.php:105
#, php-format
msgid "%s updates from everyone!"
msgstr "%s подновуввања од Ñите!"
@@ -2332,13 +2332,15 @@ msgstr ""
"име и лозинка пред да ги Ñмените Вашите нагодувања."
#: actions/login.php:270
+msgid "Login with your username and password."
+msgstr "Ðајавете Ñе Ñо кориÑничко име и лозинка."
+
+#: actions/login.php:273
#, php-format
msgid ""
-"Login with your username and password. Don't have a username yet? [Register]"
-"(%%action.register%%) a new account."
+"Don't have a username yet? [Register](%%action.register%%) a new account."
msgstr ""
-"Ðајавете Ñе Ñо Вашето кориÑничко име и лозинка. Сè уште немате кориÑничко "
-"име? [РегиÑтрирајте](%%action.register%%) нова Ñметка."
+"Сè уште немате кориÑничко име? [Ðаправете](%%action.register%%) нова Ñметка."
#: actions/makeadmin.php:92
msgid "Only an admin can make another user an admin."
@@ -2563,8 +2565,8 @@ msgid "Only %s URLs over plain HTTP please."
msgstr "Ве молиме кориÑтете Ñамо %s URL-адреÑи врз проÑÑ‚ HTTP-код."
#. TRANS: Client error on an API request with an unsupported data format.
-#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1069
-#: lib/apiaction.php:1098 lib/apiaction.php:1215
+#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1131
+#: lib/apiaction.php:1160 lib/apiaction.php:1277
msgid "Not a supported data format."
msgstr "Ова не е поддржан формат на податотека."
@@ -4870,13 +4872,13 @@ msgstr "Забрането Ви е да објавувате забелешки
msgid "Problem saving notice."
msgstr "Проблем во зачувувањето на белешката."
-#: classes/Notice.php:965
+#: classes/Notice.php:967
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:1513
+#: classes/Notice.php:1535
#, php-format
msgid "RT @%1$s %2$s"
msgstr "RT @%1$s %2$s"
@@ -5338,7 +5340,7 @@ msgid "Snapshots configuration"
msgstr "ПоÑтавки за Ñнимки"
#. TRANS: Client error 401.
-#: lib/apiauth.php:95
+#: lib/apiauth.php:113
msgid "API resource requires read-write access, but you only have read access."
msgstr ""
"API-реÑурÑот бара да може и да чита и да запишува, а вие можете Ñамо да "
@@ -5557,7 +5559,7 @@ msgstr "Ðе можев да го зачленам кориÑникот %1$s в
#. 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.
#: lib/command.php:385
-#, fuzzy, php-format
+#, php-format
msgid "Could not remove user %1$s from group %2$s"
msgstr "Ðе можев да го отÑтранам кориÑникот %1$s од групата %2$s."
@@ -6900,56 +6902,56 @@ msgid "Moderator"
msgstr "Модератор"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1054
+#: lib/util.php:1083
msgid "a few seconds ago"
msgstr "пред неколку Ñекунди"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1057
+#: lib/util.php:1086
msgid "about a minute ago"
msgstr "пред една минута"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1061
+#: lib/util.php:1090
#, php-format
msgid "about %d minutes ago"
msgstr "пред %d минути"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1064
+#: lib/util.php:1093
msgid "about an hour ago"
msgstr "пред еден чаÑ"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1068
+#: lib/util.php:1097
#, php-format
msgid "about %d hours ago"
msgstr "пред %d чаÑа"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1071
+#: lib/util.php:1100
msgid "about a day ago"
msgstr "пред еден ден"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1075
+#: lib/util.php:1104
#, php-format
msgid "about %d days ago"
msgstr "пред %d денови"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1078
+#: lib/util.php:1107
msgid "about a month ago"
msgstr "пред еден меÑец"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1082
+#: lib/util.php:1111
#, php-format
msgid "about %d months ago"
msgstr "пред %d меÑеца"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1085
+#: lib/util.php:1114
msgid "about a year ago"
msgstr "пред една година"
diff --git a/locale/nb/LC_MESSAGES/statusnet.po b/locale/nb/LC_MESSAGES/statusnet.po
index 178ed2de8..4ac3bff57 100644
--- a/locale/nb/LC_MESSAGES/statusnet.po
+++ b/locale/nb/LC_MESSAGES/statusnet.po
@@ -9,12 +9,12 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-12 21:47+0000\n"
-"PO-Revision-Date: 2010-04-12 21:49:23+0000\n"
+"POT-Creation-Date: 2010-04-24 14:16+0000\n"
+"PO-Revision-Date: 2010-04-26 22:17:50+0000\n"
"Language-Team: Norwegian (bokmål)‬\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r64984); Translate extension (2010-01-16)\n"
+"X-Generator: MediaWiki 1.17alpha (r65552); Translate extension (2010-04-25)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: no\n"
"X-Message-Group: out-statusnet\n"
@@ -86,9 +86,8 @@ msgstr "Lagre"
#. TRANS: Server error when page not found (404)
#: actions/all.php:64 actions/public.php:98 actions/replies.php:93
#: actions/showfavorites.php:138 actions/tag.php:52
-#, fuzzy
msgid "No such page."
-msgstr "Ingen slik side"
+msgstr "Ingen slik side."
#: actions/all.php:75 actions/allrss.php:68
#: actions/apiaccountupdatedeliverydevice.php:113
@@ -99,8 +98,8 @@ msgstr "Ingen slik side"
#: actions/apidirectmessagenew.php:75 actions/apigroupcreate.php:112
#: actions/apigroupismember.php:90 actions/apigroupjoin.php:99
#: actions/apigroupleave.php:99 actions/apigrouplist.php:72
-#: actions/apistatusesupdate.php:148 actions/apisubscriptions.php:87
-#: actions/apitimelinefavorites.php:71 actions/apitimelinefriends.php:78
+#: actions/apistatusesupdate.php:239 actions/apisubscriptions.php:87
+#: actions/apitimelinefavorites.php:71 actions/apitimelinefriends.php:173
#: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79
#: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75
#: actions/favoritesrss.php:74 actions/foaf.php:40 actions/foaf.php:58
@@ -124,7 +123,7 @@ msgstr "%1$s og venner, side %2$d"
#. TRANS: H1 text. %1$s is user nickname
#. TRANS: Message is used as link title. %s is a user nickname.
#: actions/all.php:89 actions/all.php:181 actions/allrss.php:116
-#: actions/apitimelinefriends.php:114 actions/apitimelinehome.php:115
+#: actions/apitimelinefriends.php:209 actions/apitimelinehome.php:115
#: lib/personalgroupnav.php:100
#, php-format
msgid "%s and friends"
@@ -191,7 +190,7 @@ msgstr "Du og venner"
#. 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:121 actions/apitimelinefriends.php:120
+#: actions/allrss.php:121 actions/apitimelinefriends.php:215
#: actions/apitimelinehome.php:121
#, php-format
msgid "Updates from %1$s and friends on %2$s!"
@@ -213,9 +212,9 @@ msgstr "Oppdateringer fra %1$s og venner på %2$s!"
#: actions/apistatusesdestroy.php:102 actions/apistatusesretweets.php:112
#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:141
#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111
-#: actions/apitimelinefavorites.php:173 actions/apitimelinefriends.php:175
+#: actions/apitimelinefavorites.php:173 actions/apitimelinefriends.php:270
#: actions/apitimelinegroup.php:151 actions/apitimelinehome.php:174
-#: actions/apitimelinementions.php:173 actions/apitimelinepublic.php:151
+#: actions/apitimelinementions.php:173 actions/apitimelinepublic.php:240
#: actions/apitimelineretweetedtome.php:121
#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:160
#: actions/apitimelineuser.php:162 actions/apiusershow.php:101
@@ -233,16 +232,15 @@ msgstr "API-metode ikke funnet!"
#: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91
#: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91
#: actions/apigroupleave.php:91 actions/apimediaupload.php:67
-#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:118
+#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:209
msgid "This method requires a POST."
msgstr "Denne metoden krever en POST."
#: actions/apiaccountupdatedeliverydevice.php:105
-#, fuzzy
msgid ""
"You must specify a parameter named 'device' with a value of one of: sms, im, "
"none."
-msgstr "Du må angi en verdi for parameteren 'device' med en av: sms, im, none"
+msgstr "Du må angi en verdi for parameteren 'device' med en av: sms, im, none."
#: actions/apiaccountupdatedeliverydevice.php:132
#, fuzzy
@@ -266,7 +264,7 @@ msgstr "Klarte ikke å lagre profil."
#: actions/apiaccountupdateprofilebackgroundimage.php:108
#: actions/apiaccountupdateprofileimage.php:97 actions/apimediaupload.php:80
-#: actions/apistatusesupdate.php:131 actions/avatarsettings.php:257
+#: actions/apistatusesupdate.php:222 actions/avatarsettings.php:257
#: actions/designadminpanel.php:123 actions/editapplication.php:118
#: actions/newapplication.php:101 actions/newnotice.php:94
#: lib/designsettings.php:283
@@ -443,9 +441,9 @@ msgid "Too many aliases! Maximum %d."
msgstr "For mange alias! Maksimum %d."
#: actions/apigroupcreate.php:266
-#, fuzzy, php-format
+#, php-format
msgid "Invalid alias: \"%s\"."
-msgstr "Ugyldig alias: «%s»"
+msgstr "Ugyldig alias: «%s»."
#: actions/apigroupcreate.php:275 actions/editgroup.php:232
#: actions/newgroup.php:172
@@ -461,9 +459,8 @@ msgstr "Alias kan ikke være det samme som kallenavn."
#: actions/apigroupismember.php:95 actions/apigroupjoin.php:104
#: actions/apigroupleave.php:104 actions/apigroupmembership.php:91
#: actions/apigroupshow.php:82 actions/apitimelinegroup.php:91
-#, fuzzy
msgid "Group not found."
-msgstr "Gruppe ikke funnet!"
+msgstr "Gruppe ikke funnet."
#: actions/apigroupjoin.php:110 actions/joingroup.php:100
msgid "You are already a member of that group."
@@ -652,17 +649,17 @@ msgstr "Status slettet."
msgid "No status with that ID found."
msgstr "Ingen status med den ID-en funnet."
-#: actions/apistatusesupdate.php:161 actions/newnotice.php:155
+#: actions/apistatusesupdate.php:252 actions/newnotice.php:155
#: lib/mailhandler.php:60
#, php-format
msgid "That's too long. Max notice size is %d chars."
msgstr "Det er for langt. Maks notisstørrelse er %d tegn."
-#: actions/apistatusesupdate.php:202 actions/apiusershow.php:96
+#: actions/apistatusesupdate.php:293 actions/apiusershow.php:96
msgid "Not found."
msgstr "Ikke funnet."
-#: actions/apistatusesupdate.php:225 actions/newnotice.php:178
+#: actions/apistatusesupdate.php:316 actions/newnotice.php:178
#, php-format
msgid "Max notice size is %d chars, including attachment URL."
msgstr "Maks notisstørrelse er %d tegn, inklusive vedleggs-URL."
@@ -691,12 +688,12 @@ msgstr "%1$s / Oppdateringer som nevner %2$s"
msgid "%1$s updates that reply to updates from %2$s / %3$s."
msgstr "%1$s oppdateringer som svarer på oppdateringer fra %2$s / %3$s."
-#: actions/apitimelinepublic.php:107 actions/publicrss.php:103
+#: actions/apitimelinepublic.php:196 actions/publicrss.php:103
#, php-format
msgid "%s public timeline"
msgstr "%s offentlig tidslinje"
-#: actions/apitimelinepublic.php:112 actions/publicrss.php:105
+#: actions/apitimelinepublic.php:201 actions/publicrss.php:105
#, php-format
msgid "%s updates from everyone!"
msgstr "%s oppdateringer fra alle sammen!"
@@ -765,7 +762,7 @@ msgstr "Avatarinnstillinger"
#: actions/avatarsettings.php:127 actions/avatarsettings.php:205
#: actions/grouplogo.php:202 actions/grouplogo.php:262
msgid "Original"
-msgstr "Original"
+msgstr "Opprinnelig"
#: actions/avatarsettings.php:142 actions/avatarsettings.php:217
#: actions/grouplogo.php:213 actions/grouplogo.php:274
@@ -835,7 +832,6 @@ msgstr ""
#: actions/block.php:145 actions/deleteapplication.php:154
#: actions/deletenotice.php:147 actions/deleteuser.php:152
#: actions/groupblock.php:178
-#, fuzzy
msgctxt "BUTTON"
msgid "No"
msgstr "Nei"
@@ -854,7 +850,6 @@ msgstr "Ikke blokker denne brukeren"
#: actions/block.php:152 actions/deleteapplication.php:161
#: actions/deletenotice.php:154 actions/deleteuser.php:159
#: actions/groupblock.php:185
-#, fuzzy
msgctxt "BUTTON"
msgid "Yes"
msgstr "Ja"
@@ -910,9 +905,9 @@ msgstr "Opphev blokkering av denne brukeren"
#. TRANS: Title for mini-posting window loaded from bookmarklet.
#: actions/bookmarklet.php:51
-#, fuzzy, php-format
+#, php-format
msgid "Post to %s"
-msgstr "Post til "
+msgstr "Post til %s"
#: actions/confirmaddress.php:75
msgid "No confirmation code."
@@ -928,9 +923,9 @@ msgstr "Den bekreftelseskoden er ikke til deg."
#. TRANS: Server error for an unknow address type, which can be 'email', 'jabber', or 'sms'.
#: actions/confirmaddress.php:91
-#, fuzzy, php-format
+#, php-format
msgid "Unrecognized address type %s."
-msgstr "Ukjent adressetype %s"
+msgstr "Ukjent adressetype %s."
#. TRANS: Client error for an already confirmed email/jabbel/sms address.
#: actions/confirmaddress.php:96
@@ -1090,20 +1085,20 @@ msgstr "Slett denne brukeren"
#: actions/designadminpanel.php:63 lib/accountsettingsaction.php:139
#: lib/groupnav.php:119
msgid "Design"
-msgstr ""
+msgstr "Utseende"
#: actions/designadminpanel.php:74
msgid "Design settings for this StatusNet site."
-msgstr ""
+msgstr "Utseendeinnstillinger for dette StatusNet-nettstedet."
#: actions/designadminpanel.php:276
msgid "Invalid logo URL."
msgstr "Ugyldig logo-URL."
#: actions/designadminpanel.php:280
-#, fuzzy, php-format
+#, php-format
msgid "Theme not available: %s."
-msgstr "Tema ikke tilgjengelig: %s"
+msgstr "Tema ikke tilgjengelig: %s."
#: actions/designadminpanel.php:376
msgid "Change logo"
@@ -1186,7 +1181,7 @@ msgstr "Bruk standard"
#: actions/designadminpanel.php:581 lib/designsettings.php:248
msgid "Restore default designs"
-msgstr ""
+msgstr "Gjenopprett standardutseende"
#: actions/designadminpanel.php:587 lib/designsettings.php:254
msgid "Reset back to default"
@@ -1205,7 +1200,7 @@ msgstr "Lagre"
#: actions/designadminpanel.php:590 lib/designsettings.php:257
msgid "Save design"
-msgstr ""
+msgstr "Lagre utseende"
#: actions/disfavor.php:81
msgid "This notice is not a favorite!"
@@ -1356,7 +1351,6 @@ msgstr "Nåværende bekreftede e-postadresse"
#: actions/emailsettings.php:115 actions/emailsettings.php:158
#: actions/imsettings.php:116 actions/smssettings.php:124
#: actions/smssettings.php:180
-#, fuzzy
msgctxt "BUTTON"
msgid "Remove"
msgstr "Fjern"
@@ -1375,7 +1369,6 @@ msgstr ""
#. TRANS: Button label
#: actions/emailsettings.php:127 actions/imsettings.php:131
#: actions/smssettings.php:137 lib/applicationeditform.php:357
-#, fuzzy
msgctxt "BUTTON"
msgid "Cancel"
msgstr "Avbryt"
@@ -1390,7 +1383,6 @@ msgstr "E-postadresse («brukernavn@eksempel.org»)"
#. TRANS: Button label for adding a SMS phone number in SMS settings form.
#: actions/emailsettings.php:139 actions/imsettings.php:148
#: actions/smssettings.php:162
-#, fuzzy
msgctxt "BUTTON"
msgid "Add"
msgstr "Legg til"
@@ -1416,16 +1408,14 @@ msgstr "Angi en ny e-postadresse for å poste til; fjerner den gamle."
#. 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:168 actions/smssettings.php:189
-#, fuzzy
msgctxt "BUTTON"
msgid "New"
msgstr "Ny"
#. TRANS: Form legend for e-mail preferences form.
#: actions/emailsettings.php:174
-#, fuzzy
msgid "Email preferences"
-msgstr "Innstillinger"
+msgstr "E-postinnstillinger"
#. TRANS: Checkbox label in e-mail preferences form.
#: actions/emailsettings.php:180
@@ -1464,9 +1454,8 @@ msgstr "Publiser en MicroID for min e-postadresse."
#. TRANS: Confirmation message for successful e-mail preferences save.
#: actions/emailsettings.php:334
-#, fuzzy
msgid "Email preferences saved."
-msgstr "Innstillinger lagret."
+msgstr "E-postinnstillinger lagret."
#. TRANS: Message given saving e-mail address without having provided one.
#: actions/emailsettings.php:353
@@ -1521,15 +1510,13 @@ msgstr "Ingen ventende bekreftelse å avbryte."
#. TRANS: Message given canceling e-mail address confirmation for the wrong e-mail address.
#: actions/emailsettings.php:424
-#, fuzzy
msgid "That is the wrong email address."
-msgstr "Det er feil IM-adresse."
+msgstr "Dette er feil e-postadresse."
#. TRANS: Message given after successfully canceling e-mail address confirmation.
#: actions/emailsettings.php:438
-#, fuzzy
msgid "Email confirmation cancelled."
-msgstr "Bekreftelse avbrutt."
+msgstr "E-postbekreftelse avbrutt."
#. TRANS: Message given trying to remove an e-mail address that is not
#. TRANS: registered for the active user.
@@ -1539,9 +1526,8 @@ msgstr "Det er ikke din e-postadresse."
#. TRANS: Message given after successfully removing a registered e-mail address.
#: actions/emailsettings.php:479
-#, fuzzy
msgid "The email address was removed."
-msgstr "Adressen ble fjernet."
+msgstr "E-postadressen ble fjernet."
#: actions/emailsettings.php:493 actions/smssettings.php:568
msgid "No incoming email address."
@@ -1552,7 +1538,7 @@ msgstr "Ingen innkommende e-postadresse."
#: actions/emailsettings.php:504 actions/emailsettings.php:528
#: actions/smssettings.php:578 actions/smssettings.php:602
msgid "Couldn't update user record."
-msgstr ""
+msgstr "Kunne ikke oppdatere brukeroppføring."
#. TRANS: Message given after successfully removing an incoming e-mail address.
#: actions/emailsettings.php:508 actions/smssettings.php:581
@@ -1618,17 +1604,17 @@ msgstr "%s sine favorittnotiser"
#: actions/favoritesrss.php:115
#, php-format
msgid "Updates favored by %1$s on %2$s!"
-msgstr ""
+msgstr "Oppdateringer markert som favoritt av %1$s på %2$s!"
#: actions/featured.php:69 lib/featureduserssection.php:87
#: lib/publicgroupnav.php:89
msgid "Featured users"
-msgstr ""
+msgstr "Profilerte brukere"
#: actions/featured.php:71
#, php-format
msgid "Featured users, page %d"
-msgstr ""
+msgstr "Profilerte brukere, side %d"
#: actions/featured.php:99
#, php-format
@@ -1653,19 +1639,19 @@ msgstr "Ingen opplastede vedlegg."
#: actions/finishremotesubscribe.php:69
msgid "Not expecting this response!"
-msgstr ""
+msgstr "Forventet ikke denne responsen!"
#: actions/finishremotesubscribe.php:80
msgid "User being listened to does not exist."
-msgstr ""
+msgstr "Brukeren som lyttes til finnes ikke."
#: actions/finishremotesubscribe.php:87 actions/remotesubscribe.php:59
msgid "You can use the local subscription!"
-msgstr ""
+msgstr "Du kan bruke det lokale abonnementet!"
#: actions/finishremotesubscribe.php:99
msgid "That user has blocked you from subscribing."
-msgstr ""
+msgstr "Brukeren har blokkert deg fra å abonnere."
#: actions/finishremotesubscribe.php:110
msgid "You are not authorized."
@@ -1677,12 +1663,11 @@ msgstr ""
#: actions/finishremotesubscribe.php:118
msgid "Remote service uses unknown version of OMB protocol."
-msgstr ""
+msgstr "Fjerntjeneste bruker ukjent versjon av OMB-protokollen."
#: actions/finishremotesubscribe.php:138
-#, fuzzy
msgid "Error updating remote profile."
-msgstr "Feil ved repetering av notis."
+msgstr "Feil ved oppdatering av fjernprofil."
#: actions/getfile.php:79
msgid "No such file."
@@ -1727,7 +1712,7 @@ msgstr "Ingen gruppe oppgitt."
#: actions/groupblock.php:91
msgid "Only an admin can block group members."
-msgstr ""
+msgstr "Bare en admin kan blokkere gruppemedlemmer."
#: actions/groupblock.php:95
msgid "User is already blocked from group."
@@ -1748,6 +1733,9 @@ msgid ""
"will be removed from the group, unable to post, and unable to subscribe to "
"the group in the future."
msgstr ""
+"Er du sikker på at du vil blokkere brukeren «%1$s» fra gruppen «%2$s»? De vil "
+"bli fjernet fra gruppen, kan ikke poste og kan ikke abonnere på gruppen i "
+"fremtiden."
#. TRANS: Submit button title for 'No' when blocking a user from a group.
#: actions/groupblock.php:182
@@ -1761,7 +1749,7 @@ msgstr "Blokker denne brukeren fra denne gruppen"
#: actions/groupblock.php:206
msgid "Database error blocking user from group."
-msgstr ""
+msgstr "Databasefeil ved blokkering av bruker fra gruppe."
#: actions/groupbyid.php:74 actions/userbyid.php:70
msgid "No ID."
@@ -1769,27 +1757,28 @@ msgstr "Ingen ID."
#: actions/groupdesignsettings.php:68
msgid "You must be logged in to edit a group."
-msgstr ""
+msgstr "Du må være logget inn for å redigere en gruppe."
#: actions/groupdesignsettings.php:144
msgid "Group design"
-msgstr ""
+msgstr "Gruppeutseende"
#: actions/groupdesignsettings.php:155
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."
#: actions/groupdesignsettings.php:266 actions/userdesignsettings.php:186
#: lib/designsettings.php:391 lib/designsettings.php:413
-#, fuzzy
msgid "Couldn't update your design."
-msgstr "Klarte ikke å oppdatere bruker."
+msgstr "Kunne ikke oppdatere utseende."
#: actions/groupdesignsettings.php:311 actions/userdesignsettings.php:231
msgid "Design preferences saved."
-msgstr ""
+msgstr "Utseende lagret."
#: actions/grouplogo.php:142 actions/grouplogo.php:195
msgid "Group logo"
@@ -1803,7 +1792,7 @@ msgstr "Du kan laste opp en logo for gruppen din. Maks filstørrelse er %s."
#: actions/grouplogo.php:365
msgid "Pick a square area of the image to be the logo."
-msgstr ""
+msgstr "Velg et kvadratisk område av bildet som skal bli logoen."
#: actions/grouplogo.php:399
msgid "Logo updated."
@@ -1924,10 +1913,12 @@ msgid ""
"Why not [register an account](%%action.register%%) and [create the group](%%"
"action.newgroup%%) yourself!"
msgstr ""
+"Hvorfor ikke [registrere en konto](%%action.register%%) og [opprette gruppen]"
+"(%%action.newgroup%%) selv!"
#: actions/groupunblock.php:91
msgid "Only an admin can unblock group members."
-msgstr ""
+msgstr "Bare en admin kan oppheve blokkering av gruppemedlemmer."
#: actions/groupunblock.php:95
msgid "User is not blocked from group."
@@ -1951,11 +1942,13 @@ msgid ""
"You can send and receive notices through Jabber/GTalk [instant messages](%%"
"doc.im%%). Configure your address and settings below."
msgstr ""
+"Du kan sende og motta notiser gjennom Jabber/GTalk [direktemeldinger](%%doc."
+"im%%). Konfigurer adresse og innstillinger under."
#. TRANS: Message given in the IM settings if XMPP is not enabled on the site.
#: actions/imsettings.php:94
msgid "IM is not available."
-msgstr ""
+msgstr "Direktemeldinger ikke tilgjengelig."
#. TRANS: Form legend for IM settings form.
#. TRANS: Field label for IM address input in IM settings form.
@@ -1986,27 +1979,28 @@ msgid ""
"Jabber or GTalk address, like \"UserName@example.org\". First, make sure to "
"add %s to your buddy list in your IM client or on GTalk."
msgstr ""
+"Jabber- og GTalk-adresse, som «brukernavn@example.org». Husk å legge %s til "
+"vennelisten din i direktemeldingsklienten din eller på GTalk."
#. TRANS: Form legend for IM preferences form.
#: actions/imsettings.php:155
-#, fuzzy
msgid "IM preferences"
-msgstr "Innstillinger"
+msgstr "Direktemeldingsinnstillinger"
#. TRANS: Checkbox label in IM preferences form.
#: actions/imsettings.php:160
msgid "Send me notices through Jabber/GTalk."
-msgstr ""
+msgstr "Send meg notiser gjennom Jabber/GTalk."
#. TRANS: Checkbox label in IM preferences form.
#: actions/imsettings.php:166
msgid "Post a notice when my Jabber/GTalk status changes."
-msgstr ""
+msgstr "Post en notis når min Jabber/Gtalk-status endres."
#. TRANS: Checkbox label in IM preferences form.
#: actions/imsettings.php:172
msgid "Send me replies through Jabber/GTalk from people I'm not subscribed to."
-msgstr ""
+msgstr "Send meg svar gjennom Jabber/GTalk fra personer jeg ikke abonnerer på."
#. TRANS: Checkbox label in IM preferences form.
#: actions/imsettings.php:179
@@ -2041,7 +2035,7 @@ msgstr "Det er allerede din Jabber ID."
#. TRANS: Message given saving IM address that is already set for another user.
#: actions/imsettings.php:330
msgid "Jabber ID already belongs to another user."
-msgstr ""
+msgstr "Jabber-ID tilhører allerede en annen bruker."
#. TRANS: Message given saving valid IM address that is to be confirmed.
#. TRANS: %s is the IM address set for the site.
@@ -2061,15 +2055,13 @@ msgstr "Det er feil IM-adresse."
#. TRANS: Server error thrown on database error canceling IM address confirmation.
#: actions/imsettings.php:397
-#, fuzzy
msgid "Couldn't delete IM confirmation."
-msgstr "Kunne ikke slette e-postbekreftelse."
+msgstr "Kunne ikke slette direktemeldingsbekreftelse."
#. TRANS: Message given after successfully canceling IM address confirmation.
#: actions/imsettings.php:402
-#, fuzzy
msgid "IM confirmation cancelled."
-msgstr "Bekreftelse avbrutt."
+msgstr "Direktemeldingsbekreftelse avbrutt."
#. TRANS: Message given trying to remove an IM address that is not
#. TRANS: registered for the active user.
@@ -2079,9 +2071,8 @@ msgstr "Det er ikke din Jabber ID."
#. TRANS: Message given after successfully removing a registered IM address.
#: actions/imsettings.php:447
-#, fuzzy
msgid "The IM address was removed."
-msgstr "Adressen ble fjernet."
+msgstr "Direktemeldingsadressen ble fjernet."
#: actions/inbox.php:59
#, php-format
@@ -2103,9 +2094,9 @@ msgid "Invites have been disabled."
msgstr "Invitasjoner har blitt deaktivert."
#: actions/invite.php:41
-#, fuzzy, php-format
+#, php-format
msgid "You must be logged in to invite other users to use %s."
-msgstr "Du må være innlogget for å invitere andre brukere til å bruke %s"
+msgstr "Du må være innlogget for å invitere andre brukere til å bruke %s."
#: actions/invite.php:72
#, php-format
@@ -2122,7 +2113,7 @@ msgstr "Inviter nye brukere"
#: actions/invite.php:128
msgid "You are already subscribed to these users:"
-msgstr ""
+msgstr "Du abonnerer allerede på disse brukerne:"
#. TRANS: Whois output.
#. TRANS: %1$s nickname of the queried user, %2$s is their profile URL.
@@ -2135,6 +2126,7 @@ msgstr "%1$s (%2$s)"
msgid ""
"These people are already users and you were automatically subscribed to them:"
msgstr ""
+"Disse personene er allerede brukere og du ble automatisk abonnent på dem:"
#: actions/invite.php:144
msgid "Invitation(s) sent to the following people:"
@@ -2145,11 +2137,15 @@ msgid ""
"You will be notified when your invitees accept the invitation and register "
"on the site. Thanks for growing the community!"
msgstr ""
+"Du vil bli varslet når dine inviterte aksepterer invitasjonen og registrerer "
+"seg på nettstedet. Takk for at du hjelper oss å vokse!"
#: actions/invite.php:162
msgid ""
"Use this form to invite your friends and colleagues to use this service."
msgstr ""
+"Bruk dette skjemaet for å invitere dine venner og kollegaer til å bruke "
+"denne tjenesten."
#: actions/invite.php:187
msgid "Email addresses"
@@ -2165,7 +2161,7 @@ msgstr "Personlig melding"
#: actions/invite.php:194
msgid "Optionally add a personal message to the invitation."
-msgstr ""
+msgstr "Om du vil kan du legge til en personlig melding i invitasjonen."
#. TRANS: Send button for inviting friends
#: actions/invite.php:198
@@ -2271,9 +2267,8 @@ msgid "Incorrect username or password."
msgstr "Feil brukernavn eller passord"
#: actions/login.php:132 actions/otp.php:120
-#, fuzzy
msgid "Error setting user. You are probably not authorized."
-msgstr "Ikke autorisert."
+msgstr "Feil ved innstilling av bruker. Du er mest sannsynlig kke autorisert."
#: actions/login.php:188 actions/login.php:241 lib/logingroupnav.php:79
msgid "Login"
@@ -2301,15 +2296,19 @@ msgid ""
"For security reasons, please re-enter your user name and password before "
"changing your settings."
msgstr ""
+"Av sikkerhetsmessige årsaker, skriv inn brukernavn og passord på nytt før du "
+"endrer innstillingene dine."
#: actions/login.php:270
+msgid "Login with your username and password."
+msgstr "Logg inn med brukernavn og passord."
+
+#: actions/login.php:273
#, php-format
msgid ""
-"Login with your username and password. Don't have a username yet? [Register]"
-"(%%action.register%%) a new account."
+"Don't have a username yet? [Register](%%action.register%%) a new account."
msgstr ""
-"Logg inn med ditt brukernavn og passord. Har du ikke et brukernavn ennå? "
-"[Opprett](%%action.register%%) en ny konto."
+"Har du ikke et brukernavn ennå? [Opprett](%%action.register%%) en ny konto."
#: actions/makeadmin.php:92
msgid "Only an admin can make another user an admin."
@@ -2321,9 +2320,9 @@ msgid "%1$s is already an admin for group \"%2$s\"."
msgstr "%1$s er allerede en administrator for gruppen «%2$s»."
#: actions/makeadmin.php:133
-#, fuzzy, php-format
+#, php-format
msgid "Can't get membership record for %1$s in group %2$s."
-msgstr "Klarte ikke å oppdatere bruker."
+msgstr "Kan ikke hente medlemsoppføring for %$1s i gruppen %2$s."
#: actions/makeadmin.php:146
#, php-format
@@ -2331,9 +2330,8 @@ msgid "Can't make %1$s an admin for group %2$s."
msgstr "Kan ikke gjøre %1$s til administrator for gruppen %2$s."
#: actions/microsummary.php:69
-#, fuzzy
msgid "No current status."
-msgstr "Ingen nåværende status"
+msgstr "Ingen nåværende status."
#: actions/newapplication.php:52
msgid "New Application"
@@ -2341,20 +2339,19 @@ msgstr "Nytt program"
#: actions/newapplication.php:64
msgid "You must be logged in to register an application."
-msgstr ""
+msgstr "Du må være logget inn for å registrere et program."
#: actions/newapplication.php:143
msgid "Use this form to register a new application."
-msgstr ""
+msgstr "Bruk dette skjemaet for å registrere et nytt program."
#: actions/newapplication.php:176
msgid "Source URL is required."
-msgstr ""
+msgstr "Nettadresse til kilde kreves."
#: actions/newapplication.php:258 actions/newapplication.php:267
-#, fuzzy
msgid "Could not create application."
-msgstr "Klarte ikke å lagre avatar-informasjonen"
+msgstr "Kunne ikke opprette program."
#: actions/newgroup.php:53
msgid "New group"
@@ -2385,6 +2382,7 @@ msgstr "Ingen mottaker oppgitt."
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."
#: actions/newmessage.php:181
msgid "Message sent"
@@ -2413,6 +2411,8 @@ msgid ""
"Search for notices on %%site.name%% by their contents. Separate search terms "
"by spaces; they must be 3 characters or more."
msgstr ""
+"Søk i notiser på %%site.name%% etter deres innhold. Separer nøkkelord med "
+"mellomrom; de må være minst 3 tegn lange."
#: actions/noticesearch.php:78
msgid "Text search"
@@ -2429,6 +2429,8 @@ msgid ""
"Be the first to [post on this topic](%%%%action.newnotice%%%%?"
"status_textarea=%s)!"
msgstr ""
+"Vær den første til å [poste om dette emnet](%%%%action.newnotice%%%%?"
+"status_textarea=%s)!"
#: actions/noticesearch.php:124
#, php-format
@@ -2436,6 +2438,9 @@ msgid ""
"Why not [register an account](%%%%action.register%%%%) and be the first to "
"[post on this topic](%%%%action.newnotice%%%%?status_textarea=%s)!"
msgstr ""
+"Hvorfor ikke [registrere en konto](%%%%action.register%%%%) og vær den "
+"første til å [poste om dette emnet](%%%%action.newnotice%%%%?status_textarea="
+"%s)!"
#: actions/noticesearchrss.php:96
#, php-format
@@ -2464,7 +2469,7 @@ msgstr "Knuff sendt!"
#: actions/oauthappssettings.php:59
msgid "You must be logged in to list your applications."
-msgstr ""
+msgstr "Du må være logget inn for å liste opp programmene dine."
#: actions/oauthappssettings.php:74
msgid "OAuth applications"
@@ -2472,16 +2477,16 @@ msgstr "OAuth-program"
#: actions/oauthappssettings.php:85
msgid "Applications you have registered"
-msgstr ""
+msgstr "Program du har registrert"
#: actions/oauthappssettings.php:135
#, php-format
msgid "You have not registered any applications yet."
-msgstr ""
+msgstr "Du har ikke registrert noen program ennå."
#: actions/oauthconnectionssettings.php:72
msgid "Connected applications"
-msgstr ""
+msgstr "Tilkoblede program"
#: actions/oauthconnectionssettings.php:83
msgid "You have allowed the following applications to access you account."
@@ -2492,9 +2497,9 @@ msgid "You are not a user of that application."
msgstr "Du er ikke bruker av dette programmet."
#: actions/oauthconnectionssettings.php:186
-#, fuzzy, php-format
+#, php-format
msgid "Unable to revoke access for app: %s."
-msgstr "Kunne ikke tilbakekalle tilgang for programmet: "
+msgstr "Kunne ikke tilbakekalle tilgang for programmet: %s."
#: actions/oauthconnectionssettings.php:198
msgid "You have not authorized any applications to use your account."
@@ -2502,12 +2507,11 @@ msgstr "Du har ikke tillatt noen programmer å bruke din konto."
#: actions/oauthconnectionssettings.php:211
msgid "Developers can edit the registration settings for their applications "
-msgstr ""
+msgstr "Utviklere kan redigere registreringsinnstillingene for sine program "
#: actions/oembed.php:79 actions/shownotice.php:100
-#, fuzzy
msgid "Notice has no profile."
-msgstr "Brukeren har ingen profil."
+msgstr "Notisen har ingen profil."
#: actions/oembed.php:86 actions/shownotice.php:175
#, php-format
@@ -2516,19 +2520,19 @@ msgstr "%1$s sin status på %2$s"
#. TRANS: Error message displaying attachments. %s is a raw MIME type (eg 'image/png')
#: actions/oembed.php:158
-#, fuzzy, php-format
+#, php-format
msgid "Content type %s not supported."
-msgstr "innholdstype "
+msgstr "Innholdstypen %s støttes ikke."
#. TRANS: Error message displaying attachments. %s is the site's base URL.
#: actions/oembed.php:162
#, php-format
msgid "Only %s URLs over plain HTTP please."
-msgstr ""
+msgstr "Bare %s-nettadresser over vanlig HTTP."
#. TRANS: Client error on an API request with an unsupported data format.
-#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1069
-#: lib/apiaction.php:1098 lib/apiaction.php:1215
+#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1131
+#: lib/apiaction.php:1160 lib/apiaction.php:1277
msgid "Not a supported data format."
msgstr "Ikke et støttet dataformat."
@@ -2546,7 +2550,7 @@ msgstr "Andre innstillinger"
#: actions/othersettings.php:71
msgid "Manage various other options."
-msgstr ""
+msgstr "HÃ¥ndter diverse andre alternativ."
#: actions/othersettings.php:108
msgid " (free service)"
@@ -2554,24 +2558,23 @@ msgstr " (gratis tjeneste)"
#: actions/othersettings.php:116
msgid "Shorten URLs with"
-msgstr ""
+msgstr "Forkort nettadresser med"
#: actions/othersettings.php:117
msgid "Automatic shortening service to use."
-msgstr ""
+msgstr "Automatisk fortkortelsestjeneste å bruke."
#: actions/othersettings.php:122
msgid "View profile designs"
-msgstr ""
+msgstr "Vis profilutseender"
#: actions/othersettings.php:123
msgid "Show or hide profile designs."
-msgstr ""
+msgstr "Vis eller skjul profilutseender."
#: actions/othersettings.php:153
-#, fuzzy
msgid "URL shortening service is too long (max 50 chars)."
-msgstr "Bioen er for lang (max 140 tegn)"
+msgstr "Navnet på nettadresseforkortelsestjenesten er for lang (maks 50 tegn)."
#: actions/otp.php:69
msgid "No user ID specified."
@@ -2673,31 +2676,31 @@ msgstr "Passordet ble lagret"
#. TRANS: Menu item for site administration
#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:383
msgid "Paths"
-msgstr ""
+msgstr "Stier"
#: actions/pathsadminpanel.php:70
msgid "Path and server settings for this StatusNet site."
-msgstr ""
+msgstr "Sti- og tjenerinnstillinger for dette StatusNet-nettstedet."
#: actions/pathsadminpanel.php:157
-#, fuzzy, php-format
+#, php-format
msgid "Theme directory not readable: %s."
-msgstr "Tema ikke tilgjengelig: %s"
+msgstr "Temamappe ikke lesbar: %s."
#: actions/pathsadminpanel.php:163
-#, fuzzy, php-format
+#, php-format
msgid "Avatar directory not writable: %s."
-msgstr "Avatarmappe"
+msgstr "Avatarmappe ikke skrivbar: %s."
#: actions/pathsadminpanel.php:169
-#, fuzzy, php-format
+#, php-format
msgid "Background directory not writable: %s."
-msgstr "Bakgrunnsmappe"
+msgstr "Bakgrunnsmappe ikke skrivbar: %s."
#: actions/pathsadminpanel.php:177
#, php-format
msgid "Locales directory not readable: %s."
-msgstr ""
+msgstr "Lokaliseringsmappe ikke lesbar: %s."
#: actions/pathsadminpanel.php:183
msgid "Invalid SSL server. The maximum length is 255 characters."
@@ -2717,27 +2720,27 @@ msgstr "Vertsnavn for nettstedets tjener."
#: actions/pathsadminpanel.php:242
msgid "Path"
-msgstr ""
+msgstr "Sti"
#: actions/pathsadminpanel.php:242
msgid "Site path"
-msgstr ""
+msgstr "Nettstedssti"
#: actions/pathsadminpanel.php:246
msgid "Path to locales"
-msgstr ""
+msgstr "Lokaliseringssti"
#: actions/pathsadminpanel.php:246
msgid "Directory path to locales"
-msgstr ""
+msgstr "Lokaliseringsmappesti"
#: actions/pathsadminpanel.php:250
msgid "Fancy URLs"
-msgstr ""
+msgstr "Pyntede nettadresser"
#: actions/pathsadminpanel.php:252
msgid "Use fancy (more readable and memorable) URLs?"
-msgstr ""
+msgstr "Bruk pyntede (mer lesbare og lettere å huske) nettadresser?"
#: actions/pathsadminpanel.php:259
msgid "Theme"
@@ -2821,7 +2824,7 @@ msgstr "Tjener SSL-forespørsler skal vises til"
#: actions/pathsadminpanel.php:352
msgid "Save paths"
-msgstr ""
+msgstr "Lagre stier"
#: actions/peoplesearch.php:52
#, php-format
@@ -2837,24 +2840,23 @@ msgid "People search"
msgstr "Personsøk"
#: actions/peopletag.php:68
-#, fuzzy, php-format
+#, php-format
msgid "Not a valid people tag: %s."
-msgstr "Ugyldig e-postadresse"
+msgstr "Ikke en gyldig personmerkelapp: %s."
#: actions/peopletag.php:142
-#, fuzzy, php-format
+#, php-format
msgid "Users self-tagged with %1$s - page %2$d"
-msgstr "Mikroblogg av %s"
+msgstr "Brukere som har merket seg selv med %1$s - side %2$d"
#: actions/postnotice.php:95
-#, fuzzy
msgid "Invalid notice content."
-msgstr "Ugyldig symbol."
+msgstr "Ugyldig notisinnhold."
#: actions/postnotice.php:101
#, php-format
msgid "Notice license ‘%1$s’ is not compatible with site license ‘%2$s’."
-msgstr ""
+msgstr "Notislisensen ‘%1$s’ er ikke kompatibel med nettstedslisensen ‘%2$s’."
#: actions/profilesettings.php:60
msgid "Profile settings"
@@ -2909,15 +2911,15 @@ msgstr "Om meg"
#: actions/userauthorization.php:166 lib/groupeditform.php:177
#: lib/userprofile.php:165
msgid "Location"
-msgstr ""
+msgstr "Plassering"
#: actions/profilesettings.php:134 actions/register.php:473
msgid "Where you are, like \"City, State (or Region), Country\""
-msgstr ""
+msgstr "Hvor du er, for eksempel «By, fylke (eller region), land»"
#: actions/profilesettings.php:138
msgid "Share my current location when posting notices"
-msgstr ""
+msgstr "Del min nåværende plassering når jeg poster notiser"
#: actions/profilesettings.php:145 actions/tagother.php:149
#: actions/tagother.php:209 lib/subscriptionlist.php:106
@@ -2929,6 +2931,8 @@ msgstr "Tagger"
msgid ""
"Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated"
msgstr ""
+"Merkelapper for degselv (bokstaver, nummer, -, ., og _), adskilt med komma "
+"eller mellomrom"
#: actions/profilesettings.php:151
msgid "Language"
@@ -2966,27 +2970,25 @@ msgid "Language is too long (max 50 chars)."
msgstr "Språk er for langt (maks 50 tegn)."
#: actions/profilesettings.php:253 actions/tagother.php:178
-#, fuzzy, php-format
+#, php-format
msgid "Invalid tag: \"%s\""
-msgstr "Ugyldig hjemmeside '%s'"
+msgstr "Ugyldig merkelapp: «%s»"
#: actions/profilesettings.php:306
msgid "Couldn't update user for autosubscribe."
-msgstr ""
+msgstr "Kunne ikke oppdatere bruker for autoabonnering."
#: actions/profilesettings.php:363
-#, fuzzy
msgid "Couldn't save location prefs."
-msgstr "Klarte ikke å lagre profil."
+msgstr "Kunne ikke lagre plasseringsinnstillinger."
#: actions/profilesettings.php:375
msgid "Couldn't save profile."
msgstr "Klarte ikke å lagre profil."
#: actions/profilesettings.php:383
-#, fuzzy
msgid "Couldn't save tags."
-msgstr "Klarte ikke å lagre profil."
+msgstr "Kunne ikke lagre merkelapper."
#. TRANS: Message after successful saving of administrative settings.
#: actions/profilesettings.php:391 lib/adminpanelaction.php:141
@@ -2994,9 +2996,9 @@ msgid "Settings saved."
msgstr "Innstillinger lagret."
#: actions/public.php:83
-#, fuzzy, php-format
+#, php-format
msgid "Beyond the page limit (%s)."
-msgstr "Over sidegrensen (%s)"
+msgstr "Over sidegrensen (%s)."
#: actions/public.php:92
msgid "Could not retrieve public stream."
@@ -3005,11 +3007,11 @@ msgstr "Kunne ikke hente offentlig strøm."
#: actions/public.php:130
#, php-format
msgid "Public timeline, page %d"
-msgstr ""
+msgstr "Offentlig tidslinje, side %d"
#: actions/public.php:132 lib/publicgroupnav.php:79
msgid "Public timeline"
-msgstr ""
+msgstr "Offentlig tidslinje"
#: actions/public.php:160
msgid "Public Stream Feed (RSS 1.0)"
@@ -3029,16 +3031,20 @@ msgid ""
"This is the public timeline for %%site.name%% but no one has posted anything "
"yet."
msgstr ""
+"Dette er den offentlige tidslinjen for %%site.name%% men ingen har postet "
+"noe ennå."
#: actions/public.php:191
msgid "Be the first to post!"
-msgstr ""
+msgstr "Vær den første til å poste!"
#: actions/public.php:195
#, php-format
msgid ""
"Why not [register an account](%%action.register%%) and be the first to post!"
msgstr ""
+"Hvorfor ikke [registrere en konto](%%action.register%%) og vær den første "
+"til å poste!"
#: actions/public.php:242
#, php-format
@@ -3048,6 +3054,10 @@ msgid ""
"tool. [Join now](%%action.register%%) to share notices about yourself with "
"friends, family, and colleagues! ([Read more](%%doc.help%%))"
msgstr ""
+"Dette er %%site.name%%, en [mikroblogg](http://no.wikipedia.org/wiki/"
+"Mikroblogg)tjeneste basert på det frie programvareverktøyet [StatusNet]"
+"(http://status.net). [Bli med nå](%%action.register%%) for å dele notiser om "
+"degselv med venner, familie og kollegaer! ([Les mer](%%doc.help%%))"
#: actions/public.php:247
#, php-format
@@ -3056,15 +3066,18 @@ msgid ""
"blogging) service based on the Free Software [StatusNet](http://status.net/) "
"tool."
msgstr ""
+"Dette er %%site.name%%, en [mikroblogg](http://no.wikipedia.org/wiki/"
+"Mikroblogg)tjeneste basert på det frie programvareverktøyet [StatusNet]"
+"(http://status.net)."
#: actions/publictagcloud.php:57
msgid "Public tag cloud"
-msgstr ""
+msgstr "Offentlig merkelappsky"
#: actions/publictagcloud.php:63
#, php-format
msgid "These are most popular recent tags on %s "
-msgstr ""
+msgstr "Dette er de siste mest populære merkelappene på %s "
#: actions/publictagcloud.php:69
#, php-format
@@ -3073,7 +3086,7 @@ msgstr ""
#: actions/publictagcloud.php:72
msgid "Be the first to post one!"
-msgstr ""
+msgstr "Vær den første til å poste en!"
#: actions/publictagcloud.php:75
#, php-format
@@ -3081,10 +3094,12 @@ msgid ""
"Why not [register an account](%%action.register%%) and be the first to post "
"one!"
msgstr ""
+"Hvorfor ikke [registrere en konto](%%action.register%%) og vær den første "
+"til å poste en!"
#: actions/publictagcloud.php:134
msgid "Tag cloud"
-msgstr ""
+msgstr "Merkelappsky"
#: actions/recoverpassword.php:36
msgid "You are already logged in!"
@@ -3092,15 +3107,15 @@ msgstr "Du er allerede logget inn!"
#: actions/recoverpassword.php:62
msgid "No such recovery code."
-msgstr ""
+msgstr "Ingen slik gjenopprettingskode."
#: actions/recoverpassword.php:66
msgid "Not a recovery code."
-msgstr ""
+msgstr "Ikke en gjenopprettingskode."
#: actions/recoverpassword.php:73
msgid "Recovery code for unknown user."
-msgstr ""
+msgstr "Gjenopprettingskode for ukjent bruker."
#: actions/recoverpassword.php:86
msgid "Error with confirmation code."
@@ -3119,22 +3134,24 @@ 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 ""
+"Om du har glemt eller mistet passordet ditt kan du få et nytt tilsendt på e-"
+"postadressen du har lagret på kontoen din."
#: actions/recoverpassword.php:158
msgid "You have been identified. Enter a new password below. "
-msgstr ""
+msgstr "Du har blitt identifisert. Skriv inn et nytt passord nedenfor. "
#: actions/recoverpassword.php:188
msgid "Password recovery"
-msgstr ""
+msgstr "Passordgjenoppretting"
#: actions/recoverpassword.php:191
msgid "Nickname or email address"
-msgstr ""
+msgstr "Kallenavn eller e-postadresse"
#: actions/recoverpassword.php:193
msgid "Your nickname on this server, or your registered email address."
-msgstr ""
+msgstr "Ditt kallenavn på denne tjeneren eller din registrerte e-postadresse."
#: actions/recoverpassword.php:199 actions/recoverpassword.php:200
msgid "Recover"
@@ -3142,15 +3159,15 @@ msgstr "Gjenopprett"
#: actions/recoverpassword.php:208
msgid "Reset password"
-msgstr ""
+msgstr "Tilbakestill passord"
#: actions/recoverpassword.php:209
msgid "Recover password"
-msgstr ""
+msgstr "Gjenopprett passord"
#: actions/recoverpassword.php:210 actions/recoverpassword.php:335
msgid "Password recovery requested"
-msgstr ""
+msgstr "Passordgjenoppretting forespurt"
#: actions/recoverpassword.php:213
msgid "Unknown action"
@@ -3166,19 +3183,19 @@ msgstr "Nullstill"
#: actions/recoverpassword.php:252
msgid "Enter a nickname or email address."
-msgstr ""
+msgstr "Skriv inn et kallenavn eller en e-postadresse."
#: actions/recoverpassword.php:282
msgid "No user with that email address or username."
-msgstr ""
+msgstr "Ingen bruker med den e-postadressen eller det kallenavnet."
#: actions/recoverpassword.php:299
msgid "No registered email address for that user."
-msgstr ""
+msgstr "Ingen registrert e-postadresse for den brukeren."
#: actions/recoverpassword.php:313
msgid "Error saving address confirmation."
-msgstr ""
+msgstr "Feil ved lagring av adressebekreftelse."
#: actions/recoverpassword.php:338
msgid ""
@@ -3190,7 +3207,7 @@ msgstr ""
#: actions/recoverpassword.php:357
msgid "Unexpected password reset."
-msgstr ""
+msgstr "Uventet tilbakestilling av passord."
#: actions/recoverpassword.php:365
msgid "Password must be 6 chars or more."
@@ -3198,39 +3215,39 @@ msgstr "Passordet må bestå av 6 eller flere tegn."
#: actions/recoverpassword.php:369
msgid "Password and confirmation do not match."
-msgstr ""
+msgstr "Passord og bekreftelse samsvarer ikke."
#: actions/recoverpassword.php:388 actions/register.php:248
msgid "Error setting user."
-msgstr ""
+msgstr "Feil ved innstilling av bruker."
#: actions/recoverpassword.php:395
msgid "New password successfully saved. You are now logged in."
-msgstr ""
+msgstr "Nytt passord ble lagret. Du er nå logget inn."
#: actions/register.php:85 actions/register.php:189 actions/register.php:405
msgid "Sorry, only invited people can register."
-msgstr ""
+msgstr "Beklager, kun inviterte personer kan registrere seg."
#: actions/register.php:92
msgid "Sorry, invalid invitation code."
-msgstr ""
+msgstr "Beklager, ugyldig invitasjonskode."
#: actions/register.php:112
msgid "Registration successful"
-msgstr ""
+msgstr "Registrering vellykket"
#: actions/register.php:114 actions/register.php:507 lib/logingroupnav.php:85
msgid "Register"
-msgstr ""
+msgstr "Registrer"
#: actions/register.php:135
msgid "Registration not allowed."
-msgstr ""
+msgstr "Registrering ikke tillatt."
#: actions/register.php:198
msgid "You can't register if you don't agree to the license."
-msgstr ""
+msgstr "Du kan ikke registrere deg om du ikke godtar lisensvilkårene."
#: actions/register.php:212
msgid "Email address already exists."
@@ -3245,6 +3262,8 @@ msgid ""
"With this form you can create a new account. You can then post notices and "
"link up to friends and colleagues. "
msgstr ""
+"Med dette skjemaet kan du opprette en ny konto. Du kan så poste notiser og "
+"knytte deg til venner og kollegaer. "
#: actions/register.php:425
msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
@@ -3267,20 +3286,20 @@ msgstr "E-post"
#: actions/register.php:439 actions/register.php:443
msgid "Used only for updates, announcements, and password recovery"
-msgstr ""
+msgstr "Kun brukt for oppdateringer, kunngjøringer og passordgjenoppretting"
#: actions/register.php:450
msgid "Longer name, preferably your \"real\" name"
msgstr "Lengre navn, helst ditt \"ekte\" navn"
#: actions/register.php:494
-#, 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 ""
-" utenom disse private dataene: passord, e-postadresse, lynmeldingsadresse "
-"og telefonnummer."
+"Mine tekster og filer er tilgjengelig under %s med unntak av disse private "
+"dataene: passord, e-postadresse, direktemeldingsadresse og telefonnummer."
#: actions/register.php:542
#, php-format
@@ -3330,47 +3349,54 @@ msgid ""
"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."
#: actions/remotesubscribe.php:112
msgid "Remote subscribe"
-msgstr ""
+msgstr "Fjernabonner"
#: actions/remotesubscribe.php:124
msgid "Subscribe to a remote user"
-msgstr ""
+msgstr "Abonner på en fjernbruker"
#: actions/remotesubscribe.php:129
msgid "User nickname"
-msgstr ""
+msgstr "Brukerens kallenavn"
#: actions/remotesubscribe.php:130
msgid "Nickname of the user you want to follow"
-msgstr ""
+msgstr "Kallenavn på brukeren du vil følge"
#: actions/remotesubscribe.php:133
msgid "Profile URL"
-msgstr ""
+msgstr "Profilnettadresse"
#: actions/remotesubscribe.php:134
msgid "URL of your profile on another compatible microblogging service"
msgstr ""
+"Nettadresse til profilen din på en annen kompatibel mikrobloggingstjeneste"
#: actions/remotesubscribe.php:137 lib/subscribeform.php:139
#: lib/userprofile.php:406
msgid "Subscribe"
-msgstr ""
+msgstr "Abonner"
#: actions/remotesubscribe.php:159
msgid "Invalid profile URL (bad format)"
-msgstr ""
+msgstr "Ugyldig profilnettadresse (dårlig format)"
#: actions/remotesubscribe.php:168
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)."
#: actions/remotesubscribe.php:176
msgid "That’s a local profile! Login to subscribe."
-msgstr ""
+msgstr "Det er en lokal profil! Logg inn for å abonnere."
#: actions/remotesubscribe.php:183
msgid "Couldn’t get a request token."
@@ -3378,21 +3404,19 @@ msgstr ""
#: actions/repeat.php:57
msgid "Only logged-in users can repeat notices."
-msgstr ""
+msgstr "Bare innloggede brukere kan repetere notiser."
#: actions/repeat.php:64 actions/repeat.php:71
-#, fuzzy
msgid "No notice specified."
-msgstr "Nytt nick"
+msgstr "Ingen notis spesifisert."
#: actions/repeat.php:76
msgid "You can't repeat your own notice."
-msgstr ""
+msgstr "Du kan ikke gjenta din egen notis."
#: actions/repeat.php:90
-#, fuzzy
msgid "You already repeated that notice."
-msgstr "Du er allerede logget inn!"
+msgstr "Du har allerede gjentatt den notisen."
#: actions/repeat.php:114 lib/noticelist.php:675
msgid "Repeated"
@@ -3429,11 +3453,13 @@ msgid "Replies feed for %s (Atom)"
msgstr "Svarstrøm for %s (Atom)"
#: actions/replies.php:199
-#, fuzzy, php-format
+#, php-format
msgid ""
"This is the timeline showing replies to %1$s but %2$s hasn't received a "
"notice to his attention yet."
-msgstr "Dette er tidslinjen for %s og venner, men ingen har postet noe enda."
+msgstr ""
+"Dette er tidslinjen som viser svar til %1$s men %2$s har ikke mottat en "
+"notis for hans oppmerksomhet ennå."
#: actions/replies.php:204
#, php-format
@@ -3441,16 +3467,17 @@ msgid ""
"You can engage other users in a conversation, subscribe to more people or "
"[join groups](%%action.groups%%)."
msgstr ""
+"Du kan engasjere andre brukere i en samtale, abonnere på flere personer "
+"eller [bli med i grupper](%%action.groups%%)."
#: actions/replies.php:206
-#, fuzzy, php-format
+#, php-format
msgid ""
"You can try to [nudge %1$s](../%2$s) or [post something to his or her "
"attention](%%%%action.newnotice%%%%?status_textarea=%3$s)."
msgstr ""
-"Du kan prøve å [knuffe %s](../%s) fra dennes profil eller [post noe for å få "
-"hans eller hennes oppmerksomhet](%%%%action.newnotice%%%%?status_textarea=%"
-"s)."
+"Du kan prøve å [knuffe %1$s](../%2$s) eller [post noe for å få hans eller "
+"hennes oppmerksomhet](%%%%action.newnotice%%%%?status_textarea=%3$s)."
#: actions/repliesrss.php:72
#, php-format
@@ -3458,68 +3485,63 @@ msgid "Replies to %1$s on %2$s!"
msgstr "Svar til %1$s på %2$s!"
#: actions/revokerole.php:75
-#, fuzzy
msgid "You cannot revoke user roles on this site."
-msgstr "Du er allerede logget inn!"
+msgstr "Du kan ikke trekke tilbake brukerroller på dette nettstedet."
#: actions/revokerole.php:82
-#, fuzzy
msgid "User doesn't have this role."
-msgstr "Brukeren har ingen profil."
+msgstr "Brukeren har ikke denne rollen."
#: actions/rsd.php:146 actions/version.php:157
msgid "StatusNet"
msgstr "StatusNet"
#: actions/sandbox.php:65 actions/unsandbox.php:65
-#, fuzzy
msgid "You cannot sandbox users on this site."
-msgstr "Du er allerede logget inn!"
+msgstr "Du kan ikke flytte brukere til sandkassen på dette nettstedet."
#: actions/sandbox.php:72
-#, fuzzy
msgid "User is already sandboxed."
-msgstr "Du er allerede logget inn!"
+msgstr "Brukeren er allerede i sandkassen."
#. TRANS: Menu item for site administration
#: actions/sessionsadminpanel.php:54 actions/sessionsadminpanel.php:170
#: lib/adminpanelaction.php:391
msgid "Sessions"
-msgstr ""
+msgstr "Økter"
#: actions/sessionsadminpanel.php:65
msgid "Session settings for this StatusNet site."
-msgstr ""
+msgstr "Øktinnstillinger for dette StatusNet-nettstedet."
#: actions/sessionsadminpanel.php:175
msgid "Handle sessions"
-msgstr ""
+msgstr "Håndter økter"
#: actions/sessionsadminpanel.php:177
msgid "Whether to handle sessions ourselves."
-msgstr ""
+msgstr "Hvorvidt økter skal håndteres av oss selv."
#: actions/sessionsadminpanel.php:181
msgid "Session debugging"
-msgstr ""
+msgstr "Øktfeilsøking"
#: actions/sessionsadminpanel.php:183
msgid "Turn on debugging output for sessions."
-msgstr ""
+msgstr "Slå på feilsøkingsutdata for økter."
#: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
#: actions/useradminpanel.php:294
-#, fuzzy
msgid "Save site settings"
-msgstr "Innstillinger for IM"
+msgstr "Lagre nettstedsinnstillinger"
#: actions/showapplication.php:82
msgid "You must be logged in to view an application."
-msgstr ""
+msgstr "Du må være innlogget for å se et program."
#: actions/showapplication.php:157
msgid "Application profile"
-msgstr ""
+msgstr "Programprofil"
#. TRANS: Form input field label for application icon.
#: actions/showapplication.php:159 lib/applicationeditform.php:182
@@ -3555,23 +3577,23 @@ msgstr "Opprettet av %1$s - %2$s standardtilgang - %3$d brukere"
#: actions/showapplication.php:213
msgid "Application actions"
-msgstr ""
+msgstr "Programhandlinger"
#: actions/showapplication.php:236
msgid "Reset key & secret"
-msgstr ""
+msgstr "Tilbakestill nøkkel & hemmelighet"
#: actions/showapplication.php:261
msgid "Application info"
-msgstr ""
+msgstr "Programinformasjon"
#: actions/showapplication.php:263
msgid "Consumer key"
-msgstr ""
+msgstr "Forbrukernøkkel"
#: actions/showapplication.php:268
msgid "Consumer secret"
-msgstr ""
+msgstr "Forbrukerhemmelighet"
#: actions/showapplication.php:273
msgid "Request token URL"
@@ -3590,11 +3612,13 @@ msgid ""
"Note: We support HMAC-SHA1 signatures. We do not support the plaintext "
"signature method."
msgstr ""
+"Merk: Vi støtter HMAC-SHA1-signaturer. Vi støtter ikke metoden for "
+"klartekstsignatur."
#: actions/showapplication.php:309
-#, fuzzy
msgid "Are you sure you want to reset your consumer key and secret?"
-msgstr "Er du sikker på at du vil slette denne notisen?"
+msgstr ""
+"Er du sikker på at du vil tilbakestille din forbrukernøkkel og -hemmelighet?"
#: actions/showfavorites.php:79
#, php-format
@@ -3625,6 +3649,8 @@ 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 ""
+"Du har ikke valgt en favorittnotis ennå. Klikk på favorittknappen på notiser "
+"du liker for å bokmerke dem for senere eller for å kaste et søkelys på dem."
#: actions/showfavorites.php:208
#, php-format
@@ -3632,6 +3658,8 @@ msgid ""
"%s hasn't added any notices to his favorites yet. Post something interesting "
"they would add to their favorites :)"
msgstr ""
+"%s har ikke lagt til noen notiser til sine favoritter ennå. Post noe "
+"interessant som de vil legge til sine favoritter :)"
#: actions/showfavorites.php:212
#, php-format
@@ -3640,10 +3668,13 @@ msgid ""
"account](%%%%action.register%%%%) and then post something interesting they "
"would add to their favorites :)"
msgstr ""
+"%s har ikke lagt noen notiser til sine favoritter ennå. Hvorfor ikke "
+"[registrere en konto](%%%%action.register%%%%) og post noe interessant som "
+"de vil legge til sine favoritter :)"
#: actions/showfavorites.php:243
msgid "This is a way to share what you like."
-msgstr ""
+msgstr "Dette er en måte å dele det du liker."
#: actions/showgroup.php:82 lib/groupnav.php:86
#, php-format
@@ -3667,7 +3698,7 @@ msgstr "Nettadresse"
#: actions/showgroup.php:283 actions/tagother.php:128
#: actions/userauthorization.php:187 lib/userprofile.php:195
msgid "Note"
-msgstr ""
+msgstr "Merk"
#: actions/showgroup.php:293 lib/groupeditform.php:184
msgid "Aliases"
@@ -3693,9 +3724,9 @@ msgid "Notice feed for %s group (Atom)"
msgstr "Notismating for %s gruppe (Atom)"
#: actions/showgroup.php:355
-#, fuzzy, php-format
+#, php-format
msgid "FOAF for %s group"
-msgstr "Klarte ikke å lagre profil."
+msgstr "FOAF for gruppen %s"
#: actions/showgroup.php:393 actions/showgroup.php:453 lib/groupnav.php:91
msgid "Members"
@@ -3754,7 +3785,7 @@ msgstr "Ingen slik melding."
#: actions/showmessage.php:98
msgid "Only the sender and recipient may read this message."
-msgstr ""
+msgstr "Kun senderen og mottakeren kan lese denne meldingen."
#: actions/showmessage.php:108
#, php-format
@@ -3771,9 +3802,9 @@ msgid "Notice deleted."
msgstr "Notis slettet."
#: actions/showstream.php:73
-#, fuzzy, php-format
+#, php-format
msgid " tagged %s"
-msgstr "Tagger"
+msgstr " merket %s"
#: actions/showstream.php:79
#, php-format
@@ -3801,30 +3832,31 @@ msgid "Notice feed for %s (Atom)"
msgstr "Notismating for %s (Atom)"
#: actions/showstream.php:148
-#, fuzzy, php-format
+#, php-format
msgid "FOAF for %s"
-msgstr "Feed for taggen %s"
+msgstr "FOAF for %s"
#: actions/showstream.php:200
-#, fuzzy, php-format
+#, php-format
msgid "This is the timeline for %1$s but %2$s hasn't posted anything yet."
-msgstr "Dette er tidslinjen for %s og venner, men ingen har postet noe enda."
+msgstr "Dette er tidslinjen for %1$s men %2$s har ikke postet noe ennå."
#: actions/showstream.php:205
msgid ""
"Seen anything interesting recently? You haven't posted any notices yet, now "
"would be a good time to start :)"
msgstr ""
+"Sett noe interessant nylig? Du har ikke postet noen notiser ennå, så hvorfor "
+"ikke begynne nå? :)"
#: actions/showstream.php:207
-#, fuzzy, php-format
+#, php-format
msgid ""
"You can try to nudge %1$s or [post something to his or her attention](%%%%"
"action.newnotice%%%%?status_textarea=%2$s)."
msgstr ""
-"Du kan prøve å [knuffe %s](../%s) fra dennes profil eller [post noe for å få "
-"hans eller hennes oppmerksomhet](%%%%action.newnotice%%%%?status_textarea=%"
-"s)."
+"Du kan prøve å knuffe %1$s eller [poste noe for å få hans eller hennes "
+"oppmerksomhet](%%%%action.newnotice%%%%?status_textarea=%2$s)."
#: actions/showstream.php:243
#, php-format
@@ -3858,20 +3890,19 @@ msgstr "Repetisjon av %s"
#: actions/silence.php:65 actions/unsilence.php:65
msgid "You cannot silence users on this site."
-msgstr ""
+msgstr "Du kan ikke bringe brukere til taushet på dette nettstedet."
#: actions/silence.php:72
-#, fuzzy
msgid "User is already silenced."
-msgstr "Du er allerede logget inn!"
+msgstr "Bruker er allerede brakt til taushet."
#: actions/siteadminpanel.php:69
msgid "Basic settings for this StatusNet site"
-msgstr ""
+msgstr "Grunninnstillinger for dette StatusNet-nettstedet"
#: actions/siteadminpanel.php:133
msgid "Site name must have non-zero length."
-msgstr ""
+msgstr "Nettstedsnavnet må være minst ett tegn langt."
#: actions/siteadminpanel.php:141
msgid "You must have a valid contact email address."
@@ -3884,7 +3915,7 @@ msgstr "Ukjent språk «%s»."
#: actions/siteadminpanel.php:165
msgid "Minimum text limit is 0 (unlimited)."
-msgstr ""
+msgstr "Minste tekstgrense er 0 (ubegrenset)."
#: actions/siteadminpanel.php:171
msgid "Dupe limit must be one or more seconds."
@@ -3900,7 +3931,7 @@ msgstr "Nettstedsnavn"
#: actions/siteadminpanel.php:225
msgid "The name of your site, like \"Yourcompany Microblog\""
-msgstr ""
+msgstr "Navnet på nettstedet ditt, for eksempel «Foretaksnavn mikroblogg»"
#: actions/siteadminpanel.php:229
msgid "Brought by"
@@ -3920,11 +3951,11 @@ msgstr ""
#: actions/siteadminpanel.php:239
msgid "Contact email address for your site"
-msgstr ""
+msgstr "Kontakte-postadresse for nettstedet ditt"
#: actions/siteadminpanel.php:245
msgid "Local"
-msgstr ""
+msgstr "Lokal"
#: actions/siteadminpanel.php:256
msgid "Default timezone"
@@ -3981,18 +4012,16 @@ msgid "Max length for the site-wide notice is 255 chars."
msgstr ""
#: actions/sitenoticeadminpanel.php:176
-#, fuzzy
msgid "Site notice text"
-msgstr "Slett notis"
+msgstr "Tekst for nettstedsnotis"
#: actions/sitenoticeadminpanel.php:178
msgid "Site-wide notice text (255 chars max; HTML okay)"
msgstr ""
#: actions/sitenoticeadminpanel.php:198
-#, fuzzy
msgid "Save site notice"
-msgstr "Innstillinger for IM"
+msgstr "Lagre nettstedsnotis"
#. TRANS: Title for SMS settings.
#: actions/smssettings.php:59
@@ -4013,9 +4042,8 @@ msgstr "SMS er ikke tilgjengelig."
#. TRANS: Form legend for SMS settings form.
#: actions/smssettings.php:111
-#, fuzzy
msgid "SMS address"
-msgstr "Direktemeldingsadresse"
+msgstr "SMS-adresse"
#. TRANS: Form guide in SMS settings form.
#: actions/smssettings.php:120
@@ -4039,7 +4067,6 @@ msgstr "Skriv inn koden du mottok på telefonen din."
#. TRANS: Button label to confirm SMS confirmation code in SMS settings.
#: actions/smssettings.php:148
-#, fuzzy
msgctxt "BUTTON"
msgid "Confirm"
msgstr "Bekreft"
@@ -4056,9 +4083,8 @@ msgstr ""
#. TRANS: Form legend for SMS preferences form.
#: actions/smssettings.php:195
-#, fuzzy
msgid "SMS preferences"
-msgstr "Innstillinger"
+msgstr "SMS-innstillinger"
#. TRANS: Checkbox label in SMS preferences form.
#: actions/smssettings.php:201
@@ -4066,12 +4092,13 @@ msgid ""
"Send me notices through SMS; I understand I may incur exorbitant charges "
"from my carrier."
msgstr ""
+"Send meg notiser via SMS; jeg forstår at dette kan føre til kostnader fra "
+"min teleoperatør."
#. TRANS: Confirmation message for successful SMS preferences save.
#: actions/smssettings.php:315
-#, fuzzy
msgid "SMS preferences saved."
-msgstr "Innstillinger lagret."
+msgstr "SMS-innstillinger lagret."
#. TRANS: Message given saving SMS phone number without having provided one.
#: actions/smssettings.php:338
@@ -4091,28 +4118,26 @@ msgstr "Det er allerede din ditt telefonnummer."
#. TRANS: Message given saving SMS phone number that is already set for another user.
#: actions/smssettings.php:356
msgid "That phone number already belongs to another user."
-msgstr ""
+msgstr "Telefonnummeret tilhører allerede en annen bruker."
#. TRANS: Message given saving valid SMS phone number that is to be confirmed.
#: actions/smssettings.php:384
-#, fuzzy
msgid ""
"A confirmation code was sent to the phone number you added. Check your phone "
"for the code and instructions on how to use it."
msgstr ""
-"En bekreftelseskode ble sendt til telefonnummeret du la til. Sjekk innboksen "
-"din for koden, og hvordan du skal bruke den."
+"En bekreftelseskode ble sendt til telefonnummeret du la til. Sjekk telefonen "
+"din for koden og hvordan du skal bruke den."
#. TRANS: Message given canceling SMS phone number confirmation for the wrong phone number.
#: actions/smssettings.php:413
msgid "That is the wrong confirmation number."
-msgstr ""
+msgstr "Dette er feil bekreftelsesnummer."
#. TRANS: Message given after successfully canceling SMS phone number confirmation.
#: actions/smssettings.php:427
-#, fuzzy
msgid "SMS confirmation cancelled."
-msgstr "Bekreftelse avbrutt."
+msgstr "SMS-bekreftelse avbrutt."
#. TRANS: Message given trying to remove an SMS phone number that is not
#. TRANS: registered for the active user.
@@ -4122,9 +4147,8 @@ msgstr "Det er ikke ditt telefonnummer."
#. TRANS: Message given after successfully removing a registered SMS phone number.
#: actions/smssettings.php:470
-#, fuzzy
msgid "The SMS phone number was removed."
-msgstr "Telefonnummer for SMS"
+msgstr "Telefonnummeret for SMS ble fjernet."
#. TRANS: Label for mobile carrier dropdown menu in SMS settings.
#: actions/smssettings.php:511
@@ -4144,11 +4168,14 @@ msgid ""
"Mobile carrier for your phone. If you know a carrier that accepts SMS over "
"email but isn't listed here, send email to let us know at %s."
msgstr ""
+"Mobiloperatør for din telefon. Om du kjenner til en operatør som kan motta "
+"SMS via e-post men som ikke er listet opp her, send en e-post til %s og "
+"fortell oss."
#. TRANS: Message given saving SMS phone number confirmation code without having provided one.
#: actions/smssettings.php:548
msgid "No code entered"
-msgstr ""
+msgstr "Ingen kode skrevet inn"
#. TRANS: Menu item for site administration
#: actions/snapshotadminpanel.php:54 actions/snapshotadminpanel.php:196
@@ -4223,9 +4250,8 @@ msgid "This action only accepts POST requests."
msgstr ""
#: actions/subscribe.php:107
-#, fuzzy
msgid "No such profile."
-msgstr "Ingen slik fil."
+msgstr "Ingen slik profil."
#: actions/subscribe.php:117
msgid "You cannot subscribe to an OMB 0.1 remote profile with this action."
@@ -4322,17 +4348,17 @@ msgstr "Mikroblogg av %s"
#: actions/tag.php:87
#, php-format
msgid "Notice feed for tag %s (RSS 1.0)"
-msgstr ""
+msgstr "Notismating for merkelapp %s (RSS 1.0)"
#: actions/tag.php:93
#, php-format
msgid "Notice feed for tag %s (RSS 2.0)"
-msgstr ""
+msgstr "Notismating for merkelapp %s (RSS 2.0)"
#: actions/tag.php:99
-#, fuzzy, php-format
+#, php-format
msgid "Notice feed for tag %s (Atom)"
-msgstr "Feed for taggen %s"
+msgstr "Notismating for merkelapp %s (Atom)"
#: actions/tagother.php:39
msgid "No ID argument."
@@ -4369,9 +4395,8 @@ msgid ""
msgstr ""
#: actions/tagother.php:200
-#, fuzzy
msgid "Could not save tags."
-msgstr "Klarte ikke å lagre avatar-informasjonen"
+msgstr "Kunne ikke lagre merkelapper."
#: actions/tagother.php:236
msgid "Use this form to add tags to your subscribers or subscriptions."
@@ -4565,9 +4590,9 @@ msgid "Avatar URL ‘%s’ is not valid."
msgstr ""
#: actions/userauthorization.php:350
-#, fuzzy, php-format
+#, php-format
msgid "Can’t read avatar URL ‘%s’."
-msgstr "Kan ikke lese brukerbilde-URL «%s»"
+msgstr "Kan ikke lese avatar-URL ‘%s’"
#: actions/userauthorization.php:355
#, php-format
@@ -4591,9 +4616,9 @@ msgstr "Bon appétit."
#. 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
+#, php-format
msgid "%1$s groups, page %2$d"
-msgstr "Alle abonnementer"
+msgstr "%1$s grupper, side %2$d"
#: actions/usergroups.php:132
msgid "Search for more groups"
@@ -4722,11 +4747,11 @@ msgstr ""
#: classes/Message.php:61
msgid "Could not insert message."
-msgstr ""
+msgstr "Kunne ikke sette inn melding."
#: classes/Message.php:71
msgid "Could not update message with new URI."
-msgstr ""
+msgstr "Kunne ikke oppdatere melding med ny nettadresse."
#. TRANS: Server exception. %s are the error details.
#: classes/Notice.php:176
@@ -4761,13 +4786,13 @@ msgstr ""
msgid "Problem saving notice."
msgstr "Problem ved lagring av notis."
-#: classes/Notice.php:965
+#: classes/Notice.php:967
msgid "Problem saving group inbox."
msgstr "Problem ved lagring av gruppeinnboks."
#. 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:1513
+#: classes/Notice.php:1535
#, php-format
msgid "RT @%1$s %2$s"
msgstr "RT @%1$s %2$s"
@@ -4890,10 +4915,9 @@ msgstr "Personlig"
#. TRANS: Tooltip for main menu option "Account"
#: lib/action.php:437
-#, fuzzy
msgctxt "TOOLTIP"
msgid "Change your email, avatar, password, profile"
-msgstr "Endre passordet ditt"
+msgstr "Endre e-posten, avateren, passordet og profilen din"
#. TRANS: Tooltip for main menu option "Services"
#: lib/action.php:442
@@ -4923,7 +4947,7 @@ msgstr "Administrator"
#, php-format
msgctxt "TOOLTIP"
msgid "Invite friends and colleagues to join you on %s"
-msgstr ""
+msgstr "Inviter venner og kollegaer til å bli med deg på %s"
#. TRANS: Main menu option when logged in and invitations are allowed for inviting new users
#: lib/action.php:458
@@ -4992,17 +5016,17 @@ msgstr "Søk"
#. TRANS: Menu item for site administration
#: lib/action.php:515 lib/adminpanelaction.php:399
msgid "Site notice"
-msgstr ""
+msgstr "Nettstedsnotis"
#. TRANS: DT element for local views block. String is hidden in default CSS.
#: lib/action.php:582
msgid "Local views"
-msgstr ""
+msgstr "Lokale visninger"
#. TRANS: DT element for page notice. String is hidden in default CSS.
#: lib/action.php:649
msgid "Page notice"
-msgstr ""
+msgstr "Sidenotis"
#. TRANS: DT element for secondary navigation menu. String is hidden in default CSS.
#: lib/action.php:752
@@ -5055,13 +5079,13 @@ msgstr "Programvarelisens for StatusNet"
#. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is set.
#: lib/action.php:817
-#, fuzzy, php-format
+#, php-format
msgid ""
"**%%site.name%%** is a microblogging service brought to you by [%%site."
"broughtby%%](%%site.broughtbyurl%%)."
msgstr ""
-"**%%site.name%%** er en mikrobloggingtjeneste av [%%site.broughtby%%](%%site."
-"broughtbyurl%%). "
+"**%%site.name%%** er en mikrobloggingtjeneste brakt til deg av [%%site."
+"broughtby%%](%%site.broughtbyurl%%)."
#. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set.
#: lib/action.php:820
@@ -5186,10 +5210,9 @@ msgstr ""
#. TRANS: Menu item for site administration
#: lib/adminpanelaction.php:359
-#, fuzzy
msgctxt "MENU"
msgid "Design"
-msgstr "Personlig"
+msgstr "Utseende"
#. TRANS: Menu item title/tooltip
#: lib/adminpanelaction.php:365
@@ -5227,7 +5250,7 @@ msgid "Snapshots configuration"
msgstr ""
#. TRANS: Client error 401.
-#: lib/apiauth.php:95
+#: lib/apiauth.php:113
msgid "API resource requires read-write access, but you only have read access."
msgstr ""
@@ -5316,15 +5339,13 @@ msgstr "Avbryt"
#. TRANS: Application access type
#: lib/applicationlist.php:136
-#, fuzzy
msgid "read-write"
-msgstr "Les og skriv"
+msgstr "les og skriv"
#. TRANS: Application access type
#: lib/applicationlist.php:138
-#, fuzzy
msgid "read-only"
-msgstr "Skrivebeskyttet"
+msgstr "skrivebeskyttet"
#. TRANS: Used in application list. %1$s is a modified date, %2$s is access type (read-write or read-only)
#: lib/applicationlist.php:144
@@ -5334,7 +5355,6 @@ msgstr ""
#. TRANS: Button label
#: lib/applicationlist.php:159
-#, fuzzy
msgctxt "BUTTON"
msgid "Revoke"
msgstr "Tilbakekall"
@@ -5372,15 +5392,15 @@ msgstr "Endring av passord er ikke tillatt"
#: lib/channel.php:157 lib/channel.php:177
msgid "Command results"
-msgstr ""
+msgstr "Kommandoresultat"
#: lib/channel.php:229 lib/mailhandler.php:142
msgid "Command complete"
-msgstr ""
+msgstr "Kommando fullført"
#: lib/channel.php:240
msgid "Command failed"
-msgstr ""
+msgstr "Kommando feilet"
#: lib/command.php:83 lib/command.php:105
msgid "Notice with that id does not exist"
@@ -5400,13 +5420,13 @@ msgstr "Fant ingen bruker med kallenavn %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:147
-#, fuzzy, php-format
+#, php-format
msgid "Could not find a local user with nickname %s"
-msgstr "Fant ingen bruker med kallenavn %s"
+msgstr "Fant ingen lokal bruker med kallenavn %s"
#: lib/command.php:180
msgid "Sorry, this command is not yet implemented."
-msgstr ""
+msgstr "Beklager, denne kommandoen er ikke implementert ennå."
#: lib/command.php:225
msgid "It does not make a lot of sense to nudge yourself!"
@@ -5448,9 +5468,9 @@ msgstr "Kunne ikke legge bruker %1$s til gruppe %2$s."
#. 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.
#: lib/command.php:385
-#, fuzzy, php-format
+#, php-format
msgid "Could not remove user %1$s from group %2$s"
-msgstr "Kunne ikke fjerne bruker %1$s fra gruppe %2$s."
+msgstr "Kunne ikke fjerne bruker %1$s fra gruppe %2$s"
#. TRANS: Whois output. %s is the full name of the queried user.
#: lib/command.php:418
@@ -5488,9 +5508,9 @@ msgstr ""
#. TRANS: Message given if content is too long.
#. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
#: lib/command.php:472
-#, fuzzy, php-format
+#, php-format
msgid "Message too long - maximum is %1$d characters, you sent %2$d"
-msgstr "Melding for lang - maks er %1$d tegn, du sendte %2$d."
+msgstr "Melding for lang - maks er %1$d tegn, du sendte %2$d"
#. TRANS: Message given have sent a direct message to another user.
#. TRANS: %s is the name of the other user.
@@ -5505,11 +5525,11 @@ msgstr "Feil ved sending av direktemelding."
#: lib/command.php:514
msgid "Cannot repeat your own notice"
-msgstr "Kan ikke repetere din egen notis"
+msgstr "Kan ikke gjenta din egen notis"
#: lib/command.php:519
msgid "Already repeated that notice"
-msgstr "Allerede repetert den notisen"
+msgstr "Allerede gjentatt den notisen"
#. TRANS: Message given having repeated a notice from another user.
#. TRANS: %s is the name of the user for which the notice was repeated.
@@ -5776,7 +5796,7 @@ msgstr ""
#: lib/galleryaction.php:143
msgid "Go"
-msgstr ""
+msgstr "GÃ¥"
#: lib/grantroleform.php:91
#, php-format
@@ -6035,9 +6055,9 @@ msgstr "SMS-bekreftelse"
#. TRANS: Main body heading for SMS-by-email address confirmation message
#: lib/mail.php:457
-#, fuzzy, php-format
+#, php-format
msgid "%s: confirm you own this phone number with this code:"
-msgstr "Venter på bekreftelse for dette telefonnummeret."
+msgstr "%s: bekreft telefonnummeret ditt med denne koden:"
#. TRANS: Subject for 'nudge' notification email
#: lib/mail.php:478
@@ -6198,6 +6218,29 @@ msgid ""
"\n"
"P.S. You can turn off these email notifications here: %8$s\n"
msgstr ""
+"%1$s (@%9$s) sendte deg akkurat varsel for din oppmerksomhet (et '@-svar') "
+"på %2$s.\n"
+"\n"
+"Notisen er her:\n"
+"\n"
+"%3$s\n"
+"\n"
+"Det lyder:\n"
+"\n"
+"%4$s\n"
+"\n"
+"%5$sDu kan svare her:\n"
+"\n"
+"%6$s\n"
+"\n"
+"Listen over alle @-svar til deg finner du her:\n"
+"\n"
+"%7$s\n"
+"\n"
+"Vennlig hilsen,\n"
+"%2$s\n"
+"\n"
+"P.S. Du kan slå av disse e-postvarslene her: %8$s\n"
#: lib/mailbox.php:89
msgid "Only the user can read their own mailboxes."
@@ -6366,7 +6409,7 @@ msgstr "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
#: lib/noticelist.php:447
msgid "at"
-msgstr ""
+msgstr "på"
#: lib/noticelist.php:567
msgid "in context"
@@ -6488,7 +6531,7 @@ msgstr "Medlem siden"
#. TRANS: Average count of posts made per day since account registration
#: lib/profileaction.php:235
msgid "Daily average"
-msgstr ""
+msgstr "Daglig gjennomsnitt"
#: lib/profileaction.php:264
msgid "All groups"
@@ -6723,56 +6766,56 @@ msgid "Moderator"
msgstr "Moderator"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1054
+#: lib/util.php:1083
msgid "a few seconds ago"
msgstr "noen få sekunder siden"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1057
+#: lib/util.php:1086
msgid "about a minute ago"
msgstr "omtrent ett minutt siden"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1061
+#: lib/util.php:1090
#, php-format
msgid "about %d minutes ago"
msgstr "omtrent %d minutter siden"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1064
+#: lib/util.php:1093
msgid "about an hour ago"
msgstr "omtrent én time siden"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1068
+#: lib/util.php:1097
#, php-format
msgid "about %d hours ago"
msgstr "omtrent %d timer siden"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1071
+#: lib/util.php:1100
msgid "about a day ago"
msgstr "omtrent én dag siden"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1075
+#: lib/util.php:1104
#, php-format
msgid "about %d days ago"
msgstr "omtrent %d dager siden"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1078
+#: lib/util.php:1107
msgid "about a month ago"
msgstr "omtrent én måned siden"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1082
+#: lib/util.php:1111
#, php-format
msgid "about %d months ago"
msgstr "omtrent %d måneder siden"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1085
+#: lib/util.php:1114
msgid "about a year ago"
msgstr "omtrent ett år siden"
diff --git a/locale/nl/LC_MESSAGES/statusnet.po b/locale/nl/LC_MESSAGES/statusnet.po
index 41318c985..cef426ff5 100644
--- a/locale/nl/LC_MESSAGES/statusnet.po
+++ b/locale/nl/LC_MESSAGES/statusnet.po
@@ -10,12 +10,12 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-12 21:47+0000\n"
-"PO-Revision-Date: 2010-04-12 21:49:31+0000\n"
+"POT-Creation-Date: 2010-04-24 14:16+0000\n"
+"PO-Revision-Date: 2010-04-26 22:17:57+0000\n"
"Language-Team: Dutch\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r64984); Translate extension (2010-01-16)\n"
+"X-Generator: MediaWiki 1.17alpha (r65552); Translate extension (2010-04-25)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: nl\n"
"X-Message-Group: out-statusnet\n"
@@ -99,8 +99,8 @@ msgstr "Deze pagina bestaat niet."
#: actions/apidirectmessagenew.php:75 actions/apigroupcreate.php:112
#: actions/apigroupismember.php:90 actions/apigroupjoin.php:99
#: actions/apigroupleave.php:99 actions/apigrouplist.php:72
-#: actions/apistatusesupdate.php:148 actions/apisubscriptions.php:87
-#: actions/apitimelinefavorites.php:71 actions/apitimelinefriends.php:78
+#: actions/apistatusesupdate.php:239 actions/apisubscriptions.php:87
+#: actions/apitimelinefavorites.php:71 actions/apitimelinefriends.php:173
#: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79
#: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75
#: actions/favoritesrss.php:74 actions/foaf.php:40 actions/foaf.php:58
@@ -124,7 +124,7 @@ msgstr "%1$s en vrienden, pagina %2$d"
#. TRANS: H1 text. %1$s is user nickname
#. TRANS: Message is used as link title. %s is a user nickname.
#: actions/all.php:89 actions/all.php:181 actions/allrss.php:116
-#: actions/apitimelinefriends.php:114 actions/apitimelinehome.php:115
+#: actions/apitimelinefriends.php:209 actions/apitimelinehome.php:115
#: lib/personalgroupnav.php:100
#, php-format
msgid "%s and friends"
@@ -193,7 +193,7 @@ msgstr "U en vrienden"
#. 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:121 actions/apitimelinefriends.php:120
+#: actions/allrss.php:121 actions/apitimelinefriends.php:215
#: actions/apitimelinehome.php:121
#, php-format
msgid "Updates from %1$s and friends on %2$s!"
@@ -215,9 +215,9 @@ msgstr "Updates van %1$s en vrienden op %2$s."
#: actions/apistatusesdestroy.php:102 actions/apistatusesretweets.php:112
#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:141
#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111
-#: actions/apitimelinefavorites.php:173 actions/apitimelinefriends.php:175
+#: actions/apitimelinefavorites.php:173 actions/apitimelinefriends.php:270
#: actions/apitimelinegroup.php:151 actions/apitimelinehome.php:174
-#: actions/apitimelinementions.php:173 actions/apitimelinepublic.php:151
+#: actions/apitimelinementions.php:173 actions/apitimelinepublic.php:240
#: actions/apitimelineretweetedtome.php:121
#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:160
#: actions/apitimelineuser.php:162 actions/apiusershow.php:101
@@ -234,7 +234,7 @@ msgstr "De API-functie is niet aangetroffen."
#: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91
#: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91
#: actions/apigroupleave.php:91 actions/apimediaupload.php:67
-#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:118
+#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:209
msgid "This method requires a POST."
msgstr "Deze methode vereist een POST."
@@ -266,7 +266,7 @@ msgstr "Het was niet mogelijk het profiel op te slaan."
#: actions/apiaccountupdateprofilebackgroundimage.php:108
#: actions/apiaccountupdateprofileimage.php:97 actions/apimediaupload.php:80
-#: actions/apistatusesupdate.php:131 actions/avatarsettings.php:257
+#: actions/apistatusesupdate.php:222 actions/avatarsettings.php:257
#: actions/designadminpanel.php:123 actions/editapplication.php:118
#: actions/newapplication.php:101 actions/newnotice.php:94
#: lib/designsettings.php:283
@@ -666,17 +666,17 @@ msgstr "De status is verwijderd."
msgid "No status with that ID found."
msgstr "Er is geen status gevonden met dit ID."
-#: actions/apistatusesupdate.php:161 actions/newnotice.php:155
+#: actions/apistatusesupdate.php:252 actions/newnotice.php:155
#: lib/mailhandler.php:60
#, php-format
msgid "That's too long. Max notice size is %d chars."
msgstr "De mededeling is te lang. Gebruik maximaal %d tekens."
-#: actions/apistatusesupdate.php:202 actions/apiusershow.php:96
+#: actions/apistatusesupdate.php:293 actions/apiusershow.php:96
msgid "Not found."
msgstr "Niet aangetroffen."
-#: actions/apistatusesupdate.php:225 actions/newnotice.php:178
+#: actions/apistatusesupdate.php:316 actions/newnotice.php:178
#, php-format
msgid "Max notice size is %d chars, including attachment URL."
msgstr ""
@@ -707,12 +707,12 @@ msgstr "%1$s / Updates over %2$s"
msgid "%1$s updates that reply to updates from %2$s / %3$s."
msgstr "%1$s updates die een reactie zijn op updates van %2$s / %3$s."
-#: actions/apitimelinepublic.php:107 actions/publicrss.php:103
+#: actions/apitimelinepublic.php:196 actions/publicrss.php:103
#, php-format
msgid "%s public timeline"
msgstr "%s publieke tijdlijn"
-#: actions/apitimelinepublic.php:112 actions/publicrss.php:105
+#: actions/apitimelinepublic.php:201 actions/publicrss.php:105
#, php-format
msgid "%s updates from everyone!"
msgstr "%s updates van iedereen"
@@ -2349,13 +2349,16 @@ msgstr ""
"invoeren alvorens u uw instellingen kunt wijzigen."
#: actions/login.php:270
+msgid "Login with your username and password."
+msgstr "Aanmelden met uw gebruikersnaam en wachtwoord."
+
+#: actions/login.php:273
#, php-format
msgid ""
-"Login with your username and password. Don't have a username yet? [Register]"
-"(%%action.register%%) a new account."
+"Don't have a username yet? [Register](%%action.register%%) a new account."
msgstr ""
-"Meld u aan met uw gebruikersnaam en wachtwoord. Hebt u nog geen "
-"gebruikersnaam? [Registreer een nieuwe gebruiker](%%action.register%%)."
+"Hebt u nog geen gebruikersnaam? [Registreer een nieuwe gebruiker](%%action."
+"register%%)."
#: actions/makeadmin.php:92
msgid "Only an admin can make another user an admin."
@@ -2584,8 +2587,8 @@ msgid "Only %s URLs over plain HTTP please."
msgstr "Alleen URL's voor %s via normale HTTP alstublieft."
#. TRANS: Client error on an API request with an unsupported data format.
-#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1069
-#: lib/apiaction.php:1098 lib/apiaction.php:1215
+#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1131
+#: lib/apiaction.php:1160 lib/apiaction.php:1277
msgid "Not a supported data format."
msgstr "Geen ondersteund gegevensformaat."
@@ -4909,7 +4912,7 @@ msgstr ""
msgid "Problem saving notice."
msgstr "Er is een probleem opgetreden bij het opslaan van de mededeling."
-#: classes/Notice.php:965
+#: classes/Notice.php:967
msgid "Problem saving group inbox."
msgstr ""
"Er is een probleem opgetreden bij het opslaan van het Postvak IN van de "
@@ -4917,7 +4920,7 @@ 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:1513
+#: classes/Notice.php:1535
#, php-format
msgid "RT @%1$s %2$s"
msgstr "RT @%1$s %2$s"
@@ -5380,7 +5383,7 @@ msgid "Snapshots configuration"
msgstr "Snapshotinstellingen"
#. TRANS: Client error 401.
-#: lib/apiauth.php:95
+#: lib/apiauth.php:113
msgid "API resource requires read-write access, but you only have read access."
msgstr ""
"Het API-programma heeft lezen-en-schrijventoegang nodig, maar u hebt alleen "
@@ -5600,7 +5603,7 @@ msgstr ""
#. 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.
#: lib/command.php:385
-#, fuzzy, php-format
+#, php-format
msgid "Could not remove user %1$s from group %2$s"
msgstr "Het was niet mogelijk gebruiker %1$s uit de group %2$s te verwijderen."
@@ -6953,56 +6956,56 @@ msgid "Moderator"
msgstr "Moderator"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1054
+#: lib/util.php:1083
msgid "a few seconds ago"
msgstr "een paar seconden geleden"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1057
+#: lib/util.php:1086
msgid "about a minute ago"
msgstr "ongeveer een minuut geleden"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1061
+#: lib/util.php:1090
#, php-format
msgid "about %d minutes ago"
msgstr "ongeveer %d minuten geleden"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1064
+#: lib/util.php:1093
msgid "about an hour ago"
msgstr "ongeveer een uur geleden"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1068
+#: lib/util.php:1097
#, php-format
msgid "about %d hours ago"
msgstr "ongeveer %d uur geleden"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1071
+#: lib/util.php:1100
msgid "about a day ago"
msgstr "ongeveer een dag geleden"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1075
+#: lib/util.php:1104
#, php-format
msgid "about %d days ago"
msgstr "ongeveer %d dagen geleden"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1078
+#: lib/util.php:1107
msgid "about a month ago"
msgstr "ongeveer een maand geleden"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1082
+#: lib/util.php:1111
#, php-format
msgid "about %d months ago"
msgstr "ongeveer %d maanden geleden"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1085
+#: lib/util.php:1114
msgid "about a year ago"
msgstr "ongeveer een jaar geleden"
diff --git a/locale/nn/LC_MESSAGES/statusnet.po b/locale/nn/LC_MESSAGES/statusnet.po
index 2df7238a6..6a2a705d7 100644
--- a/locale/nn/LC_MESSAGES/statusnet.po
+++ b/locale/nn/LC_MESSAGES/statusnet.po
@@ -8,12 +8,12 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-12 21:47+0000\n"
-"PO-Revision-Date: 2010-04-12 21:49:27+0000\n"
+"POT-Creation-Date: 2010-04-24 14:16+0000\n"
+"PO-Revision-Date: 2010-04-26 22:17:54+0000\n"
"Language-Team: Norwegian Nynorsk\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r64984); Translate extension (2010-01-16)\n"
+"X-Generator: MediaWiki 1.17alpha (r65552); Translate extension (2010-04-25)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: nn\n"
"X-Message-Group: out-statusnet\n"
@@ -106,8 +106,8 @@ msgstr "Dette emneord finst ikkje."
#: actions/apidirectmessagenew.php:75 actions/apigroupcreate.php:112
#: actions/apigroupismember.php:90 actions/apigroupjoin.php:99
#: actions/apigroupleave.php:99 actions/apigrouplist.php:72
-#: actions/apistatusesupdate.php:148 actions/apisubscriptions.php:87
-#: actions/apitimelinefavorites.php:71 actions/apitimelinefriends.php:78
+#: actions/apistatusesupdate.php:239 actions/apisubscriptions.php:87
+#: actions/apitimelinefavorites.php:71 actions/apitimelinefriends.php:173
#: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79
#: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75
#: actions/favoritesrss.php:74 actions/foaf.php:40 actions/foaf.php:58
@@ -131,7 +131,7 @@ msgstr "%s med vener, side %d"
#. TRANS: H1 text. %1$s is user nickname
#. TRANS: Message is used as link title. %s is a user nickname.
#: actions/all.php:89 actions/all.php:181 actions/allrss.php:116
-#: actions/apitimelinefriends.php:114 actions/apitimelinehome.php:115
+#: actions/apitimelinefriends.php:209 actions/apitimelinehome.php:115
#: lib/personalgroupnav.php:100
#, php-format
msgid "%s and friends"
@@ -192,7 +192,7 @@ msgstr "%s med vener"
#. 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:121 actions/apitimelinefriends.php:120
+#: actions/allrss.php:121 actions/apitimelinefriends.php:215
#: actions/apitimelinehome.php:121
#, php-format
msgid "Updates from %1$s and friends on %2$s!"
@@ -214,9 +214,9 @@ msgstr "Oppdateringar frå %1$s og vener på %2$s!"
#: actions/apistatusesdestroy.php:102 actions/apistatusesretweets.php:112
#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:141
#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111
-#: actions/apitimelinefavorites.php:173 actions/apitimelinefriends.php:175
+#: actions/apitimelinefavorites.php:173 actions/apitimelinefriends.php:270
#: actions/apitimelinegroup.php:151 actions/apitimelinehome.php:174
-#: actions/apitimelinementions.php:173 actions/apitimelinepublic.php:151
+#: actions/apitimelinementions.php:173 actions/apitimelinepublic.php:240
#: actions/apitimelineretweetedtome.php:121
#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:160
#: actions/apitimelineuser.php:162 actions/apiusershow.php:101
@@ -234,7 +234,7 @@ msgstr "Fann ikkje API-metode."
#: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91
#: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91
#: actions/apigroupleave.php:91 actions/apimediaupload.php:67
-#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:118
+#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:209
msgid "This method requires a POST."
msgstr "Dette krev ein POST."
@@ -266,7 +266,7 @@ msgstr "Kan ikkje lagra profil."
#: actions/apiaccountupdateprofilebackgroundimage.php:108
#: actions/apiaccountupdateprofileimage.php:97 actions/apimediaupload.php:80
-#: actions/apistatusesupdate.php:131 actions/avatarsettings.php:257
+#: actions/apistatusesupdate.php:222 actions/avatarsettings.php:257
#: actions/designadminpanel.php:123 actions/editapplication.php:118
#: actions/newapplication.php:101 actions/newnotice.php:94
#: lib/designsettings.php:283
@@ -665,17 +665,17 @@ msgstr "Lasta opp brukarbilete."
msgid "No status with that ID found."
msgstr "Fann ingen status med den ID-en."
-#: actions/apistatusesupdate.php:161 actions/newnotice.php:155
+#: actions/apistatusesupdate.php:252 actions/newnotice.php:155
#: lib/mailhandler.php:60
#, fuzzy, php-format
msgid "That's too long. Max notice size is %d chars."
msgstr "Det er for langt! Ein notis kan berre innehalde 140 teikn."
-#: actions/apistatusesupdate.php:202 actions/apiusershow.php:96
+#: actions/apistatusesupdate.php:293 actions/apiusershow.php:96
msgid "Not found."
msgstr "Finst ikkje."
-#: actions/apistatusesupdate.php:225 actions/newnotice.php:178
+#: actions/apistatusesupdate.php:316 actions/newnotice.php:178
#, php-format
msgid "Max notice size is %d chars, including attachment URL."
msgstr ""
@@ -705,12 +705,12 @@ msgstr "%1$s / Oppdateringar som svarar til %2$s"
msgid "%1$s updates that reply to updates from %2$s / %3$s."
msgstr "%1$s oppdateringar som svarar på oppdateringar frå %2$s / %3$s."
-#: actions/apitimelinepublic.php:107 actions/publicrss.php:103
+#: actions/apitimelinepublic.php:196 actions/publicrss.php:103
#, php-format
msgid "%s public timeline"
msgstr "%s offentleg tidsline"
-#: actions/apitimelinepublic.php:112 actions/publicrss.php:105
+#: actions/apitimelinepublic.php:201 actions/publicrss.php:105
#, php-format
msgid "%s updates from everyone!"
msgstr "%s oppdateringar frå alle saman!"
@@ -1199,9 +1199,8 @@ msgid "Change colours"
msgstr "Endra passordet ditt"
#: actions/designadminpanel.php:513 lib/designsettings.php:191
-#, fuzzy
msgid "Content"
-msgstr "Kopla til"
+msgstr "Innhald"
#: actions/designadminpanel.php:526 lib/designsettings.php:204
#, fuzzy
@@ -2386,10 +2385,14 @@ msgstr ""
"tryggleiksomsyn)."
#: actions/login.php:270
+#, fuzzy
+msgid "Login with your username and password."
+msgstr "Log inn med brukarnamn og passord."
+
+#: actions/login.php:273
#, fuzzy, php-format
msgid ""
-"Login with your username and password. Don't have a username yet? [Register]"
-"(%%action.register%%) a new account."
+"Don't have a username yet? [Register](%%action.register%%) a new account."
msgstr ""
"Logg inn med brukarnamn og passord. Har du ikkje brukarnamn endå? [Opprett](%"
"%action.register%%) ein ny konto, eller prøv [OpenID](%%action.openidlogin%"
@@ -2622,8 +2625,8 @@ msgid "Only %s URLs over plain HTTP please."
msgstr ""
#. TRANS: Client error on an API request with an unsupported data format.
-#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1069
-#: lib/apiaction.php:1098 lib/apiaction.php:1215
+#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1131
+#: lib/apiaction.php:1160 lib/apiaction.php:1277
msgid "Not a supported data format."
msgstr "Ikkje eit støtta dataformat."
@@ -4928,14 +4931,14 @@ msgstr "Du kan ikkje lengre legge inn notisar på denne sida."
msgid "Problem saving notice."
msgstr "Eit problem oppstod ved lagring av notis."
-#: classes/Notice.php:965
+#: classes/Notice.php:967
#, fuzzy
msgid "Problem saving group inbox."
msgstr "Eit problem oppstod ved lagring av notis."
#. 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:1513
+#: classes/Notice.php:1535
#, fuzzy, php-format
msgid "RT @%1$s %2$s"
msgstr "%1$s (%2$s)"
@@ -5433,7 +5436,7 @@ msgid "Snapshots configuration"
msgstr "SMS bekreftelse"
#. TRANS: Client error 401.
-#: lib/apiauth.php:95
+#: lib/apiauth.php:113
msgid "API resource requires read-write access, but you only have read access."
msgstr ""
@@ -5923,9 +5926,8 @@ msgid "Database error"
msgstr ""
#: lib/designsettings.php:105
-#, fuzzy
msgid "Upload file"
-msgstr "Last opp"
+msgstr "Last opp fil"
#: lib/designsettings.php:109
#, fuzzy
@@ -6899,56 +6901,56 @@ msgid "Moderator"
msgstr ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1054
+#: lib/util.php:1083
msgid "a few seconds ago"
msgstr "eit par sekund sidan"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1057
+#: lib/util.php:1086
msgid "about a minute ago"
msgstr "omtrent eitt minutt sidan"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1061
+#: lib/util.php:1090
#, php-format
msgid "about %d minutes ago"
msgstr "~%d minutt sidan"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1064
+#: lib/util.php:1093
msgid "about an hour ago"
msgstr "omtrent ein time sidan"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1068
+#: lib/util.php:1097
#, php-format
msgid "about %d hours ago"
msgstr "~%d timar sidan"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1071
+#: lib/util.php:1100
msgid "about a day ago"
msgstr "omtrent ein dag sidan"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1075
+#: lib/util.php:1104
#, php-format
msgid "about %d days ago"
msgstr "~%d dagar sidan"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1078
+#: lib/util.php:1107
msgid "about a month ago"
msgstr "omtrent ein månad sidan"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1082
+#: lib/util.php:1111
#, php-format
msgid "about %d months ago"
msgstr "~%d månadar sidan"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1085
+#: lib/util.php:1114
msgid "about a year ago"
msgstr "omtrent eitt år sidan"
diff --git a/locale/pl/LC_MESSAGES/statusnet.po b/locale/pl/LC_MESSAGES/statusnet.po
index 4aeae1113..cd23aea29 100644
--- a/locale/pl/LC_MESSAGES/statusnet.po
+++ b/locale/pl/LC_MESSAGES/statusnet.po
@@ -11,8 +11,8 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-12 21:47+0000\n"
-"PO-Revision-Date: 2010-04-12 21:49:35+0000\n"
+"POT-Creation-Date: 2010-04-24 14:16+0000\n"
+"PO-Revision-Date: 2010-04-26 22:18:01+0000\n"
"Last-Translator: Piotr DrÄ…g <piotrdrag@gmail.com>\n"
"Language-Team: Polish <pl@li.org>\n"
"MIME-Version: 1.0\n"
@@ -20,7 +20,7 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
"|| n%100>=20) ? 1 : 2);\n"
-"X-Generator: MediaWiki 1.17alpha (r64984); Translate extension (2010-01-16)\n"
+"X-Generator: MediaWiki 1.17alpha (r65552); Translate extension (2010-04-25)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: pl\n"
"X-Message-Group: out-statusnet\n"
@@ -103,8 +103,8 @@ msgstr "Nie ma takiej strony."
#: actions/apidirectmessagenew.php:75 actions/apigroupcreate.php:112
#: actions/apigroupismember.php:90 actions/apigroupjoin.php:99
#: actions/apigroupleave.php:99 actions/apigrouplist.php:72
-#: actions/apistatusesupdate.php:148 actions/apisubscriptions.php:87
-#: actions/apitimelinefavorites.php:71 actions/apitimelinefriends.php:78
+#: actions/apistatusesupdate.php:239 actions/apisubscriptions.php:87
+#: actions/apitimelinefavorites.php:71 actions/apitimelinefriends.php:173
#: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79
#: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75
#: actions/favoritesrss.php:74 actions/foaf.php:40 actions/foaf.php:58
@@ -128,7 +128,7 @@ msgstr "%1$s i przyjaciele, strona %2$d"
#. TRANS: H1 text. %1$s is user nickname
#. TRANS: Message is used as link title. %s is a user nickname.
#: actions/all.php:89 actions/all.php:181 actions/allrss.php:116
-#: actions/apitimelinefriends.php:114 actions/apitimelinehome.php:115
+#: actions/apitimelinefriends.php:209 actions/apitimelinehome.php:115
#: lib/personalgroupnav.php:100
#, php-format
msgid "%s and friends"
@@ -197,7 +197,7 @@ msgstr "Ty i przyjaciele"
#. 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:121 actions/apitimelinefriends.php:120
+#: actions/allrss.php:121 actions/apitimelinefriends.php:215
#: actions/apitimelinehome.php:121
#, php-format
msgid "Updates from %1$s and friends on %2$s!"
@@ -219,9 +219,9 @@ msgstr "Aktualizacje z %1$s i przyjaciół na %2$s."
#: actions/apistatusesdestroy.php:102 actions/apistatusesretweets.php:112
#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:141
#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111
-#: actions/apitimelinefavorites.php:173 actions/apitimelinefriends.php:175
+#: actions/apitimelinefavorites.php:173 actions/apitimelinefriends.php:270
#: actions/apitimelinegroup.php:151 actions/apitimelinehome.php:174
-#: actions/apitimelinementions.php:173 actions/apitimelinepublic.php:151
+#: actions/apitimelinementions.php:173 actions/apitimelinepublic.php:240
#: actions/apitimelineretweetedtome.php:121
#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:160
#: actions/apitimelineuser.php:162 actions/apiusershow.php:101
@@ -238,7 +238,7 @@ msgstr "Nie odnaleziono metody API."
#: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91
#: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91
#: actions/apigroupleave.php:91 actions/apimediaupload.php:67
-#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:118
+#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:209
msgid "This method requires a POST."
msgstr "Ta metoda wymaga POST."
@@ -269,7 +269,7 @@ msgstr "Nie można zapisać profilu."
#: actions/apiaccountupdateprofilebackgroundimage.php:108
#: actions/apiaccountupdateprofileimage.php:97 actions/apimediaupload.php:80
-#: actions/apistatusesupdate.php:131 actions/avatarsettings.php:257
+#: actions/apistatusesupdate.php:222 actions/avatarsettings.php:257
#: actions/designadminpanel.php:123 actions/editapplication.php:118
#: actions/newapplication.php:101 actions/newnotice.php:94
#: lib/designsettings.php:283
@@ -657,17 +657,17 @@ msgstr "Usunięto stan."
msgid "No status with that ID found."
msgstr "Nie odnaleziono stanów z tym identyfikatorem."
-#: actions/apistatusesupdate.php:161 actions/newnotice.php:155
+#: actions/apistatusesupdate.php:252 actions/newnotice.php:155
#: lib/mailhandler.php:60
#, php-format
msgid "That's too long. Max notice size is %d chars."
msgstr "Wpis jest za długi. Maksymalna długość wynosi %d znaków."
-#: actions/apistatusesupdate.php:202 actions/apiusershow.php:96
+#: actions/apistatusesupdate.php:293 actions/apiusershow.php:96
msgid "Not found."
msgstr "Nie odnaleziono."
-#: actions/apistatusesupdate.php:225 actions/newnotice.php:178
+#: actions/apistatusesupdate.php:316 actions/newnotice.php:178
#, php-format
msgid "Max notice size is %d chars, including attachment URL."
msgstr "Maksymalny rozmiar wpisu wynosi %d znaków, w tym adres URL załącznika."
@@ -696,12 +696,12 @@ msgstr "%1$s/aktualizacje wspominajÄ…ce %2$s"
msgid "%1$s updates that reply to updates from %2$s / %3$s."
msgstr "%1$s aktualizuje tę odpowiedź na aktualizacje od %2$s/%3$s."
-#: actions/apitimelinepublic.php:107 actions/publicrss.php:103
+#: actions/apitimelinepublic.php:196 actions/publicrss.php:103
#, php-format
msgid "%s public timeline"
msgstr "Publiczna oś czasu użytkownika %s"
-#: actions/apitimelinepublic.php:112 actions/publicrss.php:105
+#: actions/apitimelinepublic.php:201 actions/publicrss.php:105
#, php-format
msgid "%s updates from everyone!"
msgstr "Użytkownik %s aktualizuje od każdego."
@@ -2315,13 +2315,16 @@ msgstr ""
"zmienianiem ustawień."
#: actions/login.php:270
+msgid "Login with your username and password."
+msgstr "Logowanie za pomocą nazwy użytkownika i hasła."
+
+#: actions/login.php:273
#, php-format
msgid ""
-"Login with your username and password. Don't have a username yet? [Register]"
-"(%%action.register%%) a new account."
+"Don't have a username yet? [Register](%%action.register%%) a new account."
msgstr ""
-"Zaloguj się za pomocą nazwy użytkownika i hasła. Nie masz ich jeszcze? "
-"[Zarejestruj](%%action.register%%) nowe konto."
+"Nie masz jeszcze nazwy użytkownika? [Zarejestruj](%%action.register%%) nowe "
+"konto."
#: actions/makeadmin.php:92
msgid "Only an admin can make another user an admin."
@@ -2543,8 +2546,8 @@ msgid "Only %s URLs over plain HTTP please."
msgstr "Dozwolone są tylko adresy URL %s przez zwykły protokół HTTP."
#. TRANS: Client error on an API request with an unsupported data format.
-#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1069
-#: lib/apiaction.php:1098 lib/apiaction.php:1215
+#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1131
+#: lib/apiaction.php:1160 lib/apiaction.php:1277
msgid "Not a supported data format."
msgstr "To nie jest obsługiwany format danych."
@@ -4842,13 +4845,13 @@ msgstr "Zabroniono ci wysyłania wpisów na tej witrynie."
msgid "Problem saving notice."
msgstr "Problem podczas zapisywania wpisu."
-#: classes/Notice.php:965
+#: classes/Notice.php:967
msgid "Problem saving group inbox."
msgstr "Problem podczas zapisywania skrzynki odbiorczej grupy."
#. 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:1513
+#: classes/Notice.php:1535
#, php-format
msgid "RT @%1$s %2$s"
msgstr "RT @%1$s %2$s"
@@ -5311,7 +5314,7 @@ msgid "Snapshots configuration"
msgstr "Konfiguracja migawek"
#. TRANS: Client error 401.
-#: lib/apiauth.php:95
+#: lib/apiauth.php:113
msgid "API resource requires read-write access, but you only have read access."
msgstr ""
"Zasób API wymaga dostępu do zapisu i do odczytu, ale powiadasz dostęp tylko "
@@ -5530,9 +5533,9 @@ msgstr "Nie można dołączyć użytkownika %1$s do grupy %2$s."
#. 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.
#: lib/command.php:385
-#, fuzzy, php-format
+#, php-format
msgid "Could not remove user %1$s from group %2$s"
-msgstr "Nie można usunąć użytkownika %1$s z grupy %2$s."
+msgstr "Nie można usunąć użytkownika %1$s z grupy %2$s"
#. TRANS: Whois output. %s is the full name of the queried user.
#: lib/command.php:418
@@ -6873,56 +6876,56 @@ msgid "Moderator"
msgstr "Moderator"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1054
+#: lib/util.php:1083
msgid "a few seconds ago"
msgstr "kilka sekund temu"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1057
+#: lib/util.php:1086
msgid "about a minute ago"
msgstr "około minutę temu"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1061
+#: lib/util.php:1090
#, php-format
msgid "about %d minutes ago"
msgstr "około %d minut temu"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1064
+#: lib/util.php:1093
msgid "about an hour ago"
msgstr "około godzinę temu"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1068
+#: lib/util.php:1097
#, php-format
msgid "about %d hours ago"
msgstr "około %d godzin temu"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1071
+#: lib/util.php:1100
msgid "about a day ago"
msgstr "blisko dzień temu"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1075
+#: lib/util.php:1104
#, php-format
msgid "about %d days ago"
msgstr "około %d dni temu"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1078
+#: lib/util.php:1107
msgid "about a month ago"
msgstr "około miesiąc temu"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1082
+#: lib/util.php:1111
#, php-format
msgid "about %d months ago"
msgstr "około %d miesięcy temu"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1085
+#: lib/util.php:1114
msgid "about a year ago"
msgstr "około rok temu"
diff --git a/locale/pt/LC_MESSAGES/statusnet.po b/locale/pt/LC_MESSAGES/statusnet.po
index 8318da1ba..048664eb8 100644
--- a/locale/pt/LC_MESSAGES/statusnet.po
+++ b/locale/pt/LC_MESSAGES/statusnet.po
@@ -1,5 +1,6 @@
# Translation of StatusNet to Portuguese
#
+# Author@translatewiki.net: Gallaecio
# Author@translatewiki.net: Hamilton Abreu
# Author@translatewiki.net: Ipublicis
# --
@@ -9,12 +10,12 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-12 21:47+0000\n"
-"PO-Revision-Date: 2010-04-12 21:49:38+0000\n"
+"POT-Creation-Date: 2010-04-24 14:16+0000\n"
+"PO-Revision-Date: 2010-04-26 22:18:04+0000\n"
"Language-Team: Portuguese\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r64984); Translate extension (2010-01-16)\n"
+"X-Generator: MediaWiki 1.17alpha (r65552); Translate extension (2010-04-25)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: pt\n"
"X-Message-Group: out-statusnet\n"
@@ -28,15 +29,13 @@ msgstr "Acesso"
#. TRANS: Page notice
#: actions/accessadminpanel.php:67
-#, fuzzy
msgid "Site access settings"
-msgstr "Gravar configurações do site"
+msgstr "Configurações de acesso ao site"
#. TRANS: Form legend for registration form.
#: actions/accessadminpanel.php:161
-#, fuzzy
msgid "Registration"
-msgstr "Registar"
+msgstr "Registo"
#. TRANS: Checkbox instructions for admin setting "Private"
#: actions/accessadminpanel.php:165
@@ -45,7 +44,6 @@ msgstr "Proibir utilizadores anónimos (sem sessão iniciada) de ver o site?"
#. TRANS: Checkbox label for prohibiting anonymous users from viewing site.
#: actions/accessadminpanel.php:167
-#, fuzzy
msgctxt "LABEL"
msgid "Private"
msgstr "Privado"
@@ -72,9 +70,8 @@ msgstr "Fechado"
#. TRANS: Title / tooltip for button to save access settings in site admin panel
#: actions/accessadminpanel.php:202
-#, fuzzy
msgid "Save access settings"
-msgstr "Gravar configurações do site"
+msgstr "Gravar configurações de acesso"
#. TRANS: Button label to save e-mail preferences.
#. TRANS: Button label to save IM preferences.
@@ -83,7 +80,6 @@ msgstr "Gravar configurações do site"
#: actions/accessadminpanel.php:203 actions/emailsettings.php:224
#: actions/imsettings.php:184 actions/smssettings.php:209
#: lib/applicationeditform.php:361
-#, fuzzy
msgctxt "BUTTON"
msgid "Save"
msgstr "Gravar"
@@ -91,9 +87,8 @@ msgstr "Gravar"
#. TRANS: Server error when page not found (404)
#: actions/all.php:64 actions/public.php:98 actions/replies.php:93
#: actions/showfavorites.php:138 actions/tag.php:52
-#, fuzzy
msgid "No such page."
-msgstr "Página não encontrada."
+msgstr "Página não foi encontrada."
#: actions/all.php:75 actions/allrss.php:68
#: actions/apiaccountupdatedeliverydevice.php:113
@@ -104,8 +99,8 @@ msgstr "Página não encontrada."
#: actions/apidirectmessagenew.php:75 actions/apigroupcreate.php:112
#: actions/apigroupismember.php:90 actions/apigroupjoin.php:99
#: actions/apigroupleave.php:99 actions/apigrouplist.php:72
-#: actions/apistatusesupdate.php:148 actions/apisubscriptions.php:87
-#: actions/apitimelinefavorites.php:71 actions/apitimelinefriends.php:78
+#: actions/apistatusesupdate.php:239 actions/apisubscriptions.php:87
+#: actions/apitimelinefavorites.php:71 actions/apitimelinefriends.php:173
#: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79
#: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75
#: actions/favoritesrss.php:74 actions/foaf.php:40 actions/foaf.php:58
@@ -117,19 +112,19 @@ msgstr "Página não encontrada."
#: actions/xrds.php:71 lib/command.php:478 lib/galleryaction.php:59
#: lib/mailbox.php:82 lib/profileaction.php:77
msgid "No such user."
-msgstr "Utilizador não encontrado."
+msgstr "Utilizador não foi encontrado."
#. TRANS: Page title. %1$s is user nickname, %2$d is page number
#: actions/all.php:86
-#, fuzzy, php-format
+#, php-format
msgid "%1$s and friends, page %2$d"
-msgstr "Perfis bloqueados de %1$s, página %2$d"
+msgstr "%1$s e amigos, página %2$d"
#. TRANS: Page title. %1$s is user nickname
#. TRANS: H1 text. %1$s is user nickname
#. TRANS: Message is used as link title. %s is a user nickname.
#: actions/all.php:89 actions/all.php:181 actions/allrss.php:116
-#: actions/apitimelinefriends.php:114 actions/apitimelinehome.php:115
+#: actions/apitimelinefriends.php:209 actions/apitimelinehome.php:115
#: lib/personalgroupnav.php:100
#, php-format
msgid "%s and friends"
@@ -196,7 +191,7 @@ msgstr "Você e seus amigos"
#. 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:121 actions/apitimelinefriends.php:120
+#: actions/allrss.php:121 actions/apitimelinefriends.php:215
#: actions/apitimelinehome.php:121
#, php-format
msgid "Updates from %1$s and friends on %2$s!"
@@ -218,9 +213,9 @@ msgstr "Actualizações de %1$s e amigos no %2$s!"
#: actions/apistatusesdestroy.php:102 actions/apistatusesretweets.php:112
#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:141
#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111
-#: actions/apitimelinefavorites.php:173 actions/apitimelinefriends.php:175
+#: actions/apitimelinefavorites.php:173 actions/apitimelinefriends.php:270
#: actions/apitimelinegroup.php:151 actions/apitimelinehome.php:174
-#: actions/apitimelinementions.php:173 actions/apitimelinepublic.php:151
+#: actions/apitimelinementions.php:173 actions/apitimelinepublic.php:240
#: actions/apitimelineretweetedtome.php:121
#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:160
#: actions/apitimelineuser.php:162 actions/apiusershow.php:101
@@ -237,17 +232,16 @@ msgstr "Método da API não encontrado."
#: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91
#: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91
#: actions/apigroupleave.php:91 actions/apimediaupload.php:67
-#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:118
+#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:209
msgid "This method requires a POST."
msgstr "Este método requer um POST."
#: actions/apiaccountupdatedeliverydevice.php:105
-#, fuzzy
msgid ""
"You must specify a parameter named 'device' with a value of one of: sms, im, "
"none."
msgstr ""
-"Tem de especificar um parâmetro 'aparelho' com um dos valores: sms, im, none"
+"Tem de especificar um parâmetro 'aparelho' com um dos valores: sms, im, none."
#: actions/apiaccountupdatedeliverydevice.php:132
msgid "Could not update user."
@@ -269,7 +263,7 @@ msgstr "Não foi possível gravar o perfil."
#: actions/apiaccountupdateprofilebackgroundimage.php:108
#: actions/apiaccountupdateprofileimage.php:97 actions/apimediaupload.php:80
-#: actions/apistatusesupdate.php:131 actions/avatarsettings.php:257
+#: actions/apistatusesupdate.php:222 actions/avatarsettings.php:257
#: actions/designadminpanel.php:123 actions/editapplication.php:118
#: actions/newapplication.php:101 actions/newnotice.php:94
#: lib/designsettings.php:283
@@ -444,30 +438,29 @@ msgstr "Localidade demasiado longa (máx. 255 caracteres)."
#: actions/newgroup.php:159
#, php-format
msgid "Too many aliases! Maximum %d."
-msgstr "Demasiados sinónimos (máx. %d)."
+msgstr "Demasiados nomes alternativos! Máx. %d."
#: actions/apigroupcreate.php:266
-#, fuzzy, php-format
+#, php-format
msgid "Invalid alias: \"%s\"."
-msgstr "Sinónimo inválido: \"%s\""
+msgstr "Nome alternativo inválido: \"%s\""
#: actions/apigroupcreate.php:275 actions/editgroup.php:232
#: actions/newgroup.php:172
#, php-format
msgid "Alias \"%s\" already in use. Try another one."
-msgstr "Sinónimo \"%s\" já em uso. Tente outro."
+msgstr "Nome alternativo \"%s\" já em uso. Tente outro."
#: actions/apigroupcreate.php:288 actions/editgroup.php:238
#: actions/newgroup.php:178
msgid "Alias can't be the same as nickname."
-msgstr "Os sinónimos não podem ser iguais ao nome do utilizador."
+msgstr "Um nome alternativo não pode ser igual ao nome do utilizador."
#: actions/apigroupismember.php:95 actions/apigroupjoin.php:104
#: actions/apigroupleave.php:104 actions/apigroupmembership.php:91
#: actions/apigroupshow.php:82 actions/apitimelinegroup.php:91
-#, fuzzy
msgid "Group not found."
-msgstr "Grupo não foi encontrado!"
+msgstr "Grupo não foi encontrado."
#: actions/apigroupjoin.php:110 actions/joingroup.php:100
msgid "You are already a member of that group."
@@ -499,9 +492,9 @@ msgstr "Grupos de %s"
#. TRANS: Meant to convey the user %2$s is a member of each of the groups listed on site %1$s
#: actions/apigrouplist.php:107
-#, fuzzy, php-format
+#, php-format
msgid "%1$s groups %2$s is a member of."
-msgstr "Grupos de que %s é membro"
+msgstr "Grupos de %1$s de que %2$s é membro."
#. TRANS: Message is used as a title. %s is a site name.
#. TRANS: Message is used as a page title. %s is a nick name.
@@ -517,12 +510,11 @@ msgstr "Grupos em %s"
#: actions/apioauthauthorize.php:101
msgid "No oauth_token parameter provided."
-msgstr ""
+msgstr "Não foi fornecido o parâmetro oauth_token."
#: actions/apioauthauthorize.php:106
-#, fuzzy
msgid "Invalid token."
-msgstr "Tamanho inválido."
+msgstr "Chave inválida."
#: actions/apioauthauthorize.php:123 actions/avatarsettings.php:268
#: actions/deletenotice.php:169 actions/disfavor.php:74
@@ -543,31 +535,28 @@ msgid "There was a problem with your session token. Try again, please."
msgstr "Ocorreu um problema com a sua sessão. Por favor, tente novamente."
#: actions/apioauthauthorize.php:135
-#, fuzzy
msgid "Invalid nickname / password!"
-msgstr "Nome de utilizador ou senha inválidos."
+msgstr "Alcunha ou senha inválidos!"
#: actions/apioauthauthorize.php:159
-#, fuzzy
msgid "Database error deleting OAuth application user."
-msgstr "Erro ao configurar utilizador."
+msgstr "Erro na base de dados ao apagar o utilizador da aplicação OAuth."
#: actions/apioauthauthorize.php:185
-#, fuzzy
msgid "Database error inserting OAuth application user."
-msgstr "Erro na base de dados ao inserir a marca: %s"
+msgstr "Erro na base de dados ao inserir o utilizador da aplicação OAuth."
#: actions/apioauthauthorize.php:214
#, php-format
msgid ""
"The request token %s has been authorized. Please exchange it for an access "
"token."
-msgstr ""
+msgstr "A chave de pedido %s foi autorizada. Troque-a por uma chave de acesso."
#: actions/apioauthauthorize.php:227
#, php-format
msgid "The request token %s has been denied and revoked."
-msgstr ""
+msgstr "A chave de pedido %s foi negada e retirada."
#. 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.
@@ -583,11 +572,11 @@ msgstr "Envio inesperado de formulário."
#: actions/apioauthauthorize.php:259
msgid "An application would like to connect to your account"
-msgstr ""
+msgstr "Uma aplicação pretende ligar-se à sua conta"
#: actions/apioauthauthorize.php:276
msgid "Allow or deny access"
-msgstr ""
+msgstr "Permitir ou negar acesso"
#: actions/apioauthauthorize.php:292
#, php-format
@@ -596,6 +585,9 @@ msgid ""
"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 aplicação <strong>%1$s</strong> por <strong>%2$s</strong> solicita "
+"permissão para <strong>%3$s</strong> os dados da sua conta %4$s. Só deve "
+"permitir acesso à sua conta %4$s a terceiros da sua confiança."
#. TRANS: Main menu option when logged in for access to user settings
#: actions/apioauthauthorize.php:310 lib/action.php:440
@@ -617,18 +609,16 @@ msgid "Password"
msgstr "Senha"
#: actions/apioauthauthorize.php:328
-#, fuzzy
msgid "Deny"
-msgstr "Estilo"
+msgstr "Negar"
#: actions/apioauthauthorize.php:334
-#, fuzzy
msgid "Allow"
-msgstr "Todas"
+msgstr "Permitir"
#: actions/apioauthauthorize.php:351
msgid "Allow or deny access to your account information."
-msgstr ""
+msgstr "Permitir ou negar acesso à informação da sua conta."
#: actions/apistatusesdestroy.php:107
msgid "This method requires a POST or DELETE."
@@ -641,7 +631,7 @@ msgstr "Não pode apagar o estado de outro utilizador."
#: actions/apistatusesretweet.php:75 actions/apistatusesretweets.php:72
#: actions/deletenotice.php:52 actions/shownotice.php:92
msgid "No such notice."
-msgstr "Nota não encontrada."
+msgstr "Nota não foi encontrada."
#: actions/apistatusesretweet.php:83
msgid "Cannot repeat your own notice."
@@ -659,17 +649,17 @@ msgstr "Estado apagado."
msgid "No status with that ID found."
msgstr "Não foi encontrado um estado com esse ID."
-#: actions/apistatusesupdate.php:161 actions/newnotice.php:155
+#: actions/apistatusesupdate.php:252 actions/newnotice.php:155
#: lib/mailhandler.php:60
#, php-format
msgid "That's too long. Max notice size is %d chars."
msgstr "Demasiado longo. Tamanho máx. das notas é %d caracteres."
-#: actions/apistatusesupdate.php:202 actions/apiusershow.php:96
+#: actions/apistatusesupdate.php:293 actions/apiusershow.php:96
msgid "Not found."
msgstr "Não encontrado."
-#: actions/apistatusesupdate.php:225 actions/newnotice.php:178
+#: actions/apistatusesupdate.php:316 actions/newnotice.php:178
#, php-format
msgid "Max notice size is %d chars, including attachment URL."
msgstr "Tamanho máx. das notas é %d caracteres, incluíndo a URL do anexo."
@@ -698,12 +688,12 @@ msgstr "%1$s / Actualizações que mencionam %2$s"
msgid "%1$s updates that reply to updates from %2$s / %3$s."
msgstr "%1$s actualizações em resposta a actualizações de %2$s / %3$s."
-#: actions/apitimelinepublic.php:107 actions/publicrss.php:103
+#: actions/apitimelinepublic.php:196 actions/publicrss.php:103
#, php-format
msgid "%s public timeline"
msgstr "Notas públicas de %s"
-#: actions/apitimelinepublic.php:112 actions/publicrss.php:105
+#: actions/apitimelinepublic.php:201 actions/publicrss.php:105
#, php-format
msgid "%s updates from everyone!"
msgstr "%s actualizações de todos!"
@@ -730,14 +720,14 @@ msgstr "Actualizações categorizadas com %1$s em %2$s!"
#: actions/attachment.php:73
msgid "No such attachment."
-msgstr "Anexo não encontrado."
+msgstr "Anexo não foi encontrado."
#: actions/avatarbynickname.php:59 actions/blockedfromgroup.php:73
#: actions/editgroup.php:84 actions/groupdesignsettings.php:84
#: actions/grouplogo.php:86 actions/groupmembers.php:76
#: actions/grouprss.php:91 actions/showgroup.php:121
msgid "No nickname."
-msgstr "Nenhuma utilizador."
+msgstr "Alcunha não definida."
#: actions/avatarbynickname.php:64
msgid "No size."
@@ -793,9 +783,8 @@ msgid "Crop"
msgstr "Cortar"
#: actions/avatarsettings.php:305
-#, fuzzy
msgid "No file uploaded."
-msgstr "Não foi especificado um perfil."
+msgstr "Não foi carregado nenhum ficheiro."
#: actions/avatarsettings.php:332
msgid "Pick a square area of the image to be your avatar"
@@ -843,7 +832,6 @@ msgstr ""
#: actions/block.php:145 actions/deleteapplication.php:154
#: actions/deletenotice.php:147 actions/deleteuser.php:152
#: actions/groupblock.php:178
-#, fuzzy
msgctxt "BUTTON"
msgid "No"
msgstr "Não"
@@ -862,7 +850,6 @@ msgstr "Não bloquear este utilizador"
#: actions/block.php:152 actions/deleteapplication.php:161
#: actions/deletenotice.php:154 actions/deleteuser.php:159
#: actions/groupblock.php:185
-#, fuzzy
msgctxt "BUTTON"
msgid "Yes"
msgstr "Sim"
@@ -918,9 +905,9 @@ msgstr "Desbloquear este utilizador"
#. TRANS: Title for mini-posting window loaded from bookmarklet.
#: actions/bookmarklet.php:51
-#, fuzzy, php-format
+#, php-format
msgid "Post to %s"
-msgstr "Publicar em "
+msgstr "Publicar em %s"
#: actions/confirmaddress.php:75
msgid "No confirmation code."
@@ -936,9 +923,9 @@ msgstr "Esse código de confirmação não é para si!"
#. TRANS: Server error for an unknow address type, which can be 'email', 'jabber', or 'sms'.
#: actions/confirmaddress.php:91
-#, fuzzy, php-format
+#, php-format
msgid "Unrecognized address type %s."
-msgstr "Tipo do endereço %s não reconhecido"
+msgstr "Tipo do endereço %s não reconhecido."
#. TRANS: Client error for an already confirmed email/jabbel/sms address.
#: actions/confirmaddress.php:96
@@ -967,9 +954,8 @@ msgid "Couldn't delete email confirmation."
msgstr "Não foi possível apagar a confirmação do endereço electrónico."
#: actions/confirmaddress.php:146
-#, fuzzy
msgid "Confirm address"
-msgstr "Confirmar Endereço"
+msgstr "Confirmar endereço"
#: actions/confirmaddress.php:161
#, php-format
@@ -986,20 +972,17 @@ msgid "Notices"
msgstr "Notas"
#: actions/deleteapplication.php:63
-#, fuzzy
msgid "You must be logged in to delete an application."
-msgstr "Precisa de iniciar sessão para editar um grupo."
+msgstr "Tem de iniciar uma sessão para eliminar uma aplicação."
#: actions/deleteapplication.php:71
-#, fuzzy
msgid "Application not found."
-msgstr "Nota não tem perfil"
+msgstr "Aplicação não foi encontrada."
#: actions/deleteapplication.php:78 actions/editapplication.php:77
#: actions/showapplication.php:94
-#, fuzzy
msgid "You are not the owner of this application."
-msgstr "Não é membro deste grupo."
+msgstr "Não é o proprietário desta aplicação."
#: actions/deleteapplication.php:102 actions/editapplication.php:127
#: actions/newapplication.php:110 actions/showapplication.php:118
@@ -1008,31 +991,28 @@ msgid "There was a problem with your session token."
msgstr "Ocorreu um problema com a sua sessão."
#: actions/deleteapplication.php:123 actions/deleteapplication.php:147
-#, fuzzy
msgid "Delete application"
-msgstr "Nota não encontrada."
+msgstr "Apagar aplicação"
#: actions/deleteapplication.php:149
-#, 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 ""
-"Tem a certeza de que quer apagar este utilizador? Todos os dados do "
-"utilizador serão eliminados da base de dados, sem haver cópias."
+"Tem a certeza de que quer apagar esta aplicação? Todos os dados da aplicação "
+"serão eliminados da base de dados, incluindo todas as ligações de "
+"utilizadores em existência."
#. TRANS: Submit button title for 'No' when deleting an application.
#: actions/deleteapplication.php:158
-#, fuzzy
msgid "Do not delete this application"
-msgstr "Não apagar esta nota"
+msgstr "Não apagar esta aplicação"
#. TRANS: Submit button title for 'Yes' when deleting an application.
#: actions/deleteapplication.php:164
-#, fuzzy
msgid "Delete this application"
-msgstr "Apagar esta nota"
+msgstr "Apagar esta aplicação"
#. TRANS: Client error message thrown when trying to access the admin panel while not logged in.
#: actions/deletenotice.php:67 actions/disfavor.php:61 actions/favor.php:62
@@ -1116,9 +1096,9 @@ msgid "Invalid logo URL."
msgstr "URL do logotipo inválida."
#: actions/designadminpanel.php:280
-#, fuzzy, php-format
+#, php-format
msgid "Theme not available: %s."
-msgstr "Tema não está disponível: %s"
+msgstr "Tema não está disponível: %s."
#: actions/designadminpanel.php:376
msgid "Change logo"
@@ -1232,86 +1212,74 @@ msgid "Add to favorites"
msgstr "Adicionar às favoritas"
#: actions/doc.php:158
-#, fuzzy, php-format
+#, php-format
msgid "No such document \"%s\""
-msgstr "Documento não encontrado."
+msgstr "Documento \"%s\" não foi encontrado"
#: actions/editapplication.php:54
-#, fuzzy
msgid "Edit Application"
-msgstr "Outras opções"
+msgstr "Editar Aplicação"
#: actions/editapplication.php:66
-#, fuzzy
msgid "You must be logged in to edit an application."
-msgstr "Precisa de iniciar sessão para editar um grupo."
+msgstr "Tem de iniciar uma sessão para editar uma aplicação."
#: actions/editapplication.php:81 actions/oauthconnectionssettings.php:166
#: actions/showapplication.php:87
-#, fuzzy
msgid "No such application."
-msgstr "Nota não encontrada."
+msgstr "Aplicação não foi encontrada."
#: actions/editapplication.php:161
-#, fuzzy
msgid "Use this form to edit your application."
-msgstr "Use este formulário para editar o grupo."
+msgstr "Use este formulário para editar a sua aplicação."
#: actions/editapplication.php:177 actions/newapplication.php:159
-#, fuzzy
msgid "Name is required."
-msgstr "Repita a senha acima. Obrigatório."
+msgstr "Nome é obrigatório."
#: actions/editapplication.php:180 actions/newapplication.php:165
-#, fuzzy
msgid "Name is too long (max 255 chars)."
-msgstr "Nome completo demasiado longo (máx. 255 caracteres)."
+msgstr "Nome é demasiado longo (máx. 255 caracteres)."
#: actions/editapplication.php:183 actions/newapplication.php:162
-#, fuzzy
msgid "Name already in use. Try another one."
-msgstr "Utilizador já é usado. Tente outro."
+msgstr "Nome já é usado. Tente outro."
#: actions/editapplication.php:186 actions/newapplication.php:168
-#, fuzzy
msgid "Description is required."
-msgstr "Descrição"
+msgstr "Descrição é obrigatória."
#: actions/editapplication.php:194
msgid "Source URL is too long."
-msgstr ""
+msgstr "URL de origem é demasiado longa."
#: actions/editapplication.php:200 actions/newapplication.php:185
-#, fuzzy
msgid "Source URL is not valid."
-msgstr "A URL ‘%s’ do avatar é inválida."
+msgstr "A URL de origem é inválida."
#: actions/editapplication.php:203 actions/newapplication.php:188
msgid "Organization is required."
-msgstr ""
+msgstr "Organização é obrigatória."
#: actions/editapplication.php:206 actions/newapplication.php:191
-#, fuzzy
msgid "Organization is too long (max 255 chars)."
-msgstr "Localidade demasiado longa (máx. 255 caracteres)."
+msgstr "Organização é demasiado longa (máx. 255 caracteres)."
#: actions/editapplication.php:209 actions/newapplication.php:194
msgid "Organization homepage is required."
-msgstr ""
+msgstr "Página da organização é obrigatória."
#: actions/editapplication.php:218 actions/newapplication.php:206
msgid "Callback is too long."
-msgstr ""
+msgstr "Callback é demasiado longo."
#: actions/editapplication.php:225 actions/newapplication.php:215
-#, fuzzy
msgid "Callback URL is not valid."
-msgstr "A URL ‘%s’ do avatar é inválida."
+msgstr "A URL de callback é inválida."
#: actions/editapplication.php:258
-#, fuzzy
msgid "Could not update application."
-msgstr "Não foi possível actualizar o grupo."
+msgstr "Não foi possível actualizar a aplicação."
#: actions/editgroup.php:56
#, php-format
@@ -1339,7 +1307,7 @@ msgstr "descrição é demasiada extensa (máx. %d caracteres)."
#: actions/editgroup.php:228 actions/newgroup.php:168
#, php-format
msgid "Invalid alias: \"%s\""
-msgstr "Sinónimo inválido: \"%s\""
+msgstr "Nome alternativo inválido: \"%s\""
#: actions/editgroup.php:258
msgid "Could not update group."
@@ -1347,7 +1315,7 @@ msgstr "Não foi possível actualizar o grupo."
#: actions/editgroup.php:264 classes/User_group.php:496
msgid "Could not create aliases."
-msgstr "Não foi possível criar sinónimos."
+msgstr "Não foi possível criar os nomes alternativos."
#: actions/editgroup.php:280
msgid "Options saved."
@@ -1384,7 +1352,6 @@ msgstr "Endereço de correio já confirmado."
#: actions/emailsettings.php:115 actions/emailsettings.php:158
#: actions/imsettings.php:116 actions/smssettings.php:124
#: actions/smssettings.php:180
-#, fuzzy
msgctxt "BUTTON"
msgid "Remove"
msgstr "Remover"
@@ -1403,7 +1370,6 @@ msgstr ""
#. TRANS: Button label
#: actions/emailsettings.php:127 actions/imsettings.php:131
#: actions/smssettings.php:137 lib/applicationeditform.php:357
-#, fuzzy
msgctxt "BUTTON"
msgid "Cancel"
msgstr "Cancelar"
@@ -1419,7 +1385,6 @@ msgstr ""
#. TRANS: Button label for adding a SMS phone number in SMS settings form.
#: actions/emailsettings.php:139 actions/imsettings.php:148
#: actions/smssettings.php:162
-#, fuzzy
msgctxt "BUTTON"
msgid "Add"
msgstr "Adicionar"
@@ -1445,16 +1410,14 @@ msgstr "Crie um endereço electrónico novo para publicações; cancela o antigo
#. 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:168 actions/smssettings.php:189
-#, fuzzy
msgctxt "BUTTON"
msgid "New"
msgstr "Novo"
#. TRANS: Form legend for e-mail preferences form.
#: actions/emailsettings.php:174
-#, fuzzy
msgid "Email preferences"
-msgstr "Preferências"
+msgstr "Preferências de correio electrónico"
#. TRANS: Checkbox label in e-mail preferences form.
#: actions/emailsettings.php:180
@@ -1478,7 +1441,7 @@ msgstr ""
#: actions/emailsettings.php:199
msgid "Send me email when someone sends me an \"@-reply\"."
msgstr ""
-"Enviem-me notificação electrónica quando me enviarem uma \"@-resposta\"."
+"Enviem-me notificação electrónica quando me enviarem uma \"resposta-@\"."
#. TRANS: Checkbox label in e-mail preferences form.
#: actions/emailsettings.php:205
@@ -1497,9 +1460,8 @@ msgstr "Publicar uma MicroID para o meu endereço electrónico."
#. TRANS: Confirmation message for successful e-mail preferences save.
#: actions/emailsettings.php:334
-#, fuzzy
msgid "Email preferences saved."
-msgstr "Preferências de estilo foram gravadas."
+msgstr "Preferências de correio electrónico foram gravadas."
#. TRANS: Message given saving e-mail address without having provided one.
#: actions/emailsettings.php:353
@@ -1555,15 +1517,13 @@ msgstr "Nenhuma confirmação pendente para cancelar."
#. TRANS: Message given canceling e-mail address confirmation for the wrong e-mail address.
#: actions/emailsettings.php:424
-#, fuzzy
msgid "That is the wrong email address."
-msgstr "Esse endereço de mensagens instantâneas está errado."
+msgstr "Esse endereço de correio electrónico está errado."
#. TRANS: Message given after successfully canceling e-mail address confirmation.
#: actions/emailsettings.php:438
-#, fuzzy
msgid "Email confirmation cancelled."
-msgstr "Confirmação cancelada."
+msgstr "Confirmação de correio electrónico cancelada."
#. TRANS: Message given trying to remove an e-mail address that is not
#. TRANS: registered for the active user.
@@ -1573,9 +1533,8 @@ msgstr "Esse não é o seu endereço electrónico."
#. TRANS: Message given after successfully removing a registered e-mail address.
#: actions/emailsettings.php:479
-#, fuzzy
msgid "The email address was removed."
-msgstr "O endereço foi removido."
+msgstr "O endereço de correio electrónico foi removido."
#: actions/emailsettings.php:493 actions/smssettings.php:568
msgid "No incoming email address."
@@ -1713,9 +1672,8 @@ msgid "Remote service uses unknown version of OMB protocol."
msgstr "Serviço remoto usa uma versão desconhecida do protocolo OMB."
#: actions/finishremotesubscribe.php:138
-#, fuzzy
msgid "Error updating remote profile."
-msgstr "Erro ao actualizar o perfil remoto"
+msgstr "Erro ao actualizar o perfil remoto."
#: actions/getfile.php:79
msgid "No such file."
@@ -1726,23 +1684,20 @@ msgid "Cannot read file."
msgstr "Não foi possível ler o ficheiro."
#: actions/grantrole.php:62 actions/revokerole.php:62
-#, fuzzy
msgid "Invalid role."
-msgstr "Tamanho inválido."
+msgstr "Função inválida."
#: actions/grantrole.php:66 actions/revokerole.php:66
msgid "This role is reserved and cannot be set."
-msgstr ""
+msgstr "Esta função está reservada e não pode ser activada."
#: actions/grantrole.php:75
-#, fuzzy
msgid "You cannot grant user roles on this site."
-msgstr "Não pode impedir notas públicas neste site."
+msgstr "Não pode atribuir funções aos utilizadores neste site."
#: actions/grantrole.php:82
-#, fuzzy
msgid "User already has this role."
-msgstr "O utilizador já está silenciado."
+msgstr "O utilizador já tem esta função."
#: actions/groupblock.php:71 actions/groupunblock.php:71
#: actions/makeadmin.php:71 actions/subedit.php:46
@@ -1808,7 +1763,7 @@ msgstr "Sem ID."
#: actions/groupdesignsettings.php:68
msgid "You must be logged in to edit a group."
-msgstr "Precisa de iniciar sessão para editar um grupo."
+msgstr "Tem de iniciar uma sessão para editar um grupo."
#: actions/groupdesignsettings.php:144
msgid "Group design"
@@ -2039,9 +1994,8 @@ msgstr ""
#. TRANS: Form legend for IM preferences form.
#: actions/imsettings.php:155
-#, fuzzy
msgid "IM preferences"
-msgstr "Preferências"
+msgstr "Preferências de MI"
#. TRANS: Checkbox label in IM preferences form.
#: actions/imsettings.php:160
@@ -2111,15 +2065,13 @@ msgstr "Esse endereço de mensagens instantâneas está errado."
#. TRANS: Server error thrown on database error canceling IM address confirmation.
#: actions/imsettings.php:397
-#, fuzzy
msgid "Couldn't delete IM confirmation."
-msgstr "Não foi possível apagar a confirmação do endereço electrónico."
+msgstr "Não foi possível apagar a confirmação do mensageiro instantâneo."
#. TRANS: Message given after successfully canceling IM address confirmation.
#: actions/imsettings.php:402
-#, fuzzy
msgid "IM confirmation cancelled."
-msgstr "Confirmação cancelada."
+msgstr "Confirmação do mensageiro instantâneo cancelada."
#. TRANS: Message given trying to remove an IM address that is not
#. TRANS: registered for the active user.
@@ -2129,14 +2081,13 @@ msgstr "Esse não é o seu Jabber ID."
#. TRANS: Message given after successfully removing a registered IM address.
#: actions/imsettings.php:447
-#, fuzzy
msgid "The IM address was removed."
-msgstr "O endereço foi removido."
+msgstr "O endereço do mensageiro instantâneo foi removido."
#: actions/inbox.php:59
-#, fuzzy, php-format
+#, php-format
msgid "Inbox for %1$s - page %2$d"
-msgstr "Caixa de entrada de %s"
+msgstr "Caixa de entrada de %s - página %2$d"
#: actions/inbox.php:62
#, php-format
@@ -2154,11 +2105,11 @@ msgid "Invites have been disabled."
msgstr "Convites foram desabilitados."
#: actions/invite.php:41
-#, fuzzy, php-format
+#, php-format
msgid "You must be logged in to invite other users to use %s."
msgstr ""
-"Precisa de iniciar uma sessão para convidar outros utilizadores a usarem o "
-"site %s."
+"Tem de iniciar uma sessão para convidar outros utilizadores a usarem o site %"
+"s."
#: actions/invite.php:72
#, php-format
@@ -2226,7 +2177,6 @@ msgstr "Pode optar por acrescentar uma mensagem pessoal ao convite"
#. TRANS: Send button for inviting friends
#: actions/invite.php:198
-#, fuzzy
msgctxt "BUTTON"
msgid "Send"
msgstr "Enviar"
@@ -2296,12 +2246,11 @@ msgstr ""
#: actions/joingroup.php:60
msgid "You must be logged in to join a group."
-msgstr "Precisa de iniciar uma sessão para se juntar a um grupo."
+msgstr "Tem de iniciar uma sessão para se juntar a um grupo."
#: actions/joingroup.php:88 actions/leavegroup.php:88
-#, fuzzy
msgid "No nickname or ID."
-msgstr "Nenhuma utilizador."
+msgstr "Nenhuma alcunha ou utilizador."
#. 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.
@@ -2312,7 +2261,7 @@ msgstr "%1$s juntou-se ao grupo %2$s"
#: actions/leavegroup.php:60
msgid "You must be logged in to leave a group."
-msgstr "Precisa de iniciar uma sessão para deixar um grupo."
+msgstr "Tem de iniciar uma sessão para deixar um grupo."
#: actions/leavegroup.php:100 lib/command.php:373
msgid "You are not a member of that group."
@@ -2368,13 +2317,14 @@ msgstr ""
"senha antes de alterar as configurações."
#: actions/login.php:270
+msgid "Login with your username and password."
+msgstr "Iniciar sessão com um nome de utilizador e senha."
+
+#: actions/login.php:273
#, php-format
msgid ""
-"Login with your username and password. Don't have a username yet? [Register]"
-"(%%action.register%%) a new account."
-msgstr ""
-"Entrar com o seu nome de utilizador e senha. Ainda não está registado? "
-"[Registe](%%action.register%%) uma conta."
+"Don't have a username yet? [Register](%%action.register%%) a new account."
+msgstr "Ainda não está registado? [Registe](%%action.register%%) uma conta."
#: actions/makeadmin.php:92
msgid "Only an admin can make another user an admin."
@@ -2396,33 +2346,28 @@ msgid "Can't make %1$s an admin for group %2$s."
msgstr "Não é possível tornar %1$s administrador do grupo %2$s."
#: actions/microsummary.php:69
-#, fuzzy
msgid "No current status."
-msgstr "Sem estado actual"
+msgstr "Sem estado actual."
#: actions/newapplication.php:52
-#, fuzzy
msgid "New Application"
-msgstr "Nota não encontrada."
+msgstr "Aplicação Nova"
#: actions/newapplication.php:64
-#, fuzzy
msgid "You must be logged in to register an application."
-msgstr "Tem de iniciar uma sessão para criar o grupo."
+msgstr "Tem de iniciar uma sessão para registar uma aplicação."
#: actions/newapplication.php:143
-#, fuzzy
msgid "Use this form to register a new application."
-msgstr "Use este formulário para criar um grupo novo."
+msgstr "Use este formulário para registar uma nova aplicação."
#: actions/newapplication.php:176
msgid "Source URL is required."
-msgstr ""
+msgstr "É necessária a URL de origem."
#: actions/newapplication.php:258 actions/newapplication.php:267
-#, fuzzy
msgid "Could not create application."
-msgstr "Não foi possível criar sinónimos."
+msgstr "Não foi possível criar a aplicação."
#: actions/newgroup.php:53
msgid "New group"
@@ -2537,54 +2482,51 @@ msgid "Nudge sent!"
msgstr "Toque enviado!"
#: actions/oauthappssettings.php:59
-#, fuzzy
msgid "You must be logged in to list your applications."
-msgstr "Precisa de iniciar sessão para editar um grupo."
+msgstr "Tem de iniciar uma sessão para listar as suas aplicações."
#: actions/oauthappssettings.php:74
-#, fuzzy
msgid "OAuth applications"
-msgstr "Outras opções"
+msgstr "Aplicações OAuth"
#: actions/oauthappssettings.php:85
msgid "Applications you have registered"
-msgstr ""
+msgstr "Aplicações que registou"
#: actions/oauthappssettings.php:135
#, php-format
msgid "You have not registered any applications yet."
-msgstr ""
+msgstr "Ainda não registou nenhuma aplicação."
#: actions/oauthconnectionssettings.php:72
msgid "Connected applications"
-msgstr ""
+msgstr "Aplicações ligadas"
#: actions/oauthconnectionssettings.php:83
msgid "You have allowed the following applications to access you account."
-msgstr ""
+msgstr "Permitiu que as seguintes aplicações acedam à sua conta."
#: actions/oauthconnectionssettings.php:175
-#, fuzzy
msgid "You are not a user of that application."
-msgstr "Não é um membro desse grupo."
+msgstr "Não é utilizador dessa aplicação."
#: actions/oauthconnectionssettings.php:186
#, php-format
msgid "Unable to revoke access for app: %s."
-msgstr ""
+msgstr "Não foi possível retirar acesso da aplicação: %s"
#: actions/oauthconnectionssettings.php:198
msgid "You have not authorized any applications to use your account."
-msgstr ""
+msgstr "Não permitiu que nenhuma aplicação use a sua conta."
#: actions/oauthconnectionssettings.php:211
msgid "Developers can edit the registration settings for their applications "
msgstr ""
+"Programadores podem editar as configurações de inscrição das suas aplicações "
#: actions/oembed.php:79 actions/shownotice.php:100
-#, fuzzy
msgid "Notice has no profile."
-msgstr "Nota não tem perfil"
+msgstr "Nota não tem perfil."
#: actions/oembed.php:86 actions/shownotice.php:175
#, php-format
@@ -2593,19 +2535,19 @@ msgstr "Estado de %1$s em %2$s"
#. TRANS: Error message displaying attachments. %s is a raw MIME type (eg 'image/png')
#: actions/oembed.php:158
-#, fuzzy, php-format
+#, php-format
msgid "Content type %s not supported."
-msgstr "tipo de conteúdo "
+msgstr "O tipo de conteúdo %s não é suportado."
#. TRANS: Error message displaying attachments. %s is the site's base URL.
#: actions/oembed.php:162
#, php-format
msgid "Only %s URLs over plain HTTP please."
-msgstr ""
+msgstr "Só URLs %s sobre HTTP simples, por favor."
#. TRANS: Client error on an API request with an unsupported data format.
-#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1069
-#: lib/apiaction.php:1098 lib/apiaction.php:1215
+#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1131
+#: lib/apiaction.php:1160 lib/apiaction.php:1277
msgid "Not a supported data format."
msgstr "Formato de dados não suportado."
@@ -2618,9 +2560,8 @@ msgid "Notice Search"
msgstr "Pesquisa de Notas"
#: actions/othersettings.php:60
-#, fuzzy
msgid "Other settings"
-msgstr "Outras Configurações"
+msgstr "Outras configurações"
#: actions/othersettings.php:71
msgid "Manage various other options."
@@ -2651,34 +2592,29 @@ msgid "URL shortening service is too long (max 50 chars)."
msgstr "Serviço de encurtamento de URLs demasiado extenso (máx. 50 caracteres)"
#: actions/otp.php:69
-#, fuzzy
msgid "No user ID specified."
-msgstr "Não foi especificado um grupo."
+msgstr "Não foi especificado um ID de utilizador."
#: actions/otp.php:83
-#, fuzzy
msgid "No login token specified."
-msgstr "Nota não foi especificada."
+msgstr "Chave de entrada não foi especificada."
#: actions/otp.php:90
-#, fuzzy
msgid "No login token requested."
-msgstr "O pedido não tem a identificação do perfil."
+msgstr "Chave de entrada não foi pedida."
#: actions/otp.php:95
-#, fuzzy
msgid "Invalid login token specified."
-msgstr "Chave inválida ou expirada."
+msgstr "Chave de entrada especificada é inválida."
#: actions/otp.php:104
-#, fuzzy
msgid "Login token expired."
-msgstr "Iniciar sessão no site"
+msgstr "Chave de entrada expirou."
#: actions/outbox.php:58
-#, fuzzy, php-format
+#, php-format
msgid "Outbox for %1$s - page %2$d"
-msgstr "Caixa de saída de %s"
+msgstr "Caixa de saída de %s - página %2$d"
#: actions/outbox.php:61
#, php-format
@@ -2761,24 +2697,24 @@ msgid "Path and server settings for this StatusNet site."
msgstr "Configurações de localização e servidor deste site StatusNet."
#: actions/pathsadminpanel.php:157
-#, fuzzy, php-format
+#, php-format
msgid "Theme directory not readable: %s."
-msgstr "Sem acesso de leitura do directório do tema: %s"
+msgstr "Sem acesso de leitura do directório do tema: %s."
#: actions/pathsadminpanel.php:163
-#, fuzzy, php-format
+#, php-format
msgid "Avatar directory not writable: %s."
-msgstr "Sem acesso de escrita no directório do avatar: %s"
+msgstr "Sem acesso de escrita no directório do avatar: %s."
#: actions/pathsadminpanel.php:169
-#, fuzzy, php-format
+#, php-format
msgid "Background directory not writable: %s."
-msgstr "Sem acesso de escrita no directório do fundo: %s"
+msgstr "Sem acesso de escrita no directório do fundo: %s."
#: actions/pathsadminpanel.php:177
-#, fuzzy, php-format
+#, php-format
msgid "Locales directory not readable: %s."
-msgstr "Sem acesso de leitura ao directório de idiomas: %s"
+msgstr "Sem acesso de leitura ao directório de idiomas: %s."
#: actions/pathsadminpanel.php:183
msgid "Invalid SSL server. The maximum length is 255 characters."
@@ -2919,9 +2855,9 @@ msgid "People search"
msgstr "Pesquisa de pessoas"
#: actions/peopletag.php:68
-#, fuzzy, php-format
+#, php-format
msgid "Not a valid people tag: %s."
-msgstr "Categoria de pessoas inválida: %s"
+msgstr "Categoria de pessoas inválida: %s."
#: actions/peopletag.php:142
#, php-format
@@ -2929,9 +2865,8 @@ msgid "Users self-tagged with %1$s - page %2$d"
msgstr "Utilizadores auto-categorizados com %1$s - página %2$d"
#: actions/postnotice.php:95
-#, fuzzy
msgid "Invalid notice content."
-msgstr "Conteúdo da nota é inválido"
+msgstr "Conteúdo da nota é inválido."
#: actions/postnotice.php:101
#, php-format
@@ -3076,9 +3011,9 @@ msgid "Settings saved."
msgstr "Configurações gravadas."
#: actions/public.php:83
-#, fuzzy, php-format
+#, php-format
msgid "Beyond the page limit (%s)."
-msgstr "Além do limite de página (%s)"
+msgstr "Além do limite de página (%s)."
#: actions/public.php:92
msgid "Could not retrieve public stream."
@@ -3187,7 +3122,7 @@ msgstr "Já tem uma sessão iniciada!"
#: actions/recoverpassword.php:62
msgid "No such recovery code."
-msgstr "Esse código de recuperação não existe."
+msgstr "Código de recuperação não foi encontrado."
#: actions/recoverpassword.php:66
msgid "Not a recovery code."
@@ -3342,7 +3277,6 @@ msgid "Invalid username or password."
msgstr "Nome de utilizador ou senha inválidos."
#: actions/register.php:343
-#, fuzzy
msgid ""
"With this form you can create a new account. You can then post notices and "
"link up to friends and colleagues. "
@@ -3378,13 +3312,14 @@ msgid "Longer name, preferably your \"real\" name"
msgstr "Nome mais longo, de preferência o seu nome \"verdadeiro\""
#: actions/register.php:494
-#, 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 ""
-" excepto estes dados privados: senha, endereço de correio electrónico, "
-"endereço de mensageiro instantâneo, número de telefone."
+"Os meus textos e ficheiros são disponibilizados nos termos da %s excepto "
+"estes dados privados: senha, endereço de correio electrónico, endereço de "
+"mensageiro instantâneo, número de telefone."
#: actions/register.php:542
#, php-format
@@ -3517,9 +3452,9 @@ msgid "Replies to %s"
msgstr "Respostas a %s"
#: actions/replies.php:128
-#, fuzzy, php-format
+#, php-format
msgid "Replies to %1$s, page %2$d"
-msgstr "Respostas a %1$s em %2$s!"
+msgstr "Respostas a %1$s, página %2$d"
#: actions/replies.php:145
#, php-format
@@ -3569,14 +3504,12 @@ msgid "Replies to %1$s on %2$s!"
msgstr "Respostas a %1$s em %2$s!"
#: actions/revokerole.php:75
-#, fuzzy
msgid "You cannot revoke user roles on this site."
-msgstr "Não pode silenciar utilizadores neste site."
+msgstr "Não pode retirar funções aos utilizadores neste site."
#: actions/revokerole.php:82
-#, fuzzy
msgid "User doesn't have this role."
-msgstr "Utilizador sem perfil correspondente."
+msgstr "O utilizador não tem esta função."
#: actions/rsd.php:146 actions/version.php:157
msgid "StatusNet"
@@ -3597,9 +3530,8 @@ msgid "Sessions"
msgstr "Sessões"
#: actions/sessionsadminpanel.php:65
-#, fuzzy
msgid "Session settings for this StatusNet site."
-msgstr "Configurações do estilo deste site StatusNet."
+msgstr "Configurações da sessão para este site StatusNet."
#: actions/sessionsadminpanel.php:175
msgid "Handle sessions"
@@ -3623,19 +3555,17 @@ msgid "Save site settings"
msgstr "Gravar configurações do site"
#: actions/showapplication.php:82
-#, fuzzy
msgid "You must be logged in to view an application."
-msgstr "Precisa de iniciar uma sessão para deixar um grupo."
+msgstr "Tem de iniciar uma sessão para ver uma aplicação."
#: actions/showapplication.php:157
-#, fuzzy
msgid "Application profile"
-msgstr "Nota não tem perfil"
+msgstr "Perfil da aplicação"
#. TRANS: Form input field label for application icon.
#: actions/showapplication.php:159 lib/applicationeditform.php:182
msgid "Icon"
-msgstr ""
+msgstr "Ãcone"
#. TRANS: Form input field label for application name.
#: actions/showapplication.php:169 actions/version.php:195
@@ -3645,9 +3575,8 @@ msgstr "Nome"
#. TRANS: Form input field label.
#: actions/showapplication.php:178 lib/applicationeditform.php:235
-#, fuzzy
msgid "Organization"
-msgstr "Paginação"
+msgstr "Organização"
#. TRANS: Form input field label.
#: actions/showapplication.php:187 actions/version.php:198
@@ -3663,56 +3592,57 @@ msgstr "Estatísticas"
#: actions/showapplication.php:203
#, php-format
msgid "Created by %1$s - %2$s access by default - %3$d users"
-msgstr ""
+msgstr "Criado por %1$s - acesso por omissão %2$s - %3$d utilizadores"
#: actions/showapplication.php:213
msgid "Application actions"
-msgstr ""
+msgstr "Operações da aplicação"
#: actions/showapplication.php:236
msgid "Reset key & secret"
-msgstr ""
+msgstr "Reiniciar chave e segredo"
#: actions/showapplication.php:261
msgid "Application info"
-msgstr ""
+msgstr "Informação da aplicação"
#: actions/showapplication.php:263
msgid "Consumer key"
-msgstr ""
+msgstr "Chave do consumidor"
#: actions/showapplication.php:268
msgid "Consumer secret"
-msgstr ""
+msgstr "Segredo do consumidor"
#: actions/showapplication.php:273
msgid "Request token URL"
-msgstr ""
+msgstr "URL da chave de pedido"
#: actions/showapplication.php:278
msgid "Access token URL"
-msgstr ""
+msgstr "URL da chave de acesso"
#: actions/showapplication.php:283
-#, fuzzy
msgid "Authorize URL"
-msgstr "Autor"
+msgstr "Autorizar URL"
#: actions/showapplication.php:288
msgid ""
"Note: We support HMAC-SHA1 signatures. We do not support the plaintext "
"signature method."
msgstr ""
+"Nota: Assinaturas HMAC-SHA1 são suportadas. O método de assinatura com texto "
+"simples não é suportado."
#: actions/showapplication.php:309
-#, fuzzy
msgid "Are you sure you want to reset your consumer key and secret?"
-msgstr "Tem a certeza de que quer apagar esta nota?"
+msgstr ""
+"Tem a certeza de que quer reiniciar a sua chave e segredo de consumidor?"
#: actions/showfavorites.php:79
-#, fuzzy, php-format
+#, php-format
msgid "%1$s's favorite notices, page %2$d"
-msgstr "Notas favoritas de %s"
+msgstr "Notas favoritas de %1$s, página %2$d"
#: actions/showfavorites.php:132
msgid "Could not retrieve favorite notices."
@@ -3772,9 +3702,9 @@ msgid "%s group"
msgstr "Grupo %s"
#: actions/showgroup.php:84
-#, fuzzy, php-format
+#, php-format
msgid "%1$s group, page %2$d"
-msgstr "Membros do grupo %1$s, página %2$d"
+msgstr "Grupo %1$s, página %2$d"
#: actions/showgroup.php:227
msgid "Group profile"
@@ -3792,7 +3722,7 @@ msgstr "Anotação"
#: actions/showgroup.php:293 lib/groupeditform.php:184
msgid "Aliases"
-msgstr "Sinónimos"
+msgstr "Nomes alternativos"
#: actions/showgroup.php:302
msgid "Group actions"
@@ -3897,9 +3827,9 @@ msgid " tagged %s"
msgstr " categorizou %s"
#: actions/showstream.php:79
-#, fuzzy, php-format
+#, php-format
msgid "%1$s, page %2$d"
-msgstr "Perfis bloqueados de %1$s, página %2$d"
+msgstr "%1$s, página %2$d"
#: actions/showstream.php:122
#, php-format
@@ -3987,9 +3917,8 @@ msgid "User is already silenced."
msgstr "O utilizador já está silenciado."
#: actions/siteadminpanel.php:69
-#, fuzzy
msgid "Basic settings for this StatusNet site"
-msgstr "Configurações básicas para este site StatusNet."
+msgstr "Configurações básicas para este site StatusNet"
#: actions/siteadminpanel.php:133
msgid "Site name must have non-zero length."
@@ -4005,14 +3934,12 @@ msgid "Unknown language \"%s\"."
msgstr "Língua desconhecida \"%s\"."
#: actions/siteadminpanel.php:165
-#, fuzzy
msgid "Minimum text limit is 0 (unlimited)."
-msgstr "O valor mínimo de limite para o texto é 140 caracteres."
+msgstr "O limite mínimo para o texto é 0 (sem limite)."
#: actions/siteadminpanel.php:171
-#, fuzzy
msgid "Dupe limit must be one or more seconds."
-msgstr "O limite de duplicados tem de ser 1 ou mais segundos."
+msgstr "O limite de duplicados tem de ser um ou mais segundos."
#: actions/siteadminpanel.php:221
msgid "General"
@@ -4059,13 +3986,14 @@ msgid "Default timezone for the site; usually UTC."
msgstr "Fuso horário por omissão, para o site; normalmente, UTC."
#: actions/siteadminpanel.php:262
-#, fuzzy
msgid "Default language"
msgstr "Idioma do site, por omissão"
#: actions/siteadminpanel.php:263
msgid "Site language when autodetection from browser settings is not available"
msgstr ""
+"Idioma do site quando a sua detecção na configuração do browser não é "
+"possível"
#: actions/siteadminpanel.php:271
msgid "Limits"
@@ -4090,37 +4018,32 @@ msgstr ""
"mesma coisa outra vez."
#: actions/sitenoticeadminpanel.php:56
-#, fuzzy
msgid "Site Notice"
-msgstr "Aviso do site"
+msgstr "Aviso do Site"
#: actions/sitenoticeadminpanel.php:67
-#, fuzzy
msgid "Edit site-wide message"
-msgstr "Mensagem nova"
+msgstr "Editar mensagem do site"
#: actions/sitenoticeadminpanel.php:103
-#, fuzzy
msgid "Unable to save site notice."
-msgstr "Não foi possível gravar as configurações do estilo."
+msgstr "Não foi possível gravar o aviso do site."
#: actions/sitenoticeadminpanel.php:113
msgid "Max length for the site-wide notice is 255 chars."
-msgstr ""
+msgstr "Tamanho máximo do aviso do site é 255 caracteres."
#: actions/sitenoticeadminpanel.php:176
-#, fuzzy
msgid "Site notice text"
-msgstr "Aviso do site"
+msgstr "Texto do aviso do site"
#: actions/sitenoticeadminpanel.php:178
msgid "Site-wide notice text (255 chars max; HTML okay)"
-msgstr ""
+msgstr "Texto do aviso do site (máx. 255 caracteres; pode usar HTML)"
#: actions/sitenoticeadminpanel.php:198
-#, fuzzy
msgid "Save site notice"
-msgstr "Aviso do site"
+msgstr "Gravar aviso do site"
#. TRANS: Title for SMS settings.
#: actions/smssettings.php:59
@@ -4141,9 +4064,8 @@ msgstr "SMS não está disponível."
#. TRANS: Form legend for SMS settings form.
#: actions/smssettings.php:111
-#, fuzzy
msgid "SMS address"
-msgstr "Endereço IM"
+msgstr "Endereço SMS"
#. TRANS: Form guide in SMS settings form.
#: actions/smssettings.php:120
@@ -4167,10 +4089,9 @@ msgstr "Introduza o código que recebeu no seu telefone."
#. TRANS: Button label to confirm SMS confirmation code in SMS settings.
#: actions/smssettings.php:148
-#, fuzzy
msgctxt "BUTTON"
msgid "Confirm"
-msgstr "Confirmação"
+msgstr "Confirmar"
#. TRANS: Field label for SMS phone number input in SMS settings form.
#: actions/smssettings.php:153
@@ -4184,9 +4105,8 @@ msgstr "Número de telefone, sem pontuação ou espaços, com código de área"
#. TRANS: Form legend for SMS preferences form.
#: actions/smssettings.php:195
-#, fuzzy
msgid "SMS preferences"
-msgstr "Preferências"
+msgstr "Preferências de SMS"
#. TRANS: Checkbox label in SMS preferences form.
#: actions/smssettings.php:201
@@ -4199,9 +4119,8 @@ msgstr ""
#. TRANS: Confirmation message for successful SMS preferences save.
#: actions/smssettings.php:315
-#, fuzzy
msgid "SMS preferences saved."
-msgstr "Preferências gravadas."
+msgstr "Preferências de SMS gravadas."
#. TRANS: Message given saving SMS phone number without having provided one.
#: actions/smssettings.php:338
@@ -4240,9 +4159,8 @@ msgstr "Esse número de confirmação está errado."
#. TRANS: Message given after successfully canceling SMS phone number confirmation.
#: actions/smssettings.php:427
-#, fuzzy
msgid "SMS confirmation cancelled."
-msgstr "Confirmação cancelada."
+msgstr "Confirmação de SMS cancelada."
#. TRANS: Message given trying to remove an SMS phone number that is not
#. TRANS: registered for the active user.
@@ -4252,9 +4170,8 @@ msgstr "Esse número de telefone não é o seu."
#. TRANS: Message given after successfully removing a registered SMS phone number.
#: actions/smssettings.php:470
-#, fuzzy
msgid "The SMS phone number was removed."
-msgstr "Número de telefone para SMS"
+msgstr "Número de telefone para SMS foi removido."
#. TRANS: Label for mobile carrier dropdown menu in SMS settings.
#: actions/smssettings.php:511
@@ -4290,9 +4207,8 @@ msgid "Snapshots"
msgstr "Instantâneos"
#: actions/snapshotadminpanel.php:65
-#, fuzzy
msgid "Manage snapshot configuration"
-msgstr "Alterar a configuração do site"
+msgstr "Alterar a configuração do instantâneo"
#: actions/snapshotadminpanel.php:127
msgid "Invalid snapshot run value."
@@ -4307,7 +4223,6 @@ msgid "Invalid snapshot report URL."
msgstr "URL para onde enviar instantâneos é inválida"
#: actions/snapshotadminpanel.php:200
-#, fuzzy
msgid "Randomly during web hit"
msgstr "Aleatoriamente, durante o acesso pela internet"
@@ -4340,9 +4255,8 @@ msgid "Snapshots will be sent to this URL"
msgstr "Instantâneos serão enviados para esta URL"
#: actions/snapshotadminpanel.php:248
-#, fuzzy
msgid "Save snapshot settings"
-msgstr "Gravar configurações do site"
+msgstr "Gravar configurações do instantâneo"
#: actions/subedit.php:70
msgid "You are not subscribed to that profile."
@@ -4354,17 +4268,15 @@ msgstr "Não foi possível gravar a subscrição."
#: actions/subscribe.php:77
msgid "This action only accepts POST requests."
-msgstr ""
+msgstr "Esta operação só aceita pedidos POST."
#: actions/subscribe.php:107
-#, fuzzy
msgid "No such profile."
-msgstr "Ficheiro não foi encontrado."
+msgstr "Perfil não foi encontrado."
#: actions/subscribe.php:117
-#, fuzzy
msgid "You cannot subscribe to an OMB 0.1 remote profile with this action."
-msgstr "Não subscreveu esse perfil."
+msgstr "Não pode subscrever um perfil remoto OMB 0.1 com esta operação."
#: actions/subscribe.php:145
msgid "Subscribed"
@@ -4460,9 +4372,9 @@ msgid "SMS"
msgstr "SMS"
#: actions/tag.php:69
-#, fuzzy, php-format
+#, php-format
msgid "Notices tagged with %1$s, page %2$d"
-msgstr "Utilizadores auto-categorizados com %1$s - página %2$d"
+msgstr "Notas categorizadas com %1$s, página %2$d"
#: actions/tag.php:87
#, php-format
@@ -4526,7 +4438,7 @@ msgstr ""
#: actions/tagrss.php:35
msgid "No such tag."
-msgstr "Categoria não existe."
+msgstr "Categoria não foi encontrada."
#: actions/twitapitrends.php:85
msgid "API method under construction."
@@ -4545,7 +4457,6 @@ msgid "User is not silenced."
msgstr "Utilizador não está silenciado."
#: actions/unsubscribe.php:77
-#, fuzzy
msgid "No profile ID in request."
msgstr "O pedido não tem a identificação do perfil."
@@ -4563,7 +4474,6 @@ msgstr ""
#. TRANS: User admin panel title
#: actions/useradminpanel.php:59
-#, fuzzy
msgctxt "TITLE"
msgid "User"
msgstr "Utilizador"
@@ -4751,9 +4661,9 @@ msgstr "Disfrute do seu cachorro-quente!"
#. 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
+#, php-format
msgid "%1$s groups, page %2$d"
-msgstr "Membros do grupo %1$s, página %2$d"
+msgstr "Grupos de %1$s, página %2$d"
#: actions/usergroups.php:132
msgid "Search for more groups"
@@ -4864,24 +4774,20 @@ msgid "A file this large would exceed your monthly quota of %d bytes."
msgstr "Um ficheiro desta dimensão excederia a sua quota mensal de %d bytes."
#: classes/Group_member.php:41
-#, fuzzy
msgid "Group join failed."
-msgstr "Perfil do grupo"
+msgstr "Entrada no grupo falhou."
#: classes/Group_member.php:53
-#, fuzzy
msgid "Not part of group."
-msgstr "Não foi possível actualizar o grupo."
+msgstr "Não faz parte do grupo."
#: classes/Group_member.php:60
-#, fuzzy
msgid "Group leave failed."
-msgstr "Perfil do grupo"
+msgstr "Saída do grupo falhou."
#: classes/Local_group.php:41
-#, fuzzy
msgid "Could not update local group."
-msgstr "Não foi possível actualizar o grupo."
+msgstr "Não foi possível actualizar o grupo local."
#: classes/Login_token.php:76
#, php-format
@@ -4902,7 +4808,7 @@ msgstr "Não foi possível actualizar a mensagem com a nova URI."
#. TRANS: Server exception. %s are the error details.
#: classes/Notice.php:176
-#, fuzzy, php-format
+#, php-format
msgid "Database error inserting hashtag: %s"
msgstr "Erro na base de dados ao inserir a marca: %s"
@@ -4937,14 +4843,13 @@ msgstr "Está proibido de publicar notas neste site."
msgid "Problem saving notice."
msgstr "Problema na gravação da nota."
-#: classes/Notice.php:965
-#, fuzzy
+#: classes/Notice.php:967
msgid "Problem saving group inbox."
-msgstr "Problema na gravação da nota."
+msgstr "Problema na gravação da caixa de entrada do grupo."
#. 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:1513
+#: classes/Notice.php:1535
#, php-format
msgid "RT @%1$s %2$s"
msgstr "RT @%1$s %2$s"
@@ -4970,9 +4875,8 @@ msgid "Couldn't delete self-subscription."
msgstr "Não foi possível apagar a auto-subscrição."
#: classes/Subscription.php:200
-#, fuzzy
msgid "Couldn't delete subscription OMB token."
-msgstr "Não foi possível apagar a subscrição."
+msgstr "Não foi possível apagar a chave de subscrição OMB."
#: classes/Subscription.php:211
msgid "Couldn't delete subscription."
@@ -4988,18 +4892,16 @@ msgid "Could not create group."
msgstr "Não foi possível criar o grupo."
#: classes/User_group.php:489
-#, fuzzy
msgid "Could not set group URI."
-msgstr "Não foi possível configurar membros do grupo."
+msgstr "Não foi possível configurar a URI do grupo."
#: classes/User_group.php:510
msgid "Could not set group membership."
msgstr "Não foi possível configurar membros do grupo."
#: classes/User_group.php:524
-#, fuzzy
msgid "Could not save local group info."
-msgstr "Não foi possível gravar a subscrição."
+msgstr "Não foi possível gravar a informação do grupo local."
#. TRANS: Link title attribute in user account settings menu.
#: lib/accountsettingsaction.php:109
@@ -5038,9 +4940,9 @@ msgstr "Outras"
#. TRANS: Page title. %1$s is the title, %2$s is the site name.
#: lib/action.php:145
-#, 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:161
@@ -5054,28 +4956,24 @@ msgstr "Navegação primária deste site"
#. TRANS: Tooltip for main menu option "Personal"
#: lib/action.php:432
-#, fuzzy
msgctxt "TOOLTIP"
msgid "Personal profile and friends timeline"
msgstr "Perfil pessoal e notas dos amigos"
#. TRANS: Main menu option when logged in for access to personal profile and friends timeline
#: lib/action.php:435
-#, fuzzy
msgctxt "MENU"
msgid "Personal"
msgstr "Pessoal"
#. TRANS: Tooltip for main menu option "Account"
#: lib/action.php:437
-#, fuzzy
msgctxt "TOOLTIP"
msgid "Change your email, avatar, password, profile"
msgstr "Altere o seu endereço electrónico, avatar, senha, perfil"
#. TRANS: Tooltip for main menu option "Services"
#: lib/action.php:442
-#, fuzzy
msgctxt "TOOLTIP"
msgid "Connect to services"
msgstr "Ligar aos serviços"
@@ -5087,95 +4985,82 @@ msgstr "Ligar"
#. TRANS: Tooltip for menu option "Admin"
#: lib/action.php:448
-#, fuzzy
msgctxt "TOOLTIP"
msgid "Change site configuration"
msgstr "Alterar a configuração do site"
#. TRANS: Main menu option when logged in and site admin for access to site configuration
#: lib/action.php:451
-#, fuzzy
msgctxt "MENU"
msgid "Admin"
msgstr "Gestor"
#. TRANS: Tooltip for main menu option "Invite"
#: lib/action.php:455
-#, fuzzy, php-format
+#, php-format
msgctxt "TOOLTIP"
msgid "Invite friends and colleagues to join you on %s"
msgstr "Convidar amigos e colegas para se juntarem a si em %s"
#. TRANS: Main menu option when logged in and invitations are allowed for inviting new users
#: lib/action.php:458
-#, fuzzy
msgctxt "MENU"
msgid "Invite"
msgstr "Convidar"
#. TRANS: Tooltip for main menu option "Logout"
#: lib/action.php:464
-#, fuzzy
msgctxt "TOOLTIP"
msgid "Logout from the site"
msgstr "Terminar esta sessão"
#. TRANS: Main menu option when logged in to log out the current user
#: lib/action.php:467
-#, fuzzy
msgctxt "MENU"
msgid "Logout"
msgstr "Sair"
#. TRANS: Tooltip for main menu option "Register"
#: lib/action.php:472
-#, fuzzy
msgctxt "TOOLTIP"
msgid "Create an account"
msgstr "Criar uma conta"
#. TRANS: Main menu option when not logged in to register a new account
#: lib/action.php:475
-#, fuzzy
msgctxt "MENU"
msgid "Register"
msgstr "Registar"
#. TRANS: Tooltip for main menu option "Login"
#: lib/action.php:478
-#, fuzzy
msgctxt "TOOLTIP"
msgid "Login to the site"
msgstr "Iniciar uma sessão"
#: lib/action.php:481
-#, fuzzy
msgctxt "MENU"
msgid "Login"
msgstr "Entrar"
#. TRANS: Tooltip for main menu option "Help"
#: lib/action.php:484
-#, fuzzy
msgctxt "TOOLTIP"
msgid "Help me!"
msgstr "Ajudem-me!"
#: lib/action.php:487
-#, fuzzy
msgctxt "MENU"
msgid "Help"
msgstr "Ajuda"
#. TRANS: Tooltip for main menu option "Search"
#: lib/action.php:490
-#, fuzzy
msgctxt "TOOLTIP"
msgid "Search for people or text"
msgstr "Procurar pessoas ou pesquisar texto"
#: lib/action.php:493
-#, fuzzy
msgctxt "MENU"
msgid "Search"
msgstr "Pesquisa"
@@ -5247,13 +5132,13 @@ msgstr "Licença de software do StatusNet"
#. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is set.
#: lib/action.php:817
-#, fuzzy, php-format
+#, php-format
msgid ""
"**%%site.name%%** is a microblogging service brought to you by [%%site."
"broughtby%%](%%site.broughtbyurl%%)."
msgstr ""
"**%%site.name%%** é um serviço de microblogues disponibilizado por [%%site."
-"broughtby%%](%%site.broughtbyurl%%). "
+"broughtby%%](%%site.broughtbyurl%%)."
#. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set.
#: lib/action.php:820
@@ -5283,7 +5168,7 @@ msgstr "Licença de conteúdos do site"
#: lib/action.php:847
#, php-format
msgid "Content and data of %1$s are private and confidential."
-msgstr ""
+msgstr "O conteúdo e dados do site %1$s são privados e confidenciais."
#. TRANS: Content license displayed when license is set to 'allrightsreserved'.
#. TRANS: %1$s is the copyright owner.
@@ -5291,17 +5176,23 @@ msgstr ""
#, php-format
msgid "Content and data copyright by %1$s. All rights reserved."
msgstr ""
+"Direitos de autor sobre o conteúdo e dados, detidos por %1$s. Todos os "
+"direitos reservados."
#. TRANS: Content license displayed when license is set to 'allrightsreserved' and no owner is set.
#: lib/action.php:858
msgid "Content and data copyright by contributors. All rights reserved."
msgstr ""
+"Direitos de autor sobre o conteúdo e dados detidos pelos contribuidores. "
+"Todos os direitos reservados."
#. TRANS: license message in footer. %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:871
#, php-format
msgid "All %1$s content and data are available under the %2$s license."
msgstr ""
+"Todo o conteúdo e dados do site %1$s são disponibilizados nos termos da "
+"licença %2$s."
#. TRANS: DT element for pagination (previous/next, etc.).
#: lib/action.php:1182
@@ -5324,18 +5215,20 @@ msgstr "Anteriores"
#: lib/activity.php:121
msgid "Expecting a root feed element but got a whole XML document."
msgstr ""
+"Era esperado um elemento raiz da fonte, mas foi recebido um documento XML "
+"inteiro."
#: lib/activityutils.php:208
msgid "Can't handle remote content yet."
-msgstr ""
+msgstr "Ainda não é possível processar conteúdos remotos."
#: lib/activityutils.php:236
msgid "Can't handle embedded XML content yet."
-msgstr ""
+msgstr "Ainda não é possível processar conteúdo XML embutido."
#: lib/activityutils.php:240
msgid "Can't handle embedded Base64 content yet."
-msgstr ""
+msgstr "Ainda não é possível processar conteúdo Base64 embutido."
#. TRANS: Client error message thrown when a user tries to change admin settings but has no access rights.
#: lib/adminpanelaction.php:98
@@ -5370,7 +5263,6 @@ msgstr "Configuração básica do site"
#. TRANS: Menu item for site administration
#: lib/adminpanelaction.php:351
-#, fuzzy
msgctxt "MENU"
msgid "Site"
msgstr "Site"
@@ -5382,16 +5274,14 @@ msgstr "Configuração do estilo"
#. TRANS: Menu item for site administration
#: lib/adminpanelaction.php:359
-#, fuzzy
msgctxt "MENU"
msgid "Design"
msgstr "Estilo"
#. TRANS: Menu item title/tooltip
#: lib/adminpanelaction.php:365
-#, fuzzy
msgid "User configuration"
-msgstr "Configuração das localizações"
+msgstr "Configuração do utilizador"
#. TRANS: Menu item for site administration
#: lib/adminpanelaction.php:367 lib/personalgroupnav.php:115
@@ -5400,9 +5290,8 @@ msgstr "Utilizador"
#. TRANS: Menu item title/tooltip
#: lib/adminpanelaction.php:373
-#, fuzzy
msgid "Access configuration"
-msgstr "Configuração do estilo"
+msgstr "Configuração de acesso"
#. TRANS: Menu item title/tooltip
#: lib/adminpanelaction.php:381
@@ -5411,106 +5300,99 @@ msgstr "Configuração das localizações"
#. TRANS: Menu item title/tooltip
#: lib/adminpanelaction.php:389
-#, fuzzy
msgid "Sessions configuration"
-msgstr "Configuração do estilo"
+msgstr "Configuração das sessões"
#. TRANS: Menu item title/tooltip
#: lib/adminpanelaction.php:397
-#, fuzzy
msgid "Edit site notice"
-msgstr "Aviso do site"
+msgstr "Editar aviso do site"
#. TRANS: Menu item title/tooltip
#: lib/adminpanelaction.php:405
-#, fuzzy
msgid "Snapshots configuration"
-msgstr "Configuração das localizações"
+msgstr "Configuração dos instântaneos"
#. TRANS: Client error 401.
-#: lib/apiauth.php:95
+#: lib/apiauth.php:113
msgid "API resource requires read-write access, but you only have read access."
-msgstr ""
+msgstr "API requer acesso de leitura e escrita, mas só tem acesso de leitura."
#. TRANS: Form legend.
#: lib/applicationeditform.php:137
msgid "Edit application"
-msgstr ""
+msgstr "Editar aplicação"
#. TRANS: Form guide.
#: lib/applicationeditform.php:187
msgid "Icon for this application"
-msgstr ""
+msgstr "Ãcone para esta aplicação"
#. TRANS: Form input field instructions.
#: lib/applicationeditform.php:209
-#, fuzzy, php-format
+#, php-format
msgid "Describe your application in %d characters"
-msgstr "Descreva o grupo ou o assunto em %d caracteres"
+msgstr "Descreva a sua aplicação em %d caracteres"
#. TRANS: Form input field instructions.
#: lib/applicationeditform.php:213
-#, fuzzy
msgid "Describe your application"
-msgstr "Descreva o grupo ou assunto"
+msgstr "Descreva a sua aplicação"
#. TRANS: Form input field instructions.
#: lib/applicationeditform.php:224
-#, fuzzy
msgid "URL of the homepage of this application"
-msgstr "URL da página ou do blogue, deste grupo ou assunto"
+msgstr "URL da página desta aplicação"
#. TRANS: Form input field label.
#: lib/applicationeditform.php:226
-#, fuzzy
msgid "Source URL"
-msgstr "Código"
+msgstr "URL de origem"
#. TRANS: Form input field instructions.
#: lib/applicationeditform.php:233
msgid "Organization responsible for this application"
-msgstr ""
+msgstr "Organização responsável por esta aplicação"
#. TRANS: Form input field instructions.
#: lib/applicationeditform.php:242
-#, fuzzy
msgid "URL for the homepage of the organization"
-msgstr "URL da página ou do blogue, deste grupo ou assunto"
+msgstr "URL da página desta organização"
#. TRANS: Form input field instructions.
#: lib/applicationeditform.php:251
msgid "URL to redirect to after authentication"
-msgstr ""
+msgstr "URL para onde reencaminhar após autenticação"
#. TRANS: Radio button label for application type
#: lib/applicationeditform.php:278
msgid "Browser"
-msgstr ""
+msgstr "Browser"
#. TRANS: Radio button label for application type
#: lib/applicationeditform.php:295
msgid "Desktop"
-msgstr ""
+msgstr "Desktop"
#. TRANS: Form guide.
#: lib/applicationeditform.php:297
msgid "Type of application, browser or desktop"
-msgstr ""
+msgstr "Tipo da aplicação, browser ou desktop"
#. TRANS: Radio button label for access type.
#: lib/applicationeditform.php:320
msgid "Read-only"
-msgstr ""
+msgstr "Leitura"
#. TRANS: Radio button label for access type.
#: lib/applicationeditform.php:339
msgid "Read-write"
-msgstr ""
+msgstr "Leitura e escrita"
#. TRANS: Form guide.
#: lib/applicationeditform.php:341
msgid "Default access for this application: read-only, or read-write"
-msgstr ""
+msgstr "Acesso por omissão para esta aplicação: leitura ou leitura e escrita"
#. TRANS: Submit button title
#: lib/applicationeditform.php:359
@@ -5520,25 +5402,24 @@ msgstr "Cancelar"
#. TRANS: Application access type
#: lib/applicationlist.php:136
msgid "read-write"
-msgstr ""
+msgstr "leitura e escrita"
#. TRANS: Application access type
#: lib/applicationlist.php:138
msgid "read-only"
-msgstr ""
+msgstr "leitura"
#. TRANS: Used in application list. %1$s is a modified date, %2$s is access type (read-write or read-only)
#: lib/applicationlist.php:144
#, php-format
msgid "Approved %1$s - \"%2$s\" access."
-msgstr ""
+msgstr "Aprovado a %1$s - acesso \"%2$s\"."
#. TRANS: Button label
#: lib/applicationlist.php:159
-#, fuzzy
msgctxt "BUTTON"
msgid "Revoke"
-msgstr "Remover"
+msgstr "Retirar"
#. TRANS: DT element label in attachment list.
#: lib/attachmentlist.php:88
@@ -5601,9 +5482,9 @@ msgstr "Não foi encontrado um utilizador com a alcunha %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:147
-#, fuzzy, php-format
+#, php-format
msgid "Could not find a local user with nickname %s"
-msgstr "Não foi encontrado um utilizador com a alcunha %s"
+msgstr "Não foi encontrado um utilizador local com a alcunha %s"
#: lib/command.php:180
msgid "Sorry, this command is not yet implemented."
@@ -5649,9 +5530,9 @@ msgstr "Não foi possível juntar o utilizador %1$s ao grupo %2$s"
#. 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.
#: lib/command.php:385
-#, fuzzy, php-format
+#, php-format
msgid "Could not remove user %1$s from group %2$s"
-msgstr "Não foi possível remover %1$s do grupo %2$s."
+msgstr "Não foi possível remover %1$s do grupo %2$s"
#. TRANS: Whois output. %s is the full name of the queried user.
#: lib/command.php:418
@@ -5685,13 +5566,15 @@ msgid ""
"%s is a remote profile; you can only send direct messages to users on the "
"same server."
msgstr ""
+"%s é um perfil remoto; só pode enviar mensagens directas a utilizadores no "
+"mesmo servidor."
#. TRANS: Message given if content is too long.
#. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
#: lib/command.php:472
-#, fuzzy, php-format
+#, php-format
msgid "Message too long - maximum is %1$d characters, you sent %2$d"
-msgstr "Mensagem demasiado extensa - máx. %1$d caracteres, enviou %2$d."
+msgstr "Mensagem demasiado extensa - máx. %1$d caracteres, enviou %2$d"
#. TRANS: Message given have sent a direct message to another user.
#. TRANS: %s is the name of the other user.
@@ -5742,9 +5625,8 @@ msgid "Specify the name of the user to subscribe to"
msgstr "Introduza o nome do utilizador para subscrever"
#: lib/command.php:628
-#, fuzzy
msgid "Can't subscribe to OMB profiles by command."
-msgstr "Não subscreveu esse perfil."
+msgstr "Não pode subscrever perfis OMB por comando."
#: lib/command.php:634
#, php-format
@@ -5792,9 +5674,9 @@ msgstr ""
"s"
#: lib/command.php:761
-#, fuzzy, php-format
+#, php-format
msgid "Unsubscribed %s"
-msgstr "Deixou de subscrever %s"
+msgstr "Deixou de subscrever %s"
#: lib/command.php:778
msgid "You are not subscribed to anyone."
@@ -5827,7 +5709,6 @@ msgstr[0] "Está no grupo:"
msgstr[1] "Está nos grupos:"
#: lib/command.php:838
-#, fuzzy
msgid ""
"Commands:\n"
"on - turn on notifications\n"
@@ -5880,6 +5761,7 @@ msgstr ""
"d <utilizador> <texto> - mensagem directa para o utilizador\n"
"get <utilizador> - receber última nota do utilizador\n"
"whois <utilizador> - receber perfil do utilizador\n"
+"lose <utilizador> - obrigar o utilizador a deixar de subscrevê-lo\n"
"fav <utilizador> - adicionar última nota do utilizador às favoritas\n"
"fav #<id_da_nota> - adicionar nota com esta identificação às favoritas\n"
"repeat #<id_da_nota> - repetir uma nota com uma certa identificação\n"
@@ -5935,13 +5817,12 @@ msgid "Updates by SMS"
msgstr "Actualizações por SMS"
#: lib/connectsettingsaction.php:120
-#, fuzzy
msgid "Connections"
-msgstr "Ligar"
+msgstr "Ligações"
#: lib/connectsettingsaction.php:121
msgid "Authorized connected applications"
-msgstr ""
+msgstr "Aplicações ligadas autorizadas"
#: lib/dberroraction.php:60
msgid "Database error"
@@ -6021,7 +5902,7 @@ msgstr "Prosseguir"
#: lib/grantroleform.php:91
#, php-format
msgid "Grant this user the \"%s\" role"
-msgstr ""
+msgstr "Atribuir a este utilizador a função \"%s\""
#: lib/groupeditform.php:163
msgid "URL of the homepage or blog of the group or topic"
@@ -6140,9 +6021,9 @@ msgid "[%s]"
msgstr "[%s]"
#: lib/jabber.php:567
-#, fuzzy, php-format
+#, php-format
msgid "Unknown inbox source %d."
-msgstr "Língua desconhecida \"%s\"."
+msgstr "Origem da caixa de entrada desconhecida \"%s\"."
#: lib/joinform.php:114
msgid "Join"
@@ -6275,9 +6156,9 @@ msgstr "Confirmação SMS"
#. TRANS: Main body heading for SMS-by-email address confirmation message
#: lib/mail.php:457
-#, fuzzy, php-format
+#, php-format
msgid "%s: confirm you own this phone number with this code:"
-msgstr "A aguardar confirmação deste número de telefone."
+msgstr "%s: confirme que este número de telefone é seu com este código:"
#. TRANS: Subject for 'nudge' notification email
#: lib/mail.php:478
@@ -6405,6 +6286,9 @@ msgid ""
"\n"
"\t%s"
msgstr ""
+"O diálogo completo pode ser lido aqui:\n"
+"\n"
+"\t%s"
#: lib/mail.php:651
#, php-format
@@ -6438,6 +6322,29 @@ msgid ""
"\n"
"P.S. You can turn off these email notifications here: %8$s\n"
msgstr ""
+"%1$s (@%9$s) acaba de enviar uma nota à sua atenção (uma 'resposta-@') em %2"
+"$s.\n"
+"\n"
+"A nota está aqui:\n"
+"\n"
+"\t%3$s\n"
+"\n"
+"Diz:\n"
+"\n"
+"\t%4$s\n"
+"\n"
+"%5$sPode responder aqui:\n"
+"\n"
+"\t%6$s\n"
+"\n"
+"A lista de todas as respostas-@ aqui:\n"
+"\n"
+"%7$s\n"
+"\n"
+"Atenciosamente,\n"
+"%2$s\n"
+"\n"
+"P.S. Pode desligar estas notificações electrónicas aqui: %8$s\n"
#: lib/mailbox.php:89
msgid "Only the user can read their own mailboxes."
@@ -6546,7 +6453,6 @@ msgid "Available characters"
msgstr "Caracteres disponíveis"
#: lib/messageform.php:178 lib/noticeform.php:236
-#, fuzzy
msgctxt "Send button for sending notice"
msgid "Send"
msgstr "Enviar"
@@ -6573,15 +6479,16 @@ msgid "Share my location"
msgstr "Partilhar a minha localização."
#: lib/noticeform.php:215
-#, fuzzy
msgid "Do not share my location"
-msgstr "Não partilhar a minha localização."
+msgstr "Não partilhar a minha localização"
#: lib/noticeform.php:216
msgid ""
"Sorry, retrieving your geo location is taking longer than expected, please "
"try again later"
msgstr ""
+"A obtenção da sua geolocalização está a demorar mais do que o esperado; "
+"tente novamente mais tarde"
#. TRANS: Used in coordinates as abbreviation of north
#: lib/noticelist.php:430
@@ -6732,7 +6639,7 @@ msgstr "Membro desde"
#. TRANS: Average count of posts made per day since account registration
#: lib/profileaction.php:235
msgid "Daily average"
-msgstr ""
+msgstr "Média diária"
#: lib/profileaction.php:264
msgid "All groups"
@@ -6779,13 +6686,13 @@ msgid "Repeat this notice"
msgstr "Repetir esta nota"
#: lib/revokeroleform.php:91
-#, fuzzy, php-format
+#, php-format
msgid "Revoke the \"%s\" role from this user"
-msgstr "Bloquear acesso deste utilizador a este grupo"
+msgstr "Retirar a função \"%s\" a este utilizador"
#: lib/router.php:704
msgid "No single user defined for single-user mode."
-msgstr ""
+msgstr "Nenhum utilizador único definido para o modo de utilizador único."
#: lib/sandboxform.php:67
msgid "Sandbox"
@@ -6910,9 +6817,9 @@ msgid "Unsubscribe"
msgstr "Abandonar"
#: lib/usernoprofileexception.php:58
-#, fuzzy, php-format
+#, php-format
msgid "User %s (%d) has no profile record."
-msgstr "Utilizador não tem perfil."
+msgstr "Utilizador %s (%d) não tem perfil."
#: lib/userprofile.php:117
msgid "Edit Avatar"
@@ -6924,7 +6831,7 @@ msgstr "Acções do utilizador"
#: lib/userprofile.php:237
msgid "User deletion in progress..."
-msgstr ""
+msgstr "A apagar o utilizador..."
#: lib/userprofile.php:263
msgid "Edit profile settings"
@@ -6947,73 +6854,70 @@ msgid "Moderate"
msgstr "Moderar"
#: lib/userprofile.php:364
-#, fuzzy
msgid "User role"
-msgstr "Perfil"
+msgstr "Função"
#: lib/userprofile.php:366
-#, fuzzy
msgctxt "role"
msgid "Administrator"
-msgstr "Gestores"
+msgstr "Gestor"
#: lib/userprofile.php:367
-#, fuzzy
msgctxt "role"
msgid "Moderator"
-msgstr "Moderar"
+msgstr "Moderador"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1054
+#: lib/util.php:1083
msgid "a few seconds ago"
msgstr "há alguns segundos"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1057
+#: lib/util.php:1086
msgid "about a minute ago"
msgstr "há cerca de um minuto"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1061
+#: lib/util.php:1090
#, php-format
msgid "about %d minutes ago"
msgstr "há cerca de %d minutos"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1064
+#: lib/util.php:1093
msgid "about an hour ago"
msgstr "há cerca de uma hora"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1068
+#: lib/util.php:1097
#, php-format
msgid "about %d hours ago"
msgstr "há cerca de %d horas"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1071
+#: lib/util.php:1100
msgid "about a day ago"
msgstr "há cerca de um dia"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1075
+#: lib/util.php:1104
#, php-format
msgid "about %d days ago"
msgstr "há cerca de %d dias"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1078
+#: lib/util.php:1107
msgid "about a month ago"
msgstr "há cerca de um mês"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1082
+#: lib/util.php:1111
#, php-format
msgid "about %d months ago"
msgstr "há cerca de %d meses"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1085
+#: lib/util.php:1114
msgid "about a year ago"
msgstr "há cerca de um ano"
diff --git a/locale/pt_BR/LC_MESSAGES/statusnet.po b/locale/pt_BR/LC_MESSAGES/statusnet.po
index b506f7f29..4263dde6b 100644
--- a/locale/pt_BR/LC_MESSAGES/statusnet.po
+++ b/locale/pt_BR/LC_MESSAGES/statusnet.po
@@ -12,12 +12,12 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-12 21:47+0000\n"
-"PO-Revision-Date: 2010-04-12 21:49:42+0000\n"
+"POT-Creation-Date: 2010-04-24 14:16+0000\n"
+"PO-Revision-Date: 2010-04-26 22:18:12+0000\n"
"Language-Team: Brazilian Portuguese\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r64984); Translate extension (2010-01-16)\n"
+"X-Generator: MediaWiki 1.17alpha (r65552); Translate extension (2010-04-25)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: pt-br\n"
"X-Message-Group: out-statusnet\n"
@@ -89,7 +89,6 @@ msgstr "Salvar"
#. TRANS: Server error when page not found (404)
#: actions/all.php:64 actions/public.php:98 actions/replies.php:93
#: actions/showfavorites.php:138 actions/tag.php:52
-#, fuzzy
msgid "No such page."
msgstr "Esta página não existe."
@@ -102,8 +101,8 @@ msgstr "Esta página não existe."
#: actions/apidirectmessagenew.php:75 actions/apigroupcreate.php:112
#: actions/apigroupismember.php:90 actions/apigroupjoin.php:99
#: actions/apigroupleave.php:99 actions/apigrouplist.php:72
-#: actions/apistatusesupdate.php:148 actions/apisubscriptions.php:87
-#: actions/apitimelinefavorites.php:71 actions/apitimelinefriends.php:78
+#: actions/apistatusesupdate.php:239 actions/apisubscriptions.php:87
+#: actions/apitimelinefavorites.php:71 actions/apitimelinefriends.php:173
#: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79
#: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75
#: actions/favoritesrss.php:74 actions/foaf.php:40 actions/foaf.php:58
@@ -127,7 +126,7 @@ msgstr "%1$s e amigos, pág. %2$d"
#. TRANS: H1 text. %1$s is user nickname
#. TRANS: Message is used as link title. %s is a user nickname.
#: actions/all.php:89 actions/all.php:181 actions/allrss.php:116
-#: actions/apitimelinefriends.php:114 actions/apitimelinehome.php:115
+#: actions/apitimelinefriends.php:209 actions/apitimelinehome.php:115
#: lib/personalgroupnav.php:100
#, php-format
msgid "%s and friends"
@@ -196,7 +195,7 @@ msgstr "Você e amigos"
#. 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:121 actions/apitimelinefriends.php:120
+#: actions/allrss.php:121 actions/apitimelinefriends.php:215
#: actions/apitimelinehome.php:121
#, php-format
msgid "Updates from %1$s and friends on %2$s!"
@@ -218,9 +217,9 @@ msgstr "Atualizações de %1$s e amigos no %2$s!"
#: actions/apistatusesdestroy.php:102 actions/apistatusesretweets.php:112
#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:141
#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111
-#: actions/apitimelinefavorites.php:173 actions/apitimelinefriends.php:175
+#: actions/apitimelinefavorites.php:173 actions/apitimelinefriends.php:270
#: actions/apitimelinegroup.php:151 actions/apitimelinehome.php:174
-#: actions/apitimelinementions.php:173 actions/apitimelinepublic.php:151
+#: actions/apitimelinementions.php:173 actions/apitimelinepublic.php:240
#: actions/apitimelineretweetedtome.php:121
#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:160
#: actions/apitimelineuser.php:162 actions/apiusershow.php:101
@@ -237,18 +236,17 @@ msgstr "O método da API não foi encontrado!"
#: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91
#: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91
#: actions/apigroupleave.php:91 actions/apimediaupload.php:67
-#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:118
+#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:209
msgid "This method requires a POST."
msgstr "Este método requer um POST."
#: actions/apiaccountupdatedeliverydevice.php:105
-#, fuzzy
msgid ""
"You must specify a parameter named 'device' with a value of one of: sms, im, "
"none."
msgstr ""
-"Você pode especificar um parâmetro denominado 'device', com um dos valores: "
-"sms, im, none"
+"Você tem que especificar um parâmetro denominado 'device', com um desses "
+"valores: sms, im, none"
#: actions/apiaccountupdatedeliverydevice.php:132
msgid "Could not update user."
@@ -270,7 +268,7 @@ msgstr "Não foi possível salvar o perfil."
#: actions/apiaccountupdateprofilebackgroundimage.php:108
#: actions/apiaccountupdateprofileimage.php:97 actions/apimediaupload.php:80
-#: actions/apistatusesupdate.php:131 actions/avatarsettings.php:257
+#: actions/apistatusesupdate.php:222 actions/avatarsettings.php:257
#: actions/designadminpanel.php:123 actions/editapplication.php:118
#: actions/newapplication.php:101 actions/newnotice.php:94
#: lib/designsettings.php:283
@@ -450,9 +448,9 @@ msgid "Too many aliases! Maximum %d."
msgstr "Muitos apelidos! O máximo são %d."
#: actions/apigroupcreate.php:266
-#, fuzzy, php-format
+#, php-format
msgid "Invalid alias: \"%s\"."
-msgstr "Apelido inválido: \"%s\""
+msgstr "Apelido inválido: \"%s\"."
#: actions/apigroupcreate.php:275 actions/editgroup.php:232
#: actions/newgroup.php:172
@@ -468,9 +466,8 @@ msgstr "O apelido não pode ser igual à identificação."
#: actions/apigroupismember.php:95 actions/apigroupjoin.php:104
#: actions/apigroupleave.php:104 actions/apigroupmembership.php:91
#: actions/apigroupshow.php:82 actions/apitimelinegroup.php:91
-#, fuzzy
msgid "Group not found."
-msgstr "O grupo não foi encontrado!"
+msgstr "O grupo não foi encontrado."
#: actions/apigroupjoin.php:110 actions/joingroup.php:100
msgid "You are already a member of that group."
@@ -502,9 +499,9 @@ msgstr "Grupos de %s"
#. TRANS: Meant to convey the user %2$s is a member of each of the groups listed on site %1$s
#: actions/apigrouplist.php:107
-#, fuzzy, php-format
+#, php-format
msgid "%1$s groups %2$s is a member of."
-msgstr "Grupos dos quais %s é membro"
+msgstr "Grupos de %1$s nos quais %2$s é membro."
#. TRANS: Message is used as a title. %s is a site name.
#. TRANS: Message is used as a page title. %s is a nick name.
@@ -665,17 +662,17 @@ msgstr "A mensagem foi excluída."
msgid "No status with that ID found."
msgstr "Não foi encontrada nenhuma mensagem com esse ID."
-#: actions/apistatusesupdate.php:161 actions/newnotice.php:155
+#: actions/apistatusesupdate.php:252 actions/newnotice.php:155
#: lib/mailhandler.php:60
#, php-format
msgid "That's too long. Max notice size is %d chars."
msgstr "Está muito extenso. O tamanho máximo é de %s caracteres."
-#: actions/apistatusesupdate.php:202 actions/apiusershow.php:96
+#: actions/apistatusesupdate.php:293 actions/apiusershow.php:96
msgid "Not found."
msgstr "Não encontrado."
-#: actions/apistatusesupdate.php:225 actions/newnotice.php:178
+#: actions/apistatusesupdate.php:316 actions/newnotice.php:178
#, php-format
msgid "Max notice size is %d chars, including attachment URL."
msgstr "O tamanho máximo da mensagem é de %s caracteres"
@@ -704,12 +701,12 @@ msgstr "%1$s / Mensagens mencionando %2$s"
msgid "%1$s updates that reply to updates from %2$s / %3$s."
msgstr "%1$s mensagens em resposta a mensagens de %2$s / %3$s."
-#: actions/apitimelinepublic.php:107 actions/publicrss.php:103
+#: actions/apitimelinepublic.php:196 actions/publicrss.php:103
#, php-format
msgid "%s public timeline"
msgstr "Mensagens públicas de %s"
-#: actions/apitimelinepublic.php:112 actions/publicrss.php:105
+#: actions/apitimelinepublic.php:201 actions/publicrss.php:105
#, php-format
msgid "%s updates from everyone!"
msgstr "%s mensagens de todo mundo!"
@@ -850,7 +847,6 @@ msgstr ""
#: actions/block.php:145 actions/deleteapplication.php:154
#: actions/deletenotice.php:147 actions/deleteuser.php:152
#: actions/groupblock.php:178
-#, fuzzy
msgctxt "BUTTON"
msgid "No"
msgstr "Não"
@@ -869,7 +865,6 @@ msgstr "Não bloquear este usuário"
#: actions/block.php:152 actions/deleteapplication.php:161
#: actions/deletenotice.php:154 actions/deleteuser.php:159
#: actions/groupblock.php:185
-#, fuzzy
msgctxt "BUTTON"
msgid "Yes"
msgstr "Sim"
@@ -925,9 +920,9 @@ msgstr "Desbloquear este usuário"
#. TRANS: Title for mini-posting window loaded from bookmarklet.
#: actions/bookmarklet.php:51
-#, fuzzy, php-format
+#, php-format
msgid "Post to %s"
-msgstr "Enviar para "
+msgstr "Publicar em %s"
#: actions/confirmaddress.php:75
msgid "No confirmation code."
@@ -943,9 +938,9 @@ msgstr "Esse não é o seu código de confirmação!"
#. TRANS: Server error for an unknow address type, which can be 'email', 'jabber', or 'sms'.
#: actions/confirmaddress.php:91
-#, fuzzy, php-format
+#, php-format
msgid "Unrecognized address type %s."
-msgstr "Tipo de endereço desconhecido %s"
+msgstr "Tipo de endereço %s não reconhecido."
#. TRANS: Client error for an already confirmed email/jabbel/sms address.
#: actions/confirmaddress.php:96
@@ -1116,9 +1111,9 @@ msgid "Invalid logo URL."
msgstr "A URL da logo é inválida."
#: actions/designadminpanel.php:280
-#, fuzzy, php-format
+#, php-format
msgid "Theme not available: %s."
-msgstr "Tema não disponível: %s"
+msgstr "Tema não disponível: %s."
#: actions/designadminpanel.php:376
msgid "Change logo"
@@ -1372,7 +1367,6 @@ msgstr "Endereço de e-mail já confirmado."
#: actions/emailsettings.php:115 actions/emailsettings.php:158
#: actions/imsettings.php:116 actions/smssettings.php:124
#: actions/smssettings.php:180
-#, fuzzy
msgctxt "BUTTON"
msgid "Remove"
msgstr "Remover"
@@ -1391,7 +1385,6 @@ msgstr ""
#. TRANS: Button label
#: actions/emailsettings.php:127 actions/imsettings.php:131
#: actions/smssettings.php:137 lib/applicationeditform.php:357
-#, fuzzy
msgctxt "BUTTON"
msgid "Cancel"
msgstr "Cancelar"
@@ -1406,7 +1399,6 @@ msgstr "Endereço de e-mail, ex: \"usuario@exemplo.org\""
#. TRANS: Button label for adding a SMS phone number in SMS settings form.
#: actions/emailsettings.php:139 actions/imsettings.php:148
#: actions/smssettings.php:162
-#, fuzzy
msgctxt "BUTTON"
msgid "Add"
msgstr "Adicionar"
@@ -1432,16 +1424,14 @@ msgstr "Cria um novo endereço de e-mail para publicar e cancela o antigo."
#. 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:168 actions/smssettings.php:189
-#, fuzzy
msgctxt "BUTTON"
msgid "New"
msgstr "Novo"
#. TRANS: Form legend for e-mail preferences form.
#: actions/emailsettings.php:174
-#, fuzzy
msgid "Email preferences"
-msgstr "Preferências"
+msgstr "Preferências de e-mail"
#. TRANS: Checkbox label in e-mail preferences form.
#: actions/emailsettings.php:180
@@ -1484,9 +1474,8 @@ msgstr "Publique um MicroID para meu endereço de e-mail."
#. TRANS: Confirmation message for successful e-mail preferences save.
#: actions/emailsettings.php:334
-#, fuzzy
msgid "Email preferences saved."
-msgstr "As configurações da aparência foram salvas."
+msgstr "As configurações de e-mail foram salvas."
#. TRANS: Message given saving e-mail address without having provided one.
#: actions/emailsettings.php:353
@@ -1542,9 +1531,8 @@ msgstr "Nenhuma confirmação pendente para cancelar."
#. TRANS: Message given canceling e-mail address confirmation for the wrong e-mail address.
#: actions/emailsettings.php:424
-#, fuzzy
msgid "That is the wrong email address."
-msgstr "Isso é um endereço de MI errado."
+msgstr "Esse é o endereço de e-mail errado."
#. TRANS: Message given after successfully canceling e-mail address confirmation.
#: actions/emailsettings.php:438
@@ -2356,10 +2344,14 @@ msgstr ""
"senha antes de alterar suas configurações."
#: actions/login.php:270
-#, php-format
+#, fuzzy
+msgid "Login with your username and password."
+msgstr "Autentique-se com um nome de usuário e uma senha"
+
+#: actions/login.php:273
+#, fuzzy, php-format
msgid ""
-"Login with your username and password. Don't have a username yet? [Register]"
-"(%%action.register%%) a new account."
+"Don't have a username yet? [Register](%%action.register%%) a new account."
msgstr ""
"Digite seu nome de usuário e senha. Ainda não possui um usuário? [Registre](%"
"%action.register%%) uma nova conta."
@@ -2592,8 +2584,8 @@ msgid "Only %s URLs over plain HTTP please."
msgstr ""
#. TRANS: Client error on an API request with an unsupported data format.
-#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1069
-#: lib/apiaction.php:1098 lib/apiaction.php:1215
+#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1131
+#: lib/apiaction.php:1160 lib/apiaction.php:1277
msgid "Not a supported data format."
msgstr "Não é um formato de dados suportado."
@@ -4905,13 +4897,13 @@ msgstr "Você está proibido de publicar mensagens neste site."
msgid "Problem saving notice."
msgstr "Problema no salvamento da mensagem."
-#: classes/Notice.php:965
+#: classes/Notice.php:967
msgid "Problem saving group inbox."
msgstr "Problema no salvamento das mensagens recebidas do grupo."
#. 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:1513
+#: classes/Notice.php:1535
#, php-format
msgid "RT @%1$s %2$s"
msgstr "RT @%1$s %2$s"
@@ -5372,7 +5364,7 @@ msgid "Snapshots configuration"
msgstr "Configurações das estatísticas"
#. TRANS: Client error 401.
-#: lib/apiauth.php:95
+#: lib/apiauth.php:113
msgid "API resource requires read-write access, but you only have read access."
msgstr ""
"Os recursos de API exigem acesso de leitura e escrita, mas você possui "
@@ -6911,56 +6903,56 @@ msgid "Moderator"
msgstr "Moderador"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1054
+#: lib/util.php:1083
msgid "a few seconds ago"
msgstr "alguns segundos atrás"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1057
+#: lib/util.php:1086
msgid "about a minute ago"
msgstr "cerca de 1 minuto atrás"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1061
+#: lib/util.php:1090
#, php-format
msgid "about %d minutes ago"
msgstr "cerca de %d minutos atrás"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1064
+#: lib/util.php:1093
msgid "about an hour ago"
msgstr "cerca de 1 hora atrás"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1068
+#: lib/util.php:1097
#, php-format
msgid "about %d hours ago"
msgstr "cerca de %d horas atrás"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1071
+#: lib/util.php:1100
msgid "about a day ago"
msgstr "cerca de 1 dia atrás"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1075
+#: lib/util.php:1104
#, php-format
msgid "about %d days ago"
msgstr "cerca de %d dias atrás"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1078
+#: lib/util.php:1107
msgid "about a month ago"
msgstr "cerca de 1 mês atrás"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1082
+#: lib/util.php:1111
#, php-format
msgid "about %d months ago"
msgstr "cerca de %d meses atrás"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1085
+#: lib/util.php:1114
msgid "about a year ago"
msgstr "cerca de 1 ano atrás"
diff --git a/locale/ru/LC_MESSAGES/statusnet.po b/locale/ru/LC_MESSAGES/statusnet.po
index 87e7ea8fb..7f697bd8d 100644
--- a/locale/ru/LC_MESSAGES/statusnet.po
+++ b/locale/ru/LC_MESSAGES/statusnet.po
@@ -12,12 +12,12 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-12 21:47+0000\n"
-"PO-Revision-Date: 2010-04-12 21:49:46+0000\n"
+"POT-Creation-Date: 2010-04-24 14:16+0000\n"
+"PO-Revision-Date: 2010-04-26 22:18:15+0000\n"
"Language-Team: Russian\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r64984); Translate extension (2010-01-16)\n"
+"X-Generator: MediaWiki 1.17alpha (r65552); Translate extension (2010-04-25)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: ru\n"
"X-Message-Group: out-statusnet\n"
@@ -103,8 +103,8 @@ msgstr "Ðет такой Ñтраницы."
#: actions/apidirectmessagenew.php:75 actions/apigroupcreate.php:112
#: actions/apigroupismember.php:90 actions/apigroupjoin.php:99
#: actions/apigroupleave.php:99 actions/apigrouplist.php:72
-#: actions/apistatusesupdate.php:148 actions/apisubscriptions.php:87
-#: actions/apitimelinefavorites.php:71 actions/apitimelinefriends.php:78
+#: actions/apistatusesupdate.php:239 actions/apisubscriptions.php:87
+#: actions/apitimelinefavorites.php:71 actions/apitimelinefriends.php:173
#: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79
#: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75
#: actions/favoritesrss.php:74 actions/foaf.php:40 actions/foaf.php:58
@@ -128,7 +128,7 @@ msgstr "%1$s и друзьÑ, Ñтраница %2$d"
#. TRANS: H1 text. %1$s is user nickname
#. TRANS: Message is used as link title. %s is a user nickname.
#: actions/all.php:89 actions/all.php:181 actions/allrss.php:116
-#: actions/apitimelinefriends.php:114 actions/apitimelinehome.php:115
+#: actions/apitimelinefriends.php:209 actions/apitimelinehome.php:115
#: lib/personalgroupnav.php:100
#, php-format
msgid "%s and friends"
@@ -195,7 +195,7 @@ msgstr "Ð’Ñ‹ и друзьÑ"
#. 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:121 actions/apitimelinefriends.php:120
+#: actions/allrss.php:121 actions/apitimelinefriends.php:215
#: actions/apitimelinehome.php:121
#, php-format
msgid "Updates from %1$s and friends on %2$s!"
@@ -217,9 +217,9 @@ msgstr "Обновлено от %1$s и его друзей на %2$s!"
#: actions/apistatusesdestroy.php:102 actions/apistatusesretweets.php:112
#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:141
#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111
-#: actions/apitimelinefavorites.php:173 actions/apitimelinefriends.php:175
+#: actions/apitimelinefavorites.php:173 actions/apitimelinefriends.php:270
#: actions/apitimelinegroup.php:151 actions/apitimelinehome.php:174
-#: actions/apitimelinementions.php:173 actions/apitimelinepublic.php:151
+#: actions/apitimelinementions.php:173 actions/apitimelinepublic.php:240
#: actions/apitimelineretweetedtome.php:121
#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:160
#: actions/apitimelineuser.php:162 actions/apiusershow.php:101
@@ -236,7 +236,7 @@ msgstr "Метод API не найден."
#: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91
#: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91
#: actions/apigroupleave.php:91 actions/apimediaupload.php:67
-#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:118
+#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:209
msgid "This method requires a POST."
msgstr "Этот метод требует POST."
@@ -268,7 +268,7 @@ msgstr "Ðе удаётÑÑ Ñохранить профиль."
#: actions/apiaccountupdateprofilebackgroundimage.php:108
#: actions/apiaccountupdateprofileimage.php:97 actions/apimediaupload.php:80
-#: actions/apistatusesupdate.php:131 actions/avatarsettings.php:257
+#: actions/apistatusesupdate.php:222 actions/avatarsettings.php:257
#: actions/designadminpanel.php:123 actions/editapplication.php:118
#: actions/newapplication.php:101 actions/newnotice.php:94
#: lib/designsettings.php:283
@@ -661,17 +661,17 @@ msgstr "Ð¡Ñ‚Ð°Ñ‚ÑƒÑ ÑƒÐ´Ð°Ð»Ñ‘Ð½."
msgid "No status with that ID found."
msgstr "Ðе найдено ÑтатуÑа Ñ Ñ‚Ð°ÐºÐ¸Ð¼ ID."
-#: actions/apistatusesupdate.php:161 actions/newnotice.php:155
+#: actions/apistatusesupdate.php:252 actions/newnotice.php:155
#: lib/mailhandler.php:60
#, php-format
msgid "That's too long. Max notice size is %d chars."
msgstr "Слишком Ð´Ð»Ð¸Ð½Ð½Ð°Ñ Ð·Ð°Ð¿Ð¸ÑÑŒ. МакÑÐ¸Ð¼Ð°Ð»ÑŒÐ½Ð°Ñ Ð´Ð»Ð¸Ð½Ð° — %d знаков."
-#: actions/apistatusesupdate.php:202 actions/apiusershow.php:96
+#: actions/apistatusesupdate.php:293 actions/apiusershow.php:96
msgid "Not found."
msgstr "Ðе найдено."
-#: actions/apistatusesupdate.php:225 actions/newnotice.php:178
+#: actions/apistatusesupdate.php:316 actions/newnotice.php:178
#, php-format
msgid "Max notice size is %d chars, including attachment URL."
msgstr "МакÑÐ¸Ð¼Ð°Ð»ÑŒÐ½Ð°Ñ Ð´Ð»Ð¸Ð½Ð° запиÑи — %d Ñимволов, Ð²ÐºÐ»ÑŽÑ‡Ð°Ñ URL вложениÑ."
@@ -700,12 +700,12 @@ msgstr "%1$s / ОбновлениÑ, упоминающие %2$s"
msgid "%1$s updates that reply to updates from %2$s / %3$s."
msgstr "%1$s обновил Ñтот ответ на Ñообщение: %2$s / %3$s."
-#: actions/apitimelinepublic.php:107 actions/publicrss.php:103
+#: actions/apitimelinepublic.php:196 actions/publicrss.php:103
#, php-format
msgid "%s public timeline"
msgstr "ÐžÐ±Ñ‰Ð°Ñ Ð»ÐµÐ½Ñ‚Ð° %s"
-#: actions/apitimelinepublic.php:112 actions/publicrss.php:105
+#: actions/apitimelinepublic.php:201 actions/publicrss.php:105
#, php-format
msgid "%s updates from everyone!"
msgstr "ÐžÐ±Ð½Ð¾Ð²Ð»ÐµÐ½Ð¸Ñ %s от вÑех!"
@@ -2336,13 +2336,16 @@ msgstr ""
"изменÑÑ‚ÑŒ Ваши уÑтановки."
#: actions/login.php:270
+msgid "Login with your username and password."
+msgstr "Войти Ñ Ð²Ð°ÑˆÐ¸Ð¼ именем учаÑтника и паролем."
+
+#: actions/login.php:273
#, php-format
msgid ""
-"Login with your username and password. Don't have a username yet? [Register]"
-"(%%action.register%%) a new account."
+"Don't have a username yet? [Register](%%action.register%%) a new account."
msgstr ""
-"Вход Ñ Ð²Ð°ÑˆÐ¸Ð¼ логином и паролем. Ðет аккаунта? [ЗарегиÑтрируйте](%%action."
-"register%%) новый аккаунт."
+"У Ð²Ð°Ñ Ð½ÐµÑ‚ логина? [ЗарегиÑтрируйте](%%action.register%%) новую учётную "
+"запиÑÑŒ."
#: actions/makeadmin.php:92
msgid "Only an admin can make another user an admin."
@@ -2564,8 +2567,8 @@ msgid "Only %s URLs over plain HTTP please."
msgstr "Только %s URL в проÑтом HTTP, пожалуйÑта."
#. TRANS: Client error on an API request with an unsupported data format.
-#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1069
-#: lib/apiaction.php:1098 lib/apiaction.php:1215
+#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1131
+#: lib/apiaction.php:1160 lib/apiaction.php:1277
msgid "Not a supported data format."
msgstr "Ðеподдерживаемый формат данных."
@@ -3705,7 +3708,7 @@ msgstr ""
#: actions/showfavorites.php:243
msgid "This is a way to share what you like."
-msgstr "Это ÑпоÑоб разделить то, что вам нравитÑÑ."
+msgstr "Это ÑпоÑоб поделитьÑÑ Ñ‚ÐµÐ¼, что вам нравитÑÑ."
#: actions/showgroup.php:82 lib/groupnav.php:86
#, php-format
@@ -4860,13 +4863,13 @@ msgstr "Вам запрещено поÑтитьÑÑ Ð½Ð° Ñтом Ñайте (Ð
msgid "Problem saving notice."
msgstr "Проблемы Ñ Ñохранением запиÑи."
-#: classes/Notice.php:965
+#: classes/Notice.php:967
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:1513
+#: classes/Notice.php:1535
#, php-format
msgid "RT @%1$s %2$s"
msgstr "RT @%1$s %2$s"
@@ -5327,7 +5330,7 @@ msgid "Snapshots configuration"
msgstr "ÐšÐ¾Ð½Ñ„Ð¸Ð³ÑƒÑ€Ð°Ñ†Ð¸Ñ Ñнимков"
#. TRANS: Client error 401.
-#: lib/apiauth.php:95
+#: lib/apiauth.php:113
msgid "API resource requires read-write access, but you only have read access."
msgstr ""
"API реÑурÑа требует доÑтуп Ð´Ð»Ñ Ñ‡Ñ‚ÐµÐ½Ð¸Ñ Ð¸ запиÑи, но у Ð²Ð°Ñ ÐµÑÑ‚ÑŒ только доÑтуп "
@@ -5546,9 +5549,9 @@ msgstr "Ðе удаётÑÑ Ð¿Ñ€Ð¸Ñоединить Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ %1
#. 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.
#: lib/command.php:385
-#, fuzzy, php-format
+#, php-format
msgid "Could not remove user %1$s from group %2$s"
-msgstr "Ðе удаётÑÑ ÑƒÐ´Ð°Ð»Ð¸Ñ‚ÑŒ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ %1$s из группы %2$s."
+msgstr "Ðе удаётÑÑ ÑƒÐ´Ð°Ð»Ð¸Ñ‚ÑŒ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ %1$s из группы %2$s"
#. TRANS: Whois output. %s is the full name of the queried user.
#: lib/command.php:418
@@ -6886,56 +6889,56 @@ msgid "Moderator"
msgstr "Модератор"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1054
+#: lib/util.php:1083
msgid "a few seconds ago"
msgstr "пару Ñекунд назад"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1057
+#: lib/util.php:1086
msgid "about a minute ago"
msgstr "около минуты назад"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1061
+#: lib/util.php:1090
#, php-format
msgid "about %d minutes ago"
msgstr "около %d минут(ы) назад"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1064
+#: lib/util.php:1093
msgid "about an hour ago"
msgstr "около чаÑа назад"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1068
+#: lib/util.php:1097
#, php-format
msgid "about %d hours ago"
msgstr "около %d чаÑа(ов) назад"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1071
+#: lib/util.php:1100
msgid "about a day ago"
msgstr "около Ð´Ð½Ñ Ð½Ð°Ð·Ð°Ð´"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1075
+#: lib/util.php:1104
#, php-format
msgid "about %d days ago"
msgstr "около %d днÑ(ей) назад"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1078
+#: lib/util.php:1107
msgid "about a month ago"
msgstr "около меÑÑца назад"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1082
+#: lib/util.php:1111
#, php-format
msgid "about %d months ago"
msgstr "около %d меÑÑца(ев) назад"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1085
+#: lib/util.php:1114
msgid "about a year ago"
msgstr "около года назад"
diff --git a/locale/statusnet.pot b/locale/statusnet.pot
index 12fa2d986..e0aad7146 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: 2010-04-12 21:47+0000\n"
+"POT-Creation-Date: 2010-04-26 22:15+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"
@@ -95,8 +95,8 @@ msgstr ""
#: actions/apidirectmessagenew.php:75 actions/apigroupcreate.php:112
#: actions/apigroupismember.php:90 actions/apigroupjoin.php:99
#: actions/apigroupleave.php:99 actions/apigrouplist.php:72
-#: actions/apistatusesupdate.php:148 actions/apisubscriptions.php:87
-#: actions/apitimelinefavorites.php:71 actions/apitimelinefriends.php:78
+#: actions/apistatusesupdate.php:239 actions/apisubscriptions.php:87
+#: actions/apitimelinefavorites.php:71 actions/apitimelinefriends.php:173
#: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79
#: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75
#: actions/favoritesrss.php:74 actions/foaf.php:40 actions/foaf.php:58
@@ -120,7 +120,7 @@ msgstr ""
#. TRANS: H1 text. %1$s is user nickname
#. TRANS: Message is used as link title. %s is a user nickname.
#: actions/all.php:89 actions/all.php:181 actions/allrss.php:116
-#: actions/apitimelinefriends.php:114 actions/apitimelinehome.php:115
+#: actions/apitimelinefriends.php:209 actions/apitimelinehome.php:115
#: lib/personalgroupnav.php:100
#, php-format
msgid "%s and friends"
@@ -180,7 +180,7 @@ msgstr ""
#. 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:121 actions/apitimelinefriends.php:120
+#: actions/allrss.php:121 actions/apitimelinefriends.php:215
#: actions/apitimelinehome.php:121
#, php-format
msgid "Updates from %1$s and friends on %2$s!"
@@ -202,9 +202,9 @@ msgstr ""
#: actions/apistatusesdestroy.php:102 actions/apistatusesretweets.php:112
#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:141
#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111
-#: actions/apitimelinefavorites.php:173 actions/apitimelinefriends.php:175
+#: actions/apitimelinefavorites.php:173 actions/apitimelinefriends.php:270
#: actions/apitimelinegroup.php:151 actions/apitimelinehome.php:174
-#: actions/apitimelinementions.php:173 actions/apitimelinepublic.php:151
+#: actions/apitimelinementions.php:173 actions/apitimelinepublic.php:240
#: actions/apitimelineretweetedtome.php:121
#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:160
#: actions/apitimelineuser.php:162 actions/apiusershow.php:101
@@ -221,7 +221,7 @@ msgstr ""
#: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91
#: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91
#: actions/apigroupleave.php:91 actions/apimediaupload.php:67
-#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:118
+#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:209
msgid "This method requires a POST."
msgstr ""
@@ -251,7 +251,7 @@ msgstr ""
#: actions/apiaccountupdateprofilebackgroundimage.php:108
#: actions/apiaccountupdateprofileimage.php:97 actions/apimediaupload.php:80
-#: actions/apistatusesupdate.php:131 actions/avatarsettings.php:257
+#: actions/apistatusesupdate.php:222 actions/avatarsettings.php:257
#: actions/designadminpanel.php:123 actions/editapplication.php:118
#: actions/newapplication.php:101 actions/newnotice.php:94
#: lib/designsettings.php:283
@@ -630,17 +630,17 @@ msgstr ""
msgid "No status with that ID found."
msgstr ""
-#: actions/apistatusesupdate.php:161 actions/newnotice.php:155
+#: actions/apistatusesupdate.php:252 actions/newnotice.php:155
#: lib/mailhandler.php:60
#, php-format
msgid "That's too long. Max notice size is %d chars."
msgstr ""
-#: actions/apistatusesupdate.php:202 actions/apiusershow.php:96
+#: actions/apistatusesupdate.php:293 actions/apiusershow.php:96
msgid "Not found."
msgstr ""
-#: actions/apistatusesupdate.php:225 actions/newnotice.php:178
+#: actions/apistatusesupdate.php:316 actions/newnotice.php:178
#, php-format
msgid "Max notice size is %d chars, including attachment URL."
msgstr ""
@@ -669,12 +669,12 @@ msgstr ""
msgid "%1$s updates that reply to updates from %2$s / %3$s."
msgstr ""
-#: actions/apitimelinepublic.php:107 actions/publicrss.php:103
+#: actions/apitimelinepublic.php:196 actions/publicrss.php:103
#, php-format
msgid "%s public timeline"
msgstr ""
-#: actions/apitimelinepublic.php:112 actions/publicrss.php:105
+#: actions/apitimelinepublic.php:201 actions/publicrss.php:105
#, php-format
msgid "%s updates from everyone!"
msgstr ""
@@ -2206,10 +2206,13 @@ msgid ""
msgstr ""
#: actions/login.php:270
+msgid "Login with your username and password."
+msgstr ""
+
+#: actions/login.php:273
#, php-format
msgid ""
-"Login with your username and password. Don't have a username yet? [Register]"
-"(%%action.register%%) a new account."
+"Don't have a username yet? [Register](%%action.register%%) a new account."
msgstr ""
#: actions/makeadmin.php:92
@@ -2423,8 +2426,8 @@ msgid "Only %s URLs over plain HTTP please."
msgstr ""
#. TRANS: Client error on an API request with an unsupported data format.
-#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1069
-#: lib/apiaction.php:1098 lib/apiaction.php:1215
+#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1131
+#: lib/apiaction.php:1160 lib/apiaction.php:1277
msgid "Not a supported data format."
msgstr ""
@@ -4566,13 +4569,13 @@ msgstr ""
msgid "Problem saving notice."
msgstr ""
-#: classes/Notice.php:965
+#: classes/Notice.php:967
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:1513
+#: classes/Notice.php:1535
#, php-format
msgid "RT @%1$s %2$s"
msgstr ""
@@ -5024,7 +5027,7 @@ msgid "Snapshots configuration"
msgstr ""
#. TRANS: Client error 401.
-#: lib/apiauth.php:95
+#: lib/apiauth.php:113
msgid "API resource requires read-write access, but you only have read access."
msgstr ""
@@ -6423,56 +6426,56 @@ msgid "Moderator"
msgstr ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1054
+#: lib/util.php:1083
msgid "a few seconds ago"
msgstr ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1057
+#: lib/util.php:1086
msgid "about a minute ago"
msgstr ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1061
+#: lib/util.php:1090
#, php-format
msgid "about %d minutes ago"
msgstr ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1064
+#: lib/util.php:1093
msgid "about an hour ago"
msgstr ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1068
+#: lib/util.php:1097
#, php-format
msgid "about %d hours ago"
msgstr ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1071
+#: lib/util.php:1100
msgid "about a day ago"
msgstr ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1075
+#: lib/util.php:1104
#, php-format
msgid "about %d days ago"
msgstr ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1078
+#: lib/util.php:1107
msgid "about a month ago"
msgstr ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1082
+#: lib/util.php:1111
#, php-format
msgid "about %d months ago"
msgstr ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1085
+#: lib/util.php:1114
msgid "about a year ago"
msgstr ""
diff --git a/locale/sv/LC_MESSAGES/statusnet.po b/locale/sv/LC_MESSAGES/statusnet.po
index 1e6065dc5..65a64dc32 100644
--- a/locale/sv/LC_MESSAGES/statusnet.po
+++ b/locale/sv/LC_MESSAGES/statusnet.po
@@ -9,12 +9,12 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-12 21:47+0000\n"
-"PO-Revision-Date: 2010-04-12 21:49:49+0000\n"
+"POT-Creation-Date: 2010-04-24 14:16+0000\n"
+"PO-Revision-Date: 2010-04-26 22:18:20+0000\n"
"Language-Team: Swedish\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r64984); Translate extension (2010-01-16)\n"
+"X-Generator: MediaWiki 1.17alpha (r65552); Translate extension (2010-04-25)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: sv\n"
"X-Message-Group: out-statusnet\n"
@@ -99,8 +99,8 @@ msgstr "Ingen sådan sida"
#: actions/apidirectmessagenew.php:75 actions/apigroupcreate.php:112
#: actions/apigroupismember.php:90 actions/apigroupjoin.php:99
#: actions/apigroupleave.php:99 actions/apigrouplist.php:72
-#: actions/apistatusesupdate.php:148 actions/apisubscriptions.php:87
-#: actions/apitimelinefavorites.php:71 actions/apitimelinefriends.php:78
+#: actions/apistatusesupdate.php:239 actions/apisubscriptions.php:87
+#: actions/apitimelinefavorites.php:71 actions/apitimelinefriends.php:173
#: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79
#: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75
#: actions/favoritesrss.php:74 actions/foaf.php:40 actions/foaf.php:58
@@ -124,7 +124,7 @@ msgstr "%1$s och vänner, sida %2$d"
#. TRANS: H1 text. %1$s is user nickname
#. TRANS: Message is used as link title. %s is a user nickname.
#: actions/all.php:89 actions/all.php:181 actions/allrss.php:116
-#: actions/apitimelinefriends.php:114 actions/apitimelinehome.php:115
+#: actions/apitimelinefriends.php:209 actions/apitimelinehome.php:115
#: lib/personalgroupnav.php:100
#, php-format
msgid "%s and friends"
@@ -191,7 +191,7 @@ msgstr "Du och vänner"
#. 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:121 actions/apitimelinefriends.php:120
+#: actions/allrss.php:121 actions/apitimelinefriends.php:215
#: actions/apitimelinehome.php:121
#, php-format
msgid "Updates from %1$s and friends on %2$s!"
@@ -213,9 +213,9 @@ msgstr "Uppdateringar från %1$s och vänner på %2$s!"
#: actions/apistatusesdestroy.php:102 actions/apistatusesretweets.php:112
#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:141
#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111
-#: actions/apitimelinefavorites.php:173 actions/apitimelinefriends.php:175
+#: actions/apitimelinefavorites.php:173 actions/apitimelinefriends.php:270
#: actions/apitimelinegroup.php:151 actions/apitimelinehome.php:174
-#: actions/apitimelinementions.php:173 actions/apitimelinepublic.php:151
+#: actions/apitimelinementions.php:173 actions/apitimelinepublic.php:240
#: actions/apitimelineretweetedtome.php:121
#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:160
#: actions/apitimelineuser.php:162 actions/apiusershow.php:101
@@ -232,7 +232,7 @@ msgstr "API-metod hittades inte."
#: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91
#: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91
#: actions/apigroupleave.php:91 actions/apimediaupload.php:67
-#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:118
+#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:209
msgid "This method requires a POST."
msgstr "Denna metod kräver en POST."
@@ -262,7 +262,7 @@ msgstr "Kunde inte spara profil."
#: actions/apiaccountupdateprofilebackgroundimage.php:108
#: actions/apiaccountupdateprofileimage.php:97 actions/apimediaupload.php:80
-#: actions/apistatusesupdate.php:131 actions/avatarsettings.php:257
+#: actions/apistatusesupdate.php:222 actions/avatarsettings.php:257
#: actions/designadminpanel.php:123 actions/editapplication.php:118
#: actions/newapplication.php:101 actions/newnotice.php:94
#: lib/designsettings.php:283
@@ -647,17 +647,17 @@ msgstr "Status borttagen."
msgid "No status with that ID found."
msgstr "Ingen status med det ID:t hittades."
-#: actions/apistatusesupdate.php:161 actions/newnotice.php:155
+#: actions/apistatusesupdate.php:252 actions/newnotice.php:155
#: lib/mailhandler.php:60
#, php-format
msgid "That's too long. Max notice size is %d chars."
msgstr "Det är för långt. Maximal notisstorlek är %d tecken."
-#: actions/apistatusesupdate.php:202 actions/apiusershow.php:96
+#: actions/apistatusesupdate.php:293 actions/apiusershow.php:96
msgid "Not found."
msgstr "Hittades inte."
-#: actions/apistatusesupdate.php:225 actions/newnotice.php:178
+#: actions/apistatusesupdate.php:316 actions/newnotice.php:178
#, php-format
msgid "Max notice size is %d chars, including attachment URL."
msgstr "Maximal notisstorlek är %d tecken, inklusive webbadress för bilaga."
@@ -686,12 +686,12 @@ msgstr "%1$s / Uppdateringar som nämner %2$s"
msgid "%1$s updates that reply to updates from %2$s / %3$s."
msgstr "%1$s uppdateringar med svar på uppdatering från %2$s / %3$s."
-#: actions/apitimelinepublic.php:107 actions/publicrss.php:103
+#: actions/apitimelinepublic.php:196 actions/publicrss.php:103
#, php-format
msgid "%s public timeline"
msgstr "%s publika tidslinje"
-#: actions/apitimelinepublic.php:112 actions/publicrss.php:105
+#: actions/apitimelinepublic.php:201 actions/publicrss.php:105
#, php-format
msgid "%s updates from everyone!"
msgstr "%s uppdateringar från alla!"
@@ -2312,13 +2312,16 @@ msgstr ""
"igen innan du ändrar dina inställningar."
#: actions/login.php:270
+msgid "Login with your username and password."
+msgstr "Logga in med ditt användarnamn och lösenord."
+
+#: actions/login.php:273
#, php-format
msgid ""
-"Login with your username and password. Don't have a username yet? [Register]"
-"(%%action.register%%) a new account."
+"Don't have a username yet? [Register](%%action.register%%) a new account."
msgstr ""
-"Logga in med ditt användarnamn och lösenord. Har du inget användarnamn ännu? "
-"[Registrera](%%action.register%%) ett nytt konto."
+"Har du inte ett användarnamn ännu? [Registrera](%%action.register%%) ett "
+"nytt konto."
#: actions/makeadmin.php:92
msgid "Only an admin can make another user an admin."
@@ -2542,8 +2545,8 @@ msgid "Only %s URLs over plain HTTP please."
msgstr "Endast %s-webbadresser över vanlig HTTP."
#. TRANS: Client error on an API request with an unsupported data format.
-#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1069
-#: lib/apiaction.php:1098 lib/apiaction.php:1215
+#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1131
+#: lib/apiaction.php:1160 lib/apiaction.php:1277
msgid "Not a supported data format."
msgstr "Ett dataformat som inte stödjs"
@@ -4837,13 +4840,13 @@ msgstr "Du är utestängd från att posta notiser på denna webbplats."
msgid "Problem saving notice."
msgstr "Problem med att spara notis."
-#: classes/Notice.php:965
+#: classes/Notice.php:967
msgid "Problem saving group inbox."
msgstr "Problem med att spara gruppinkorg."
#. 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:1513
+#: classes/Notice.php:1535
#, php-format
msgid "RT @%1$s %2$s"
msgstr "RT @%1$s %2$s"
@@ -5301,7 +5304,7 @@ msgid "Snapshots configuration"
msgstr "Konfiguration av ögonblicksbilder"
#. TRANS: Client error 401.
-#: lib/apiauth.php:95
+#: lib/apiauth.php:113
msgid "API resource requires read-write access, but you only have read access."
msgstr ""
"API-resursen kräver läs- och skrivrättigheter, men du har bara läsrättighet."
@@ -5519,9 +5522,9 @@ msgstr "Kunde inte ansluta användare %1$s till grupp %2$s."
#. 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.
#: lib/command.php:385
-#, fuzzy, php-format
+#, php-format
msgid "Could not remove user %1$s from group %2$s"
-msgstr "Kunde inte ta bort användare %1$s från grupp %2$s."
+msgstr "Kunde inte ta bort användare %1$s från grupp %2$s"
#. TRANS: Whois output. %s is the full name of the queried user.
#: lib/command.php:418
@@ -6853,56 +6856,56 @@ msgid "Moderator"
msgstr "Moderator"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1054
+#: lib/util.php:1083
msgid "a few seconds ago"
msgstr "ett par sekunder sedan"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1057
+#: lib/util.php:1086
msgid "about a minute ago"
msgstr "för nån minut sedan"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1061
+#: lib/util.php:1090
#, php-format
msgid "about %d minutes ago"
msgstr "för %d minuter sedan"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1064
+#: lib/util.php:1093
msgid "about an hour ago"
msgstr "för en timma sedan"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1068
+#: lib/util.php:1097
#, php-format
msgid "about %d hours ago"
msgstr "för %d timmar sedan"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1071
+#: lib/util.php:1100
msgid "about a day ago"
msgstr "för en dag sedan"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1075
+#: lib/util.php:1104
#, php-format
msgid "about %d days ago"
msgstr "för %d dagar sedan"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1078
+#: lib/util.php:1107
msgid "about a month ago"
msgstr "för en månad sedan"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1082
+#: lib/util.php:1111
#, php-format
msgid "about %d months ago"
msgstr "för %d månader sedan"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1085
+#: lib/util.php:1114
msgid "about a year ago"
msgstr "för ett år sedan"
diff --git a/locale/te/LC_MESSAGES/statusnet.po b/locale/te/LC_MESSAGES/statusnet.po
index b591d2fc0..54e7d0de1 100644
--- a/locale/te/LC_MESSAGES/statusnet.po
+++ b/locale/te/LC_MESSAGES/statusnet.po
@@ -9,12 +9,12 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-12 21:47+0000\n"
-"PO-Revision-Date: 2010-04-12 21:49:52+0000\n"
+"POT-Creation-Date: 2010-04-24 14:16+0000\n"
+"PO-Revision-Date: 2010-04-26 22:18:38+0000\n"
"Language-Team: Telugu\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r64984); Translate extension (2010-01-16)\n"
+"X-Generator: MediaWiki 1.17alpha (r65552); Translate extension (2010-04-25)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: te\n"
"X-Message-Group: out-statusnet\n"
@@ -98,8 +98,8 @@ msgstr "à°…à°Ÿà±à°µà°‚à°Ÿà°¿ పేజీ లేదà±."
#: actions/apidirectmessagenew.php:75 actions/apigroupcreate.php:112
#: actions/apigroupismember.php:90 actions/apigroupjoin.php:99
#: actions/apigroupleave.php:99 actions/apigrouplist.php:72
-#: actions/apistatusesupdate.php:148 actions/apisubscriptions.php:87
-#: actions/apitimelinefavorites.php:71 actions/apitimelinefriends.php:78
+#: actions/apistatusesupdate.php:239 actions/apisubscriptions.php:87
+#: actions/apitimelinefavorites.php:71 actions/apitimelinefriends.php:173
#: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79
#: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75
#: actions/favoritesrss.php:74 actions/foaf.php:40 actions/foaf.php:58
@@ -123,7 +123,7 @@ msgstr "%1$s మరియౠమితà±à°°à±à°²à±, పేజీ %2$d"
#. TRANS: H1 text. %1$s is user nickname
#. TRANS: Message is used as link title. %s is a user nickname.
#: actions/all.php:89 actions/all.php:181 actions/allrss.php:116
-#: actions/apitimelinefriends.php:114 actions/apitimelinehome.php:115
+#: actions/apitimelinefriends.php:209 actions/apitimelinehome.php:115
#: lib/personalgroupnav.php:100
#, php-format
msgid "%s and friends"
@@ -183,11 +183,11 @@ msgstr "మీరౠమరియౠమీ à°¸à±à°¨à±‡à°¹à°¿à°¤à±à°²à±"
#. 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:121 actions/apitimelinefriends.php:120
+#: actions/allrss.php:121 actions/apitimelinefriends.php:215
#: actions/apitimelinehome.php:121
#, php-format
msgid "Updates from %1$s and friends on %2$s!"
-msgstr ""
+msgstr "%2$sలో %1$s మరియౠసà±à°¨à±‡à°¹à°¿à°¤à±à°² à°¨à±à°‚à°¡à°¿ తాజాకరణలà±!"
#: actions/apiaccountratelimitstatus.php:70
#: actions/apiaccountupdatedeliverydevice.php:93
@@ -205,9 +205,9 @@ msgstr ""
#: actions/apistatusesdestroy.php:102 actions/apistatusesretweets.php:112
#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:141
#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111
-#: actions/apitimelinefavorites.php:173 actions/apitimelinefriends.php:175
+#: actions/apitimelinefavorites.php:173 actions/apitimelinefriends.php:270
#: actions/apitimelinegroup.php:151 actions/apitimelinehome.php:174
-#: actions/apitimelinementions.php:173 actions/apitimelinepublic.php:151
+#: actions/apitimelinementions.php:173 actions/apitimelinepublic.php:240
#: actions/apitimelineretweetedtome.php:121
#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:160
#: actions/apitimelineuser.php:162 actions/apiusershow.php:101
@@ -225,7 +225,7 @@ msgstr "నిరà±à°§à°¾à°°à°£ సంకేతం కనబడలేదà±."
#: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91
#: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91
#: actions/apigroupleave.php:91 actions/apimediaupload.php:67
-#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:118
+#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:209
msgid "This method requires a POST."
msgstr ""
@@ -257,7 +257,7 @@ msgstr "à°ªà±à°°à±Šà°«à±ˆà°²à±à°¨à°¿ à°­à°¦à±à°°à°ªà°°à°šà°²à±‡à°•à±à°¨à±à°
#: actions/apiaccountupdateprofilebackgroundimage.php:108
#: actions/apiaccountupdateprofileimage.php:97 actions/apimediaupload.php:80
-#: actions/apistatusesupdate.php:131 actions/avatarsettings.php:257
+#: actions/apistatusesupdate.php:222 actions/avatarsettings.php:257
#: actions/designadminpanel.php:123 actions/editapplication.php:118
#: actions/newapplication.php:101 actions/newnotice.php:94
#: lib/designsettings.php:283
@@ -335,7 +335,7 @@ msgstr "మీ à°¸à±à°¨à±‡à°¹à°¿à°¤à±à°²à± కాని వాడà±à°•à°°à±
#: actions/apifavoritecreate.php:108 actions/apifavoritedestroy.php:109
#: actions/apistatusesdestroy.php:113
msgid "No status found with that ID."
-msgstr ""
+msgstr "à°† IDతో ఠనోటీసూ కనబడలేదà±."
#: actions/apifavoritecreate.php:119
msgid "This status is already a favorite."
@@ -642,17 +642,17 @@ msgstr "à°¸à±à°¥à°¿à°¤à°¿à°¨à°¿ తొలగించాం."
msgid "No status with that ID found."
msgstr "à°† IDతో ఠనోటీసౠకనబడలేదà±."
-#: actions/apistatusesupdate.php:161 actions/newnotice.php:155
+#: actions/apistatusesupdate.php:252 actions/newnotice.php:155
#: lib/mailhandler.php:60
#, php-format
msgid "That's too long. Max notice size is %d chars."
msgstr "అది చాలా పొడవà±à°‚ది. à°—à°°à°¿à°·à±à°  నోటీసౠపరిమాణం %d à°…à°•à±à°·à°°à°¾à°²à±."
-#: actions/apistatusesupdate.php:202 actions/apiusershow.php:96
+#: actions/apistatusesupdate.php:293 actions/apiusershow.php:96
msgid "Not found."
msgstr "కనబడలేదà±."
-#: actions/apistatusesupdate.php:225 actions/newnotice.php:178
+#: actions/apistatusesupdate.php:316 actions/newnotice.php:178
#, php-format
msgid "Max notice size is %d chars, including attachment URL."
msgstr "à°—à°°à°¿à°·à±à°  నోటీసౠపొడవౠ%d à°…à°•à±à°·à°°à°¾à°²à±, జోడింపౠURLని à°•à°²à±à°ªà±à°•à±à°¨à°¿."
@@ -681,12 +681,12 @@ msgstr ""
msgid "%1$s updates that reply to updates from %2$s / %3$s."
msgstr ""
-#: actions/apitimelinepublic.php:107 actions/publicrss.php:103
+#: actions/apitimelinepublic.php:196 actions/publicrss.php:103
#, php-format
msgid "%s public timeline"
msgstr "%s బహిరంగ కాలరేఖ"
-#: actions/apitimelinepublic.php:112 actions/publicrss.php:105
+#: actions/apitimelinepublic.php:201 actions/publicrss.php:105
#, php-format
msgid "%s updates from everyone!"
msgstr "అందరి à°¨à±à°‚à°¡à°¿ %s తాజాకరణలà±!"
@@ -778,9 +778,8 @@ msgid "Crop"
msgstr "à°•à°¤à±à°¤à°¿à°°à°¿à°‚à°šà±"
#: actions/avatarsettings.php:305
-#, fuzzy
msgid "No file uploaded."
-msgstr "పాకà±à°·à°¿à°• à°Žà°—à±à°®à°¤à°¿."
+msgstr "ఠదసà±à°¤à±à°°à°®à±‚ à°Žà°•à±à°•à°¿à°‚పబడలేదà±."
#: actions/avatarsettings.php:332
msgid "Pick a square area of the image to be your avatar"
@@ -827,7 +826,6 @@ msgstr ""
#: actions/block.php:145 actions/deleteapplication.php:154
#: actions/deletenotice.php:147 actions/deleteuser.php:152
#: actions/groupblock.php:178
-#, fuzzy
msgctxt "BUTTON"
msgid "No"
msgstr "కాదà±"
@@ -1347,7 +1345,6 @@ msgstr "à°ªà±à°°à°¸à±à°¤à±à°¤ నిరà±à°§à°¾à°°à°¿à°¤ ఈమెయిలà
#: actions/emailsettings.php:115 actions/emailsettings.php:158
#: actions/imsettings.php:116 actions/smssettings.php:124
#: actions/smssettings.php:180
-#, fuzzy
msgctxt "BUTTON"
msgid "Remove"
msgstr "తొలగించà±"
@@ -1366,7 +1363,6 @@ msgstr ""
#. TRANS: Button label
#: actions/emailsettings.php:127 actions/imsettings.php:131
#: actions/smssettings.php:137 lib/applicationeditform.php:357
-#, fuzzy
msgctxt "BUTTON"
msgid "Cancel"
msgstr "à°°à°¦à±à°¦à±à°šà±‡à°¯à°¿"
@@ -1381,7 +1377,6 @@ msgstr "ఈమెయిలౠచిరà±à°¨à°¾à°®à°¾, \"username@example.org\"
#. TRANS: Button label for adding a SMS phone number in SMS settings form.
#: actions/emailsettings.php:139 actions/imsettings.php:148
#: actions/smssettings.php:162
-#, fuzzy
msgctxt "BUTTON"
msgid "Add"
msgstr "చేరà±à°šà±"
@@ -1908,7 +1903,7 @@ msgstr ""
#: actions/groupunblock.php:91
msgid "Only an admin can unblock group members."
-msgstr ""
+msgstr "నిరà±à°µà°¾à°¹à°•à±à°²à± మాతà±à°°à°®à±‡ à°—à±à°‚పౠసభà±à°¯à±à°²à°ªà±ˆ నిరోధానà±à°¨à°¿ à°Žà°¤à±à°¤à°¿à°µà±‡à°¯à°—లరà±."
#: actions/groupunblock.php:95
msgid "User is not blocked from group."
@@ -2043,9 +2038,8 @@ msgstr "ఈమెయిలౠనిరà±à°§à°¾à°°à°£à°¨à°¿ తొలగింà
#. TRANS: Message given after successfully canceling IM address confirmation.
#: actions/imsettings.php:402
-#, fuzzy
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.
@@ -2055,9 +2049,8 @@ msgstr "ఇది మీ Jabber ID కాదà±"
#. TRANS: Message given after successfully removing a registered IM address.
#: actions/imsettings.php:447
-#, fuzzy
msgid "The IM address was removed."
-msgstr "à°† à°šà°¿à°°à±à°¨à°¾à°®à°¾à°¨à°¿ తొలగించాం."
+msgstr "à°† IM à°šà°¿à°°à±à°¨à°¾à°®à°¾à°¨à°¿ తొలగించాం."
#: actions/inbox.php:59
#, php-format
@@ -2185,6 +2178,29 @@ msgid ""
"\n"
"Sincerely, %2$s\n"
msgstr ""
+"%2$s (%3$s) లో వారితో చేరమని %1$s మిమà±à°®à°²à±à°¨à°¿ ఆహà±à°µà°¾à°¨à°¿à°‚చారà±.\n"
+"\n"
+"%2$s అనేది మీకౠతెలిసిన మరియౠమీకౠఆసకà±à°¤à°¿ ఉనà±à°¨ à°µà±à°¯à°•à±à°¤à±à°²à°¤à±‹ à°Žà°ªà±à°ªà°Ÿà°¿à°•à°ªà±à°ªà±à°¡à± పరిచయంలో ఉండేదà±à°•à± "
+"వీలà±à°•à°²à±à°ªà°¿à°‚చే à°’à°• సూకà±à°·à±à°®-à°¬à±à°²à°¾à°—ింగౠసేవ.\n"
+"\n"
+"మీరౠకూడా మీ à°—à±à°°à°¿à°‚à°šà°¿, మీ ఆలోచనల à°—à±à°°à°¿à°‚à°šà°¿ లేదా మీ జీవితం à°—à±à°°à°¿à°‚à°šà°¿à°¨ విశేషాలనౠమీకౠతెలిసిన వారితో "
+"పంచà±à°•à±‹à°µà°šà±à°šà±. అలానే ఇది మీలాంటి ఆసకà±à°¤à±à°²à± కలిగిన కొతà±à°¤ à°µà±à°¯à°•à±à°¤à±à°²à°¨à°¿ à°•à°²à±à°¸à±à°•à±à°¨à±‡à°‚à°¦à±à°•à± గొపà±à°ª à°ªà±à°°à°¦à±‡à°¶à°‚.\n"
+"\n"
+"%1$s à°…à°¨à±à°¨à°¾à°°à±:\n"
+"\n"
+"%4$s\n"
+"\n"
+"%2$sలో %1$s యొకà±à°• à°ªà±à°°à±Šà°«à±ˆà°²à±à°¨à°¿ మీరౠఇకà±à°•à°¡ చూడవచà±à°šà±:\n"
+"\n"
+"%5$s\n"
+"\n"
+"మీరౠదీనà±à°¨à°¿ à°ªà±à°°à°¯à°¤à±à°¨à°¿à°‚à°šà°¿ చూడాలనà±à°•à±à°‚టే, à°ˆ ఆహà±à°µà°¾à°¨à°¾à°¨à±à°¨à°¿ అంగీకరించడానికి à°ˆ à°•à±à°°à°¿à°‚à°¦ లంకెపై నొకà±à°•à°‚à°¡à°¿.\n"
+"\n"
+"%6$s\n"
+"\n"
+"కాదనà±à°•à±à°‚టే, à°ˆ సందేశానà±à°¨à°¿ పటà±à°Ÿà°¿à°‚à°šà±à°•à±‹à°•à°‚à°¡à°¿. మీ ఓపిక మరియౠసమయానికి ధనà±à°¯à°µà°¾à°¦à°¾à°²à±.\n"
+"\n"
+"వినమà±à°°à°¤à°¤à±‹, %2$s\n"
#: actions/joingroup.php:60
msgid "You must be logged in to join a group."
@@ -2257,13 +2273,14 @@ msgstr ""
"à°­à°¦à±à°°à°¤à°¾ కారణాల దృషà±à°Ÿà±à°¯à°¾, అమరికలౠమారà±à°šà±‡ à°®à±à°‚దౠమీ వాడà±à°•à°°à°¿ పేరà±à°¨à°¿ మరియౠసంకేతపదానà±à°¨à°¿ మరోసారి ఇవà±à°µà°‚à°¡à°¿."
#: actions/login.php:270
+msgid "Login with your username and password."
+msgstr "మీ వాడà±à°•à°°à°¿à°ªà±‡à°°à± మరియౠసంకేతపదాలతో à°ªà±à°°à°µà±‡à°¶à°¿à°‚à°šà°‚à°¡à°¿."
+
+#: actions/login.php:273
#, php-format
msgid ""
-"Login with your username and password. Don't have a username yet? [Register]"
-"(%%action.register%%) a new account."
-msgstr ""
-"మీ వాడà±à°•à°°à°¿à°ªà±‡à°°à± మరియౠసంకేతపదాలతో à°ªà±à°°à°µà±‡à°¶à°¿à°‚à°šà°‚à°¡à°¿. మీకౠఇంకా వాడà±à°•à°°à°¿à°ªà±‡à°°à± లేదా? కొతà±à°¤ ఖాతాని [నమోదà±à°šà±‡à°¸à±à°•à±‹à°‚à°¡à°¿]"
-"(%%action.register%%)."
+"Don't have a username yet? [Register](%%action.register%%) a new account."
+msgstr "మీకౠఇంకా వాడà±à°•à°°à°¿à°ªà±‡à°°à± లేదా? కొతà±à°¤ ఖాతాని [నమోదà±à°šà±‡à°¸à±à°•à±‹à°‚à°¡à°¿](%%action.register%%)."
#: actions/makeadmin.php:92
msgid "Only an admin can make another user an admin."
@@ -2343,9 +2360,9 @@ msgid "Message sent"
msgstr "సందేశానà±à°¨à°¿ పంపించాం"
#: actions/newmessage.php:185
-#, fuzzy, php-format
+#, php-format
msgid "Direct message to %s sent."
-msgstr "%sà°•à°¿ నేరౠసందేశానà±à°¨à°¿ పంపించాం"
+msgstr "%sà°•à°¿ నేరౠసందేశానà±à°¨à°¿ పంపించాం."
#: actions/newmessage.php:210 actions/newnotice.php:251 lib/channel.php:189
msgid "Ajax Error"
@@ -2384,6 +2401,7 @@ msgid ""
"Be the first to [post on this topic](%%%%action.newnotice%%%%?"
"status_textarea=%s)!"
msgstr ""
+"[à°ˆ విషయంపై](%%%%action.newnotice%%%%?status_textarea=%s) à°µà±à°°à°¾à°¸à±‡ మొదటివారౠమీరే à°…à°µà±à°µà°‚à°¡à°¿!"
#: actions/noticesearch.php:124
#, php-format
@@ -2482,8 +2500,8 @@ msgid "Only %s URLs over plain HTTP please."
msgstr ""
#. TRANS: Client error on an API request with an unsupported data format.
-#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1069
-#: lib/apiaction.php:1098 lib/apiaction.php:1215
+#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1131
+#: lib/apiaction.php:1160 lib/apiaction.php:1277
msgid "Not a supported data format."
msgstr ""
@@ -3332,7 +3350,7 @@ msgstr ""
#: actions/remotesubscribe.php:176
msgid "That’s a local profile! Login to subscribe."
-msgstr ""
+msgstr "అది à°¸à±à°¥à°¾à°¨à°¿à°• à°ªà±à°°à±Šà°«à±ˆà°²à±! చందాచేరడానికి à°ªà±à°°à°µà±‡à°¶à°¿à°‚à°šà°‚à°¡à°¿."
#: actions/remotesubscribe.php:183
msgid "Couldn’t get a request token."
@@ -3392,11 +3410,11 @@ msgid "Replies feed for %s (Atom)"
msgstr "%s కొరకౠసà±à°ªà°‚దనల ఫీడౠ(ఆటమà±)"
#: actions/replies.php:199
-#, fuzzy, php-format
+#, php-format
msgid ""
"This is the timeline showing replies to %1$s but %2$s hasn't received a "
"notice to his attention yet."
-msgstr "ఇది %s మరియౠమితà±à°°à±à°² కాలరేఖ కానీ ఇంకా ఎవరూ à°à°®à±€ రాయలేదà±."
+msgstr "ఇది %1$sà°•à°¿ వచà±à°šà°¿à°¨ à°¸à±à°ªà°‚దనలని చూపించే కాలరేఖ కానీ %2$s దృషà±à°Ÿà°¿à°•à°¿ ఇంకా ఎవరూ à°à°®à±€ పంపించలేదà±."
#: actions/replies.php:204
#, php-format
@@ -3476,9 +3494,8 @@ msgid "Save site settings"
msgstr "సైటౠఅమరికలనౠభదà±à°°à°ªà°°à°šà±"
#: actions/showapplication.php:82
-#, fuzzy
msgid "You must be logged in to view an application."
-msgstr "à°—à±à°‚à°ªà±à°¨à°¿ వదిలివెళà±à°³à°¡à°¾à°¨à°¿à°•à°¿ మీరౠపà±à°°à°µà±‡à°¶à°¿à°‚à°šà°¿ ఉండాలి."
+msgstr "ఉపకరణాలని చూడడానికి మీరౠతపà±à°ªà°¨à°¿à°¸à°°à°¿à°—à°¾ à°ªà±à°°à°µà±‡à°¶à°¿à°‚à°šà°¿ ఉండాలి."
#: actions/showapplication.php:157
msgid "Application profile"
@@ -3514,7 +3531,7 @@ msgstr "గణాంకాలà±"
#: actions/showapplication.php:203
#, php-format
msgid "Created by %1$s - %2$s access by default - %3$d users"
-msgstr ""
+msgstr "సృషà±à°Ÿà°¿à°‚చినది %1$s - à°…à°ªà±à°°à°®à±‡à°¯ à°…à°‚à°¦à±à°¬à°¾à°Ÿà± %2$s - %3$d వాడà±à°•à°°à±à°²à±"
#: actions/showapplication.php:213
msgid "Application actions"
@@ -3688,6 +3705,12 @@ msgid ""
"their life and interests. [Join now](%%%%action.register%%%%) to become part "
"of this group and many more! ([Read more](%%%%doc.help%%%%))"
msgstr ""
+"**%s** అనేది [à°¸à±à°Ÿà±‡à°Ÿà°¸à±â€Œà°¨à±†à°Ÿà±](http://status.net/) అనే à°¸à±à°µà±‡à°šà±à°›à°¾ ఉపకరణ అధారిత [సూకà±à°·à±à°®-à°¬à±à°²à°¾à°—à°¿à°‚à°—à±]"
+"(http://en.wikipedia.org/wiki/Micro-blogging) సేవ అయిన %%%%site.name%%%%లో ఒక "
+"వాడà±à°•à°°à°¿ à°—à±à°‚à°ªà±.\n"
+"దీని సభà±à°¯à±à°²à± వారి జీవితం మరియౠఆసకà±à°¤à±à°² à°—à±à°°à°¿à°‚à°šà°¿ à°šà°¿à°¨à±à°¨ సందేశాలని పంచà±à°•à±à°‚టారà±. à°ˆ à°—à±à°‚పౠమరియౠఇంకా "
+"చాల వాటిలో భాగసà±à°¤à±à°²à°µà±à°µà°¡à°¾à°¨à°¿à°•à°¿ [ఇపà±à°ªà±à°¡à±‡ చేరండి](%%%%action.register%%%%)! ([మరింత చదవండి](%%%%"
+"doc.help%%%%))"
#: actions/showgroup.php:469
#, php-format
@@ -3760,9 +3783,9 @@ msgid "FOAF for %s"
msgstr ""
#: actions/showstream.php:200
-#, fuzzy, php-format
+#, php-format
msgid "This is the timeline for %1$s but %2$s hasn't posted anything yet."
-msgstr "ఇది %s మరియౠమితà±à°°à±à°² కాలరేఖ కానీ ఇంకా ఎవరూ à°à°®à±€ రాయలేదà±."
+msgstr "ఇది %1$s యొకà±à°• కాలరేఖ కానీ %2$s ఇంకా à°à°®à±€ రాయలేదà±."
#: actions/showstream.php:205
msgid ""
@@ -3921,9 +3944,8 @@ msgid "Unable to save site notice."
msgstr "సందేశానà±à°¨à°¿ à°­à°¦à±à°°à°ªà°°à°šà°¡à°‚లో పొరపాటà±."
#: actions/sitenoticeadminpanel.php:113
-#, fuzzy
msgid "Max length for the site-wide notice is 255 chars."
-msgstr "సైటà±-వారీ నోటీసà±à°•à°¿ à°—à°°à°¿à°·à±à°  పొడవౠ255 à°…à°•à±à°·à°°à°¾à°²à±"
+msgstr "సైటà±-వారీ నోటీసà±à°•à°¿ à°—à°°à°¿à°·à±à°  పొడవౠ255 à°…à°•à±à°·à°°à°¾à°²à±."
#: actions/sitenoticeadminpanel.php:176
msgid "Site notice text"
@@ -3957,9 +3979,8 @@ msgstr "హోమౠపేజీ URL సరైనది కాదà±."
#. TRANS: Form legend for SMS settings form.
#: actions/smssettings.php:111
-#, fuzzy
msgid "SMS address"
-msgstr "IM à°šà°¿à°°à±à°¨à°¾à°®à°¾"
+msgstr "SMS à°šà°¿à°°à±à°¨à°¾à°®à°¾"
#. TRANS: Form guide in SMS settings form.
#: actions/smssettings.php:120
@@ -4372,7 +4393,7 @@ msgstr ""
#: actions/useradminpanel.php:155
msgid "Invalid welcome text. Max length is 255 characters."
-msgstr ""
+msgstr "చెలà±à°²à°¨à°¿ à°¸à±à°µà°¾à°—à°¤ పాఠà±à°¯à°‚. à°—à°°à°¿à°·à±à°  పొడవౠ255 à°…à°•à±à°·à°°à°¾à°²à±."
#: actions/useradminpanel.php:165
#, php-format
@@ -4701,17 +4722,17 @@ msgstr "à°ˆ సైటà±à°²à±‹ నోటీసà±à°²à± రాయడం à°¨à±à°
msgid "Problem saving notice."
msgstr "సందేశానà±à°¨à°¿ à°­à°¦à±à°°à°ªà°°à°šà°¡à°‚లో పొరపాటà±."
-#: classes/Notice.php:965
+#: classes/Notice.php:967
#, fuzzy
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:1513
-#, fuzzy, php-format
+#: classes/Notice.php:1535
+#, php-format
msgid "RT @%1$s %2$s"
-msgstr "%1$s (%2$s)"
+msgstr "RT @%1$s %2$s"
#: classes/Subscription.php:74 lib/oauthstore.php:465
msgid "You have been banned from subscribing."
@@ -5180,7 +5201,7 @@ msgid "Snapshots configuration"
msgstr "SMS నిరà±à°§à°¾à°°à°£"
#. TRANS: Client error 401.
-#: lib/apiauth.php:95
+#: lib/apiauth.php:113
msgid "API resource requires read-write access, but you only have read access."
msgstr ""
@@ -5269,13 +5290,11 @@ msgstr "à°°à°¦à±à°¦à±à°šà±‡à°¯à°¿"
#. TRANS: Application access type
#: lib/applicationlist.php:136
-#, fuzzy
msgid "read-write"
msgstr "చదవడం-à°µà±à°°à°¾à°¯à°¡à°‚"
#. TRANS: Application access type
#: lib/applicationlist.php:138
-#, fuzzy
msgid "read-only"
msgstr "చదవడం-మాతà±à°°à°®à±‡"
@@ -5623,13 +5642,12 @@ msgid ""
msgstr ""
#: lib/common.php:135
-#, fuzzy
msgid "No configuration file found. "
-msgstr "నిరà±à°§à°¾à°°à°£ సంకేతం లేదà±."
+msgstr "à°¸à±à°µà°°à±‚పణపౠదసà±à°¤à±à°°à°®à±‡à°®à±€ కనబడలేదà±. "
#: lib/common.php:136
msgid "I looked for configuration files in the following places: "
-msgstr ""
+msgstr "à°¸à±à°µà°°à±‚పణపౠదసà±à°¤à±à°°à°¾à°² కొరకౠఈ à°ªà±à°°à°¦à±‡à°¶à°¾à°²à°¤à±‹ చూసాం: "
#: lib/common.php:138
msgid "You may wish to run the installer to fix this."
@@ -5687,7 +5705,7 @@ msgstr "à°…à°Ÿà±à°µà°‚à°Ÿà°¿ సందేశమేమీ లేదà±."
#: lib/favorform.php:140
msgid "Favor"
-msgstr ""
+msgstr "ఇషà±à°Ÿà°ªà°¡à±"
#: lib/feed.php:85
msgid "RSS 1.0"
@@ -5744,9 +5762,8 @@ 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 à°…à°•à±à°·à°°à°¾à°²à±à°²à±‹ చెపà±à°ªà°‚à°¡à°¿"
+msgstr "à°—à±à°‚à°ªà±à°¨à°¿ లేదా విషయానà±à°¨à°¿ వివరించండి"
#: lib/groupeditform.php:170
#, php-format
@@ -5768,9 +5785,8 @@ msgid "Group"
msgstr "à°—à±à°‚à°ªà±"
#: lib/groupnav.php:101
-#, fuzzy
msgid "Blocked"
-msgstr "à°…à°Ÿà±à°µà°‚à°Ÿà°¿ వాడà±à°•à°°à°¿ లేరà±."
+msgstr "నిరోధించారà±"
#: lib/groupnav.php:102
#, php-format
@@ -5875,9 +5891,8 @@ msgid "Login with a username and password"
msgstr "వాడà±à°•à°°à°¿à°ªà±‡à°°à± మరియౠసంకేతపదాలతో à°ªà±à°°à°µà±‡à°¶à°¿à°‚à°šà°‚à°¡à°¿"
#: lib/logingroupnav.php:86
-#, fuzzy
msgid "Sign up for a new account"
-msgstr "కొతà±à°¤ ఖాతా సృషà±à°Ÿà°¿à°‚à°šà±à°•à±‹à°‚à°¡à°¿"
+msgstr "కొతà±à°¤ ఖాతా కొరకై నమోదà±à°šà±‡à°¸à±à°•à±‹à°‚à°¡à°¿"
#. TRANS: Subject for address confirmation email
#: lib/mail.php:174
@@ -6011,6 +6026,17 @@ msgid ""
"With kind regards,\n"
"%4$s\n"
msgstr ""
+"%1$s (%2$s) మీరేం చేసà±à°¤à±à°¨à±à°¨à°¾à°°à±‹ అని విసà±à°®à°¯à°‚ చెందà±à°¤à±à°¨à±à°¨à°¾à°°à± మరియౠà°à°µà±ˆà°¨à°¾ విశేషాలని à°µà±à°°à°¾à°¯à°®à°¨à°¿ మిమà±à°®à°²à±à°¨à°¿ "
+"ఆహà±à°µà°¾à°¨à°¿à°¸à±à°¤à±à°¨à±à°¨à°¾à°°à±.\n"
+"\n"
+"కాబటà±à°Ÿà°¿ మిమà±à°®à°²à±à°¨à°¿ విననివà±à°µà°‚à°¡à°¿ :)\n"
+"\n"
+"%3$s\n"
+"\n"
+"à°ˆ ఈమెయిలà±à°•à±‡ à°¸à±à°ªà°‚దించకండి; ఇది వారికి వెళà±à°³à°¦à±.\n"
+"\n"
+"à°¶à±à°­à°¾à°¶à±€à°¸à±à°¸à±à°²à°¤à±‹,\n"
+"%4$s\n"
#. TRANS: Subject for direct-message notification email
#: lib/mail.php:530
@@ -6641,9 +6667,9 @@ msgid "Unsubscribe"
msgstr "చందామానà±"
#: lib/usernoprofileexception.php:58
-#, fuzzy, php-format
+#, php-format
msgid "User %s (%d) has no profile record."
-msgstr "వాడà±à°•à°°à°¿à°•à°¿ à°ªà±à°°à±Šà°«à±ˆà°²à± లేదà±."
+msgstr "వాడà±à°•à°°à°¿ %s (%d) à°•à°¿ à°ªà±à°°à±Šà°«à±ˆà°²à± లేదà±."
#: lib/userprofile.php:117
msgid "Edit Avatar"
@@ -6692,56 +6718,56 @@ msgid "Moderator"
msgstr "సమనà±à°µà°¯à°•à°°à±à°¤"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1054
+#: lib/util.php:1083
msgid "a few seconds ago"
msgstr "కొనà±à°¨à°¿ à°•à±à°·à°£à°¾à°² à°•à±à°°à°¿à°¤à°‚"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1057
+#: lib/util.php:1086
msgid "about a minute ago"
msgstr "à°“ నిమిషం à°•à±à°°à°¿à°¤à°‚"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1061
+#: lib/util.php:1090
#, php-format
msgid "about %d minutes ago"
msgstr "%d నిమిషాల à°•à±à°°à°¿à°¤à°‚"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1064
+#: lib/util.php:1093
msgid "about an hour ago"
msgstr "à°’à°• à°—à°‚à°Ÿ à°•à±à°°à°¿à°¤à°‚"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1068
+#: lib/util.php:1097
#, php-format
msgid "about %d hours ago"
msgstr "%d à°—à°‚à°Ÿà°² à°•à±à°°à°¿à°¤à°‚"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1071
+#: lib/util.php:1100
msgid "about a day ago"
msgstr "à°“ రోజౠకà±à°°à°¿à°¤à°‚"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1075
+#: lib/util.php:1104
#, php-format
msgid "about %d days ago"
msgstr "%d రోజà±à°² à°•à±à°°à°¿à°¤à°‚"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1078
+#: lib/util.php:1107
msgid "about a month ago"
msgstr "à°“ నెల à°•à±à°°à°¿à°¤à°‚"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1082
+#: lib/util.php:1111
#, php-format
msgid "about %d months ago"
msgstr "%d నెలల à°•à±à°°à°¿à°¤à°‚"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1085
+#: lib/util.php:1114
msgid "about a year ago"
msgstr "à°’à°• సంవతà±à°¸à°°à°‚ à°•à±à°°à°¿à°¤à°‚"
diff --git a/locale/tr/LC_MESSAGES/statusnet.po b/locale/tr/LC_MESSAGES/statusnet.po
index 3fe578e08..8514f78d5 100644
--- a/locale/tr/LC_MESSAGES/statusnet.po
+++ b/locale/tr/LC_MESSAGES/statusnet.po
@@ -9,12 +9,12 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-12 21:47+0000\n"
-"PO-Revision-Date: 2010-04-12 21:49:55+0000\n"
+"POT-Creation-Date: 2010-04-24 14:16+0000\n"
+"PO-Revision-Date: 2010-04-26 22:18:42+0000\n"
"Language-Team: Turkish\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r64984); Translate extension (2010-01-16)\n"
+"X-Generator: MediaWiki 1.17alpha (r65552); Translate extension (2010-04-25)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: tr\n"
"X-Message-Group: out-statusnet\n"
@@ -106,8 +106,8 @@ msgstr "Böyle bir durum mesajı yok."
#: actions/apidirectmessagenew.php:75 actions/apigroupcreate.php:112
#: actions/apigroupismember.php:90 actions/apigroupjoin.php:99
#: actions/apigroupleave.php:99 actions/apigrouplist.php:72
-#: actions/apistatusesupdate.php:148 actions/apisubscriptions.php:87
-#: actions/apitimelinefavorites.php:71 actions/apitimelinefriends.php:78
+#: actions/apistatusesupdate.php:239 actions/apisubscriptions.php:87
+#: actions/apitimelinefavorites.php:71 actions/apitimelinefriends.php:173
#: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79
#: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75
#: actions/favoritesrss.php:74 actions/foaf.php:40 actions/foaf.php:58
@@ -131,7 +131,7 @@ msgstr "%s ve arkadaşları"
#. TRANS: H1 text. %1$s is user nickname
#. TRANS: Message is used as link title. %s is a user nickname.
#: actions/all.php:89 actions/all.php:181 actions/allrss.php:116
-#: actions/apitimelinefriends.php:114 actions/apitimelinehome.php:115
+#: actions/apitimelinefriends.php:209 actions/apitimelinehome.php:115
#: lib/personalgroupnav.php:100
#, php-format
msgid "%s and friends"
@@ -192,7 +192,7 @@ msgstr "%s ve arkadaşları"
#. 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:121 actions/apitimelinefriends.php:120
+#: actions/allrss.php:121 actions/apitimelinefriends.php:215
#: actions/apitimelinehome.php:121
#, php-format
msgid "Updates from %1$s and friends on %2$s!"
@@ -214,9 +214,9 @@ msgstr ""
#: actions/apistatusesdestroy.php:102 actions/apistatusesretweets.php:112
#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:141
#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111
-#: actions/apitimelinefavorites.php:173 actions/apitimelinefriends.php:175
+#: actions/apitimelinefavorites.php:173 actions/apitimelinefriends.php:270
#: actions/apitimelinegroup.php:151 actions/apitimelinehome.php:174
-#: actions/apitimelinementions.php:173 actions/apitimelinepublic.php:151
+#: actions/apitimelinementions.php:173 actions/apitimelinepublic.php:240
#: actions/apitimelineretweetedtome.php:121
#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:160
#: actions/apitimelineuser.php:162 actions/apiusershow.php:101
@@ -234,7 +234,7 @@ msgstr "Onay kodu bulunamadı."
#: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91
#: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91
#: actions/apigroupleave.php:91 actions/apimediaupload.php:67
-#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:118
+#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:209
msgid "This method requires a POST."
msgstr ""
@@ -266,7 +266,7 @@ msgstr "Profil kaydedilemedi."
#: actions/apiaccountupdateprofilebackgroundimage.php:108
#: actions/apiaccountupdateprofileimage.php:97 actions/apimediaupload.php:80
-#: actions/apistatusesupdate.php:131 actions/avatarsettings.php:257
+#: actions/apistatusesupdate.php:222 actions/avatarsettings.php:257
#: actions/designadminpanel.php:123 actions/editapplication.php:118
#: actions/newapplication.php:101 actions/newnotice.php:94
#: lib/designsettings.php:283
@@ -666,19 +666,19 @@ msgstr "Avatar güncellendi."
msgid "No status with that ID found."
msgstr ""
-#: actions/apistatusesupdate.php:161 actions/newnotice.php:155
+#: actions/apistatusesupdate.php:252 actions/newnotice.php:155
#: lib/mailhandler.php:60
#, fuzzy, php-format
msgid "That's too long. Max notice size is %d chars."
msgstr ""
"Ah, durumunuz biraz uzun kaçtı. Azami 180 karaktere sığdırmaya ne dersiniz?"
-#: actions/apistatusesupdate.php:202 actions/apiusershow.php:96
+#: actions/apistatusesupdate.php:293 actions/apiusershow.php:96
#, fuzzy
msgid "Not found."
msgstr "İstek bulunamadı!"
-#: actions/apistatusesupdate.php:225 actions/newnotice.php:178
+#: actions/apistatusesupdate.php:316 actions/newnotice.php:178
#, php-format
msgid "Max notice size is %d chars, including attachment URL."
msgstr ""
@@ -708,12 +708,12 @@ msgstr "%1$s'in %2$s'deki durum mesajları "
msgid "%1$s updates that reply to updates from %2$s / %3$s."
msgstr ""
-#: actions/apitimelinepublic.php:107 actions/publicrss.php:103
+#: actions/apitimelinepublic.php:196 actions/publicrss.php:103
#, php-format
msgid "%s public timeline"
msgstr ""
-#: actions/apitimelinepublic.php:112 actions/publicrss.php:105
+#: actions/apitimelinepublic.php:201 actions/publicrss.php:105
#, php-format
msgid "%s updates from everyone!"
msgstr ""
@@ -2355,10 +2355,14 @@ msgstr ""
"ve parolanızı tekrar giriniz."
#: actions/login.php:270
+#, fuzzy
+msgid "Login with your username and password."
+msgstr "Geçersiz kullanıcı adı veya parola."
+
+#: actions/login.php:273
#, fuzzy, php-format
msgid ""
-"Login with your username and password. Don't have a username yet? [Register]"
-"(%%action.register%%) a new account."
+"Don't have a username yet? [Register](%%action.register%%) a new account."
msgstr ""
"Kullanıcı adı ve parolanızla giriş yapın. Henüz bir hesabınız yok mu? Ne "
"duruyorsunuz, hemen bir [yeni hesap oluÅŸturun](%%action.register%%) ya da "
@@ -2583,8 +2587,8 @@ msgid "Only %s URLs over plain HTTP please."
msgstr ""
#. TRANS: Client error on an API request with an unsupported data format.
-#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1069
-#: lib/apiaction.php:1098 lib/apiaction.php:1215
+#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1131
+#: lib/apiaction.php:1160 lib/apiaction.php:1277
msgid "Not a supported data format."
msgstr ""
@@ -4841,14 +4845,14 @@ msgstr ""
msgid "Problem saving notice."
msgstr "Durum mesajını kaydederken hata oluştu."
-#: classes/Notice.php:965
+#: classes/Notice.php:967
#, fuzzy
msgid "Problem saving group inbox."
msgstr "Durum mesajını kaydederken hata oluştu."
#. 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:1513
+#: classes/Notice.php:1535
#, php-format
msgid "RT @%1$s %2$s"
msgstr ""
@@ -5343,7 +5347,7 @@ msgid "Snapshots configuration"
msgstr "Eposta adresi onayı"
#. TRANS: Client error 401.
-#: lib/apiauth.php:95
+#: lib/apiauth.php:113
msgid "API resource requires read-write access, but you only have read access."
msgstr ""
@@ -6809,56 +6813,56 @@ msgid "Moderator"
msgstr ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1054
+#: lib/util.php:1083
msgid "a few seconds ago"
msgstr "birkaç saniye önce"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1057
+#: lib/util.php:1086
msgid "about a minute ago"
msgstr "yaklaşık bir dakika önce"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1061
+#: lib/util.php:1090
#, php-format
msgid "about %d minutes ago"
msgstr "yaklaşık %d dakika önce"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1064
+#: lib/util.php:1093
msgid "about an hour ago"
msgstr "yaklaşık bir saat önce"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1068
+#: lib/util.php:1097
#, php-format
msgid "about %d hours ago"
msgstr "yaklaşık %d saat önce"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1071
+#: lib/util.php:1100
msgid "about a day ago"
msgstr "yaklaşık bir gün önce"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1075
+#: lib/util.php:1104
#, php-format
msgid "about %d days ago"
msgstr "yaklaşık %d gün önce"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1078
+#: lib/util.php:1107
msgid "about a month ago"
msgstr "yaklaşık bir ay önce"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1082
+#: lib/util.php:1111
#, php-format
msgid "about %d months ago"
msgstr "yaklaşık %d ay önce"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1085
+#: lib/util.php:1114
msgid "about a year ago"
msgstr "yaklaşık bir yıl önce"
diff --git a/locale/uk/LC_MESSAGES/statusnet.po b/locale/uk/LC_MESSAGES/statusnet.po
index de2f4e803..efdcae240 100644
--- a/locale/uk/LC_MESSAGES/statusnet.po
+++ b/locale/uk/LC_MESSAGES/statusnet.po
@@ -11,12 +11,12 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-12 21:47+0000\n"
-"PO-Revision-Date: 2010-04-12 21:49:58+0000\n"
+"POT-Creation-Date: 2010-04-24 14:16+0000\n"
+"PO-Revision-Date: 2010-04-26 22:18:45+0000\n"
"Language-Team: Ukrainian\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r64984); Translate extension (2010-01-16)\n"
+"X-Generator: MediaWiki 1.17alpha (r65552); Translate extension (2010-04-25)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: uk\n"
"X-Message-Group: out-statusnet\n"
@@ -103,8 +103,8 @@ msgstr "Ðемає такої Ñторінки."
#: actions/apidirectmessagenew.php:75 actions/apigroupcreate.php:112
#: actions/apigroupismember.php:90 actions/apigroupjoin.php:99
#: actions/apigroupleave.php:99 actions/apigrouplist.php:72
-#: actions/apistatusesupdate.php:148 actions/apisubscriptions.php:87
-#: actions/apitimelinefavorites.php:71 actions/apitimelinefriends.php:78
+#: actions/apistatusesupdate.php:239 actions/apisubscriptions.php:87
+#: actions/apitimelinefavorites.php:71 actions/apitimelinefriends.php:173
#: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79
#: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75
#: actions/favoritesrss.php:74 actions/foaf.php:40 actions/foaf.php:58
@@ -128,7 +128,7 @@ msgstr "%1$s та друзі, Ñторінка %2$d"
#. TRANS: H1 text. %1$s is user nickname
#. TRANS: Message is used as link title. %s is a user nickname.
#: actions/all.php:89 actions/all.php:181 actions/allrss.php:116
-#: actions/apitimelinefriends.php:114 actions/apitimelinehome.php:115
+#: actions/apitimelinefriends.php:209 actions/apitimelinehome.php:115
#: lib/personalgroupnav.php:100
#, php-format
msgid "%s and friends"
@@ -194,7 +194,7 @@ msgstr "Ви з друзÑми"
#. 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:121 actions/apitimelinefriends.php:120
+#: actions/allrss.php:121 actions/apitimelinefriends.php:215
#: actions/apitimelinehome.php:121
#, php-format
msgid "Updates from %1$s and friends on %2$s!"
@@ -216,9 +216,9 @@ msgstr "ÐžÐ½Ð¾Ð²Ð»ÐµÐ½Ð½Ñ Ð²Ñ–Ð´ %1$s та друзів на %2$s!"
#: actions/apistatusesdestroy.php:102 actions/apistatusesretweets.php:112
#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:141
#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111
-#: actions/apitimelinefavorites.php:173 actions/apitimelinefriends.php:175
+#: actions/apitimelinefavorites.php:173 actions/apitimelinefriends.php:270
#: actions/apitimelinegroup.php:151 actions/apitimelinehome.php:174
-#: actions/apitimelinementions.php:173 actions/apitimelinepublic.php:151
+#: actions/apitimelinementions.php:173 actions/apitimelinepublic.php:240
#: actions/apitimelineretweetedtome.php:121
#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:160
#: actions/apitimelineuser.php:162 actions/apiusershow.php:101
@@ -235,7 +235,7 @@ msgstr "API метод не знайдено."
#: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91
#: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91
#: actions/apigroupleave.php:91 actions/apimediaupload.php:67
-#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:118
+#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:209
msgid "This method requires a POST."
msgstr "Цей метод потребує POST."
@@ -266,7 +266,7 @@ msgstr "Ðе вдалоÑÑ Ð·Ð±ÐµÑ€ÐµÐ³Ñ‚Ð¸ профіль."
#: actions/apiaccountupdateprofilebackgroundimage.php:108
#: actions/apiaccountupdateprofileimage.php:97 actions/apimediaupload.php:80
-#: actions/apistatusesupdate.php:131 actions/avatarsettings.php:257
+#: actions/apistatusesupdate.php:222 actions/avatarsettings.php:257
#: actions/designadminpanel.php:123 actions/editapplication.php:118
#: actions/newapplication.php:101 actions/newnotice.php:94
#: lib/designsettings.php:283
@@ -657,17 +657,17 @@ msgstr "Ð¡Ñ‚Ð°Ñ‚ÑƒÑ Ð²Ð¸Ð´Ð°Ð»ÐµÐ½Ð¾."
msgid "No status with that ID found."
msgstr "Ðе знайдено жодних ÑтатуÑів з таким ID."
-#: actions/apistatusesupdate.php:161 actions/newnotice.php:155
+#: actions/apistatusesupdate.php:252 actions/newnotice.php:155
#: lib/mailhandler.php:60
#, php-format
msgid "That's too long. Max notice size is %d chars."
msgstr "Ðадто довго. МакÑимальний розмір допиÑу — %d знаків."
-#: actions/apistatusesupdate.php:202 actions/apiusershow.php:96
+#: actions/apistatusesupdate.php:293 actions/apiusershow.php:96
msgid "Not found."
msgstr "Ðе знайдено."
-#: actions/apistatusesupdate.php:225 actions/newnotice.php:178
+#: actions/apistatusesupdate.php:316 actions/newnotice.php:178
#, php-format
msgid "Max notice size is %d chars, including attachment URL."
msgstr ""
@@ -698,12 +698,12 @@ msgstr "%1$s / Оновленні відповіді %2$s"
msgid "%1$s updates that reply to updates from %2$s / %3$s."
msgstr "%1$s оновив цю відповідь на Ð´Ð¾Ð¿Ð¸Ñ Ð²Ñ–Ð´ %2$s / %3$s."
-#: actions/apitimelinepublic.php:107 actions/publicrss.php:103
+#: actions/apitimelinepublic.php:196 actions/publicrss.php:103
#, php-format
msgid "%s public timeline"
msgstr "%s загальна Ñтрічка"
-#: actions/apitimelinepublic.php:112 actions/publicrss.php:105
+#: actions/apitimelinepublic.php:201 actions/publicrss.php:105
#, php-format
msgid "%s updates from everyone!"
msgstr "%s Ð¾Ð½Ð¾Ð²Ð»ÐµÐ½Ð½Ñ Ð²Ñ–Ð´ уÑÑ–Ñ…!"
@@ -2322,13 +2322,16 @@ msgstr ""
"змінювати налаштуваннÑ."
#: actions/login.php:270
+msgid "Login with your username and password."
+msgstr "Увійти викориÑтовуючи Ñ–Ð¼â€™Ñ Ñ‚Ð° пароль."
+
+#: actions/login.php:273
#, php-format
msgid ""
-"Login with your username and password. Don't have a username yet? [Register]"
-"(%%action.register%%) a new account."
+"Don't have a username yet? [Register](%%action.register%%) a new account."
msgstr ""
-"Увійти викриÑтовуючи Ñ–Ð¼â€™Ñ Ñ‚Ð° пароль. Ще не маєте імені кориÑтувача? "
-"[ЗареєÑтрувати](%%action.register%%) новий акаунт."
+"Ще не маєте імені кориÑтувача? [ЗареєÑтрувати](%%action.register%%) новий "
+"акаунт."
#: actions/makeadmin.php:92
msgid "Only an admin can make another user an admin."
@@ -2552,8 +2555,8 @@ msgid "Only %s URLs over plain HTTP please."
msgstr "URL-адреÑа %s лише в проÑтому HTTP, будь лаÑка."
#. TRANS: Client error on an API request with an unsupported data format.
-#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1069
-#: lib/apiaction.php:1098 lib/apiaction.php:1215
+#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1131
+#: lib/apiaction.php:1160 lib/apiaction.php:1277
msgid "Not a supported data format."
msgstr "Такий формат даних не підтримуєтьÑÑ."
@@ -4845,13 +4848,13 @@ msgstr "Вам заборонено надÑилати допиÑи до цьоÐ
msgid "Problem saving notice."
msgstr "Проблема при збереженні допиÑу."
-#: classes/Notice.php:965
+#: classes/Notice.php:967
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:1513
+#: classes/Notice.php:1535
#, php-format
msgid "RT @%1$s %2$s"
msgstr "RT @%1$s %2$s"
@@ -5310,7 +5313,7 @@ msgid "Snapshots configuration"
msgstr "ÐšÐ¾Ð½Ñ„Ñ–Ð³ÑƒÑ€Ð°Ñ†Ñ–Ñ Ð·Ð½Ñ–Ð¼ÐºÑ–Ð²"
#. TRANS: Client error 401.
-#: lib/apiauth.php:95
+#: lib/apiauth.php:113
msgid "API resource requires read-write access, but you only have read access."
msgstr ""
"API-реÑÑƒÑ€Ñ Ð²Ð¸Ð¼Ð°Ð³Ð°Ñ” дозвіл типу «читаннÑ-запиÑ», але у Ð²Ð°Ñ Ñ” лише доÑтуп Ð´Ð»Ñ "
@@ -5529,9 +5532,9 @@ msgstr "Ðе вдалоÑÑŒ долучити кориÑтувача %1$s до г
#. 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.
#: lib/command.php:385
-#, fuzzy, php-format
+#, php-format
msgid "Could not remove user %1$s from group %2$s"
-msgstr "Ðе вдалоÑÑŒ видалити кориÑтувача %1$s з групи %2$s."
+msgstr "Ðе вдалоÑÑŒ видалити кориÑтувача %1$s з групи %2$s"
#. TRANS: Whois output. %s is the full name of the queried user.
#: lib/command.php:418
@@ -6868,56 +6871,56 @@ msgid "Moderator"
msgstr "Модератор"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1054
+#: lib/util.php:1083
msgid "a few seconds ago"
msgstr "мить тому"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1057
+#: lib/util.php:1086
msgid "about a minute ago"
msgstr "хвилину тому"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1061
+#: lib/util.php:1090
#, php-format
msgid "about %d minutes ago"
msgstr "близько %d хвилин тому"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1064
+#: lib/util.php:1093
msgid "about an hour ago"
msgstr "годину тому"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1068
+#: lib/util.php:1097
#, php-format
msgid "about %d hours ago"
msgstr "близько %d годин тому"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1071
+#: lib/util.php:1100
msgid "about a day ago"
msgstr "день тому"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1075
+#: lib/util.php:1104
#, php-format
msgid "about %d days ago"
msgstr "близько %d днів тому"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1078
+#: lib/util.php:1107
msgid "about a month ago"
msgstr "міÑÑць тому"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1082
+#: lib/util.php:1111
#, php-format
msgid "about %d months ago"
msgstr "близько %d міÑÑців тому"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1085
+#: lib/util.php:1114
msgid "about a year ago"
msgstr "рік тому"
diff --git a/locale/vi/LC_MESSAGES/statusnet.po b/locale/vi/LC_MESSAGES/statusnet.po
index 9f6fd0b16..4dd5e6ceb 100644
--- a/locale/vi/LC_MESSAGES/statusnet.po
+++ b/locale/vi/LC_MESSAGES/statusnet.po
@@ -7,12 +7,12 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-12 21:47+0000\n"
-"PO-Revision-Date: 2010-04-12 21:50:02+0000\n"
+"POT-Creation-Date: 2010-04-24 14:16+0000\n"
+"PO-Revision-Date: 2010-04-26 22:18:48+0000\n"
"Language-Team: Vietnamese\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r64984); Translate extension (2010-01-16)\n"
+"X-Generator: MediaWiki 1.17alpha (r65552); Translate extension (2010-04-25)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: vi\n"
"X-Message-Group: out-statusnet\n"
@@ -105,8 +105,8 @@ msgstr "Không có tin nhắn nào."
#: actions/apidirectmessagenew.php:75 actions/apigroupcreate.php:112
#: actions/apigroupismember.php:90 actions/apigroupjoin.php:99
#: actions/apigroupleave.php:99 actions/apigrouplist.php:72
-#: actions/apistatusesupdate.php:148 actions/apisubscriptions.php:87
-#: actions/apitimelinefavorites.php:71 actions/apitimelinefriends.php:78
+#: actions/apistatusesupdate.php:239 actions/apisubscriptions.php:87
+#: actions/apitimelinefavorites.php:71 actions/apitimelinefriends.php:173
#: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79
#: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75
#: actions/favoritesrss.php:74 actions/foaf.php:40 actions/foaf.php:58
@@ -130,7 +130,7 @@ msgstr "%s và bạn bè"
#. TRANS: H1 text. %1$s is user nickname
#. TRANS: Message is used as link title. %s is a user nickname.
#: actions/all.php:89 actions/all.php:181 actions/allrss.php:116
-#: actions/apitimelinefriends.php:114 actions/apitimelinehome.php:115
+#: actions/apitimelinefriends.php:209 actions/apitimelinehome.php:115
#: lib/personalgroupnav.php:100
#, php-format
msgid "%s and friends"
@@ -191,7 +191,7 @@ msgstr "%s và bạn bè"
#. 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:121 actions/apitimelinefriends.php:120
+#: actions/allrss.php:121 actions/apitimelinefriends.php:215
#: actions/apitimelinehome.php:121
#, php-format
msgid "Updates from %1$s and friends on %2$s!"
@@ -213,9 +213,9 @@ msgstr ""
#: actions/apistatusesdestroy.php:102 actions/apistatusesretweets.php:112
#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:141
#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111
-#: actions/apitimelinefavorites.php:173 actions/apitimelinefriends.php:175
+#: actions/apitimelinefavorites.php:173 actions/apitimelinefriends.php:270
#: actions/apitimelinegroup.php:151 actions/apitimelinehome.php:174
-#: actions/apitimelinementions.php:173 actions/apitimelinepublic.php:151
+#: actions/apitimelinementions.php:173 actions/apitimelinepublic.php:240
#: actions/apitimelineretweetedtome.php:121
#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:160
#: actions/apitimelineuser.php:162 actions/apiusershow.php:101
@@ -233,7 +233,7 @@ msgstr "Phương thức API không tìm thấy!"
#: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91
#: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91
#: actions/apigroupleave.php:91 actions/apimediaupload.php:67
-#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:118
+#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:209
msgid "This method requires a POST."
msgstr "Phương thức này yêu cầu là POST."
@@ -265,7 +265,7 @@ msgstr "Không thể lưu hồ sơ cá nhân."
#: actions/apiaccountupdateprofilebackgroundimage.php:108
#: actions/apiaccountupdateprofileimage.php:97 actions/apimediaupload.php:80
-#: actions/apistatusesupdate.php:131 actions/avatarsettings.php:257
+#: actions/apistatusesupdate.php:222 actions/avatarsettings.php:257
#: actions/designadminpanel.php:123 actions/editapplication.php:118
#: actions/newapplication.php:101 actions/newnotice.php:94
#: lib/designsettings.php:283
@@ -668,18 +668,18 @@ msgstr "Hình đại diện đã được cập nhật."
msgid "No status with that ID found."
msgstr "Không tìm thấy trạng thái nào tương ứng với ID đó."
-#: actions/apistatusesupdate.php:161 actions/newnotice.php:155
+#: actions/apistatusesupdate.php:252 actions/newnotice.php:155
#: lib/mailhandler.php:60
#, fuzzy, php-format
msgid "That's too long. Max notice size is %d chars."
msgstr "Quá dài. Tối đa là 140 ký tự."
-#: actions/apistatusesupdate.php:202 actions/apiusershow.php:96
+#: actions/apistatusesupdate.php:293 actions/apiusershow.php:96
#, fuzzy
msgid "Not found."
msgstr "Không tìm thấy"
-#: actions/apistatusesupdate.php:225 actions/newnotice.php:178
+#: actions/apistatusesupdate.php:316 actions/newnotice.php:178
#, php-format
msgid "Max notice size is %d chars, including attachment URL."
msgstr ""
@@ -709,12 +709,12 @@ msgstr "%1$s / Các cập nhật Ä‘ang trả lá»i tá»›i %2$s"
msgid "%1$s updates that reply to updates from %2$s / %3$s."
msgstr ""
-#: actions/apitimelinepublic.php:107 actions/publicrss.php:103
+#: actions/apitimelinepublic.php:196 actions/publicrss.php:103
#, fuzzy, php-format
msgid "%s public timeline"
msgstr "Dòng tin công cộng"
-#: actions/apitimelinepublic.php:112 actions/publicrss.php:105
+#: actions/apitimelinepublic.php:201 actions/publicrss.php:105
#, php-format
msgid "%s updates from everyone!"
msgstr "%s cập nhật từ tất cả má»i ngÆ°á»i!"
@@ -2436,10 +2436,14 @@ msgstr ""
"đổi trong Ä‘iá»u chỉnh."
#: actions/login.php:270
-#, php-format
+#, fuzzy
+msgid "Login with your username and password."
+msgstr "Sai tên đăng nhập hoặc mật khẩu."
+
+#: actions/login.php:273
+#, fuzzy, php-format
msgid ""
-"Login with your username and password. Don't have a username yet? [Register]"
-"(%%action.register%%) a new account."
+"Don't have a username yet? [Register](%%action.register%%) a new account."
msgstr ""
"Hãy đăng nhập với tên đăng nhập và mật khẩu của bạn. Nếu bạn chưa có tài "
"khoản, [hãy đăng ký](%%action.register%%) tài khoản mới, hoặc thử đăng nhập "
@@ -2673,8 +2677,8 @@ msgid "Only %s URLs over plain HTTP please."
msgstr ""
#. TRANS: Client error on an API request with an unsupported data format.
-#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1069
-#: lib/apiaction.php:1098 lib/apiaction.php:1215
+#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1131
+#: lib/apiaction.php:1160 lib/apiaction.php:1277
msgid "Not a supported data format."
msgstr "Không hỗ trợ định dạng dữ liệu này."
@@ -4995,14 +4999,14 @@ msgstr ""
msgid "Problem saving notice."
msgstr "Có lỗi xảy ra khi lưu tin nhắn."
-#: classes/Notice.php:965
+#: classes/Notice.php:967
#, fuzzy
msgid "Problem saving group inbox."
msgstr "Có lỗi xảy ra khi lưu tin nhắ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.
-#: classes/Notice.php:1513
+#: classes/Notice.php:1535
#, fuzzy, php-format
msgid "RT @%1$s %2$s"
msgstr "%s (%s)"
@@ -5504,7 +5508,7 @@ msgid "Snapshots configuration"
msgstr "Xác nhận SMS"
#. TRANS: Client error 401.
-#: lib/apiauth.php:95
+#: lib/apiauth.php:113
msgid "API resource requires read-write access, but you only have read access."
msgstr ""
@@ -7052,56 +7056,56 @@ msgid "Moderator"
msgstr ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1054
+#: lib/util.php:1083
msgid "a few seconds ago"
msgstr "vài giây trước"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1057
+#: lib/util.php:1086
msgid "about a minute ago"
msgstr "1 phút trước"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1061
+#: lib/util.php:1090
#, php-format
msgid "about %d minutes ago"
msgstr "%d phút trước"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1064
+#: lib/util.php:1093
msgid "about an hour ago"
msgstr "1 giá» trÆ°á»›c"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1068
+#: lib/util.php:1097
#, php-format
msgid "about %d hours ago"
msgstr "%d giá» trÆ°á»›c"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1071
+#: lib/util.php:1100
msgid "about a day ago"
msgstr "1 ngày trước"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1075
+#: lib/util.php:1104
#, php-format
msgid "about %d days ago"
msgstr "%d ngày trước"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1078
+#: lib/util.php:1107
msgid "about a month ago"
msgstr "1 tháng trước"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1082
+#: lib/util.php:1111
#, php-format
msgid "about %d months ago"
msgstr "%d tháng trước"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1085
+#: lib/util.php:1114
msgid "about a year ago"
msgstr "1 năm trước"
diff --git a/locale/zh_CN/LC_MESSAGES/statusnet.po b/locale/zh_CN/LC_MESSAGES/statusnet.po
index cd34a3499..e38cda2ec 100644
--- a/locale/zh_CN/LC_MESSAGES/statusnet.po
+++ b/locale/zh_CN/LC_MESSAGES/statusnet.po
@@ -10,12 +10,12 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-12 21:47+0000\n"
-"PO-Revision-Date: 2010-04-12 21:50:08+0000\n"
+"POT-Creation-Date: 2010-04-24 14:16+0000\n"
+"PO-Revision-Date: 2010-04-26 22:18:51+0000\n"
"Language-Team: Simplified Chinese\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r64984); Translate extension (2010-01-16)\n"
+"X-Generator: MediaWiki 1.17alpha (r65552); Translate extension (2010-04-25)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: zh-hans\n"
"X-Message-Group: out-statusnet\n"
@@ -43,7 +43,7 @@ msgstr "注册"
#. TRANS: Checkbox instructions for admin setting "Private"
#: actions/accessadminpanel.php:165
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:167
@@ -55,7 +55,7 @@ msgstr "éšç§"
#. TRANS: Checkbox instructions for admin setting "Invite only"
#: actions/accessadminpanel.php:174
msgid "Make registration invitation only."
-msgstr ""
+msgstr "åªå…许邀请注册。"
#. TRANS: Checkbox label for configuring site as invite only.
#: actions/accessadminpanel.php:176
@@ -66,13 +66,13 @@ msgstr "邀请"
#. TRANS: Checkbox instructions for admin setting "Closed" (no new registrations)
#: actions/accessadminpanel.php:183
msgid "Disable new registrations."
-msgstr ""
+msgstr "ç¦æ­¢æ–°ç”¨æˆ·æ³¨å†Œ"
#. TRANS: Checkbox label for disabling new user registrations.
#: actions/accessadminpanel.php:185
#, fuzzy
msgid "Closed"
-msgstr "阻止"
+msgstr "已关闭"
#. TRANS: Title / tooltip for button to save access settings in site admin panel
#: actions/accessadminpanel.php:202
@@ -108,8 +108,8 @@ msgstr "没有该页é¢"
#: actions/apidirectmessagenew.php:75 actions/apigroupcreate.php:112
#: actions/apigroupismember.php:90 actions/apigroupjoin.php:99
#: actions/apigroupleave.php:99 actions/apigrouplist.php:72
-#: actions/apistatusesupdate.php:148 actions/apisubscriptions.php:87
-#: actions/apitimelinefavorites.php:71 actions/apitimelinefriends.php:78
+#: actions/apistatusesupdate.php:239 actions/apisubscriptions.php:87
+#: actions/apitimelinefavorites.php:71 actions/apitimelinefriends.php:173
#: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79
#: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75
#: actions/favoritesrss.php:74 actions/foaf.php:40 actions/foaf.php:58
@@ -125,15 +125,15 @@ msgstr "没有这个用户。"
#. TRANS: Page title. %1$s is user nickname, %2$d is page number
#: actions/all.php:86
-#, fuzzy, php-format
+#, php-format
msgid "%1$s and friends, page %2$d"
-msgstr "%s åŠå¥½å‹"
+msgstr "%1$s 和好å‹ï¼Œç¬¬%2$d页"
#. TRANS: Page title. %1$s is user nickname
#. TRANS: H1 text. %1$s is user nickname
#. TRANS: Message is used as link title. %s is a user nickname.
#: actions/all.php:89 actions/all.php:181 actions/allrss.php:116
-#: actions/apitimelinefriends.php:114 actions/apitimelinehome.php:115
+#: actions/apitimelinefriends.php:209 actions/apitimelinehome.php:115
#: lib/personalgroupnav.php:100
#, php-format
msgid "%s and friends"
@@ -188,13 +188,12 @@ msgstr ""
#. TRANS: H1 text
#: actions/all.php:178
-#, fuzzy
msgid "You and friends"
-msgstr "%s åŠå¥½å‹"
+msgstr "你和好å‹"
#. 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:121 actions/apitimelinefriends.php:120
+#: actions/allrss.php:121 actions/apitimelinefriends.php:215
#: actions/apitimelinehome.php:121
#, php-format
msgid "Updates from %1$s and friends on %2$s!"
@@ -216,9 +215,9 @@ msgstr "æ¥è‡ª%2$s 上 %1$s 和好å‹çš„æ›´æ–°ï¼"
#: actions/apistatusesdestroy.php:102 actions/apistatusesretweets.php:112
#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:141
#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111
-#: actions/apitimelinefavorites.php:173 actions/apitimelinefriends.php:175
+#: actions/apitimelinefavorites.php:173 actions/apitimelinefriends.php:270
#: actions/apitimelinegroup.php:151 actions/apitimelinehome.php:174
-#: actions/apitimelinementions.php:173 actions/apitimelinepublic.php:151
+#: actions/apitimelinementions.php:173 actions/apitimelinepublic.php:240
#: actions/apitimelineretweetedtome.php:121
#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:160
#: actions/apitimelineuser.php:162 actions/apiusershow.php:101
@@ -236,7 +235,7 @@ msgstr "API 方法未实现ï¼"
#: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91
#: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91
#: actions/apigroupleave.php:91 actions/apimediaupload.php:67
-#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:118
+#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:209
msgid "This method requires a POST."
msgstr "此方法接å—POST请求。"
@@ -268,7 +267,7 @@ msgstr "无法ä¿å­˜ä¸ªäººä¿¡æ¯ã€‚"
#: actions/apiaccountupdateprofilebackgroundimage.php:108
#: actions/apiaccountupdateprofileimage.php:97 actions/apimediaupload.php:80
-#: actions/apistatusesupdate.php:131 actions/avatarsettings.php:257
+#: actions/apistatusesupdate.php:222 actions/avatarsettings.php:257
#: actions/designadminpanel.php:123 actions/editapplication.php:118
#: actions/newapplication.php:101 actions/newnotice.php:94
#: lib/designsettings.php:283
@@ -667,18 +666,18 @@ msgstr "头åƒå·²æ›´æ–°ã€‚"
msgid "No status with that ID found."
msgstr "没有找到此IDçš„ä¿¡æ¯ã€‚"
-#: actions/apistatusesupdate.php:161 actions/newnotice.php:155
+#: actions/apistatusesupdate.php:252 actions/newnotice.php:155
#: lib/mailhandler.php:60
#, fuzzy, php-format
msgid "That's too long. Max notice size is %d chars."
msgstr "超出长度é™åˆ¶ã€‚ä¸èƒ½è¶…过 140 个字符。"
-#: actions/apistatusesupdate.php:202 actions/apiusershow.php:96
+#: actions/apistatusesupdate.php:293 actions/apiusershow.php:96
#, fuzzy
msgid "Not found."
msgstr "未找到"
-#: actions/apistatusesupdate.php:225 actions/newnotice.php:178
+#: actions/apistatusesupdate.php:316 actions/newnotice.php:178
#, php-format
msgid "Max notice size is %d chars, including attachment URL."
msgstr ""
@@ -708,12 +707,12 @@ msgstr "%1$s / å›žå¤ %2$s 的消æ¯"
msgid "%1$s updates that reply to updates from %2$s / %3$s."
msgstr "å›žå¤ %2$s / %3$s çš„ %1$s 更新。"
-#: actions/apitimelinepublic.php:107 actions/publicrss.php:103
+#: actions/apitimelinepublic.php:196 actions/publicrss.php:103
#, php-format
msgid "%s public timeline"
msgstr "%s 公众时间表"
-#: actions/apitimelinepublic.php:112 actions/publicrss.php:105
+#: actions/apitimelinepublic.php:201 actions/publicrss.php:105
#, php-format
msgid "%s updates from everyone!"
msgstr "æ¥è‡ªæ‰€æœ‰äººçš„ %s 消æ¯ï¼"
@@ -1038,6 +1037,8 @@ msgid ""
"about the application from the database, including all existing user "
"connections."
msgstr ""
+"你确定è¦åˆ é™¤è¿™ä¸ªç»„件å—?这将从数æ®åº“中清除有关这个组件的所有数æ®ï¼ŒåŒ…括所有的"
+"用户è”系。"
#. TRANS: Submit button title for 'No' when deleting an application.
#: actions/deleteapplication.php:158
@@ -2393,10 +2394,14 @@ msgid ""
msgstr "由于安全原因,修改设置å‰éœ€è¦è¾“入用户å和密ç ã€‚"
#: actions/login.php:270
+#, fuzzy
+msgid "Login with your username and password."
+msgstr "输入用户å和密ç ä»¥ç™»å½•ã€‚"
+
+#: actions/login.php:273
#, fuzzy, php-format
msgid ""
-"Login with your username and password. Don't have a username yet? [Register]"
-"(%%action.register%%) a new account."
+"Don't have a username yet? [Register](%%action.register%%) a new account."
msgstr ""
"请使用你的å¸å·å’Œå¯†ç ç™»å…¥ã€‚没有å¸å·ï¼Ÿ[注册](%%action.register%%) 一个新å¸å·, "
"或使用 [OpenID](%%action.openidlogin%%). "
@@ -2624,8 +2629,8 @@ msgid "Only %s URLs over plain HTTP please."
msgstr ""
#. TRANS: Client error on an API request with an unsupported data format.
-#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1069
-#: lib/apiaction.php:1098 lib/apiaction.php:1215
+#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1131
+#: lib/apiaction.php:1160 lib/apiaction.php:1277
msgid "Not a supported data format."
msgstr "ä¸æ”¯æŒçš„æ•°æ®æ ¼å¼ã€‚"
@@ -4923,14 +4928,14 @@ msgstr "在这个网站你被ç¦æ­¢å‘布消æ¯ã€‚"
msgid "Problem saving notice."
msgstr "ä¿å­˜é€šå‘Šæ—¶å‡ºé”™ã€‚"
-#: classes/Notice.php:965
+#: classes/Notice.php:967
#, fuzzy
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:1513
+#: classes/Notice.php:1535
#, fuzzy, php-format
msgid "RT @%1$s %2$s"
msgstr "%1$s (%2$s)"
@@ -5435,7 +5440,7 @@ msgid "Snapshots configuration"
msgstr "SMS短信确认"
#. TRANS: Client error 401.
-#: lib/apiauth.php:95
+#: lib/apiauth.php:113
msgid "API resource requires read-write access, but you only have read access."
msgstr ""
@@ -6783,7 +6788,7 @@ msgstr "无标题章节"
#: lib/section.php:106
msgid "More..."
-msgstr ""
+msgstr "更多..."
#: lib/silenceform.php:67
#, fuzzy
@@ -6892,7 +6897,7 @@ msgstr "个人设置"
#: lib/userprofile.php:264
msgid "Edit"
-msgstr ""
+msgstr "编辑"
#: lib/userprofile.php:287
#, fuzzy
@@ -6925,56 +6930,56 @@ msgid "Moderator"
msgstr ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1054
+#: lib/util.php:1083
msgid "a few seconds ago"
msgstr "几秒å‰"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1057
+#: lib/util.php:1086
msgid "about a minute ago"
msgstr "一分钟å‰"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1061
+#: lib/util.php:1090
#, php-format
msgid "about %d minutes ago"
msgstr "%d 分钟å‰"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1064
+#: lib/util.php:1093
msgid "about an hour ago"
msgstr "一å°æ—¶å‰"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1068
+#: lib/util.php:1097
#, php-format
msgid "about %d hours ago"
msgstr "%d å°æ—¶å‰"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1071
+#: lib/util.php:1100
msgid "about a day ago"
msgstr "一天å‰"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1075
+#: lib/util.php:1104
#, php-format
msgid "about %d days ago"
msgstr "%d 天å‰"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1078
+#: lib/util.php:1107
msgid "about a month ago"
msgstr "一个月å‰"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1082
+#: lib/util.php:1111
#, php-format
msgid "about %d months ago"
msgstr "%d 个月å‰"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1085
+#: lib/util.php:1114
msgid "about a year ago"
msgstr "一年å‰"
diff --git a/locale/zh_TW/LC_MESSAGES/statusnet.po b/locale/zh_TW/LC_MESSAGES/statusnet.po
index 5d8a1c381..4240b921a 100644
--- a/locale/zh_TW/LC_MESSAGES/statusnet.po
+++ b/locale/zh_TW/LC_MESSAGES/statusnet.po
@@ -7,12 +7,12 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-12 21:47+0000\n"
-"PO-Revision-Date: 2010-04-12 21:50:12+0000\n"
+"POT-Creation-Date: 2010-04-24 14:16+0000\n"
+"PO-Revision-Date: 2010-04-26 22:18:54+0000\n"
"Language-Team: Traditional Chinese\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r64984); Translate extension (2010-01-16)\n"
+"X-Generator: MediaWiki 1.17alpha (r65552); Translate extension (2010-04-25)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: zh-hant\n"
"X-Message-Group: out-statusnet\n"
@@ -102,8 +102,8 @@ msgstr "無此通知"
#: actions/apidirectmessagenew.php:75 actions/apigroupcreate.php:112
#: actions/apigroupismember.php:90 actions/apigroupjoin.php:99
#: actions/apigroupleave.php:99 actions/apigrouplist.php:72
-#: actions/apistatusesupdate.php:148 actions/apisubscriptions.php:87
-#: actions/apitimelinefavorites.php:71 actions/apitimelinefriends.php:78
+#: actions/apistatusesupdate.php:239 actions/apisubscriptions.php:87
+#: actions/apitimelinefavorites.php:71 actions/apitimelinefriends.php:173
#: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79
#: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75
#: actions/favoritesrss.php:74 actions/foaf.php:40 actions/foaf.php:58
@@ -127,7 +127,7 @@ msgstr "%s與好å‹"
#. TRANS: H1 text. %1$s is user nickname
#. TRANS: Message is used as link title. %s is a user nickname.
#: actions/all.php:89 actions/all.php:181 actions/allrss.php:116
-#: actions/apitimelinefriends.php:114 actions/apitimelinehome.php:115
+#: actions/apitimelinefriends.php:209 actions/apitimelinehome.php:115
#: lib/personalgroupnav.php:100
#, php-format
msgid "%s and friends"
@@ -188,7 +188,7 @@ 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:121 actions/apitimelinefriends.php:120
+#: actions/allrss.php:121 actions/apitimelinefriends.php:215
#: actions/apitimelinehome.php:121
#, php-format
msgid "Updates from %1$s and friends on %2$s!"
@@ -210,9 +210,9 @@ msgstr ""
#: actions/apistatusesdestroy.php:102 actions/apistatusesretweets.php:112
#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:141
#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111
-#: actions/apitimelinefavorites.php:173 actions/apitimelinefriends.php:175
+#: actions/apitimelinefavorites.php:173 actions/apitimelinefriends.php:270
#: actions/apitimelinegroup.php:151 actions/apitimelinehome.php:174
-#: actions/apitimelinementions.php:173 actions/apitimelinepublic.php:151
+#: actions/apitimelinementions.php:173 actions/apitimelinepublic.php:240
#: actions/apitimelineretweetedtome.php:121
#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:160
#: actions/apitimelineuser.php:162 actions/apiusershow.php:101
@@ -230,7 +230,7 @@ msgstr "確èªç¢¼éºå¤±"
#: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91
#: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91
#: actions/apigroupleave.php:91 actions/apimediaupload.php:67
-#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:118
+#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:209
msgid "This method requires a POST."
msgstr ""
@@ -262,7 +262,7 @@ msgstr "無法儲存個人資料"
#: actions/apiaccountupdateprofilebackgroundimage.php:108
#: actions/apiaccountupdateprofileimage.php:97 actions/apimediaupload.php:80
-#: actions/apistatusesupdate.php:131 actions/avatarsettings.php:257
+#: actions/apistatusesupdate.php:222 actions/avatarsettings.php:257
#: actions/designadminpanel.php:123 actions/editapplication.php:118
#: actions/newapplication.php:101 actions/newnotice.php:94
#: lib/designsettings.php:283
@@ -657,18 +657,18 @@ msgstr "更新個人圖åƒ"
msgid "No status with that ID found."
msgstr ""
-#: actions/apistatusesupdate.php:161 actions/newnotice.php:155
+#: actions/apistatusesupdate.php:252 actions/newnotice.php:155
#: lib/mailhandler.php:60
#, php-format
msgid "That's too long. Max notice size is %d chars."
msgstr ""
-#: actions/apistatusesupdate.php:202 actions/apiusershow.php:96
+#: actions/apistatusesupdate.php:293 actions/apiusershow.php:96
#, fuzzy
msgid "Not found."
msgstr "ç›®å‰ç„¡è«‹æ±‚"
-#: actions/apistatusesupdate.php:225 actions/newnotice.php:178
+#: actions/apistatusesupdate.php:316 actions/newnotice.php:178
#, php-format
msgid "Max notice size is %d chars, including attachment URL."
msgstr ""
@@ -697,12 +697,12 @@ msgstr "%1$s的狀態是%2$s"
msgid "%1$s updates that reply to updates from %2$s / %3$s."
msgstr ""
-#: actions/apitimelinepublic.php:107 actions/publicrss.php:103
+#: actions/apitimelinepublic.php:196 actions/publicrss.php:103
#, php-format
msgid "%s public timeline"
msgstr ""
-#: actions/apitimelinepublic.php:112 actions/publicrss.php:105
+#: actions/apitimelinepublic.php:201 actions/publicrss.php:105
#, php-format
msgid "%s updates from everyone!"
msgstr ""
@@ -2311,10 +2311,14 @@ msgid ""
msgstr "為安全起見,請先é‡æ–°è¼¸å…¥ä½ çš„使用者å稱與密碼å†æ›´æ”¹è¨­å®šã€‚"
#: actions/login.php:270
+#, fuzzy
+msgid "Login with your username and password."
+msgstr "使用者å稱或密碼無效"
+
+#: actions/login.php:273
#, php-format
msgid ""
-"Login with your username and password. Don't have a username yet? [Register]"
-"(%%action.register%%) a new account."
+"Don't have a username yet? [Register](%%action.register%%) a new account."
msgstr ""
#: actions/makeadmin.php:92
@@ -2533,8 +2537,8 @@ msgid "Only %s URLs over plain HTTP please."
msgstr ""
#. TRANS: Client error on an API request with an unsupported data format.
-#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1069
-#: lib/apiaction.php:1098 lib/apiaction.php:1215
+#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1131
+#: lib/apiaction.php:1160 lib/apiaction.php:1277
msgid "Not a supported data format."
msgstr ""
@@ -4749,14 +4753,14 @@ msgstr ""
msgid "Problem saving notice."
msgstr ""
-#: classes/Notice.php:965
+#: classes/Notice.php:967
#, fuzzy
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:1513
+#: classes/Notice.php:1535
#, php-format
msgid "RT @%1$s %2$s"
msgstr ""
@@ -5244,7 +5248,7 @@ msgid "Snapshots configuration"
msgstr "確èªä¿¡ç®±"
#. TRANS: Client error 401.
-#: lib/apiauth.php:95
+#: lib/apiauth.php:113
msgid "API resource requires read-write access, but you only have read access."
msgstr ""
@@ -6688,56 +6692,56 @@ msgid "Moderator"
msgstr ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1054
+#: lib/util.php:1083
msgid "a few seconds ago"
msgstr ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1057
+#: lib/util.php:1086
msgid "about a minute ago"
msgstr ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1061
+#: lib/util.php:1090
#, php-format
msgid "about %d minutes ago"
msgstr ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1064
+#: lib/util.php:1093
msgid "about an hour ago"
msgstr ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1068
+#: lib/util.php:1097
#, php-format
msgid "about %d hours ago"
msgstr ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1071
+#: lib/util.php:1100
msgid "about a day ago"
msgstr ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1075
+#: lib/util.php:1104
#, php-format
msgid "about %d days ago"
msgstr ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1078
+#: lib/util.php:1107
msgid "about a month ago"
msgstr ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1082
+#: lib/util.php:1111
#, php-format
msgid "about %d months ago"
msgstr ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1085
+#: lib/util.php:1114
msgid "about a year ago"
msgstr ""
diff --git a/plugins/Autocomplete/AutocompletePlugin.php b/plugins/Autocomplete/AutocompletePlugin.php
index d586631a4..b2b18bf27 100644
--- a/plugins/Autocomplete/AutocompletePlugin.php
+++ b/plugins/Autocomplete/AutocompletePlugin.php
@@ -31,8 +31,6 @@ if (!defined('STATUSNET') && !defined('LACONICA')) {
exit(1);
}
-require_once(INSTALLDIR.'/plugins/Autocomplete/autocomplete.php');
-
class AutocompletePlugin extends Plugin
{
function __construct()
@@ -40,6 +38,16 @@ class AutocompletePlugin extends Plugin
parent::__construct();
}
+ function onAutoload($cls)
+ {
+ switch ($cls)
+ {
+ case 'AutocompleteAction':
+ require_once(INSTALLDIR.'/plugins/Autocomplete/autocomplete.php');
+ return false;
+ }
+ }
+
function onEndShowScripts($action){
if (common_logged_in()) {
$action->script('plugins/Autocomplete/jquery-autocomplete/jquery.autocomplete.pack.js');
diff --git a/plugins/Blacklist/BlacklistPlugin.php b/plugins/Blacklist/BlacklistPlugin.php
index adc4d9d7e..63bffe2c6 100644
--- a/plugins/Blacklist/BlacklistPlugin.php
+++ b/plugins/Blacklist/BlacklistPlugin.php
@@ -262,7 +262,7 @@ class BlacklistPlugin extends Plugin
$patterns = $this->_getUrlPatterns();
foreach ($patterns as $pattern) {
- if (preg_match("/$pattern/", $url)) {
+ if ($pattern != '' && preg_match("/$pattern/", $url)) {
return false;
}
}
@@ -285,7 +285,7 @@ class BlacklistPlugin extends Plugin
$patterns = $this->_getNicknamePatterns();
foreach ($patterns as $pattern) {
- if (preg_match("/$pattern/", $nickname)) {
+ if ($pattern != '' && preg_match("/$pattern/", $nickname)) {
return false;
}
}
diff --git a/plugins/Blacklist/Homepage_blacklist.php b/plugins/Blacklist/Homepage_blacklist.php
index 32080667e..ec89ee4bd 100644
--- a/plugins/Blacklist/Homepage_blacklist.php
+++ b/plugins/Blacklist/Homepage_blacklist.php
@@ -94,7 +94,7 @@ class Homepage_blacklist extends Memcached_DataObject
function keys()
{
- return array('pattern' => 'K');
+ return array_keys($this->keyTypes());
}
/**
@@ -108,7 +108,7 @@ class Homepage_blacklist extends Memcached_DataObject
function keyTypes()
{
- return $this->keys();
+ return array('pattern' => 'K');
}
/**
diff --git a/plugins/Blacklist/Nickname_blacklist.php b/plugins/Blacklist/Nickname_blacklist.php
index 981063144..e8545292d 100644
--- a/plugins/Blacklist/Nickname_blacklist.php
+++ b/plugins/Blacklist/Nickname_blacklist.php
@@ -88,7 +88,7 @@ class Nickname_blacklist extends Memcached_DataObject
function keys()
{
- return array('pattern' => 'K');
+ return array_keys($this->keyTypes());
}
/**
@@ -99,7 +99,7 @@ class Nickname_blacklist extends Memcached_DataObject
function keyTypes()
{
- return $this->keys();
+ return array('pattern' => 'K');
}
/**
diff --git a/plugins/Blacklist/blacklistadminpanel.php b/plugins/Blacklist/blacklistadminpanel.php
index b996aba8d..4289dec1b 100644
--- a/plugins/Blacklist/blacklistadminpanel.php
+++ b/plugins/Blacklist/blacklistadminpanel.php
@@ -88,28 +88,27 @@ class BlacklistadminpanelAction extends AdminPanelAction
function saveSettings()
{
- $nickPatterns = array();
-
- $rawNickPatterns = explode("\n", $this->trimmed('blacklist-nicknames'));
-
- foreach ($rawNickPatterns as $raw) {
- $nickPatterns[] = trim($raw);
- }
-
+ $nickPatterns = $this->splitPatterns($this->trimmed('blacklist-nicknames'));
Nickname_blacklist::saveNew($nickPatterns);
- $rawUrlPatterns = explode("\n", $this->trimmed('blacklist-urls'));
- $urlPatterns = array();
-
- foreach ($rawUrlPatterns as $raw) {
- $urlPatterns[] = trim($raw);
- }
-
+ $urlPatterns = $this->splitPatterns($this->trimmed('blacklist-urls'));
Homepage_blacklist::saveNew($urlPatterns);
return;
}
+ protected function splitPatterns($text)
+ {
+ $patterns = array();
+ foreach (explode("\n", $text) as $raw) {
+ $trimmed = trim($raw);
+ if ($trimmed != '') {
+ $patterns[] = $trimmed;
+ }
+ }
+ return $patterns;
+ }
+
/**
* Validate the values
*
diff --git a/plugins/ClientSideShorten/ClientSideShortenPlugin.php b/plugins/ClientSideShorten/ClientSideShortenPlugin.php
new file mode 100644
index 000000000..ba1f7d3a7
--- /dev/null
+++ b/plugins/ClientSideShorten/ClientSideShortenPlugin.php
@@ -0,0 +1,79 @@
+<?php
+/**
+ * StatusNet, the distributed open-source microblogging tool
+ *
+ * Plugin to enable client side url shortening in the status box
+ *
+ * PHP version 5
+ *
+ * LICENCE: This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * @category Plugin
+ * @package StatusNet
+ * @author Craig Andrews <candrews@integralblue.com>
+ * @copyright 2009 Craig Andrews http://candrews.integralblue.com
+ * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link http://status.net/
+ */
+
+if (!defined('STATUSNET') && !defined('LACONICA')) {
+ exit(1);
+}
+
+require_once(INSTALLDIR.'/plugins/ClientSideShorten/shorten.php');
+
+class ClientSideShortenPlugin extends Plugin
+{
+ function __construct()
+ {
+ parent::__construct();
+ }
+
+ function onAutoload($cls)
+ {
+ switch ($cls)
+ {
+ case 'ShortenAction':
+ require_once(INSTALLDIR.'/plugins/ClientSideShorten/shorten.php');
+ return false;
+ }
+ }
+
+ function onEndShowScripts($action){
+ $action->inlineScript('var Notice_maxContent = ' . Notice::maxContent());
+ if (common_logged_in()) {
+ $action->script('plugins/ClientSideShorten/shorten.js');
+ }
+ }
+
+ function onRouterInitialized($m)
+ {
+ if (common_logged_in()) {
+ $m->connect('plugins/ClientSideShorten/shorten', array('action'=>'shorten'));
+ }
+ }
+
+ function onPluginVersion(&$versions)
+ {
+ $versions[] = array('name' => 'Shorten',
+ 'version' => STATUSNET_VERSION,
+ 'author' => 'Craig Andrews',
+ 'homepage' => 'http://status.net/wiki/Plugin:ClientSideShorten',
+ 'rawdescription' =>
+ _m('ClientSideShorten causes the web interface\'s notice form to automatically shorten urls as they entered, and before the notice is submitted.'));
+ return true;
+ }
+
+}
+
diff --git a/plugins/ClientSideShorten/README b/plugins/ClientSideShorten/README
new file mode 100644
index 000000000..e6524c9c7
--- /dev/null
+++ b/plugins/ClientSideShorten/README
@@ -0,0 +1,6 @@
+ClientSideShorten causes the web interface's notice form to automatically shorten urls as they entered, and before the notice is submitted.
+
+Installation
+============
+Add "addPlugin('ClientSideShorten');" to the bottom of your config.php
+That's it!
diff --git a/plugins/ClientSideShorten/shorten.js b/plugins/ClientSideShorten/shorten.js
new file mode 100644
index 000000000..856c7f05f
--- /dev/null
+++ b/plugins/ClientSideShorten/shorten.js
@@ -0,0 +1,66 @@
+//wrap everything in a self-executing anonymous function to avoid conflicts
+(function(){
+
+ // smart(x) from Paul Irish
+ // http://paulirish.com/2009/throttled-smartresize-jquery-event-handler/
+
+ (function($,sr){
+
+ // debouncing function from John Hann
+ // http://unscriptable.com/index.php/2009/03/20/debouncing-javascript-methods/
+ var debounce = function (func, threshold, execAsap) {
+ var timeout;
+
+ return function debounced () {
+ var obj = this, args = arguments;
+ function delayed () {
+ if (!execAsap)
+ func.apply(obj, args);
+ timeout = null;
+ };
+
+ if (timeout)
+ clearTimeout(timeout);
+ else if (execAsap)
+ func.apply(obj, args);
+
+ timeout = setTimeout(delayed, threshold || 100);
+ };
+ }
+ jQuery.fn[sr] = function(fn){ return fn ? this.bind('keypress', debounce(fn, 1000)) : this.trigger(sr); };
+
+ })(jQuery,'smartkeypress');
+
+ function shorten()
+ {
+ $noticeDataText = $('#'+SN.C.S.NoticeDataText);
+ if(Notice_maxContent > 0 && $noticeDataText.val().length > Notice_maxContent){
+ var original = $noticeDataText.val();
+ shortenAjax = $.ajax({
+ url: $('address .url')[0].href+'/plugins/ClientSideShorten/shorten',
+ data: { text: $noticeDataText.val() },
+ dataType: 'text',
+ success: function(data) {
+ if(original == $noticeDataText.val()) {
+ $noticeDataText.val(data).keyup();
+ }
+ }
+ });
+ }
+ }
+
+ $(document).ready(function(){
+ $noticeDataText = $('#'+SN.C.S.NoticeDataText);
+ $noticeDataText.smartkeypress(function(e){
+ //if(typeof(shortenAjax) !== 'undefined') shortenAjax.abort();
+ if(e.charCode == '32') {
+ shorten();
+ }
+ });
+ $noticeDataText.bind('paste', function() {
+ //if(typeof(shortenAjax) !== 'undefined') shortenAjax.abort();
+ setTimeout(shorten,1);
+ });
+ });
+
+})();
diff --git a/plugins/ClientSideShorten/shorten.php b/plugins/ClientSideShorten/shorten.php
new file mode 100644
index 000000000..07c19e2e7
--- /dev/null
+++ b/plugins/ClientSideShorten/shorten.php
@@ -0,0 +1,68 @@
+<?php
+/**
+ * StatusNet, the distributed open-source microblogging tool
+ *
+ * List users for autocompletion
+ *
+ * PHP version 5
+ *
+ * LICENCE: This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * @category Plugin
+ * @package StatusNet
+ * @author Craig Andrews <candrews@integralblue.com>
+ * @copyright 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);
+}
+
+/**
+ * Shorten all URLs in a string
+ *
+ * @category Plugin
+ * @package StatusNet
+ * @author Craig Andrews <candrews@integralblue.com>
+ * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link http://status.net/
+ */
+
+class ShortenAction extends Action
+{
+ private $text;
+
+ function prepare($args)
+ {
+ parent::prepare($args);
+ $this->groups=array();
+ $this->users=array();
+ $this->text = $this->arg('text');
+ if(is_null($this->text)){
+ throw new ClientException(_m('\'text\' argument must be specified.'));
+ }
+ return true;
+ }
+
+ function handle($args)
+ {
+ parent::handle($args);
+ header('Content-Type: text/plain');
+ $shortened_text = common_shorten_links($this->text);
+ print $shortened_text;
+ }
+}
+
diff --git a/plugins/OStatus/actions/ostatussub.php b/plugins/OStatus/actions/ostatussub.php
index 994af6e95..28714514f 100644
--- a/plugins/OStatus/actions/ostatussub.php
+++ b/plugins/OStatus/actions/ostatussub.php
@@ -446,4 +446,18 @@ class OStatusSubAction extends Action
{
return common_local_url('ostatussub');
}
+
+ /**
+ * Disable the send-notice form at the top of the page.
+ * This is really just a hack for the broken CSS in the Cloudy theme,
+ * I think; copying from other non-notice-navigation pages that do this
+ * as well. There will be plenty of others also broken.
+ *
+ * @fixme fix the cloudy theme
+ * @fixme do this in a more general way
+ */
+ function showNoticeForm() {
+ // nop
+ }
+
}
diff --git a/plugins/OStatus/classes/Ostatus_profile.php b/plugins/OStatus/classes/Ostatus_profile.php
index e3b3daa2c..5d3f37cd0 100644
--- a/plugins/OStatus/classes/Ostatus_profile.php
+++ b/plugins/OStatus/classes/Ostatus_profile.php
@@ -1001,7 +1001,7 @@ class Ostatus_profile extends Memcached_DataObject
return;
}
if (!common_valid_http_url($url)) {
- throw new ServerException(_m("Invalid avatar URL %s"), $url);
+ throw new ServerException(sprintf(_m("Invalid avatar URL %s"), $url));
}
if ($this->isGroup()) {
@@ -1303,15 +1303,23 @@ class Ostatus_profile extends Memcached_DataObject
$ok = $oprofile->insert();
- if ($ok) {
- $avatar = self::getActivityObjectAvatar($object, $hints);
- if ($avatar) {
+ if (!$ok) {
+ throw new ServerException("Can't save OStatus profile");
+ }
+
+ $avatar = self::getActivityObjectAvatar($object, $hints);
+
+ if ($avatar) {
+ try {
$oprofile->updateAvatar($avatar);
+ } catch (Exception $ex) {
+ // Profile is saved, but Avatar is messed up. We're
+ // just going to continue.
+ common_log(LOG_WARNING, "Exception saving OStatus profile avatar: ". $ex->getMessage());
}
- return $oprofile;
- } else {
- throw new ServerException("Can't save OStatus profile");
}
+
+ return $oprofile;
}
/**
@@ -1330,7 +1338,11 @@ class Ostatus_profile extends Memcached_DataObject
}
$avatar = self::getActivityObjectAvatar($object, $hints);
if ($avatar) {
- $this->updateAvatar($avatar);
+ try {
+ $this->updateAvatar($avatar);
+ } catch (Exception $ex) {
+ common_log(LOG_WARNING, "Exception saving OStatus profile avatar: " . $ex->getMessage());
+ }
}
}
diff --git a/plugins/OStatus/scripts/resub-feed.php b/plugins/OStatus/scripts/resub-feed.php
new file mode 100644
index 000000000..121d12109
--- /dev/null
+++ b/plugins/OStatus/scripts/resub-feed.php
@@ -0,0 +1,74 @@
+#!/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
+resub-feed.php [options] http://example.com/atom-feed-url
+Reinitialize the PuSH subscription for the given feed. This may help get
+things restarted if we and the hub have gotten our states out of sync.
+
+
+END_OF_HELP;
+
+require_once INSTALLDIR.'/scripts/commandline.inc';
+
+if (empty($args[0]) || !Validate::uri($args[0])) {
+ print "$helptext";
+ exit(1);
+}
+
+$feedurl = $args[0];
+
+
+$sub = FeedSub::staticGet('topic', $feedurl);
+if (!$sub) {
+ print "Feed $feedurl is not subscribed.\n";
+ exit(1);
+}
+
+print "Old state:\n";
+showSub($sub);
+
+print "\n";
+print "Pinging hub $sub->huburi with new subscription for $sub->uri\n";
+$ok = $sub->subscribe();
+
+if ($ok) {
+ print "ok\n";
+} else {
+ print "Could not confirm.\n";
+}
+
+$sub2 = FeedSub::staticGet('topic', $feedurl);
+
+print "\n";
+print "New state:\n";
+showSub($sub2);
+
+function showSub($sub)
+{
+ print " Subscription state: $sub->sub_state\n";
+ print " Verify token: $sub->verify_token\n";
+ print " Signature secret: $sub->secret\n";
+ print " Sub start date: $sub->sub_start\n";
+ print " Record created: $sub->created\n";
+ print " Record modified: $sub->modified\n";
+}
diff --git a/plugins/OStatus/scripts/update-profile.php b/plugins/OStatus/scripts/update-profile.php
new file mode 100644
index 000000000..d06de4f90
--- /dev/null
+++ b/plugins/OStatus/scripts/update-profile.php
@@ -0,0 +1,147 @@
+#!/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
+update-profile.php [options] http://example.com/profile/url
+
+Rerun profile and feed info discovery for the given OStatus remote profile,
+and reinitialize its PuSH subscription for the given feed. This may help get
+things restarted if the hub or feed URLs have changed for the profile.
+
+
+END_OF_HELP;
+
+require_once INSTALLDIR.'/scripts/commandline.inc';
+
+if (empty($args[0]) || !Validate::uri($args[0])) {
+ print "$helptext";
+ exit(1);
+}
+
+$uri = $args[0];
+
+
+$oprofile = Ostatus_profile::staticGet('uri', $uri);
+
+if (!$oprofile) {
+ print "No OStatus remote profile known for URI $uri\n";
+ exit(1);
+}
+
+print "Old profile state for $oprofile->uri\n";
+showProfile($oprofile);
+
+print "\n";
+print "Re-running feed discovery for profile URL $oprofile->uri\n";
+// @fixme will bork where the URI isn't the profile URL for now
+$discover = new FeedDiscovery();
+$feedurl = $discover->discoverFromURL($oprofile->uri);
+$huburi = $discover->getAtomLink('hub');
+$salmonuri = $discover->getAtomLink(Salmon::NS_REPLIES);
+
+print " Feed URL: $feedurl\n";
+print " Hub URL: $huburi\n";
+print " Salmon URL: $salmonuri\n";
+
+if ($feedurl != $oprofile->feeduri || $salmonuri != $oprofile->salmonuri) {
+ print "\n";
+ print "Updating...\n";
+ // @fixme update keys :P
+ #$orig = clone($oprofile);
+ #$oprofile->feeduri = $feedurl;
+ #$oprofile->salmonuri = $salmonuri;
+ #$ok = $oprofile->update($orig);
+ $ok = $oprofile->query('UPDATE ostatus_profile SET ' .
+ 'feeduri=\'' . $oprofile->escape($feedurl) . '\',' .
+ 'salmonuri=\'' . $oprofile->escape($salmonuri) . '\' ' .
+ 'WHERE uri=\'' . $oprofile->escape($uri) . '\'');
+
+ if (!$ok) {
+ print "Failed to update profile record...\n";
+ exit(1);
+ }
+
+ $oprofile->decache();
+} else {
+ print "\n";
+ print "Ok, ostatus_profile record unchanged.\n\n";
+}
+
+$sub = FeedSub::ensureFeed($feedurl);
+
+if ($huburi != $sub->huburi) {
+ print "\n";
+ print "Updating hub record for feed; was $sub->huburi\n";
+ $orig = clone($sub);
+ $sub->huburi = $huburi;
+ $ok = $sub->update($orig);
+
+ if (!$ok) {
+ print "Failed to update sub record...\n";
+ exit(1);
+ }
+} else {
+ print "\n";
+ print "Feed record ok, not changing.\n\n";
+}
+
+print "\n";
+print "Pinging hub $sub->huburi with new subscription for $sub->uri\n";
+$ok = $sub->subscribe();
+
+if ($ok) {
+ print "ok\n";
+} else {
+ print "Could not confirm.\n";
+}
+
+$o2 = Ostatus_profile::staticGet('uri', $uri);
+
+print "\n";
+print "New profile state:\n";
+showProfile($o2);
+
+print "\n";
+print "New feed state:\n";
+$sub2 = FeedSub::ensureFeed($feedurl);
+showSub($sub2);
+
+function showProfile($oprofile)
+{
+ print " Feed URL: $oprofile->feeduri\n";
+ print " Salmon URL: $oprofile->salmonuri\n";
+ print " Avatar URL: $oprofile->avatar\n";
+ print " Profile ID: $oprofile->profile_id\n";
+ print " Group ID: $oprofile->group_id\n";
+ print " Record created: $oprofile->created\n";
+ print " Record modified: $oprofile->modified\n";
+}
+
+function showSub($sub)
+{
+ print " Subscription state: $sub->sub_state\n";
+ print " Verify token: $sub->verify_token\n";
+ print " Signature secret: $sub->secret\n";
+ print " Sub start date: $sub->sub_start\n";
+ print " Record created: $sub->created\n";
+ print " Record modified: $sub->modified\n";
+}
diff --git a/plugins/OpenID/openid.php b/plugins/OpenID/openid.php
index 152438917..4ec336e1c 100644
--- a/plugins/OpenID/openid.php
+++ b/plugins/OpenID/openid.php
@@ -299,11 +299,21 @@ class AutosubmitAction extends Action
function title()
{
- return _m('OpenID Auto-Submit');
+ return _m('OpenID Login Submission');
}
function showContent()
{
+ $this->raw('<p style="margin: 20px 80px">');
+ // @fixme this would be better using standard CSS class, but the present theme's a bit scary.
+ $this->element('img', array('src' => Theme::path('images/icons/icon_processing.gif', 'base'),
+ // for some reason the base CSS sets <img>s as block display?!
+ 'style' => 'display: inline'));
+ $this->text(_m('Requesting authorization from your login provider...'));
+ $this->raw('</p>');
+ $this->raw('<p style="margin-top: 60px; font-style: italic">');
+ $this->text(_m('If you are not redirected to your login provider in a few seconds, try pushing the button below.'));
+ $this->raw('</p>');
$this->raw($this->form_html);
}
@@ -311,8 +321,6 @@ class AutosubmitAction extends Action
{
parent::showScripts();
$this->element('script', null,
- '$(document).ready(function() { ' .
- ' $(\'#'. $this->form_id .'\').submit(); '.
- '});');
+ 'document.getElementById(\'' . $this->form_id . '\').submit();');
}
}
diff --git a/plugins/RSSCloud/RSSCloudPlugin.php b/plugins/RSSCloud/RSSCloudPlugin.php
index 001106ace..661c32141 100644
--- a/plugins/RSSCloud/RSSCloudPlugin.php
+++ b/plugins/RSSCloud/RSSCloudPlugin.php
@@ -100,7 +100,7 @@ class RSSCloudPlugin extends Plugin
*
* Hook for RouterInitialized event.
*
- * @param Mapper &$m URL parser and mapper
+ * @param Mapper $m URL parser and mapper
*
* @return boolean hook return
*/
diff --git a/scripts/apidocs.config b/scripts/apidocs.config
new file mode 100644
index 000000000..fdbe35ba1
--- /dev/null
+++ b/scripts/apidocs.config
@@ -0,0 +1,1551 @@
+# Doxyfile 1.6.2
+
+# This file describes the settings to be used by the documentation system
+# doxygen (www.doxygen.org) for a project
+#
+# All text after a hash (#) is considered a comment and will be ignored
+# The format is:
+# TAG = value [value, ...]
+# For lists items can also be appended using:
+# TAG += value [value, ...]
+# Values that contain spaces should be placed between quotes (" ")
+
+#---------------------------------------------------------------------------
+# Project related configuration options
+#---------------------------------------------------------------------------
+
+# This tag specifies the encoding used for all characters in the config file
+# that follow. The default is UTF-8 which is also the encoding used for all
+# text before the first occurrence of this tag. Doxygen uses libiconv (or the
+# iconv built into libc) for the transcoding. See
+# http://www.gnu.org/software/libiconv for the list of possible encodings.
+
+DOXYFILE_ENCODING = UTF-8
+
+# The PROJECT_NAME tag is a single word (or a sequence of words surrounded
+# by quotes) that should identify the project.
+
+PROJECT_NAME = "StatusNet REST API"
+
+# The PROJECT_NUMBER tag can be used to enter a project or revision number.
+# This could be handy for archiving the generated documentation or
+# if some version control system is used.
+
+PROJECT_NUMBER =
+
+# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute)
+# base path where the generated documentation will be put.
+# If a relative path is entered, it will be relative to the location
+# where doxygen was started. If left blank the current directory will be used.
+
+OUTPUT_DIRECTORY = ../apidocs
+
+# If the CREATE_SUBDIRS tag is set to YES, then doxygen will create
+# 4096 sub-directories (in 2 levels) under the output directory of each output
+# format and will distribute the generated files over these directories.
+# Enabling this option can be useful when feeding doxygen a huge amount of
+# source files, where putting all generated files in the same directory would
+# otherwise cause performance problems for the file system.
+
+CREATE_SUBDIRS = NO
+
+# The OUTPUT_LANGUAGE tag is used to specify the language in which all
+# documentation generated by doxygen is written. Doxygen will use this
+# information to generate all constant output in the proper language.
+# The default language is English, other supported languages are:
+# Afrikaans, Arabic, Brazilian, Catalan, Chinese, Chinese-Traditional,
+# Croatian, Czech, Danish, Dutch, Esperanto, Farsi, Finnish, French, German,
+# Greek, Hungarian, Italian, Japanese, Japanese-en (Japanese with English
+# messages), Korean, Korean-en, Lithuanian, Norwegian, Macedonian, Persian,
+# Polish, Portuguese, Romanian, Russian, Serbian, Serbian-Cyrilic, Slovak,
+# Slovene, Spanish, Swedish, Ukrainian, and Vietnamese.
+
+OUTPUT_LANGUAGE = English
+
+# If the BRIEF_MEMBER_DESC tag is set to YES (the default) Doxygen will
+# include brief member descriptions after the members that are listed in
+# the file and class documentation (similar to JavaDoc).
+# Set to NO to disable this.
+
+BRIEF_MEMBER_DESC = NO
+
+# If the REPEAT_BRIEF tag is set to YES (the default) Doxygen will prepend
+# the brief description of a member or function before the detailed description.
+# Note: if both HIDE_UNDOC_MEMBERS and BRIEF_MEMBER_DESC are set to NO, the
+# brief descriptions will be completely suppressed.
+
+REPEAT_BRIEF = NO
+
+# This tag implements a quasi-intelligent brief description abbreviator
+# that is used to form the text in various listings. Each string
+# in this list, if found as the leading text of the brief description, will be
+# stripped from the text and the result after processing the whole list, is
+# used as the annotated text. Otherwise, the brief description is used as-is.
+# If left blank, the following values are used ("$name" is automatically
+# replaced with the name of the entity): "The $name class" "The $name widget"
+# "The $name file" "is" "provides" "specifies" "contains"
+# "represents" "a" "an" "the"
+
+ABBREVIATE_BRIEF =
+
+# If the ALWAYS_DETAILED_SEC and REPEAT_BRIEF tags are both set to YES then
+# Doxygen will generate a detailed section even if there is only a brief
+# description.
+
+ALWAYS_DETAILED_SEC = NO
+
+# If the INLINE_INHERITED_MEMB tag is set to YES, doxygen will show all
+# inherited members of a class in the documentation of that class as if those
+# members were ordinary class members. Constructors, destructors and assignment
+# operators of the base classes will not be shown.
+
+INLINE_INHERITED_MEMB = NO
+
+# If the FULL_PATH_NAMES tag is set to YES then Doxygen will prepend the full
+# path before files name in the file list and in the header files. If set
+# to NO the shortest path that makes the file name unique will be used.
+
+FULL_PATH_NAMES = NO
+
+# If the FULL_PATH_NAMES tag is set to YES then the STRIP_FROM_PATH tag
+# can be used to strip a user-defined part of the path. Stripping is
+# only done if one of the specified strings matches the left-hand part of
+# the path. The tag can be used to show relative paths in the file list.
+# If left blank the directory from which doxygen is run is used as the
+# path to strip.
+
+STRIP_FROM_PATH =
+
+# The STRIP_FROM_INC_PATH tag can be used to strip a user-defined part of
+# the path mentioned in the documentation of a class, which tells
+# the reader which header file to include in order to use a class.
+# If left blank only the name of the header file containing the class
+# definition is used. Otherwise one should specify the include paths that
+# are normally passed to the compiler using the -I flag.
+
+STRIP_FROM_INC_PATH =
+
+# If the SHORT_NAMES tag is set to YES, doxygen will generate much shorter
+# (but less readable) file names. This can be useful is your file systems
+# doesn't support long names like on DOS, Mac, or CD-ROM.
+
+SHORT_NAMES = NO
+
+# If the JAVADOC_AUTOBRIEF tag is set to YES then Doxygen
+# will interpret the first line (until the first dot) of a JavaDoc-style
+# comment as the brief description. If set to NO, the JavaDoc
+# comments will behave just like regular Qt-style comments
+# (thus requiring an explicit @brief command for a brief description.)
+
+JAVADOC_AUTOBRIEF = NO
+
+# If the QT_AUTOBRIEF tag is set to YES then Doxygen will
+# interpret the first line (until the first dot) of a Qt-style
+# comment as the brief description. If set to NO, the comments
+# will behave just like regular Qt-style comments (thus requiring
+# an explicit \brief command for a brief description.)
+
+QT_AUTOBRIEF = NO
+
+# The MULTILINE_CPP_IS_BRIEF tag can be set to YES to make Doxygen
+# treat a multi-line C++ special comment block (i.e. a block of //! or ///
+# comments) as a brief description. This used to be the default behaviour.
+# The new default is to treat a multi-line C++ comment block as a detailed
+# description. Set this tag to YES if you prefer the old behaviour instead.
+
+MULTILINE_CPP_IS_BRIEF = NO
+
+# If the INHERIT_DOCS tag is set to YES (the default) then an undocumented
+# member inherits the documentation from any documented member that it
+# re-implements.
+
+INHERIT_DOCS = NO
+
+# If the SEPARATE_MEMBER_PAGES tag is set to YES, then doxygen will produce
+# a new page for each member. If set to NO, the documentation of a member will
+# be part of the file/class/namespace that contains it.
+
+SEPARATE_MEMBER_PAGES = NO
+
+# The TAB_SIZE tag can be used to set the number of spaces in a tab.
+# Doxygen uses this value to replace tabs by spaces in code fragments.
+
+TAB_SIZE = 4
+
+# This tag can be used to specify a number of aliases that acts
+# as commands in the documentation. An alias has the form "name=value".
+# For example adding "sideeffect=\par Side Effects:\n" will allow you to
+# put the command \sideeffect (or @sideeffect) in the documentation, which
+# will result in a user-defined paragraph with heading "Side Effects:".
+# You can put \n's in the value part of an alias to insert newlines.
+
+ALIASES =
+
+# Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C
+# sources only. Doxygen will then generate output that is more tailored for C.
+# For instance, some of the names that are used will be different. The list
+# of all members will be omitted, etc.
+
+OPTIMIZE_OUTPUT_FOR_C = NO
+
+# Set the OPTIMIZE_OUTPUT_JAVA tag to YES if your project consists of Java
+# sources only. Doxygen will then generate output that is more tailored for
+# Java. For instance, namespaces will be presented as packages, qualified
+# scopes will look different, etc.
+
+OPTIMIZE_OUTPUT_JAVA = NO
+
+# Set the OPTIMIZE_FOR_FORTRAN tag to YES if your project consists of Fortran
+# sources only. Doxygen will then generate output that is more tailored for
+# Fortran.
+
+OPTIMIZE_FOR_FORTRAN = NO
+
+# Set the OPTIMIZE_OUTPUT_VHDL tag to YES if your project consists of VHDL
+# sources. Doxygen will then generate output that is tailored for
+# VHDL.
+
+OPTIMIZE_OUTPUT_VHDL = NO
+
+# Doxygen selects the parser to use depending on the extension of the files it parses.
+# With this tag you can assign which parser to use for a given extension.
+# Doxygen has a built-in mapping, but you can override or extend it using this tag.
+# The format is ext=language, where ext is a file extension, and language is one of
+# the parsers supported by doxygen: IDL, Java, Javascript, C#, C, C++, D, PHP,
+# Objective-C, Python, Fortran, VHDL, C, C++. For instance to make doxygen treat
+# .inc files as Fortran files (default is PHP), and .f files as C (default is Fortran),
+# use: inc=Fortran f=C. Note that for custom extensions you also need to set FILE_PATTERNS otherwise the files are not read by doxygen.
+
+EXTENSION_MAPPING =
+
+# If you use STL classes (i.e. std::string, std::vector, etc.) but do not want
+# to include (a tag file for) the STL sources as input, then you should
+# set this tag to YES in order to let doxygen match functions declarations and
+# definitions whose arguments contain STL classes (e.g. func(std::string); v.s.
+# func(std::string) {}). This also make the inheritance and collaboration
+# diagrams that involve STL classes more complete and accurate.
+
+BUILTIN_STL_SUPPORT = NO
+
+# If you use Microsoft's C++/CLI language, you should set this option to YES to
+# enable parsing support.
+
+CPP_CLI_SUPPORT = NO
+
+# Set the SIP_SUPPORT tag to YES if your project consists of sip sources only.
+# Doxygen will parse them like normal C++ but will assume all classes use public
+# instead of private inheritance when no explicit protection keyword is present.
+
+SIP_SUPPORT = NO
+
+# For Microsoft's IDL there are propget and propput attributes to indicate getter
+# and setter methods for a property. Setting this option to YES (the default)
+# will make doxygen to replace the get and set methods by a property in the
+# documentation. This will only work if the methods are indeed getting or
+# setting a simple type. If this is not the case, or you want to show the
+# methods anyway, you should set this option to NO.
+
+IDL_PROPERTY_SUPPORT = YES
+
+# If member grouping is used in the documentation and the DISTRIBUTE_GROUP_DOC
+# tag is set to YES, then doxygen will reuse the documentation of the first
+# member in the group (if any) for the other members of the group. By default
+# all members of a group must be documented explicitly.
+
+DISTRIBUTE_GROUP_DOC = NO
+
+# Set the SUBGROUPING tag to YES (the default) to allow class member groups of
+# the same type (for instance a group of public functions) to be put as a
+# subgroup of that type (e.g. under the Public Functions section). Set it to
+# NO to prevent subgrouping. Alternatively, this can be done per class using
+# the \nosubgrouping command.
+
+SUBGROUPING = YES
+
+# When TYPEDEF_HIDES_STRUCT is enabled, a typedef of a struct, union, or enum
+# is documented as struct, union, or enum with the name of the typedef. So
+# typedef struct TypeS {} TypeT, will appear in the documentation as a struct
+# with name TypeT. When disabled the typedef will appear as a member of a file,
+# namespace, or class. And the struct will be named TypeS. This can typically
+# be useful for C code in case the coding convention dictates that all compound
+# types are typedef'ed and only the typedef is referenced, never the tag name.
+
+TYPEDEF_HIDES_STRUCT = NO
+
+# The SYMBOL_CACHE_SIZE determines the size of the internal cache use to
+# determine which symbols to keep in memory and which to flush to disk.
+# When the cache is full, less often used symbols will be written to disk.
+# For small to medium size projects (<1000 input files) the default value is
+# probably good enough. For larger projects a too small cache size can cause
+# doxygen to be busy swapping symbols to and from disk most of the time
+# causing a significant performance penality.
+# If the system has enough physical memory increasing the cache will improve the
+# performance by keeping more symbols in memory. Note that the value works on
+# a logarithmic scale so increasing the size by one will rougly double the
+# memory usage. The cache size is given by this formula:
+# 2^(16+SYMBOL_CACHE_SIZE). The valid range is 0..9, the default is 0,
+# corresponding to a cache size of 2^16 = 65536 symbols
+
+SYMBOL_CACHE_SIZE = 0
+
+#---------------------------------------------------------------------------
+# Build related configuration options
+#---------------------------------------------------------------------------
+
+# If the EXTRACT_ALL tag is set to YES doxygen will assume all entities in
+# documentation are documented, even if no documentation was available.
+# Private class members and static file members will be hidden unless
+# the EXTRACT_PRIVATE and EXTRACT_STATIC tags are set to YES
+
+EXTRACT_ALL = NO
+
+# If the EXTRACT_PRIVATE tag is set to YES all private members of a class
+# will be included in the documentation.
+
+EXTRACT_PRIVATE = NO
+
+# If the EXTRACT_STATIC tag is set to YES all static members of a file
+# will be included in the documentation.
+
+EXTRACT_STATIC = NO
+
+# If the EXTRACT_LOCAL_CLASSES tag is set to YES classes (and structs)
+# defined locally in source files will be included in the documentation.
+# If set to NO only classes defined in header files are included.
+
+EXTRACT_LOCAL_CLASSES = NO
+
+# This flag is only useful for Objective-C code. When set to YES local
+# methods, which are defined in the implementation section but not in
+# the interface are included in the documentation.
+# If set to NO (the default) only methods in the interface are included.
+
+EXTRACT_LOCAL_METHODS = NO
+
+# If this flag is set to YES, the members of anonymous namespaces will be
+# extracted and appear in the documentation as a namespace called
+# 'anonymous_namespace{file}', where file will be replaced with the base
+# name of the file that contains the anonymous namespace. By default
+# anonymous namespace are hidden.
+
+EXTRACT_ANON_NSPACES = NO
+
+# If the HIDE_UNDOC_MEMBERS tag is set to YES, Doxygen will hide all
+# undocumented members of documented classes, files or namespaces.
+# If set to NO (the default) these members will be included in the
+# various overviews, but no documentation section is generated.
+# This option has no effect if EXTRACT_ALL is enabled.
+
+HIDE_UNDOC_MEMBERS = NO
+
+# If the HIDE_UNDOC_CLASSES tag is set to YES, Doxygen will hide all
+# undocumented classes that are normally visible in the class hierarchy.
+# If set to NO (the default) these classes will be included in the various
+# overviews. This option has no effect if EXTRACT_ALL is enabled.
+
+HIDE_UNDOC_CLASSES = NO
+
+# If the HIDE_FRIEND_COMPOUNDS tag is set to YES, Doxygen will hide all
+# friend (class|struct|union) declarations.
+# If set to NO (the default) these declarations will be included in the
+# documentation.
+
+HIDE_FRIEND_COMPOUNDS = NO
+
+# If the HIDE_IN_BODY_DOCS tag is set to YES, Doxygen will hide any
+# documentation blocks found inside the body of a function.
+# If set to NO (the default) these blocks will be appended to the
+# function's detailed documentation block.
+
+HIDE_IN_BODY_DOCS = NO
+
+# The INTERNAL_DOCS tag determines if documentation
+# that is typed after a \internal command is included. If the tag is set
+# to NO (the default) then the documentation will be excluded.
+# Set it to YES to include the internal documentation.
+
+INTERNAL_DOCS = NO
+
+# If the CASE_SENSE_NAMES tag is set to NO then Doxygen will only generate
+# file names in lower-case letters. If set to YES upper-case letters are also
+# allowed. This is useful if you have classes or files whose names only differ
+# in case and if your file system supports case sensitive file names. Windows
+# and Mac users are advised to set this option to NO.
+
+CASE_SENSE_NAMES = NO
+
+# If the HIDE_SCOPE_NAMES tag is set to NO (the default) then Doxygen
+# will show members with their full class and namespace scopes in the
+# documentation. If set to YES the scope will be hidden.
+
+HIDE_SCOPE_NAMES = NO
+
+# If the SHOW_INCLUDE_FILES tag is set to YES (the default) then Doxygen
+# will put a list of the files that are included by a file in the documentation
+# of that file.
+
+SHOW_INCLUDE_FILES = NO
+
+# If the FORCE_LOCAL_INCLUDES tag is set to YES then Doxygen
+# will list include files with double quotes in the documentation
+# rather than with sharp brackets.
+
+FORCE_LOCAL_INCLUDES = NO
+
+# If the INLINE_INFO tag is set to YES (the default) then a tag [inline]
+# is inserted in the documentation for inline members.
+
+INLINE_INFO = NO
+
+# If the SORT_MEMBER_DOCS tag is set to YES (the default) then doxygen
+# will sort the (detailed) documentation of file and class members
+# alphabetically by member name. If set to NO the members will appear in
+# declaration order.
+
+SORT_MEMBER_DOCS = YES
+
+# If the SORT_BRIEF_DOCS tag is set to YES then doxygen will sort the
+# brief documentation of file, namespace and class members alphabetically
+# by member name. If set to NO (the default) the members will appear in
+# declaration order.
+
+SORT_BRIEF_DOCS = NO
+
+# If the SORT_MEMBERS_CTORS_1ST tag is set to YES then doxygen will sort the (brief and detailed) documentation of class members so that constructors and destructors are listed first. If set to NO (the default) the constructors will appear in the respective orders defined by SORT_MEMBER_DOCS and SORT_BRIEF_DOCS. This tag will be ignored for brief docs if SORT_BRIEF_DOCS is set to NO and ignored for detailed docs if SORT_MEMBER_DOCS is set to NO.
+
+SORT_MEMBERS_CTORS_1ST = NO
+
+# If the SORT_GROUP_NAMES tag is set to YES then doxygen will sort the
+# hierarchy of group names into alphabetical order. If set to NO (the default)
+# the group names will appear in their defined order.
+
+SORT_GROUP_NAMES = NO
+
+# If the SORT_BY_SCOPE_NAME tag is set to YES, the class list will be
+# sorted by fully-qualified names, including namespaces. If set to
+# NO (the default), the class list will be sorted only by class name,
+# not including the namespace part.
+# Note: This option is not very useful if HIDE_SCOPE_NAMES is set to YES.
+# Note: This option applies only to the class list, not to the
+# alphabetical list.
+
+SORT_BY_SCOPE_NAME = NO
+
+# The GENERATE_TODOLIST tag can be used to enable (YES) or
+# disable (NO) the todo list. This list is created by putting \todo
+# commands in the documentation.
+
+GENERATE_TODOLIST = NO
+
+# The GENERATE_TESTLIST tag can be used to enable (YES) or
+# disable (NO) the test list. This list is created by putting \test
+# commands in the documentation.
+
+GENERATE_TESTLIST = NO
+
+# The GENERATE_BUGLIST tag can be used to enable (YES) or
+# disable (NO) the bug list. This list is created by putting \bug
+# commands in the documentation.
+
+GENERATE_BUGLIST = NO
+
+# The GENERATE_DEPRECATEDLIST tag can be used to enable (YES) or
+# disable (NO) the deprecated list. This list is created by putting
+# \deprecated commands in the documentation.
+
+GENERATE_DEPRECATEDLIST= NO
+
+# The ENABLED_SECTIONS tag can be used to enable conditional
+# documentation sections, marked by \if sectionname ... \endif.
+
+ENABLED_SECTIONS =
+
+# The MAX_INITIALIZER_LINES tag determines the maximum number of lines
+# the initial value of a variable or define consists of for it to appear in
+# the documentation. If the initializer consists of more lines than specified
+# here it will be hidden. Use a value of 0 to hide initializers completely.
+# The appearance of the initializer of individual variables and defines in the
+# documentation can be controlled using \showinitializer or \hideinitializer
+# command in the documentation regardless of this setting.
+
+MAX_INITIALIZER_LINES = 30
+
+# Set the SHOW_USED_FILES tag to NO to disable the list of files generated
+# at the bottom of the documentation of classes and structs. If set to YES the
+# list will mention the files that were used to generate the documentation.
+
+SHOW_USED_FILES = NO
+
+# If the sources in your project are distributed over multiple directories
+# then setting the SHOW_DIRECTORIES tag to YES will show the directory hierarchy
+# in the documentation. The default is NO.
+
+SHOW_DIRECTORIES = NO
+
+# Set the SHOW_FILES tag to NO to disable the generation of the Files page.
+# This will remove the Files entry from the Quick Index and from the
+# Folder Tree View (if specified). The default is YES.
+
+SHOW_FILES = NO
+
+# Set the SHOW_NAMESPACES tag to NO to disable the generation of the
+# Namespaces page.
+# This will remove the Namespaces entry from the Quick Index
+# and from the Folder Tree View (if specified). The default is YES.
+
+SHOW_NAMESPACES = NO
+
+# The FILE_VERSION_FILTER tag can be used to specify a program or script that
+# doxygen should invoke to get the current version for each file (typically from
+# the version control system). Doxygen will invoke the program by executing (via
+# popen()) the command <command> <input-file>, where <command> is the value of
+# the FILE_VERSION_FILTER tag, and <input-file> is the name of an input file
+# provided by doxygen. Whatever the program writes to standard output
+# is used as the file version. See the manual for examples.
+
+FILE_VERSION_FILTER =
+
+# The LAYOUT_FILE tag can be used to specify a layout file which will be parsed by
+# doxygen. The layout file controls the global structure of the generated output files
+# in an output format independent way. The create the layout file that represents
+# doxygen's defaults, run doxygen with the -l option. You can optionally specify a
+# file name after the option, if omitted DoxygenLayout.xml will be used as the name
+# of the layout file.
+
+LAYOUT_FILE =
+
+#---------------------------------------------------------------------------
+# configuration options related to warning and progress messages
+#---------------------------------------------------------------------------
+
+# The QUIET tag can be used to turn on/off the messages that are generated
+# by doxygen. Possible values are YES and NO. If left blank NO is used.
+
+QUIET = NO
+
+# The WARNINGS tag can be used to turn on/off the warning messages that are
+# generated by doxygen. Possible values are YES and NO. If left blank
+# NO is used.
+
+WARNINGS = YES
+
+# If WARN_IF_UNDOCUMENTED is set to YES, then doxygen will generate warnings
+# for undocumented members. If EXTRACT_ALL is set to YES then this flag will
+# automatically be disabled.
+
+WARN_IF_UNDOCUMENTED = YES
+
+# If WARN_IF_DOC_ERROR is set to YES, doxygen will generate warnings for
+# potential errors in the documentation, such as not documenting some
+# parameters in a documented function, or documenting parameters that
+# don't exist or using markup commands wrongly.
+
+WARN_IF_DOC_ERROR = YES
+
+# This WARN_NO_PARAMDOC option can be abled to get warnings for
+# functions that are documented, but have no documentation for their parameters
+# or return value. If set to NO (the default) doxygen will only warn about
+# wrong or incomplete parameter documentation, but not about the absence of
+# documentation.
+
+WARN_NO_PARAMDOC = NO
+
+# The WARN_FORMAT tag determines the format of the warning messages that
+# doxygen can produce. The string should contain the $file, $line, and $text
+# tags, which will be replaced by the file and line number from which the
+# warning originated and the warning text. Optionally the format may contain
+# $version, which will be replaced by the version of the file (if it could
+# be obtained via FILE_VERSION_FILTER)
+
+WARN_FORMAT = "$file:$line: $text"
+
+# The WARN_LOGFILE tag can be used to specify a file to which warning
+# and error messages should be written. If left blank the output is written
+# to stderr.
+
+WARN_LOGFILE =
+
+#---------------------------------------------------------------------------
+# configuration options related to the input files
+#---------------------------------------------------------------------------
+
+# The INPUT tag can be used to specify the files and/or directories that contain
+# documented source files. You may enter file names like "myfile.cpp" or
+# directories like "/usr/src/myproject". Separate the files or directories
+# with spaces.
+
+INPUT = ../actions ../lib
+
+# This tag can be used to specify the character encoding of the source files
+# that doxygen parses. Internally doxygen uses the UTF-8 encoding, which is
+# also the default input encoding. Doxygen uses libiconv (or the iconv built
+# into libc) for the transcoding. See http://www.gnu.org/software/libiconv for
+# the list of possible encodings.
+
+INPUT_ENCODING = UTF-8
+
+# If the value of the INPUT tag contains directories, you can use the
+# FILE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp
+# and *.h) to filter out the source-files in the directories. If left
+# blank the following patterns are tested:
+# *.c *.cc *.cxx *.cpp *.c++ *.java *.ii *.ixx *.ipp *.i++ *.inl *.h *.hh *.hxx
+# *.hpp *.h++ *.idl *.odl *.cs *.php *.php3 *.inc *.m *.mm *.py *.f90
+
+FILE_PATTERNS = api*.php
+
+# The RECURSIVE tag can be used to turn specify whether or not subdirectories
+# should be searched for input files as well. Possible values are YES and NO.
+# If left blank NO is used.
+
+RECURSIVE = NO
+
+# The EXCLUDE tag can be used to specify files and/or directories that should
+# excluded from the INPUT source files. This way you can easily exclude a
+# subdirectory from a directory tree whose root is specified with the INPUT tag.
+
+EXCLUDE =
+
+# The EXCLUDE_SYMLINKS tag can be used select whether or not files or
+# directories that are symbolic links (a Unix filesystem feature) are excluded
+# from the input.
+
+EXCLUDE_SYMLINKS = NO
+
+# If the value of the INPUT tag contains directories, you can use the
+# EXCLUDE_PATTERNS tag to specify one or more wildcard patterns to exclude
+# certain files from those directories. Note that the wildcards are matched
+# against the file with absolute path, so to exclude all test directories
+# for example use the pattern */test/*
+
+EXCLUDE_PATTERNS =
+
+# The EXCLUDE_SYMBOLS tag can be used to specify one or more symbol names
+# (namespaces, classes, functions, etc.) that should be excluded from the
+# output. The symbol name can be a fully qualified name, a word, or if the
+# wildcard * is used, a substring. Examples: ANamespace, AClass,
+# AClass::ANamespace, ANamespace::*Test
+
+EXCLUDE_SYMBOLS = *Action Api* if*
+
+# The EXAMPLE_PATH tag can be used to specify one or more files or
+# directories that contain example code fragments that are included (see
+# the \include command).
+
+EXAMPLE_PATH =
+
+# If the value of the EXAMPLE_PATH tag contains directories, you can use the
+# EXAMPLE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp
+# and *.h) to filter out the source-files in the directories. If left
+# blank all files are included.
+
+EXAMPLE_PATTERNS =
+
+# If the EXAMPLE_RECURSIVE tag is set to YES then subdirectories will be
+# searched for input files to be used with the \include or \dontinclude
+# commands irrespective of the value of the RECURSIVE tag.
+# Possible values are YES and NO. If left blank NO is used.
+
+EXAMPLE_RECURSIVE = NO
+
+# The IMAGE_PATH tag can be used to specify one or more files or
+# directories that contain image that are included in the documentation (see
+# the \image command).
+
+IMAGE_PATH =
+
+# The INPUT_FILTER tag can be used to specify a program that doxygen should
+# invoke to filter for each input file. Doxygen will invoke the filter program
+# by executing (via popen()) the command <filter> <input-file>, where <filter>
+# is the value of the INPUT_FILTER tag, and <input-file> is the name of an
+# input file. Doxygen will then use the output that the filter program writes
+# to standard output.
+# If FILTER_PATTERNS is specified, this tag will be
+# ignored.
+
+INPUT_FILTER =
+
+# The FILTER_PATTERNS tag can be used to specify filters on a per file pattern
+# basis.
+# Doxygen will compare the file name with each pattern and apply the
+# filter if there is a match.
+# The filters are a list of the form:
+# pattern=filter (like *.cpp=my_cpp_filter). See INPUT_FILTER for further
+# info on how filters are used. If FILTER_PATTERNS is empty, INPUT_FILTER
+# is applied to all files.
+
+FILTER_PATTERNS =
+
+# If the FILTER_SOURCE_FILES tag is set to YES, the input filter (if set using
+# INPUT_FILTER) will be used to filter the input files when producing source
+# files to browse (i.e. when SOURCE_BROWSER is set to YES).
+
+FILTER_SOURCE_FILES = NO
+
+#---------------------------------------------------------------------------
+# configuration options related to source browsing
+#---------------------------------------------------------------------------
+
+# If the SOURCE_BROWSER tag is set to YES then a list of source files will
+# be generated. Documented entities will be cross-referenced with these sources.
+# Note: To get rid of all source code in the generated output, make sure also
+# VERBATIM_HEADERS is set to NO.
+
+SOURCE_BROWSER = NO
+
+# Setting the INLINE_SOURCES tag to YES will include the body
+# of functions and classes directly in the documentation.
+
+INLINE_SOURCES = NO
+
+# Setting the STRIP_CODE_COMMENTS tag to YES (the default) will instruct
+# doxygen to hide any special comment blocks from generated source code
+# fragments. Normal C and C++ comments will always remain visible.
+
+STRIP_CODE_COMMENTS = YES
+
+# If the REFERENCED_BY_RELATION tag is set to YES
+# then for each documented function all documented
+# functions referencing it will be listed.
+
+REFERENCED_BY_RELATION = NO
+
+# If the REFERENCES_RELATION tag is set to YES
+# then for each documented function all documented entities
+# called/used by that function will be listed.
+
+REFERENCES_RELATION = NO
+
+# If the REFERENCES_LINK_SOURCE tag is set to YES (the default)
+# and SOURCE_BROWSER tag is set to YES, then the hyperlinks from
+# functions in REFERENCES_RELATION and REFERENCED_BY_RELATION lists will
+# link to the source code.
+# Otherwise they will link to the documentation.
+
+REFERENCES_LINK_SOURCE = YES
+
+# If the USE_HTAGS tag is set to YES then the references to source code
+# will point to the HTML generated by the htags(1) tool instead of doxygen
+# built-in source browser. The htags tool is part of GNU's global source
+# tagging system (see http://www.gnu.org/software/global/global.html). You
+# will need version 4.8.6 or higher.
+
+USE_HTAGS = NO
+
+# If the VERBATIM_HEADERS tag is set to YES (the default) then Doxygen
+# will generate a verbatim copy of the header file for each class for
+# which an include is specified. Set to NO to disable this.
+
+VERBATIM_HEADERS = YES
+
+#---------------------------------------------------------------------------
+# configuration options related to the alphabetical class index
+#---------------------------------------------------------------------------
+
+# If the ALPHABETICAL_INDEX tag is set to YES, an alphabetical index
+# of all compounds will be generated. Enable this if the project
+# contains a lot of classes, structs, unions or interfaces.
+
+ALPHABETICAL_INDEX = NO
+
+# If the alphabetical index is enabled (see ALPHABETICAL_INDEX) then
+# the COLS_IN_ALPHA_INDEX tag can be used to specify the number of columns
+# in which this list will be split (can be a number in the range [1..20])
+
+COLS_IN_ALPHA_INDEX = 5
+
+# In case all classes in a project start with a common prefix, all
+# classes will be put under the same header in the alphabetical index.
+# The IGNORE_PREFIX tag can be used to specify one or more prefixes that
+# should be ignored while generating the index headers.
+
+IGNORE_PREFIX =
+
+#---------------------------------------------------------------------------
+# configuration options related to the HTML output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_HTML tag is set to YES (the default) Doxygen will
+# generate HTML output.
+
+GENERATE_HTML = YES
+
+# The HTML_OUTPUT tag is used to specify where the HTML docs will be put.
+# If a relative path is entered the value of OUTPUT_DIRECTORY will be
+# put in front of it. If left blank `html' will be used as the default path.
+
+HTML_OUTPUT = html
+
+# The HTML_FILE_EXTENSION tag can be used to specify the file extension for
+# each generated HTML page (for example: .htm,.php,.asp). If it is left blank
+# doxygen will generate files with .html extension.
+
+HTML_FILE_EXTENSION = .html
+
+# The HTML_HEADER tag can be used to specify a personal HTML header for
+# each generated HTML page. If it is left blank doxygen will generate a
+# standard header.
+
+HTML_HEADER =
+
+# The HTML_FOOTER tag can be used to specify a personal HTML footer for
+# each generated HTML page. If it is left blank doxygen will generate a
+# standard footer.
+
+HTML_FOOTER =
+
+# The HTML_STYLESHEET tag can be used to specify a user-defined cascading
+# style sheet that is used by each HTML page. It can be used to
+# fine-tune the look of the HTML output. If the tag is left blank doxygen
+# will generate a default style sheet. Note that doxygen will try to copy
+# the style sheet file to the HTML output directory, so don't put your own
+# stylesheet in the HTML output directory as well, or it will be erased!
+
+HTML_STYLESHEET =
+
+# If the HTML_TIMESTAMP tag is set to YES then the footer of each generated HTML
+# page will contain the date and time when the page was generated. Setting
+# this to NO can help when comparing the output of multiple runs.
+
+HTML_TIMESTAMP = NO
+
+# If the HTML_ALIGN_MEMBERS tag is set to YES, the members of classes,
+# files or namespaces will be aligned in HTML using tables. If set to
+# NO a bullet list will be used.
+
+HTML_ALIGN_MEMBERS = YES
+
+# If the HTML_DYNAMIC_SECTIONS tag is set to YES then the generated HTML
+# documentation will contain sections that can be hidden and shown after the
+# page has loaded. For this to work a browser that supports
+# JavaScript and DHTML is required (for instance Mozilla 1.0+, Firefox
+# Netscape 6.0+, Internet explorer 5.0+, Konqueror, or Safari).
+
+HTML_DYNAMIC_SECTIONS = NO
+
+# If the GENERATE_DOCSET tag is set to YES, additional index files
+# will be generated that can be used as input for Apple's Xcode 3
+# integrated development environment, introduced with OSX 10.5 (Leopard).
+# To create a documentation set, doxygen will generate a Makefile in the
+# HTML output directory. Running make will produce the docset in that
+# directory and running "make install" will install the docset in
+# ~/Library/Developer/Shared/Documentation/DocSets so that Xcode will find
+# it at startup.
+# See http://developer.apple.com/tools/creatingdocsetswithdoxygen.html for more information.
+
+GENERATE_DOCSET = NO
+
+# When GENERATE_DOCSET tag is set to YES, this tag determines the name of the
+# feed. A documentation feed provides an umbrella under which multiple
+# documentation sets from a single provider (such as a company or product suite)
+# can be grouped.
+
+DOCSET_FEEDNAME = "Doxygen generated docs"
+
+# When GENERATE_DOCSET tag is set to YES, this tag specifies a string that
+# should uniquely identify the documentation set bundle. This should be a
+# reverse domain-name style string, e.g. com.mycompany.MyDocSet. Doxygen
+# will append .docset to the name.
+
+DOCSET_BUNDLE_ID = org.doxygen.Project
+
+# If the GENERATE_HTMLHELP tag is set to YES, additional index files
+# will be generated that can be used as input for tools like the
+# Microsoft HTML help workshop to generate a compiled HTML help file (.chm)
+# of the generated HTML documentation.
+
+GENERATE_HTMLHELP = NO
+
+# If the GENERATE_HTMLHELP tag is set to YES, the CHM_FILE tag can
+# be used to specify the file name of the resulting .chm file. You
+# can add a path in front of the file if the result should not be
+# written to the html output directory.
+
+CHM_FILE =
+
+# If the GENERATE_HTMLHELP tag is set to YES, the HHC_LOCATION tag can
+# be used to specify the location (absolute path including file name) of
+# the HTML help compiler (hhc.exe). If non-empty doxygen will try to run
+# the HTML help compiler on the generated index.hhp.
+
+HHC_LOCATION =
+
+# If the GENERATE_HTMLHELP tag is set to YES, the GENERATE_CHI flag
+# controls if a separate .chi index file is generated (YES) or that
+# it should be included in the master .chm file (NO).
+
+GENERATE_CHI = NO
+
+# If the GENERATE_HTMLHELP tag is set to YES, the CHM_INDEX_ENCODING
+# is used to encode HtmlHelp index (hhk), content (hhc) and project file
+# content.
+
+CHM_INDEX_ENCODING =
+
+# If the GENERATE_HTMLHELP tag is set to YES, the BINARY_TOC flag
+# controls whether a binary table of contents is generated (YES) or a
+# normal table of contents (NO) in the .chm file.
+
+BINARY_TOC = NO
+
+# The TOC_EXPAND flag can be set to YES to add extra items for group members
+# to the contents of the HTML help documentation and to the tree view.
+
+TOC_EXPAND = NO
+
+# If the GENERATE_QHP tag is set to YES and both QHP_NAMESPACE and QHP_VIRTUAL_FOLDER
+# are set, an additional index file will be generated that can be used as input for
+# Qt's qhelpgenerator to generate a Qt Compressed Help (.qch) of the generated
+# HTML documentation.
+
+GENERATE_QHP = NO
+
+# If the QHG_LOCATION tag is specified, the QCH_FILE tag can
+# be used to specify the file name of the resulting .qch file.
+# The path specified is relative to the HTML output folder.
+
+QCH_FILE =
+
+# The QHP_NAMESPACE tag specifies the namespace to use when generating
+# Qt Help Project output. For more information please see
+# http://doc.trolltech.com/qthelpproject.html#namespace
+
+QHP_NAMESPACE = org.doxygen.Project
+
+# The QHP_VIRTUAL_FOLDER tag specifies the namespace to use when generating
+# Qt Help Project output. For more information please see
+# http://doc.trolltech.com/qthelpproject.html#virtual-folders
+
+QHP_VIRTUAL_FOLDER = doc
+
+# If QHP_CUST_FILTER_NAME is set, it specifies the name of a custom filter to add.
+# For more information please see
+# http://doc.trolltech.com/qthelpproject.html#custom-filters
+
+QHP_CUST_FILTER_NAME =
+
+# The QHP_CUST_FILT_ATTRS tag specifies the list of the attributes of the custom filter to add.For more information please see
+# <a href="http://doc.trolltech.com/qthelpproject.html#custom-filters">Qt Help Project / Custom Filters</a>.
+
+QHP_CUST_FILTER_ATTRS =
+
+# The QHP_SECT_FILTER_ATTRS tag specifies the list of the attributes this project's
+# filter section matches.
+# <a href="http://doc.trolltech.com/qthelpproject.html#filter-attributes">Qt Help Project / Filter Attributes</a>.
+
+QHP_SECT_FILTER_ATTRS =
+
+# If the GENERATE_QHP tag is set to YES, the QHG_LOCATION tag can
+# be used to specify the location of Qt's qhelpgenerator.
+# If non-empty doxygen will try to run qhelpgenerator on the generated
+# .qhp file.
+
+QHG_LOCATION =
+
+# If the GENERATE_ECLIPSEHELP tag is set to YES, additional index files
+# will be generated, which together with the HTML files, form an Eclipse help
+# plugin. To install this plugin and make it available under the help contents
+# menu in Eclipse, the contents of the directory containing the HTML and XML
+# files needs to be copied into the plugins directory of eclipse. The name of
+# the directory within the plugins directory should be the same as
+# the ECLIPSE_DOC_ID value. After copying Eclipse needs to be restarted before the help appears.
+
+GENERATE_ECLIPSEHELP = NO
+
+# A unique identifier for the eclipse help plugin. When installing the plugin
+# the directory name containing the HTML and XML files should also have
+# this name.
+
+ECLIPSE_DOC_ID = org.doxygen.Project
+
+# The DISABLE_INDEX tag can be used to turn on/off the condensed index at
+# top of each HTML page. The value NO (the default) enables the index and
+# the value YES disables it.
+
+DISABLE_INDEX = NO
+
+# This tag can be used to set the number of enum values (range [1..20])
+# that doxygen will group on one line in the generated HTML documentation.
+
+ENUM_VALUES_PER_LINE = 4
+
+# The GENERATE_TREEVIEW tag is used to specify whether a tree-like index
+# structure should be generated to display hierarchical information.
+# If the tag value is set to YES, a side panel will be generated
+# containing a tree-like index structure (just like the one that
+# is generated for HTML Help). For this to work a browser that supports
+# JavaScript, DHTML, CSS and frames is required (i.e. any modern browser).
+# Windows users are probably better off using the HTML help feature.
+
+GENERATE_TREEVIEW = NO
+
+# By enabling USE_INLINE_TREES, doxygen will generate the Groups, Directories,
+# and Class Hierarchy pages using a tree view instead of an ordered list.
+
+USE_INLINE_TREES = NO
+
+# If the treeview is enabled (see GENERATE_TREEVIEW) then this tag can be
+# used to set the initial width (in pixels) of the frame in which the tree
+# is shown.
+
+TREEVIEW_WIDTH = 250
+
+# Use this tag to change the font size of Latex formulas included
+# as images in the HTML documentation. The default is 10. Note that
+# when you change the font size after a successful doxygen run you need
+# to manually remove any form_*.png images from the HTML output directory
+# to force them to be regenerated.
+
+FORMULA_FONTSIZE = 10
+
+# When the SEARCHENGINE tag is enabled doxygen will generate a search box for the HTML output. The underlying search engine uses javascript
+# and DHTML and should work on any modern browser. Note that when using HTML help (GENERATE_HTMLHELP), Qt help (GENERATE_QHP), or docsets (GENERATE_DOCSET) there is already a search function so this one should
+# typically be disabled. For large projects the javascript based search engine
+# can be slow, then enabling SERVER_BASED_SEARCH may provide a better solution.
+
+SEARCHENGINE = YES
+
+# When the SERVER_BASED_SEARCH tag is enabled the search engine will be implemented using a PHP enabled web server instead of at the web client using Javascript. Doxygen will generate the search PHP script and index
+# file to put on the web server. The advantage of the server based approach is that it scales better to large projects and allows full text search. The disadvances is that it is more difficult to setup
+# and does not have live searching capabilities.
+
+SERVER_BASED_SEARCH = NO
+
+#---------------------------------------------------------------------------
+# configuration options related to the LaTeX output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_LATEX tag is set to YES (the default) Doxygen will
+# generate Latex output.
+
+GENERATE_LATEX = NO
+
+# The LATEX_OUTPUT tag is used to specify where the LaTeX docs will be put.
+# If a relative path is entered the value of OUTPUT_DIRECTORY will be
+# put in front of it. If left blank `latex' will be used as the default path.
+
+LATEX_OUTPUT = latex
+
+# The LATEX_CMD_NAME tag can be used to specify the LaTeX command name to be
+# invoked. If left blank `latex' will be used as the default command name.
+# Note that when enabling USE_PDFLATEX this option is only used for
+# generating bitmaps for formulas in the HTML output, but not in the
+# Makefile that is written to the output directory.
+
+LATEX_CMD_NAME = latex
+
+# The MAKEINDEX_CMD_NAME tag can be used to specify the command name to
+# generate index for LaTeX. If left blank `makeindex' will be used as the
+# default command name.
+
+MAKEINDEX_CMD_NAME = makeindex
+
+# If the COMPACT_LATEX tag is set to YES Doxygen generates more compact
+# LaTeX documents. This may be useful for small projects and may help to
+# save some trees in general.
+
+COMPACT_LATEX = NO
+
+# The PAPER_TYPE tag can be used to set the paper type that is used
+# by the printer. Possible values are: a4, a4wide, letter, legal and
+# executive. If left blank a4wide will be used.
+
+PAPER_TYPE = a4wide
+
+# The EXTRA_PACKAGES tag can be to specify one or more names of LaTeX
+# packages that should be included in the LaTeX output.
+
+EXTRA_PACKAGES =
+
+# The LATEX_HEADER tag can be used to specify a personal LaTeX header for
+# the generated latex document. The header should contain everything until
+# the first chapter. If it is left blank doxygen will generate a
+# standard header. Notice: only use this tag if you know what you are doing!
+
+LATEX_HEADER =
+
+# If the PDF_HYPERLINKS tag is set to YES, the LaTeX that is generated
+# is prepared for conversion to pdf (using ps2pdf). The pdf file will
+# contain links (just like the HTML output) instead of page references
+# This makes the output suitable for online browsing using a pdf viewer.
+
+PDF_HYPERLINKS = YES
+
+# If the USE_PDFLATEX tag is set to YES, pdflatex will be used instead of
+# plain latex in the generated Makefile. Set this option to YES to get a
+# higher quality PDF documentation.
+
+USE_PDFLATEX = YES
+
+# If the LATEX_BATCHMODE tag is set to YES, doxygen will add the \\batchmode.
+# command to the generated LaTeX files. This will instruct LaTeX to keep
+# running if errors occur, instead of asking the user for help.
+# This option is also used when generating formulas in HTML.
+
+LATEX_BATCHMODE = NO
+
+# If LATEX_HIDE_INDICES is set to YES then doxygen will not
+# include the index chapters (such as File Index, Compound Index, etc.)
+# in the output.
+
+LATEX_HIDE_INDICES = NO
+
+# If LATEX_SOURCE_CODE is set to YES then doxygen will include source code with syntax highlighting in the LaTeX output. Note that which sources are shown also depends on other settings such as SOURCE_BROWSER.
+
+LATEX_SOURCE_CODE = NO
+
+#---------------------------------------------------------------------------
+# configuration options related to the RTF output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_RTF tag is set to YES Doxygen will generate RTF output
+# The RTF output is optimized for Word 97 and may not look very pretty with
+# other RTF readers or editors.
+
+GENERATE_RTF = NO
+
+# The RTF_OUTPUT tag is used to specify where the RTF docs will be put.
+# If a relative path is entered the value of OUTPUT_DIRECTORY will be
+# put in front of it. If left blank `rtf' will be used as the default path.
+
+RTF_OUTPUT = rtf
+
+# If the COMPACT_RTF tag is set to YES Doxygen generates more compact
+# RTF documents. This may be useful for small projects and may help to
+# save some trees in general.
+
+COMPACT_RTF = NO
+
+# If the RTF_HYPERLINKS tag is set to YES, the RTF that is generated
+# will contain hyperlink fields. The RTF file will
+# contain links (just like the HTML output) instead of page references.
+# This makes the output suitable for online browsing using WORD or other
+# programs which support those fields.
+# Note: wordpad (write) and others do not support links.
+
+RTF_HYPERLINKS = NO
+
+# Load stylesheet definitions from file. Syntax is similar to doxygen's
+# config file, i.e. a series of assignments. You only have to provide
+# replacements, missing definitions are set to their default value.
+
+RTF_STYLESHEET_FILE =
+
+# Set optional variables used in the generation of an rtf document.
+# Syntax is similar to doxygen's config file.
+
+RTF_EXTENSIONS_FILE =
+
+#---------------------------------------------------------------------------
+# configuration options related to the man page output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_MAN tag is set to YES (the default) Doxygen will
+# generate man pages
+
+GENERATE_MAN = NO
+
+# The MAN_OUTPUT tag is used to specify where the man pages will be put.
+# If a relative path is entered the value of OUTPUT_DIRECTORY will be
+# put in front of it. If left blank `man' will be used as the default path.
+
+MAN_OUTPUT = man
+
+# The MAN_EXTENSION tag determines the extension that is added to
+# the generated man pages (default is the subroutine's section .3)
+
+MAN_EXTENSION = .3
+
+# If the MAN_LINKS tag is set to YES and Doxygen generates man output,
+# then it will generate one additional man file for each entity
+# documented in the real man page(s). These additional files
+# only source the real man page, but without them the man command
+# would be unable to find the correct page. The default is NO.
+
+MAN_LINKS = NO
+
+#---------------------------------------------------------------------------
+# configuration options related to the XML output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_XML tag is set to YES Doxygen will
+# generate an XML file that captures the structure of
+# the code including all documentation.
+
+GENERATE_XML = NO
+
+# The XML_OUTPUT tag is used to specify where the XML pages will be put.
+# If a relative path is entered the value of OUTPUT_DIRECTORY will be
+# put in front of it. If left blank `xml' will be used as the default path.
+
+XML_OUTPUT = xml
+
+# The XML_SCHEMA tag can be used to specify an XML schema,
+# which can be used by a validating XML parser to check the
+# syntax of the XML files.
+
+XML_SCHEMA =
+
+# The XML_DTD tag can be used to specify an XML DTD,
+# which can be used by a validating XML parser to check the
+# syntax of the XML files.
+
+XML_DTD =
+
+# If the XML_PROGRAMLISTING tag is set to YES Doxygen will
+# dump the program listings (including syntax highlighting
+# and cross-referencing information) to the XML output. Note that
+# enabling this will significantly increase the size of the XML output.
+
+XML_PROGRAMLISTING = YES
+
+#---------------------------------------------------------------------------
+# configuration options for the AutoGen Definitions output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_AUTOGEN_DEF tag is set to YES Doxygen will
+# generate an AutoGen Definitions (see autogen.sf.net) file
+# that captures the structure of the code including all
+# documentation. Note that this feature is still experimental
+# and incomplete at the moment.
+
+GENERATE_AUTOGEN_DEF = NO
+
+#---------------------------------------------------------------------------
+# configuration options related to the Perl module output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_PERLMOD tag is set to YES Doxygen will
+# generate a Perl module file that captures the structure of
+# the code including all documentation. Note that this
+# feature is still experimental and incomplete at the
+# moment.
+
+GENERATE_PERLMOD = NO
+
+# If the PERLMOD_LATEX tag is set to YES Doxygen will generate
+# the necessary Makefile rules, Perl scripts and LaTeX code to be able
+# to generate PDF and DVI output from the Perl module output.
+
+PERLMOD_LATEX = NO
+
+# If the PERLMOD_PRETTY tag is set to YES the Perl module output will be
+# nicely formatted so it can be parsed by a human reader.
+# This is useful
+# if you want to understand what is going on.
+# On the other hand, if this
+# tag is set to NO the size of the Perl module output will be much smaller
+# and Perl will parse it just the same.
+
+PERLMOD_PRETTY = YES
+
+# The names of the make variables in the generated doxyrules.make file
+# are prefixed with the string contained in PERLMOD_MAKEVAR_PREFIX.
+# This is useful so different doxyrules.make files included by the same
+# Makefile don't overwrite each other's variables.
+
+PERLMOD_MAKEVAR_PREFIX =
+
+#---------------------------------------------------------------------------
+# Configuration options related to the preprocessor
+#---------------------------------------------------------------------------
+
+# If the ENABLE_PREPROCESSING tag is set to YES (the default) Doxygen will
+# evaluate all C-preprocessor directives found in the sources and include
+# files.
+
+ENABLE_PREPROCESSING = YES
+
+# If the MACRO_EXPANSION tag is set to YES Doxygen will expand all macro
+# names in the source code. If set to NO (the default) only conditional
+# compilation will be performed. Macro expansion can be done in a controlled
+# way by setting EXPAND_ONLY_PREDEF to YES.
+
+MACRO_EXPANSION = NO
+
+# If the EXPAND_ONLY_PREDEF and MACRO_EXPANSION tags are both set to YES
+# then the macro expansion is limited to the macros specified with the
+# PREDEFINED and EXPAND_AS_DEFINED tags.
+
+EXPAND_ONLY_PREDEF = NO
+
+# If the SEARCH_INCLUDES tag is set to YES (the default) the includes files
+# in the INCLUDE_PATH (see below) will be search if a #include is found.
+
+SEARCH_INCLUDES = YES
+
+# The INCLUDE_PATH tag can be used to specify one or more directories that
+# contain include files that are not input files but should be processed by
+# the preprocessor.
+
+INCLUDE_PATH =
+
+# You can use the INCLUDE_FILE_PATTERNS tag to specify one or more wildcard
+# patterns (like *.h and *.hpp) to filter out the header-files in the
+# directories. If left blank, the patterns specified with FILE_PATTERNS will
+# be used.
+
+INCLUDE_FILE_PATTERNS =
+
+# The PREDEFINED tag can be used to specify one or more macro names that
+# are defined before the preprocessor is started (similar to the -D option of
+# gcc). The argument of the tag is a list of macros of the form: name
+# or name=definition (no spaces). If the definition and the = are
+# omitted =1 is assumed. To prevent a macro definition from being
+# undefined via #undef or recursively expanded use the := operator
+# instead of the = operator.
+
+PREDEFINED =
+
+# If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then
+# this tag can be used to specify a list of macro names that should be expanded.
+# The macro definition that is found in the sources will be used.
+# Use the PREDEFINED tag if you want to use a different macro definition.
+
+EXPAND_AS_DEFINED =
+
+# If the SKIP_FUNCTION_MACROS tag is set to YES (the default) then
+# doxygen's preprocessor will remove all function-like macros that are alone
+# on a line, have an all uppercase name, and do not end with a semicolon. Such
+# function macros are typically used for boiler-plate code, and will confuse
+# the parser if not removed.
+
+SKIP_FUNCTION_MACROS = YES
+
+#---------------------------------------------------------------------------
+# Configuration::additions related to external references
+#---------------------------------------------------------------------------
+
+# The TAGFILES option can be used to specify one or more tagfiles.
+# Optionally an initial location of the external documentation
+# can be added for each tagfile. The format of a tag file without
+# this location is as follows:
+#
+# TAGFILES = file1 file2 ...
+# Adding location for the tag files is done as follows:
+#
+# TAGFILES = file1=loc1 "file2 = loc2" ...
+# where "loc1" and "loc2" can be relative or absolute paths or
+# URLs. If a location is present for each tag, the installdox tool
+# does not have to be run to correct the links.
+# Note that each tag file must have a unique name
+# (where the name does NOT include the path)
+# If a tag file is not located in the directory in which doxygen
+# is run, you must also specify the path to the tagfile here.
+
+TAGFILES =
+
+# When a file name is specified after GENERATE_TAGFILE, doxygen will create
+# a tag file that is based on the input files it reads.
+
+GENERATE_TAGFILE =
+
+# If the ALLEXTERNALS tag is set to YES all external classes will be listed
+# in the class index. If set to NO only the inherited external classes
+# will be listed.
+
+ALLEXTERNALS = NO
+
+# If the EXTERNAL_GROUPS tag is set to YES all external groups will be listed
+# in the modules index. If set to NO, only the current project's groups will
+# be listed.
+
+EXTERNAL_GROUPS = YES
+
+# The PERL_PATH should be the absolute path and name of the perl script
+# interpreter (i.e. the result of `which perl').
+
+PERL_PATH = /usr/bin/perl
+
+#---------------------------------------------------------------------------
+# Configuration options related to the dot tool
+#---------------------------------------------------------------------------
+
+# If the CLASS_DIAGRAMS tag is set to YES (the default) Doxygen will
+# generate a inheritance diagram (in HTML, RTF and LaTeX) for classes with base
+# or super classes. Setting the tag to NO turns the diagrams off. Note that
+# this option is superseded by the HAVE_DOT option below. This is only a
+# fallback. It is recommended to install and use dot, since it yields more
+# powerful graphs.
+
+CLASS_DIAGRAMS = NO
+
+# You can define message sequence charts within doxygen comments using the \msc
+# command. Doxygen will then run the mscgen tool (see
+# http://www.mcternan.me.uk/mscgen/) to produce the chart and insert it in the
+# documentation. The MSCGEN_PATH tag allows you to specify the directory where
+# the mscgen tool resides. If left empty the tool is assumed to be found in the
+# default search path.
+
+MSCGEN_PATH =
+
+# If set to YES, the inheritance and collaboration graphs will hide
+# inheritance and usage relations if the target is undocumented
+# or is not a class.
+
+HIDE_UNDOC_RELATIONS = YES
+
+# If you set the HAVE_DOT tag to YES then doxygen will assume the dot tool is
+# available from the path. This tool is part of Graphviz, a graph visualization
+# toolkit from AT&T and Lucent Bell Labs. The other options in this section
+# have no effect if this option is set to NO (the default)
+
+HAVE_DOT = NO
+
+# By default doxygen will write a font called FreeSans.ttf to the output
+# directory and reference it in all dot files that doxygen generates. This
+# font does not include all possible unicode characters however, so when you need
+# these (or just want a differently looking font) you can specify the font name
+# using DOT_FONTNAME. You need need to make sure dot is able to find the font,
+# which can be done by putting it in a standard location or by setting the
+# DOTFONTPATH environment variable or by setting DOT_FONTPATH to the directory
+# containing the font.
+
+DOT_FONTNAME = FreeSans
+
+# The DOT_FONTSIZE tag can be used to set the size of the font of dot graphs.
+# The default size is 10pt.
+
+DOT_FONTSIZE = 10
+
+# By default doxygen will tell dot to use the output directory to look for the
+# FreeSans.ttf font (which doxygen will put there itself). If you specify a
+# different font using DOT_FONTNAME you can set the path where dot
+# can find it using this tag.
+
+DOT_FONTPATH =
+
+# If the CLASS_GRAPH and HAVE_DOT tags are set to YES then doxygen
+# will generate a graph for each documented class showing the direct and
+# indirect inheritance relations. Setting this tag to YES will force the
+# the CLASS_DIAGRAMS tag to NO.
+
+CLASS_GRAPH = YES
+
+# If the COLLABORATION_GRAPH and HAVE_DOT tags are set to YES then doxygen
+# will generate a graph for each documented class showing the direct and
+# indirect implementation dependencies (inheritance, containment, and
+# class references variables) of the class with other documented classes.
+
+COLLABORATION_GRAPH = YES
+
+# If the GROUP_GRAPHS and HAVE_DOT tags are set to YES then doxygen
+# will generate a graph for groups, showing the direct groups dependencies
+
+GROUP_GRAPHS = YES
+
+# If the UML_LOOK tag is set to YES doxygen will generate inheritance and
+# collaboration diagrams in a style similar to the OMG's Unified Modeling
+# Language.
+
+UML_LOOK = NO
+
+# If set to YES, the inheritance and collaboration graphs will show the
+# relations between templates and their instances.
+
+TEMPLATE_RELATIONS = NO
+
+# If the ENABLE_PREPROCESSING, SEARCH_INCLUDES, INCLUDE_GRAPH, and HAVE_DOT
+# tags are set to YES then doxygen will generate a graph for each documented
+# file showing the direct and indirect include dependencies of the file with
+# other documented files.
+
+INCLUDE_GRAPH = YES
+
+# If the ENABLE_PREPROCESSING, SEARCH_INCLUDES, INCLUDED_BY_GRAPH, and
+# HAVE_DOT tags are set to YES then doxygen will generate a graph for each
+# documented header file showing the documented files that directly or
+# indirectly include this file.
+
+INCLUDED_BY_GRAPH = YES
+
+# If the CALL_GRAPH and HAVE_DOT options are set to YES then
+# doxygen will generate a call dependency graph for every global function
+# or class method. Note that enabling this option will significantly increase
+# the time of a run. So in most cases it will be better to enable call graphs
+# for selected functions only using the \callgraph command.
+
+CALL_GRAPH = NO
+
+# If the CALLER_GRAPH and HAVE_DOT tags are set to YES then
+# doxygen will generate a caller dependency graph for every global function
+# or class method. Note that enabling this option will significantly increase
+# the time of a run. So in most cases it will be better to enable caller
+# graphs for selected functions only using the \callergraph command.
+
+CALLER_GRAPH = NO
+
+# If the GRAPHICAL_HIERARCHY and HAVE_DOT tags are set to YES then doxygen
+# will graphical hierarchy of all classes instead of a textual one.
+
+GRAPHICAL_HIERARCHY = YES
+
+# If the DIRECTORY_GRAPH, SHOW_DIRECTORIES and HAVE_DOT tags are set to YES
+# then doxygen will show the dependencies a directory has on other directories
+# in a graphical way. The dependency relations are determined by the #include
+# relations between the files in the directories.
+
+DIRECTORY_GRAPH = YES
+
+# The DOT_IMAGE_FORMAT tag can be used to set the image format of the images
+# generated by dot. Possible values are png, jpg, or gif
+# If left blank png will be used.
+
+DOT_IMAGE_FORMAT = png
+
+# The tag DOT_PATH can be used to specify the path where the dot tool can be
+# found. If left blank, it is assumed the dot tool can be found in the path.
+
+DOT_PATH =
+
+# The DOTFILE_DIRS tag can be used to specify one or more directories that
+# contain dot files that are included in the documentation (see the
+# \dotfile command).
+
+DOTFILE_DIRS =
+
+# The DOT_GRAPH_MAX_NODES tag can be used to set the maximum number of
+# nodes that will be shown in the graph. If the number of nodes in a graph
+# becomes larger than this value, doxygen will truncate the graph, which is
+# visualized by representing a node as a red box. Note that doxygen if the
+# number of direct children of the root node in a graph is already larger than
+# DOT_GRAPH_MAX_NODES then the graph will not be shown at all. Also note
+# that the size of a graph can be further restricted by MAX_DOT_GRAPH_DEPTH.
+
+DOT_GRAPH_MAX_NODES = 50
+
+# The MAX_DOT_GRAPH_DEPTH tag can be used to set the maximum depth of the
+# graphs generated by dot. A depth value of 3 means that only nodes reachable
+# from the root by following a path via at most 3 edges will be shown. Nodes
+# that lay further from the root node will be omitted. Note that setting this
+# option to 1 or 2 may greatly reduce the computation time needed for large
+# code bases. Also note that the size of a graph can be further restricted by
+# DOT_GRAPH_MAX_NODES. Using a depth of 0 means no depth restriction.
+
+MAX_DOT_GRAPH_DEPTH = 0
+
+# Set the DOT_TRANSPARENT tag to YES to generate images with a transparent
+# background. This is disabled by default, because dot on Windows does not
+# seem to support this out of the box. Warning: Depending on the platform used,
+# enabling this option may lead to badly anti-aliased labels on the edges of
+# a graph (i.e. they become hard to read).
+
+DOT_TRANSPARENT = NO
+
+# Set the DOT_MULTI_TARGETS tag to YES allow dot to generate multiple output
+# files in one run (i.e. multiple -o and -T options on the command line). This
+# makes dot run faster, but since only newer versions of dot (>1.8.10)
+# support this, this feature is disabled by default.
+
+DOT_MULTI_TARGETS = NO
+
+# If the GENERATE_LEGEND tag is set to YES (the default) Doxygen will
+# generate a legend page explaining the meaning of the various boxes and
+# arrows in the dot generated graphs.
+
+GENERATE_LEGEND = YES
+
+# If the DOT_CLEANUP tag is set to YES (the default) Doxygen will
+# remove the intermediate dot files that are used to generate
+# the various graphs.
+
+DOT_CLEANUP = YES
diff --git a/scripts/commandline.inc b/scripts/commandline.inc
index 9029bb19d..a475e11d0 100644
--- a/scripts/commandline.inc
+++ b/scripts/commandline.inc
@@ -123,6 +123,10 @@ require_once INSTALLDIR . '/lib/common.php';
set_error_handler('common_error_handler');
+// Set up the language infrastructure so we can localize anything that
+// needs to be sent out to users, such as mail notifications.
+common_init_language();
+
function _make_matches($opt, $alt)
{
$matches = array();
diff --git a/scripts/docgen.php b/scripts/docgen.php
index 78bbe37d8..ac0a5c83d 100755
--- a/scripts/docgen.php
+++ b/scripts/docgen.php
@@ -17,10 +17,30 @@ Options:
ENDOFHELP;
define('INSTALLDIR', realpath(dirname(__FILE__) . '/..'));
-require_once INSTALLDIR.'/scripts/commandline.inc';
+set_include_path(INSTALLDIR . DIRECTORY_SEPARATOR . 'extlib' . PATH_SEPARATOR . get_include_path());
$pattern = "*.php *.inc";
$exclude = 'config.php */extlib/* */local/* */plugins/* */scripts/*';
+$plugin = false;
+
+require_once 'Console/Getopt.php';
+$parser = new Console_Getopt();
+$result = $parser->getopt($_SERVER['argv'], $shortoptions, $longoptions);
+if (PEAR::isError($result)) {
+ print $result->getMessage() . "\n";
+ exit(1);
+}
+list($options, $args) = $result;
+
+foreach ($options as $option) {
+ $arg = $option[0];
+ if ($arg == '--plugin') {
+ $plugin = $options[1];
+ } else if ($arg == 'h' || $arg == '--help') {
+ print $helptext;
+ exit(0);
+ }
+}
if (isset($args[0])) {
$outdir = $args[0];
@@ -33,8 +53,7 @@ if (isset($args[0])) {
exit(1);
}
-if (have_option('p', 'plugin')) {
- $plugin = get_option_value('plugin');
+if ($plugin) {
$exclude = "*/extlib/*";
$indir = INSTALLDIR . "/plugins/" . $plugin;
if (!is_dir($indir)) {
@@ -51,8 +70,19 @@ if (have_option('p', 'plugin')) {
$indir = INSTALLDIR;
}
+function getVersion()
+{
+ // define('STATUSNET_VERSION', '0.9.1');
+ $source = file_get_contents(INSTALLDIR . '/lib/common.php');
+ if (preg_match('/^\s*define\s*\(\s*[\'"]STATUSNET_VERSION[\'"]\s*,\s*[\'"](.*)[\'"]\s*\)\s*;/m', $source, $matches)) {
+ return $matches[1];
+ }
+ return 'unknown';
+}
+
+
$replacements = array(
- '%%version%%' => STATUSNET_VERSION,
+ '%%version%%' => getVersion(),
'%%indir%%' => $indir,
'%%pattern%%' => $pattern,
'%%outdir%%' => $outdir,
diff --git a/tests/ActivityParseTests.php b/tests/ActivityParseTests.php
index 4563da914..378478d74 100644
--- a/tests/ActivityParseTests.php
+++ b/tests/ActivityParseTests.php
@@ -32,6 +32,18 @@ class ActivityParseTests extends PHPUnit_Framework_TestCase
$this->assertEquals('tag:versioncentral.example.org,2009:/change/1643245', $act->objects[0]->id);
}
+ public function testExample2()
+ {
+ global $_example2;
+ $dom = DOMDocument::loadXML($_example2);
+ $act = new Activity($dom->documentElement);
+
+ $this->assertFalse(empty($act));
+ // Did we handle <content type="html"> correctly with a typical payload?
+ $this->assertEquals("<p>Geraldine posted a Photo on PhotoPanic</p>\n " .
+ "<img src=\"/geraldine/photo1.jpg\">", trim($act->content));
+ }
+
public function testExample3()
{
global $_example3;
@@ -305,6 +317,71 @@ class ActivityParseTests extends PHPUnit_Framework_TestCase
}
+ public function testAtomContent()
+ {
+ $tests = array(array("<content>Some regular plain text.</content>",
+ "Some regular plain text."),
+ array("<content>&lt;b&gt;this is not HTML&lt;/b&gt;</content>",
+ "&lt;b&gt;this is not HTML&lt;/b&gt;"),
+ array("<content type='html'>Some regular plain HTML.</content>",
+ "Some regular plain HTML."),
+ array("<content type='html'>&lt;b&gt;this is too HTML&lt;/b&gt;</content>",
+ "<b>this is too HTML</b>"),
+ array("<content type='html'>&amp;lt;b&amp;gt;but this is not HTML!&amp;lt;/b&amp;gt;</content>",
+ "&lt;b&gt;but this is not HTML!&lt;/b&gt;"),
+ array("<content type='xhtml'><div xmlns='http://www.w3.org/1999/xhtml'>Some regular plain XHTML.</div></content>",
+ "Some regular plain XHTML."),
+ array("<content type='xhtml'><div xmlns='http://www.w3.org/1999/xhtml'><b>This is some XHTML!</b></div></content>",
+ "<b>This is some XHTML!</b>"),
+ array("<content type='xhtml'><div xmlns='http://www.w3.org/1999/xhtml'>&lt;b&gt;This is not some XHTML!&lt;/b&gt;</div></content>",
+ "&lt;b&gt;This is not some XHTML!&lt;/b&gt;"),
+ array("<content type='xhtml'><div xmlns='http://www.w3.org/1999/xhtml'>&amp;lt;b&amp;gt;This is not some XHTML either!&amp;lt;/b&amp;gt;</div></content>",
+ "&amp;lt;b&amp;gt;This is not some XHTML either!&amp;lt;/b&amp;gt;"));
+ foreach ($tests as $data) {
+ list($source, $output) = $data;
+ $xml = "<entry xmlns='http://www.w3.org/2005/Atom'>" .
+ "<id>http://example.com/fakeid</id>" .
+ "<author><name>Test</name></author>" .
+ "<title>Atom content tests</title>" .
+ $source .
+ "</entry>";
+ $dom = DOMDocument::loadXML($xml);
+ $act = new Activity($dom->documentElement);
+
+ $this->assertFalse(empty($act));
+ $this->assertEquals($output, trim($act->content));
+ }
+ }
+
+ public function testRssContent()
+ {
+ $tests = array(array("<content:encoded>Some regular plain HTML.</content:encoded>",
+ "Some regular plain HTML."),
+ array("<content:encoded>Some &lt;b&gt;exciting bold HTML&lt;/b&gt;</content:encoded>",
+ "Some <b>exciting bold HTML</b>"),
+ array("<content:encoded>Some &amp;lt;b&amp;gt;escaped non-HTML.&amp;lt;/b&amp;gt;</content:encoded>",
+ "Some &lt;b&gt;escaped non-HTML.&lt;/b&gt;"),
+ array("<description>Some plain text.</description>",
+ "Some plain text."),
+ array("<description>Some &lt;b&gt;non-HTML text&lt;/b&gt;</description>",
+ "Some &lt;b&gt;non-HTML text&lt;/b&gt;"),
+ array("<description>Some &amp;lt;b&amp;gt;double-escaped text&amp;lt;/b&amp;gt;</description>",
+ "Some &amp;lt;b&amp;gt;double-escaped text&amp;lt;/b&amp;gt;"));
+ foreach ($tests as $data) {
+ list($source, $output) = $data;
+ $xml = "<item xmlns:content='http://purl.org/rss/1.0/modules/content/'>" .
+ "<guid>http://example.com/fakeid</guid>" .
+ "<title>RSS content tests</title>" .
+ $source .
+ "</item>";
+ $dom = DOMDocument::loadXML($xml);
+ $act = new Activity($dom->documentElement);
+
+ $this->assertFalse(empty($act));
+ $this->assertEquals($output, trim($act->content));
+ }
+ }
+
}
$_example1 = <<<EXAMPLE1