diff options
121 files changed, 2709 insertions, 1550 deletions
@@ -85,18 +85,27 @@ public sites upgrade to the new version immediately. Notable changes this version: +- Installer no longer fails with a PHP fatal error when trying to set up the + subscription to update@status.net - 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 +- 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) +- 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 +- 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 diff --git a/actions/apidirectmessagenew.php b/actions/apidirectmessagenew.php index b9ac92d77..65d065648 100644 --- a/actions/apidirectmessagenew.php +++ b/actions/apidirectmessagenew.php @@ -52,7 +52,6 @@ require_once INSTALLDIR . '/lib/apiauth.php'; class ApiDirectMessageNewAction extends ApiAuthAction { - var $source = null; var $other = null; var $content = null; @@ -76,13 +75,6 @@ class ApiDirectMessageNewAction extends ApiAuthAction return; } - $this->source = $this->trimmed('source'); // Not supported by Twitter. - - $reserved_sources = array('web', 'omb', 'mail', 'xmpp', 'api'); - if (empty($this->source) || in_array($this->source, $reserved_sources)) { - $source = 'api'; - } - $this->content = $this->trimmed('text'); $this->user = $this->auth_user; diff --git a/actions/apistatusesretweet.php b/actions/apistatusesretweet.php index 128c881e2..9aa337485 100644 --- a/actions/apistatusesretweet.php +++ b/actions/apistatusesretweet.php @@ -79,7 +79,7 @@ class ApiStatusesRetweetAction extends ApiAuthAction $this->user = $this->auth_user; - if ($this->user->id == $notice->profile_id) { + if ($this->user->id == $this->original->profile_id) { $this->clientError(_('Cannot repeat your own notice.'), 400, $this->format); return false; diff --git a/actions/apistatusesupdate.php b/actions/apistatusesupdate.php index d4ef6b550..e3e579b0d 100644 --- a/actions/apistatusesupdate.php +++ b/actions/apistatusesupdate.php @@ -64,8 +64,6 @@ class ApiStatusesUpdateAction extends ApiAuthAction var $lat = null; var $lon = null; - static $reserved_sources = array('web', 'omb', 'mail', 'xmpp', 'api'); - /** * Take arguments for running * @@ -80,19 +78,9 @@ class ApiStatusesUpdateAction extends ApiAuthAction parent::prepare($args); $this->status = $this->trimmed('status'); - $this->source = $this->trimmed('source'); $this->lat = $this->trimmed('lat'); $this->lon = $this->trimmed('long'); - // try to set the source attr from OAuth app - if (empty($this->source)) { - $this->source = $this->oauth_source; - } - - if (empty($this->source) || in_array($this->source, self::$reserved_sources)) { - $this->source = 'api'; - } - $this->in_reply_to_status_id = intval($this->trimmed('in_reply_to_status_id')); diff --git a/actions/apitimelinefavorites.php b/actions/apitimelinefavorites.php index 8cb2e808d..79632447e 100644 --- a/actions/apitimelinefavorites.php +++ b/actions/apitimelinefavorites.php @@ -185,17 +185,23 @@ class ApiTimelineFavoritesAction extends ApiBareAuthAction { $notices = array(); + common_debug("since id = " . $this->since_id . " max id = " . $this->max_id); + if (!empty($this->auth_user) && $this->auth_user->id == $this->user->id) { $notice = $this->user->favoriteNotices( + true, ($this->page-1) * $this->count, $this->count, - true + $this->since_id, + $this->max_id ); } else { $notice = $this->user->favoriteNotices( + false, ($this->page-1) * $this->count, $this->count, - false + $this->since_id, + $this->max_id ); } diff --git a/actions/block.php b/actions/block.php index 7f609c253..239a50868 100644 --- a/actions/block.php +++ b/actions/block.php @@ -87,13 +87,15 @@ class BlockAction extends ProfileFormAction { if ($_SERVER['REQUEST_METHOD'] == 'POST') { if ($this->arg('no')) { - $this->returnToArgs(); + $this->returnToPrevious(); } elseif ($this->arg('yes')) { $this->handlePost(); - $this->returnToArgs(); + $this->returnToPrevious(); } else { $this->showPage(); } + } else { + $this->showPage(); } } @@ -118,6 +120,12 @@ class BlockAction extends ProfileFormAction */ function areYouSureForm() { + // @fixme if we ajaxify the confirmation form, skip the preview on ajax hits + $profile = new ArrayWrapper(array($this->profile)); + $preview = new ProfileList($profile, $this); + $preview->show(); + + $id = $this->profile->id; $this->elementStart('form', array('id' => 'block-' . $id, 'method' => 'post', @@ -175,4 +183,38 @@ class BlockAction extends ProfileFormAction $this->autofocus('form_action-yes'); } + /** + * Override for form session token checks; on our first hit we're just + * requesting confirmation, which doesn't need a token. We need to be + * able to take regular GET requests from email! + * + * @throws ClientException if token is bad on POST request or if we have + * confirmation parameters which could trigger something. + */ + function checkSessionToken() + { + if ($_SERVER['REQUEST_METHOD'] == 'POST' || + $this->arg('yes') || + $this->arg('no')) { + + return parent::checkSessionToken(); + } + } + + /** + * If we reached this form without returnto arguments, return to the + * current user's subscription list. + * + * @return string URL + */ + function defaultReturnTo() + { + $user = common_current_user(); + if ($user) { + return common_local_url('subscribers', + array('nickname' => $user->nickname)); + } else { + return common_local_url('public'); + } + } } diff --git a/actions/deleteuser.php b/actions/deleteuser.php index 42ef4b9f5..c0a8b20e2 100644 --- a/actions/deleteuser.php +++ b/actions/deleteuser.php @@ -92,10 +92,10 @@ class DeleteuserAction extends ProfileFormAction { if ($_SERVER['REQUEST_METHOD'] == 'POST') { if ($this->arg('no')) { - $this->returnToArgs(); + $this->returnToPrevious(); } elseif ($this->arg('yes')) { $this->handlePost(); - $this->returnToArgs(); + $this->returnToPrevious(); } else { $this->showPage(); } diff --git a/actions/favoritesrss.php b/actions/favoritesrss.php index 62f06e841..51c92af93 100644 --- a/actions/favoritesrss.php +++ b/actions/favoritesrss.php @@ -89,7 +89,7 @@ class FavoritesrssAction extends Rss10Action function getNotices($limit=0) { $user = $this->user; - $notice = $user->favoriteNotices(0, $limit); + $notice = $user->favoriteNotices(false, 0, $limit); $notices = array(); while ($notice->fetch()) { $notices[] = clone($notice); diff --git a/actions/groupblock.php b/actions/groupblock.php index fc95c0e66..2e06dc324 100644 --- a/actions/groupblock.php +++ b/actions/groupblock.php @@ -117,7 +117,7 @@ class GroupblockAction extends RedirectingAction parent::handle($args); if ($_SERVER['REQUEST_METHOD'] == 'POST') { if ($this->arg('no')) { - $this->returnToArgs(); + $this->returnToPrevious(); } elseif ($this->arg('yes')) { $this->blockProfile(); } elseif ($this->arg('blockto')) { @@ -195,7 +195,7 @@ class GroupblockAction extends RedirectingAction return false; } - $this->returnToArgs(); + $this->returnToPrevious(); } /** diff --git a/actions/login.php b/actions/login.php index dc6352368..d3e4312f7 100644 --- a/actions/login.php +++ b/actions/login.php @@ -63,6 +63,28 @@ class LoginAction extends Action } /** + * Prepare page to run + * + * + * @param $args + * @return string title + */ + + function prepare($args) + { + parent::prepare($args); + + // @todo this check should really be in index.php for all sensitive actions + $ssl = common_config('site', 'ssl'); + if (empty($_SERVER['HTTPS']) && ($ssl == 'always' || $ssl == 'sometimes')) { + common_redirect(common_local_url('login')); + // exit + } + + return true; + } + + /** * Handle input, produce output * * Switches on request method; either shows the form or handles its input. diff --git a/actions/register.php b/actions/register.php index da8d0a0bb..2fc7ef921 100644 --- a/actions/register.php +++ b/actions/register.php @@ -74,6 +74,13 @@ class RegisterAction extends Action parent::prepare($args); $this->code = $this->trimmed('code'); + // @todo this check should really be in index.php for all sensitive actions + $ssl = common_config('site', 'ssl'); + if (empty($_SERVER['HTTPS']) && ($ssl == 'always' || $ssl == 'sometimes')) { + common_redirect(common_local_url('register')); + // exit + } + if (empty($this->code)) { common_ensure_session(); if (array_key_exists('invitecode', $_SESSION)) { @@ -491,6 +498,45 @@ class RegisterAction extends Action $this->elementStart('li'); $this->element('input', $attrs); $this->elementStart('label', array('class' => 'checkbox', 'for' => 'license')); + $this->raw($this->licenseCheckbox()); + $this->elementEnd('label'); + $this->elementEnd('li'); + } + $this->elementEnd('ul'); + $this->submit('submit', _('Register')); + $this->elementEnd('fieldset'); + $this->elementEnd('form'); + } + + function licenseCheckbox() + { + $out = ''; + switch (common_config('license', 'type')) { + case 'private': + // TRANS: Copyright checkbox label in registration dialog, for private sites. + $out .= htmlspecialchars(sprintf( + _('I understand that content and data of %1$s are private and confidential.'), + common_config('site', 'name'))); + // fall through + case 'allrightsreserved': + if ($out != '') { + $out .= ' '; + } + if (common_config('license', 'owner')) { + // TRANS: Copyright checkbox label in registration dialog, for all rights reserved with a specified copyright owner. + $out .= htmlspecialchars(sprintf( + _('My text and files are copyright by %1$s.'), + common_config('license', 'owner'))); + } else { + // TRANS: Copyright checkbox label in registration dialog, for all rights reserved with ownership left to contributors. + $out .= htmlspecialchars(_('My text and files remain under my own copyright.')); + } + // TRANS: Copyright checkbox label in registration dialog, for all rights reserved. + $out .= ' ' . _('All rights reserved.'); + break; + case 'cc': // fall through + default: + // TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses. $message = _('My text and files are available under %s ' . 'except this private data: password, ' . 'email address, IM address, and phone number.'); @@ -499,14 +545,9 @@ class RegisterAction extends Action '">' . htmlspecialchars(common_config('license', 'title')) . '</a>'; - $this->raw(sprintf(htmlspecialchars($message), $link)); - $this->elementEnd('label'); - $this->elementEnd('li'); + $out .= sprintf(htmlspecialchars($message), $link); } - $this->elementEnd('ul'); - $this->submit('submit', _('Register')); - $this->elementEnd('fieldset'); - $this->elementEnd('form'); + return $out; } /** diff --git a/actions/showfavorites.php b/actions/showfavorites.php index 4d776ef04..7f3c77ee2 100644 --- a/actions/showfavorites.php +++ b/actions/showfavorites.php @@ -121,11 +121,11 @@ class ShowfavoritesAction extends OwnerDesignAction // Show imported/gateway notices as well as local if // the user is looking at his own favorites - $this->notice = $this->user->favoriteNotices(($this->page-1)*NOTICES_PER_PAGE, - NOTICES_PER_PAGE + 1, true); + $this->notice = $this->user->favoriteNotices(true, ($this->page-1)*NOTICES_PER_PAGE, + NOTICES_PER_PAGE + 1); } else { - $this->notice = $this->user->favoriteNotices(($this->page-1)*NOTICES_PER_PAGE, - NOTICES_PER_PAGE + 1, false); + $this->notice = $this->user->favoriteNotices(false, ($this->page-1)*NOTICES_PER_PAGE, + NOTICES_PER_PAGE + 1); } if (empty($this->notice)) { diff --git a/actions/twitapisearchatom.php b/actions/twitapisearchatom.php index 24aa619bd..51e8a8881 100644 --- a/actions/twitapisearchatom.php +++ b/actions/twitapisearchatom.php @@ -342,10 +342,24 @@ class TwitapisearchatomAction extends ApiAction 'rel' => 'related', 'href' => $profile->avatarUrl())); - // TODO: Here is where we'd put in a link to an atom feed for threads + // @todo: Here is where we'd put in a link to an atom feed for threads + + $source = null; + + $ns = $notice->getSource(); + if ($ns) { + if (!empty($ns->name) && !empty($ns->url)) { + $source = '<a href="' + . htmlspecialchars($ns->url) + . '" rel="nofollow">' + . htmlspecialchars($ns->name) + . '</a>'; + } else { + $source = $ns->code; + } + } - $this->element("twitter:source", null, - htmlentities($this->sourceLink($notice->source))); + $this->element("twitter:source", null, $source); $this->elementStart('author'); diff --git a/classes/Fave.php b/classes/Fave.php index 7ca9ade7f..ed4f56aee 100644 --- a/classes/Fave.php +++ b/classes/Fave.php @@ -75,13 +75,13 @@ class Fave extends Memcached_DataObject return Memcached_DataObject::pkeyGet('Fave', $kv); } - function stream($user_id, $offset=0, $limit=NOTICES_PER_PAGE, $own=false) + function stream($user_id, $offset=0, $limit=NOTICES_PER_PAGE, $own=false, $since_id=0, $max_id=0) { $ids = Notice::stream(array('Fave', '_streamDirect'), array($user_id, $own), ($own) ? 'fave:ids_by_user_own:'.$user_id : 'fave:ids_by_user:'.$user_id, - $offset, $limit); + $offset, $limit, $since_id, $max_id); return $ids; } diff --git a/classes/Notice.php b/classes/Notice.php index 0b1b2e402..e173a2469 100644 --- a/classes/Notice.php +++ b/classes/Notice.php @@ -703,7 +703,7 @@ class Notice extends Memcached_DataObject /** * Is this notice part of an active conversation? - * + * * @return boolean true if other messages exist in the same * conversation, false if this is the only one */ @@ -1171,7 +1171,7 @@ class Notice extends Memcached_DataObject return $groups; } - function asAtomEntry($namespace=false, $source=false, $author=true) + function asAtomEntry($namespace=false, $source=false, $author=true, $cur=null) { $profile = $this->getProfile(); @@ -1184,7 +1184,8 @@ class Notice extends Memcached_DataObject 'xmlns:activity' => 'http://activitystrea.ms/spec/1.0/', 'xmlns:media' => 'http://purl.org/syndication/atommedia', 'xmlns:poco' => 'http://portablecontacts.net/spec/1.0', - 'xmlns:ostatus' => 'http://ostatus.org/schema/1.0'); + 'xmlns:ostatus' => 'http://ostatus.org/schema/1.0', + 'xmlns:statusnet' => 'http://status.net/ont/'); } else { $attrs = array(); } @@ -1232,6 +1233,24 @@ class Notice extends Memcached_DataObject $xs->element('published', null, common_date_w3dtf($this->created)); $xs->element('updated', null, common_date_w3dtf($this->created)); + $noticeInfoAttr = array( + 'local_id' => $this->id, // local notice ID (useful to clients for ordering) + 'source' => $this->source // the client name (source attribution) + ); + + $ns = $this->getSource(); + if ($ns) { + if (!empty($ns->url)) { + $noticeInfoAttr['source_link'] = $ns->url; + } + } + + if (!empty($cur)) { + $noticeInfoAttr['favorited'] = ($cur->hasFave($this)) ? 'true' : 'false'; + } + + $xs->element('statusnet:notice_info', $noticeInfoAttr, null); + if ($this->reply_to) { $reply_notice = Notice::staticGet('id', $this->reply_to); if (!empty($reply_notice)) { @@ -1796,4 +1815,41 @@ class Notice extends Memcached_DataObject return $result; } + + /** + * Get the source of the notice + * + * @return Notice_source $ns A notice source object. 'code' is the only attribute + * guaranteed to be populated. + */ + function getSource() + { + $ns = new Notice_source(); + if (!empty($this->source)) { + switch ($this->source) { + case 'web': + case 'xmpp': + case 'mail': + case 'omb': + case 'system': + case 'api': + $ns->code = $this->source; + break; + default: + $ns = Notice_source::staticGet($this->source); + if (!$ns) { + $ns = new Notice_source(); + $ns->code = $this->source; + $app = Oauth_application::staticGet('name', $this->source); + if ($app) { + $ns->name = $app->name; + $ns->url = $app->source_url; + } + } + break; + } + } + return $ns; + } + } diff --git a/classes/User.php b/classes/User.php index 1928a3c62..2abb7eeb6 100644 --- a/classes/User.php +++ b/classes/User.php @@ -464,9 +464,9 @@ class User extends Memcached_DataObject return $profile->getNotices($offset, $limit, $since_id, $before_id); } - function favoriteNotices($offset=0, $limit=NOTICES_PER_PAGE, $own=false) + function favoriteNotices($own=false, $offset=0, $limit=NOTICES_PER_PAGE, $since_id=0, $max_id=0) { - $ids = Fave::stream($this->id, $offset, $limit, $own); + $ids = Fave::stream($this->id, $offset, $limit, $own, $since_id, $max_id); return Notice::getStreamByIds($ids); } diff --git a/db/notice_source.sql b/db/notice_source.sql index 50660e948..fbcdd6568 100644 --- a/db/notice_source.sql +++ b/db/notice_source.sql @@ -12,7 +12,8 @@ VALUES ('deskbar','Deskbar-Applet','http://www.gnome.org/projects/deskbar-applet/', now()), ('Do','Gnome Do','http://do.davebsd.com/wiki/index.php?title=Microblog_Plugin', now()), ('drupal','Drupal','http://drupal.org/', now()), - ('eventbox','EventBox','http://thecosmicmachine.com/eventbox/ ', now()), + ('eventbox','EventBox','http://thecosmicmachine.com/eventbox/', now()), + ('identica-mode','Emacs Identica-mode','http://nongnu.org/identica-mode/', now()), ('Facebook','Facebook','http://apps.facebook.com/identica/', now()), ('feed2omb','feed2omb','http://projects.ciarang.com/p/feed2omb/', now()), ('get2gnow', 'get2gnow', 'http://uberchicgeekchick.com/?projects=get2gnow', now()), @@ -53,6 +54,7 @@ VALUES ('tr.im','tr.im','http://tr.im/', now()), ('triklepost', 'Tricklepost', 'http://github.com/zcopley/tricklepost/tree/master', now()), ('tweenky','Tweenky','http://beta.tweenky.com/', now()), + ('TweetDeck', 'TweetDeck', 'http://www.tweetdeck.com/', now()), ('twhirl','Twhirl','http://www.twhirl.org/', now()), ('twibble','twibble','http://www.twibble.de/', now()), ('Twidge','Twidge','http://software.complete.org/twidge', now()), diff --git a/lib/apiaction.php b/lib/apiaction.php index 6ee0a94d9..320aa0316 100644 --- a/lib/apiaction.php +++ b/lib/apiaction.php @@ -63,9 +63,12 @@ class ApiAction extends Action var $count = null; var $max_id = null; var $since_id = null; + var $source = null; var $access = self::READ_ONLY; // read (default) or read-write + static $reserved_sources = array('web', 'omb', 'ostatus', 'mail', 'xmpp', 'api'); + /** * Initialization. * @@ -89,6 +92,12 @@ class ApiAction extends Action header('X-StatusNet-Warning: since parameter is disabled; use since_id'); } + $this->source = $this->trimmed('source'); + + if (empty($this->source) || in_array($this->source, self::$reserved_sources)) { + $this->source = 'api'; + } + return true; } @@ -255,7 +264,23 @@ class ApiAction extends Action $twitter_status['created_at'] = $this->dateTwitter($notice->created); $twitter_status['in_reply_to_status_id'] = ($notice->reply_to) ? intval($notice->reply_to) : null; - $twitter_status['source'] = $this->sourceLink($notice->source); + + $source = null; + + $ns = $notice->getSource(); + if ($ns) { + if (!empty($ns->name) && !empty($ns->url)) { + $source = '<a href="' + . htmlspecialchars($ns->url) + . '" rel="nofollow">' + . htmlspecialchars($ns->name) + . '</a>'; + } else { + $source = $ns->code; + } + } + + $twitter_status['source'] = $source; $twitter_status['id'] = intval($notice->id); $replier_profile = null; @@ -1311,43 +1336,6 @@ class ApiAction extends Action } } - function sourceLink($source) - { - $source_name = _($source); - switch ($source) { - case 'web': - case 'xmpp': - case 'mail': - case 'omb': - case 'api': - break; - default: - - $name = null; - $url = null; - - $ns = Notice_source::staticGet($source); - - if ($ns) { - $name = $ns->name; - $url = $ns->url; - } else { - $app = Oauth_application::staticGet('name', $source); - if ($app) { - $name = $app->name; - $url = $app->source_url; - } - } - - if (!empty($name) && !empty($url)) { - $source_name = '<a href="' . $url . '">' . $name . '</a>'; - } - - break; - } - return $source_name; - } - /** * Returns query argument or default value if not found. Certain * parameters used throughout the API are lightly scrubbed and diff --git a/lib/apiauth.php b/lib/apiauth.php index e78de618e..95acbbd7b 100644 --- a/lib/apiauth.php +++ b/lib/apiauth.php @@ -54,7 +54,6 @@ class ApiAuthAction extends ApiAction { var $auth_user_nickname = null; var $auth_user_password = null; - var $oauth_source = null; /** * Take arguments for running, looks for an OAuth request, @@ -162,7 +161,7 @@ class ApiAuthAction extends ApiAction // set the source attr - $this->oauth_source = $app->name; + $this->source = $app->name; $appUser = Oauth_application_user::staticGet('token', $access_token); diff --git a/lib/atomnoticefeed.php b/lib/atomnoticefeed.php index e4df731fe..35a45118c 100644 --- a/lib/atomnoticefeed.php +++ b/lib/atomnoticefeed.php @@ -79,6 +79,11 @@ class AtomNoticeFeed extends Atom10Feed 'ostatus', 'http://ostatus.org/schema/1.0' ); + + $this->addNamespace( + 'statusnet', + 'http://status.net/ont/' + ); } /** @@ -110,7 +115,9 @@ class AtomNoticeFeed extends Atom10Feed $source = $this->showSource(); $author = $this->showAuthor(); - $this->addEntryRaw($notice->asAtomEntry(false, $source, $author)); + $cur = common_current_user(); + + $this->addEntryRaw($notice->asAtomEntry(false, $source, $author, $cur)); } function showSource() diff --git a/lib/default.php b/lib/default.php index fa4ece10a..950c6018d 100644 --- a/lib/default.php +++ b/lib/default.php @@ -188,7 +188,8 @@ $default = 'cache' => array('base' => null), 'ping' => - array('notify' => array()), + array('notify' => array(), + 'timeout' => 2), 'inboxes' => array('enabled' => true), # ignored after 0.9.x 'newuser' => @@ -303,4 +304,7 @@ $default = array('subscribers' => true, 'members' => true, 'peopletag' => true), + 'http' => // HTTP client settings when contacting other sites + array('ssl_cafile' => false // To enable SSL cert validation, point to a CA bundle (eg '/usr/lib/ssl/certs/ca-certificates.crt') + ), ); diff --git a/lib/httpclient.php b/lib/httpclient.php index 384626ae0..b69f718e5 100644 --- a/lib/httpclient.php +++ b/lib/httpclient.php @@ -132,7 +132,19 @@ class HTTPClient extends HTTP_Request2 // ought to be investigated to see if we can handle // it gracefully in that case as well. $this->config['protocol_version'] = '1.0'; - + + // Default state of OpenSSL seems to have no trusted + // SSL certificate authorities, which breaks hostname + // verification and means we have a hard time communicating + // with other sites' HTTPS interfaces. + // + // Turn off verification unless we've configured a CA bundle. + if (common_config('http', 'ssl_cafile')) { + $this->config['ssl_cafile'] = common_config('http', 'ssl_cafile'); + } else { + $this->config['ssl_verify_peer'] = false; + } + parent::__construct($url, $method, $config); $this->setHeader('User-Agent', $this->userAgent()); } diff --git a/lib/installer.php b/lib/installer.php index 589a19a66..58ffbfef7 100644 --- a/lib/installer.php +++ b/lib/installer.php @@ -128,6 +128,7 @@ abstract class Installer $pass = false; } + // @fixme this check seems to be insufficient with Windows ACLs if (!is_writable(INSTALLDIR)) { $this->warning(sprintf('Cannot write config file to: <code>%s</code></p>', INSTALLDIR), sprintf('On your server, try this command: <code>chmod a+w %s</code>', INSTALLDIR)); @@ -409,6 +410,10 @@ abstract class Installer "\$config['db']['database'] = '{$this->db['database']}';\n\n". ($this->db['type'] == 'pgsql' ? "\$config['db']['quote_identifiers'] = true;\n\n":''). "\$config['db']['type'] = '{$this->db['type']}';\n\n"; + + // Normalize line endings for Windows servers + $cfg = str_replace("\n", PHP_EOL, $cfg); + // write configuration file out to install directory $res = file_put_contents(INSTALLDIR.'/config.php', $cfg); diff --git a/lib/mail.php b/lib/mail.php index 5fc584e28..ab5742e33 100644 --- a/lib/mail.php +++ b/lib/mail.php @@ -224,9 +224,6 @@ function mail_subscribe_notify_profile($listenee, $other) if ($other->hasRight(Right::EMAILONSUBSCRIBE) && $listenee->email && $listenee->emailnotifysub) { - // use the recipient's localization - common_init_locale($listenee->language); - $profile = $listenee->getProfile(); $name = $profile->getBestName(); @@ -236,6 +233,9 @@ function mail_subscribe_notify_profile($listenee, $other) $recipients = $listenee->email; + // use the recipient's localization + common_switch_locale($listenee->language); + $headers = _mail_prepare_headers('subscribe', $listenee->nickname, $other->nickname); $headers['From'] = mail_notify_from(); $headers['To'] = $name . ' <' . $listenee->email . '>'; @@ -245,6 +245,11 @@ function mail_subscribe_notify_profile($listenee, $other) $other->getBestName(), common_config('site', 'name')); + $blocklink = sprintf(_("If you believe this account is being used abusively, " . + "you can block them from your subscribers list and " . + "report as spam to site administrators at %s"), + common_local_url('block', array('profileid' => $other->id))); + // TRANS: Main body of new-subscriber notification e-mail $body = sprintf(_('%1$s is now listening to your notices on %2$s.'."\n\n". "\t".'%3$s'."\n\n". @@ -264,14 +269,15 @@ function mail_subscribe_notify_profile($listenee, $other) ($other->homepage) ? // TRANS: Profile info line in new-subscriber notification e-mail sprintf(_("Homepage: %s"), $other->homepage) . "\n" : '', - ($other->bio) ? + (($other->bio) ? // TRANS: Profile info line in new-subscriber notification e-mail - sprintf(_("Bio: %s"), $other->bio) . "\n\n" : '', + sprintf(_("Bio: %s"), $other->bio) . "\n" : '') . + "\n\n" . $blocklink . "\n", common_config('site', 'name'), common_local_url('emailsettings')); // reset localization - common_init_locale(); + common_switch_locale(); mail_send($recipients, $headers, $body); } } @@ -473,7 +479,7 @@ function mail_confirm_sms($code, $nickname, $address) function mail_notify_nudge($from, $to) { - common_init_locale($to->language); + common_switch_locale($to->language); // TRANS: Subject for 'nudge' notification email $subject = sprintf(_('You\'ve been nudged by %s'), $from->nickname); @@ -491,7 +497,7 @@ function mail_notify_nudge($from, $to) $from->nickname, common_local_url('all', array('nickname' => $to->nickname)), common_config('site', 'name')); - common_init_locale(); + common_switch_locale(); $headers = _mail_prepare_headers('nudge', $to->nickname, $from->nickname); @@ -525,7 +531,7 @@ function mail_notify_message($message, $from=null, $to=null) return true; } - common_init_locale($to->language); + common_switch_locale($to->language); // TRANS: Subject for direct-message notification email $subject = sprintf(_('New private message from %s'), $from->nickname); @@ -549,7 +555,7 @@ function mail_notify_message($message, $from=null, $to=null) $headers = _mail_prepare_headers('message', $to->nickname, $from->nickname); - common_init_locale(); + common_switch_locale(); return mail_to_user($to, $subject, $body, $headers); } @@ -577,7 +583,7 @@ function mail_notify_fave($other, $user, $notice) $bestname = $profile->getBestName(); - common_init_locale($other->language); + common_switch_locale($other->language); // TRANS: Subject for favorite notification email $subject = sprintf(_('%s (@%s) added your notice as a favorite'), $bestname, $user->nickname); @@ -605,7 +611,7 @@ function mail_notify_fave($other, $user, $notice) $headers = _mail_prepare_headers('fave', $other->nickname, $user->nickname); - common_init_locale(); + common_switch_locale(); mail_to_user($other, $subject, $body, $headers); } diff --git a/lib/noticelist.php b/lib/noticelist.php index 4f997a328..81da9edc0 100644 --- a/lib/noticelist.php +++ b/lib/noticelist.php @@ -480,54 +480,46 @@ class NoticeListItem extends Widget function showNoticeSource() { - if ($this->notice->source) { + $ns = $this->notice->getSource(); + + if ($ns) { + $source_name = _($ns->code); $this->out->text(' '); $this->out->elementStart('span', 'source'); $this->out->text(_('from')); - $source_name = _($this->notice->source); $this->out->text(' '); - switch ($this->notice->source) { - case 'web': - case 'xmpp': - case 'mail': - case 'omb': - case 'system': - case 'api': - $this->out->element('span', 'device', $source_name); - break; - default: + $name = $source_name; + $url = $ns->url; + $title = null; + + if (Event::handle('StartNoticeSourceLink', array($this->notice, &$name, &$url, &$title))) { $name = $source_name; - $url = null; - - if (Event::handle('StartNoticeSourceLink', array($this->notice, &$name, &$url, &$title))) { - $ns = Notice_source::staticGet($this->notice->source); - - if ($ns) { - $name = $ns->name; - $url = $ns->url; - } else { - $app = Oauth_application::staticGet('name', $this->notice->source); - if ($app) { - $name = $app->name; - $url = $app->source_url; - } - } - } - Event::handle('EndNoticeSourceLink', array($this->notice, &$name, &$url, &$title)); - - if (!empty($name) && !empty($url)) { - $this->out->elementStart('span', 'device'); - $this->out->element('a', array('href' => $url, - 'rel' => 'external', - 'title' => $title), - $name); - $this->out->elementEnd('span'); - } else { - $this->out->element('span', 'device', $name); + $url = $ns->url; + } + Event::handle('EndNoticeSourceLink', array($this->notice, &$name, &$url, &$title)); + + // if $ns->name and $ns->url are populated we have + // configured a source attr somewhere + if (!empty($name) && !empty($url)) { + + $this->out->elementStart('span', 'device'); + + $attrs = array( + 'href' => $url, + 'rel' => 'external' + ); + + if (!empty($title)) { + $attrs['title'] = $title; } - break; + + $this->out->element('a', $attrs, $name); + $this->out->elementEnd('span'); + } else { + $this->out->element('span', 'device', $name); } + $this->out->elementEnd('span'); } } diff --git a/lib/ping.php b/lib/ping.php index 735af9ef1..be2933ae3 100644 --- a/lib/ping.php +++ b/lib/ping.php @@ -45,7 +45,15 @@ function ping_broadcast_notice($notice) { $tags)); $request = HTTPClient::start(); - $httpResponse = $request->post($notify_url, array('Content-Type: text/xml'), $req); + $request->setConfig('connect_timeout', common_config('ping', 'timeout')); + $request->setConfig('timeout', common_config('ping', 'timeout')); + try { + $httpResponse = $request->post($notify_url, array('Content-Type: text/xml'), $req); + } catch (Exception $e) { + common_log(LOG_ERR, + "Exception pinging $notify_url: " . $e->getMessage()); + continue; + } if (!$httpResponse || mb_strlen($httpResponse->getBody()) == 0) { common_log(LOG_WARNING, diff --git a/lib/profileformaction.php b/lib/profileformaction.php index 0ffafe5fb..51c89a922 100644 --- a/lib/profileformaction.php +++ b/lib/profileformaction.php @@ -60,7 +60,16 @@ class ProfileFormAction extends RedirectingAction $this->checkSessionToken(); if (!common_logged_in()) { - $this->clientError(_('Not logged in.')); + if ($_SERVER['REQUEST_METHOD'] == 'POST') { + $this->clientError(_('Not logged in.')); + } else { + // Redirect to login. + common_set_returnto($this->selfUrl()); + $user = common_current_user(); + if (Event::handle('RedirectToLogin', array($this, $user))) { + common_redirect(common_local_url('login'), 303); + } + } return false; } @@ -97,7 +106,7 @@ class ProfileFormAction extends RedirectingAction if ($_SERVER['REQUEST_METHOD'] == 'POST') { $this->handlePost(); - $this->returnToArgs(); + $this->returnToPrevious(); } } diff --git a/lib/redirectingaction.php b/lib/redirectingaction.php index f11585274..3a358f891 100644 --- a/lib/redirectingaction.php +++ b/lib/redirectingaction.php @@ -53,12 +53,13 @@ class RedirectingAction extends Action * * To be called only after successful processing. * - * @fixme rename this -- it obscures Action::returnToArgs() which - * returns a list of arguments, and is a bit confusing. + * Note: this was named returnToArgs() up through 0.9.2, which + * caused problems because there's an Action::returnToArgs() + * already which does something different. * * @return void */ - function returnToArgs() + function returnToPrevious() { // Now, gotta figure where we go back to $action = false; @@ -77,7 +78,7 @@ class RedirectingAction extends Action if ($action) { common_redirect(common_local_url($action, $args, $params), 303); } else { - $url = $this->defaultReturnToUrl(); + $url = $this->defaultReturnTo(); } common_redirect($url, 303); } diff --git a/lib/router.php b/lib/router.php index a9d07276f..afe44f92a 100644 --- a/lib/router.php +++ b/lib/router.php @@ -136,6 +136,11 @@ class Router $m->connect('main/'.$a, array('action' => $a)); } + // Also need a block variant accepting ID on URL for mail links + $m->connect('main/block/:profileid', + array('action' => 'block'), + array('profileid' => '[0-9]+')); + $m->connect('main/sup/:seconds', array('action' => 'sup'), array('seconds' => '[0-9]+')); diff --git a/lib/util.php b/lib/util.php index c0013bb3d..59d5132ec 100644 --- a/lib/util.php +++ b/lib/util.php @@ -34,6 +34,14 @@ function common_user_error($msg, $code=400) $err->showPage(); } +/** + * This should only be used at setup; processes switching languages + * to send text to other users should use common_switch_locale(). + * + * @param string $language Locale language code (optional; empty uses + * current user's preference or site default) + * @return mixed success + */ function common_init_locale($language=null) { if(!$language) { @@ -50,6 +58,15 @@ function common_init_locale($language=null) return $ok; } +/** + * Initialize locale and charset settings and gettext with our message catalog, + * using the current user's language preference or the site default. + * + * This should generally only be run at framework initialization; code switching + * languages at runtime should call common_switch_language(). + * + * @access private + */ function common_init_language() { mb_internal_encoding('UTF-8'); @@ -1365,7 +1382,7 @@ function common_log_line($priority, $msg) { static $syslog_priorities = array('LOG_EMERG', 'LOG_ALERT', 'LOG_CRIT', 'LOG_ERR', 'LOG_WARNING', 'LOG_NOTICE', 'LOG_INFO', 'LOG_DEBUG'); - return date('Y-m-d H:i:s') . ' ' . $syslog_priorities[$priority] . ': ' . $msg . "\n"; + return date('Y-m-d H:i:s') . ' ' . $syslog_priorities[$priority] . ': ' . $msg . PHP_EOL; } function common_request_id() @@ -1908,6 +1925,15 @@ function common_url_to_nickname($url) $path = preg_replace('@/$@', '', $parts['path']); $path = preg_replace('@^/@', '', $path); $path = basename($path); + + // Hack for MediaWiki user pages, in the form: + // http://example.com/wiki/User:Myname + // ('User' may be localized.) + if (strpos($path, ':')) { + $parts = array_filter(explode(':', $path)); + $path = $parts[count($parts) - 1]; + } + if ($path) { return common_nicknamize($path); } diff --git a/lib/xmppmanager.php b/lib/xmppmanager.php index cca54db08..829eaa36c 100644 --- a/lib/xmppmanager.php +++ b/lib/xmppmanager.php @@ -253,12 +253,12 @@ class XmppManager extends IoManager $from = jabber_normalize_jid($pl['from']); if ($pl['type'] != 'chat') { - $this->log(LOG_WARNING, "Ignoring message of type ".$pl['type']." from $from."); + $this->log(LOG_WARNING, "Ignoring message of type ".$pl['type']." from $from: " . $pl['xml']->toString()); return; } if (mb_strlen($pl['body']) == 0) { - $this->log(LOG_WARNING, "Ignoring message with empty body from $from."); + $this->log(LOG_WARNING, "Ignoring message with empty body from $from: " . $pl['xml']->toString()); return; } diff --git a/locale/af/LC_MESSAGES/statusnet.po b/locale/af/LC_MESSAGES/statusnet.po index 10dab614e..b6ca4a23e 100644 --- a/locale/af/LC_MESSAGES/statusnet.po +++ b/locale/af/LC_MESSAGES/statusnet.po @@ -9,11 +9,11 @@ msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2010-04-24 14:16+0000\n" -"PO-Revision-Date: 2010-04-26 22:15:59+0000\n" +"PO-Revision-Date: 2010-05-03 19:17:08+0000\n" "Language-Team: Afrikaans\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r65552); Translate extension (2010-04-25)\n" +"X-Generator: MediaWiki 1.17alpha (r65870); Translate extension (2010-05-01)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: af\n" "X-Message-Group: out-statusnet\n" @@ -4616,7 +4616,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:1535 +#: classes/Notice.php:1533 #, php-format msgid "RT @%1$s %2$s" msgstr "RT @%1$s %2$s" @@ -4968,7 +4968,7 @@ msgid "Before" msgstr "Voor" #. TRANS: Client exception thrown when a feed instance is a DOMDocument. -#: lib/activity.php:121 +#: lib/activity.php:122 msgid "Expecting a root feed element but got a whole XML document." msgstr "" @@ -4976,11 +4976,11 @@ msgstr "" msgid "Can't handle remote content yet." msgstr "" -#: lib/activityutils.php:236 +#: lib/activityutils.php:244 msgid "Can't handle embedded XML content yet." msgstr "" -#: lib/activityutils.php:240 +#: lib/activityutils.php:248 msgid "Can't handle embedded Base64 content yet." msgstr "" @@ -6212,7 +6212,7 @@ msgstr "" msgid "Tags in %s's notices" msgstr "" -#: lib/plugin.php:114 +#: lib/plugin.php:115 msgid "Unknown" msgstr "Onbekend" diff --git a/locale/ar/LC_MESSAGES/statusnet.po b/locale/ar/LC_MESSAGES/statusnet.po index 84c856ba8..44a1607da 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-24 14:16+0000\n" -"PO-Revision-Date: 2010-04-26 22:16:02+0000\n" +"POT-Creation-Date: 2010-04-29 23:21+0000\n" +"PO-Revision-Date: 2010-05-03 19:17:11+0000\n" "Language-Team: Arabic\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r65552); Translate extension (2010-04-25)\n" +"X-Generator: MediaWiki 1.17alpha (r65870); Translate extension (2010-05-01)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: ar\n" "X-Message-Group: out-statusnet\n" @@ -1227,7 +1227,7 @@ msgstr "الوصف مطلوب." #: actions/editapplication.php:194 msgid "Source URL is too long." -msgstr "" +msgstr "المسار المصدر طويل جدًا." #: actions/editapplication.php:200 actions/newapplication.php:185 msgid "Source URL is not valid." @@ -2008,15 +2008,13 @@ msgstr "هذا عنوان محادثة فورية خاطئ." #. TRANS: Server error thrown on database error canceling IM address confirmation. #: actions/imsettings.php:397 -#, fuzzy msgid "Couldn't delete IM confirmation." -msgstr "تعذّر حذف تأكيد البريد الإلكتروني." +msgstr "تعذّر حذف تأكيد البريد المراسلة الفورية." #. TRANS: Message given after successfully canceling IM address confirmation. #: actions/imsettings.php:402 -#, fuzzy msgid "IM confirmation cancelled." -msgstr "أُلغي التأكيد." +msgstr "أُلغي تأكيد المراسلة الفورية." #. TRANS: Message given trying to remove an IM address that is not #. TRANS: registered for the active user. @@ -2026,9 +2024,8 @@ msgstr "هذه ليست هويتك في جابر." #. TRANS: Message given after successfully removing a registered IM address. #: actions/imsettings.php:447 -#, fuzzy msgid "The IM address was removed." -msgstr "أزيل هذا العنوان." +msgstr "أزيل عنوان المراسلة الفورية هذا." #: actions/inbox.php:59 #, php-format @@ -2046,7 +2043,7 @@ msgstr "هذا صندوق بريدك الوارد، والذي يسرد رسائ #: actions/invite.php:39 msgid "Invites have been disabled." -msgstr "" +msgstr "تم تعطيل الدعوات." #: actions/invite.php:41 #, fuzzy, php-format @@ -2258,9 +2255,8 @@ msgid "Can't make %1$s an admin for group %2$s." msgstr "لم يمكن جعل %1$s إداريا للمجموعة %2$s." #: actions/microsummary.php:69 -#, fuzzy msgid "No current status." -msgstr "لا حالة حالية" +msgstr "لا حالة جارية." #: actions/newapplication.php:52 msgid "New Application" @@ -2603,24 +2599,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 "لا يمكن قراءة دليل السمات: %s" +msgstr "لا يمكن قراءة دليل السمات: %s." #: actions/pathsadminpanel.php:163 -#, fuzzy, php-format +#, php-format msgid "Avatar directory not writable: %s." -msgstr "لا يمكن الكتابة في دليل الأفتارات: %s" +msgstr "لا يمكن الكتابة في دليل الأفتارات: %s." #: actions/pathsadminpanel.php:169 -#, fuzzy, php-format +#, php-format msgid "Background directory not writable: %s." -msgstr "لا يمكن الكتابة في دليل الخلفيات: %s" +msgstr "لا يمكن الكتابة في دليل الخلفيات: %s." #: actions/pathsadminpanel.php:177 -#, fuzzy, php-format +#, php-format msgid "Locales directory not readable: %s." -msgstr "لا يمكن قراءة دليل المحليات: %s" +msgstr "لا يمكن قراءة دليل المحليات: %s." #: actions/pathsadminpanel.php:183 msgid "Invalid SSL server. The maximum length is 255 characters." @@ -2760,9 +2756,9 @@ msgid "People search" msgstr "بحث في الأشخاص" #: actions/peopletag.php:68 -#, fuzzy, php-format +#, php-format msgid "Not a valid people tag: %s." -msgstr "ليس وسم أشخاص صالح: %s" +msgstr "ليس وسم أشخاص صالح: %s." #: actions/peopletag.php:142 #, php-format @@ -2770,9 +2766,8 @@ msgid "Users self-tagged with %1$s - page %2$d" msgstr "المستخدمون الذين وسموا أنفسهم ب%1$s - الصفحة %2$d" #: actions/postnotice.php:95 -#, fuzzy msgid "Invalid notice content." -msgstr "محتوى إشعار غير صالح" +msgstr "محتوى إشعار غير صالح." #: actions/postnotice.php:101 #, php-format @@ -2913,9 +2908,9 @@ msgid "Settings saved." msgstr "حُفظت الإعدادات." #: actions/public.php:83 -#, fuzzy, php-format +#, php-format msgid "Beyond the page limit (%s)." -msgstr "وراء حد الصفحة (%s)" +msgstr "بعد حد الصفحة (%s)." #: actions/public.php:92 msgid "Could not retrieve public stream." @@ -3385,9 +3380,8 @@ msgid "Sessions" msgstr "الجلسات" #: actions/sessionsadminpanel.php:65 -#, fuzzy msgid "Session settings for this StatusNet site." -msgstr "الإعدادات الأساسية لموقع StatusNet هذا." +msgstr "إعدادات جلسة موقع StatusNet هذا." #: actions/sessionsadminpanel.php:175 msgid "Handle sessions" @@ -4641,7 +4635,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:1535 +#: classes/Notice.php:1533 #, php-format msgid "RT @%1$s %2$s" msgstr "آر تي @%1$s %2$s" @@ -5002,7 +4996,7 @@ msgid "Before" msgstr "قبل" #. TRANS: Client exception thrown when a feed instance is a DOMDocument. -#: lib/activity.php:121 +#: lib/activity.php:122 msgid "Expecting a root feed element but got a whole XML document." msgstr "" @@ -5010,11 +5004,11 @@ msgstr "" msgid "Can't handle remote content yet." msgstr "" -#: lib/activityutils.php:236 +#: lib/activityutils.php:244 msgid "Can't handle embedded XML content yet." msgstr "" -#: lib/activityutils.php:240 +#: lib/activityutils.php:248 msgid "Can't handle embedded Base64 content yet." msgstr "" @@ -6318,7 +6312,7 @@ msgstr "رسائلك المُرسلة" msgid "Tags in %s's notices" msgstr "وسوم في إشعارات %s" -#: lib/plugin.php:114 +#: lib/plugin.php:115 msgid "Unknown" msgstr "غير معروفة" diff --git a/locale/arz/LC_MESSAGES/statusnet.po b/locale/arz/LC_MESSAGES/statusnet.po index e67405582..30763d3e0 100644 --- a/locale/arz/LC_MESSAGES/statusnet.po +++ b/locale/arz/LC_MESSAGES/statusnet.po @@ -11,11 +11,11 @@ msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2010-04-24 14:16+0000\n" -"PO-Revision-Date: 2010-04-26 22:16:06+0000\n" +"PO-Revision-Date: 2010-05-03 19:17:20+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 (r65552); Translate extension (2010-04-25)\n" +"X-Generator: MediaWiki 1.17alpha (r65870); Translate extension (2010-05-01)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: arz\n" "X-Message-Group: out-statusnet\n" @@ -4658,7 +4658,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:1535 +#: classes/Notice.php:1533 #, php-format msgid "RT @%1$s %2$s" msgstr "آر تى @%1$s %2$s" @@ -5035,7 +5035,7 @@ msgid "Before" msgstr "قبل" #. TRANS: Client exception thrown when a feed instance is a DOMDocument. -#: lib/activity.php:121 +#: lib/activity.php:122 msgid "Expecting a root feed element but got a whole XML document." msgstr "" @@ -5043,11 +5043,11 @@ msgstr "" msgid "Can't handle remote content yet." msgstr "" -#: lib/activityutils.php:236 +#: lib/activityutils.php:244 msgid "Can't handle embedded XML content yet." msgstr "" -#: lib/activityutils.php:240 +#: lib/activityutils.php:248 msgid "Can't handle embedded Base64 content yet." msgstr "" @@ -6298,7 +6298,7 @@ msgstr "رسائلك المُرسلة" msgid "Tags in %s's notices" msgstr "" -#: lib/plugin.php:114 +#: lib/plugin.php:115 msgid "Unknown" msgstr "مش معروف" diff --git a/locale/bg/LC_MESSAGES/statusnet.po b/locale/bg/LC_MESSAGES/statusnet.po index c96b66ee6..650bfdc93 100644 --- a/locale/bg/LC_MESSAGES/statusnet.po +++ b/locale/bg/LC_MESSAGES/statusnet.po @@ -10,11 +10,11 @@ msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2010-04-24 14:16+0000\n" -"PO-Revision-Date: 2010-04-26 22:16:09+0000\n" +"PO-Revision-Date: 2010-05-03 19:17:24+0000\n" "Language-Team: Bulgarian\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r65552); Translate extension (2010-04-25)\n" +"X-Generator: MediaWiki 1.17alpha (r65870); Translate extension (2010-05-01)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: bg\n" "X-Message-Group: out-statusnet\n" @@ -4816,7 +4816,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:1535 +#: classes/Notice.php:1533 #, php-format msgid "RT @%1$s %2$s" msgstr "RT @%1$s %2$s" @@ -5188,7 +5188,7 @@ msgid "Before" msgstr "Преди" #. TRANS: Client exception thrown when a feed instance is a DOMDocument. -#: lib/activity.php:121 +#: lib/activity.php:122 msgid "Expecting a root feed element but got a whole XML document." msgstr "" @@ -5196,11 +5196,11 @@ msgstr "" msgid "Can't handle remote content yet." msgstr "" -#: lib/activityutils.php:236 +#: lib/activityutils.php:244 msgid "Can't handle embedded XML content yet." msgstr "" -#: lib/activityutils.php:240 +#: lib/activityutils.php:248 msgid "Can't handle embedded Base64 content yet." msgstr "" @@ -6472,7 +6472,7 @@ msgstr "Изпратените от вас съобщения" msgid "Tags in %s's notices" msgstr "Етикети в бележките на %s" -#: lib/plugin.php:114 +#: lib/plugin.php:115 #, fuzzy msgid "Unknown" msgstr "Непознато действие" diff --git a/locale/br/LC_MESSAGES/statusnet.po b/locale/br/LC_MESSAGES/statusnet.po index 9e0994529..2ab02917b 100644 --- a/locale/br/LC_MESSAGES/statusnet.po +++ b/locale/br/LC_MESSAGES/statusnet.po @@ -10,11 +10,11 @@ msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2010-04-24 14:16+0000\n" -"PO-Revision-Date: 2010-04-26 22:16:12+0000\n" +"PO-Revision-Date: 2010-05-03 19:17:27+0000\n" "Language-Team: Dutch\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r65552); Translate extension (2010-04-25)\n" +"X-Generator: MediaWiki 1.17alpha (r65870); Translate extension (2010-05-01)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: br\n" "X-Message-Group: out-statusnet\n" @@ -2105,7 +2105,7 @@ msgstr "Kemennadenn bersonel" #: actions/invite.php:194 msgid "Optionally add a personal message to the invitation." -msgstr "" +msgstr "Ouzhpennañ ur gemennadenn bersonel d'ar bedadenn (diret)." #. TRANS: Send button for inviting friends #: actions/invite.php:198 @@ -2772,6 +2772,8 @@ msgstr "Danvez direizh an ali." #, php-format msgid "Notice license ‘%1$s’ is not compatible with site license ‘%2$s’." msgstr "" +"Aotre-implijout ar menegoù \"%1$s\" ne ya ket gant aotre-implijout al " +"lec'hienn \"%2$s\"." #: actions/profilesettings.php:60 msgid "Profile settings" @@ -2781,6 +2783,8 @@ msgstr "Arventennoù ar profil" msgid "" "You can update your personal profile info here so people know more about you." msgstr "" +"Gellout a reoc'h hizivaat titouroù ho profil evit ma ouifemp muioc'h a draoù " +"diwar ho penn." #: actions/profilesettings.php:99 msgid "Profile information" @@ -2788,7 +2792,7 @@ msgstr "Titouroù ar profil" #: actions/profilesettings.php:108 lib/groupeditform.php:154 msgid "1-64 lowercase letters or numbers, no punctuation or spaces" -msgstr "" +msgstr "1 da 64 lizherenn vihan pe sifr, hep poentaouiñ nag esaouenn" #: actions/profilesettings.php:111 actions/register.php:448 #: actions/showgroup.php:256 actions/tagother.php:104 @@ -2804,12 +2808,12 @@ msgstr "Pajenn degemer" #: actions/profilesettings.php:117 actions/register.php:455 msgid "URL of your homepage, blog, or profile on another site" -msgstr "" +msgstr "URL ho pajenn degemer, ho blog, pe ho profil en ul lec'hienn all" #: actions/profilesettings.php:122 actions/register.php:461 #, php-format msgid "Describe yourself and your interests in %d chars" -msgstr "" +msgstr "Deskrivit ac'hanoc'h hag ho interestoù, gant %d arouezenn" #: actions/profilesettings.php:125 actions/register.php:464 msgid "Describe yourself and your interests" @@ -2844,6 +2848,8 @@ msgstr "Balizennoù" msgid "" "Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated" msgstr "" +"Merkoù evidoc'h oc'h unan (lizherennoù, sifroù, -, ., ha _), dispartiet gant " +"virgulennoù pe esaouennoù" #: actions/profilesettings.php:151 msgid "Language" @@ -2859,12 +2865,14 @@ msgstr "Takad eur" #: actions/profilesettings.php:162 msgid "What timezone are you normally in?" -msgstr "" +msgstr "Pehini eo gwerzhid-eur boaz ?" #: actions/profilesettings.php:167 msgid "" "Automatically subscribe to whoever subscribes to me (best for non-humans)" msgstr "" +"En em enskrivañ ez emgefre d'an holl re hag en em goumanant din (erbedet " +"evit an implijerien nann-denel)" #: actions/profilesettings.php:228 actions/register.php:223 #, php-format @@ -2886,7 +2894,7 @@ msgstr "Balizenn direizh : \"%s\"" #: actions/profilesettings.php:306 msgid "Couldn't update user for autosubscribe." -msgstr "" +msgstr "Dibosupl eo hizivaat ar c'houmanant ez emgefre." #: actions/profilesettings.php:363 msgid "Couldn't save location prefs." @@ -2912,16 +2920,16 @@ msgstr "Dreist da bevennoù ar bajenn (%s)." #: actions/public.php:92 msgid "Could not retrieve public stream." -msgstr "" +msgstr "Dibosupl eo adtapout al lanv foran." #: actions/public.php:130 #, php-format msgid "Public timeline, page %d" -msgstr "" +msgstr "Lanv foran - pajenn %d" #: actions/public.php:132 lib/publicgroupnav.php:79 msgid "Public timeline" -msgstr "" +msgstr "Lanv foran" #: actions/public.php:160 msgid "Public Stream Feed (RSS 1.0)" @@ -2941,6 +2949,7 @@ msgid "" "This is the public timeline for %%site.name%% but no one has posted anything " "yet." msgstr "" +"Kronologiezh foran %%site.name%% eo, met den n'en deus skrivet tra ebet." #: actions/public.php:191 msgid "Be the first to post!" @@ -2951,6 +2960,8 @@ msgstr "Bezit an hini gentañ da bostañ !" msgid "" "Why not [register an account](%%action.register%%) and be the first to post!" msgstr "" +"Perak ne [groufec'h ket ur gont](%%action.register%%) ha bezañ an hini " +"gentañ da embann un dra !" #: actions/public.php:242 #, php-format @@ -2968,10 +2979,12 @@ msgid "" "blogging) service based on the Free Software [StatusNet](http://status.net/) " "tool." msgstr "" +"%%site.name%% a zo ur servij [micro-blogging](http://br.wikipedia.org/wiki/" +"Microblog) diazezet war ar meziant frank [StatusNet](http://status.net/)." #: actions/publictagcloud.php:57 msgid "Public tag cloud" -msgstr "" +msgstr "Koumoulenn a merkoù foran" #: actions/publictagcloud.php:63 #, php-format @@ -2993,10 +3006,12 @@ msgid "" "Why not [register an account](%%action.register%%) and be the first to post " "one!" msgstr "" +"Perak ne [groufec'h ket ur gont](%%action.register%%) ha bezañ an hini " +"gentañ da embann un dra !" #: actions/publictagcloud.php:134 msgid "Tag cloud" -msgstr "" +msgstr "Koumoulenn merkoù" #: actions/recoverpassword.php:36 msgid "You are already logged in!" @@ -3024,17 +3039,19 @@ msgstr "Re gozh eo ar c'hod gwiriañ. Adkrogit mar plij." #: actions/recoverpassword.php:111 msgid "Could not update user with confirmed email address." -msgstr "" +msgstr "Dibosupl eo hizivaat an implijer gant ar chomlec'h postel gwiriekaet." #: actions/recoverpassword.php:152 msgid "" "If you have forgotten or lost your password, you can get a new one sent to " "the email address you have stored in your account." msgstr "" +"M'o peus disoñjet pe kollet ho ger-tremen, e c'helloc'h kaout unan nevez hag " +"a vo kaset deoc'h d'ar chomlec'h postel termenet en ho kont." #: actions/recoverpassword.php:158 msgid "You have been identified. Enter a new password below. " -msgstr "" +msgstr "Diskleriet oc'h bet. Lakait ur ger-tremen nevez amañ da heul. " #: actions/recoverpassword.php:188 msgid "Password recovery" @@ -3046,7 +3063,7 @@ msgstr "Lesanv pe chomlec'h postel" #: actions/recoverpassword.php:193 msgid "Your nickname on this server, or your registered email address." -msgstr "" +msgstr "Ho lesanv war ar servijer-mañ, pe ar chomlec'h postel o peus enrollet." #: actions/recoverpassword.php:199 actions/recoverpassword.php:200 msgid "Recover" @@ -3097,10 +3114,12 @@ msgid "" "Instructions for recovering your password have been sent to the email " "address registered to your account." msgstr "" +"Kaset eo bet deoc'h, d'ar chomlec'h postel termenet en ho kont, an titouroù " +"ret evit gouzout penaos adtapout o ger-tremen." #: actions/recoverpassword.php:357 msgid "Unexpected password reset." -msgstr "" +msgstr "Adderaouekadur dic'hortoz ar ger-tremen." #: actions/recoverpassword.php:365 msgid "Password must be 6 chars or more." @@ -3217,6 +3236,8 @@ msgid "" "(You should receive a message by email momentarily, with instructions on how " "to confirm your email address.)" msgstr "" +"(Resevout a reoc'h a-benn nebeut ur postel gant an titouroù evit kadarnaat " +"ho chomlec'h.)" #: actions/remotesubscribe.php:98 #, php-format @@ -3265,7 +3286,7 @@ msgstr "" #: actions/remotesubscribe.php:176 msgid "That’s a local profile! Login to subscribe." -msgstr "" +msgstr "Lec'hel eo ar profil-mañ ! Kevreit evit koumananti." #: actions/remotesubscribe.php:183 msgid "Couldn’t get a request token." @@ -3461,11 +3482,11 @@ msgstr "Sekred an implijer" #: actions/showapplication.php:273 msgid "Request token URL" -msgstr "" +msgstr "URL ar jedouer reked" #: actions/showapplication.php:278 msgid "Access token URL" -msgstr "" +msgstr "URL ar jedouer moned" #: actions/showapplication.php:283 msgid "Authorize URL" @@ -3480,6 +3501,7 @@ msgstr "" #: actions/showapplication.php:309 msgid "Are you sure you want to reset your consumer key and secret?" msgstr "" +"Ha sur oc'h o peus c'hoant adderaouekaat ho alc'hwez bevezer ha sekred ?" #: actions/showfavorites.php:79 #, php-format @@ -4614,7 +4636,7 @@ 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:1535 +#: classes/Notice.php:1533 #, php-format msgid "RT @%1$s %2$s" msgstr "RT @%1$s %2$s" @@ -4908,7 +4930,7 @@ msgstr "" #: lib/action.php:820 #, php-format msgid "**%%site.name%%** is a microblogging service." -msgstr "" +msgstr "**%%site.name%%** a zo ur servij microblogging." #. TRANS: Second sentence of the StatusNet site license. Mentions the StatusNet source code license. #: lib/action.php:824 @@ -4967,7 +4989,7 @@ msgid "Before" msgstr "Kent" #. TRANS: Client exception thrown when a feed instance is a DOMDocument. -#: lib/activity.php:121 +#: lib/activity.php:122 msgid "Expecting a root feed element but got a whole XML document." msgstr "" @@ -4975,11 +4997,11 @@ msgstr "" msgid "Can't handle remote content yet." msgstr "" -#: lib/activityutils.php:236 +#: lib/activityutils.php:244 msgid "Can't handle embedded XML content yet." msgstr "" -#: lib/activityutils.php:240 +#: lib/activityutils.php:248 msgid "Can't handle embedded Base64 content yet." msgstr "" @@ -5532,7 +5554,7 @@ msgstr "" #: lib/connectsettingsaction.php:116 msgid "Updates by SMS" -msgstr "" +msgstr "Hizivadennoù dre SMS" #: lib/connectsettingsaction.php:120 msgid "Connections" @@ -5759,7 +5781,7 @@ msgstr "Digeriñ ur gont nevez" #. TRANS: Subject for address confirmation email #: lib/mail.php:174 msgid "Email address confirmation" -msgstr "" +msgstr "Kadarnadur ar chomlec'h postel" #. TRANS: Body for address confirmation email. #: lib/mail.php:177 @@ -5811,7 +5833,7 @@ msgstr "" #: lib/mail.php:298 #, php-format msgid "New email address for posting to %s" -msgstr "" +msgstr "Chomlec'h postel nevez evit embann e %s" #. TRANS: Body of notification mail for new posting email address #: lib/mail.php:302 @@ -6018,7 +6040,7 @@ msgstr "" #: lib/mediafile.php:159 msgid "Missing a temporary folder." -msgstr "" +msgstr "Mankout a ra un doser padennek." #: lib/mediafile.php:162 msgid "Failed to write file to disk." @@ -6216,7 +6238,7 @@ msgstr "Ar c'hemenadennoù kaset ganeoc'h" msgid "Tags in %s's notices" msgstr "" -#: lib/plugin.php:114 +#: lib/plugin.php:115 msgid "Unknown" msgstr "Dianav" diff --git a/locale/ca/LC_MESSAGES/statusnet.po b/locale/ca/LC_MESSAGES/statusnet.po index 7b59c0ef4..b12c03a1c 100644 --- a/locale/ca/LC_MESSAGES/statusnet.po +++ b/locale/ca/LC_MESSAGES/statusnet.po @@ -12,11 +12,11 @@ msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2010-04-24 14:16+0000\n" -"PO-Revision-Date: 2010-04-26 22:16:15+0000\n" +"PO-Revision-Date: 2010-05-03 19:17:30+0000\n" "Language-Team: Catalan\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r65552); Translate extension (2010-04-25)\n" +"X-Generator: MediaWiki 1.17alpha (r65870); Translate extension (2010-05-01)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: ca\n" "X-Message-Group: out-statusnet\n" @@ -166,6 +166,8 @@ msgid "" "Try subscribing to more people, [join a group](%%action.groups%%) or post " "something yourself." msgstr "" +"Proveu de subscriure més gent, [uniu-vos a un grup](%%action.groups%%) o " +"envieu quelcom personal." #. TRANS: %1$s is user nickname, %2$s is user nickname, %2$s is user nickname prefixed with "@" #: actions/all.php:142 @@ -239,9 +241,10 @@ msgid "" "You must specify a parameter named 'device' with a value of one of: sms, im, " "none." msgstr "" +"Heu d'especificar un paràmetre anomenat 'device' (dispositiu) amb un valor " +"dels següents: sms, im, none (cap)" #: actions/apiaccountupdatedeliverydevice.php:132 -#, fuzzy msgid "Could not update user." msgstr "No s'ha pogut actualitzar l'usuari." @@ -256,9 +259,8 @@ msgid "User has no profile." msgstr "L'usuari no té perfil." #: actions/apiaccountupdateprofile.php:147 -#, fuzzy msgid "Could not save profile." -msgstr "No s'ha pogut guardar el perfil." +msgstr "No s'ha pogut desar el perfil." #: actions/apiaccountupdateprofilebackgroundimage.php:108 #: actions/apiaccountupdateprofileimage.php:97 actions/apimediaupload.php:80 @@ -271,6 +273,8 @@ msgid "" "The server was unable to handle that much POST data (%s bytes) due to its " "current configuration." msgstr "" +"El servidor no ha pogut gestionar tantes dades POST (%s bytes) a causa de la " +"configuració actual." #: actions/apiaccountupdateprofilebackgroundimage.php:136 #: actions/apiaccountupdateprofilebackgroundimage.php:146 @@ -279,15 +283,13 @@ msgstr "" #: actions/groupdesignsettings.php:290 actions/groupdesignsettings.php:300 #: actions/userdesignsettings.php:210 actions/userdesignsettings.php:220 #: actions/userdesignsettings.php:263 actions/userdesignsettings.php:273 -#, fuzzy msgid "Unable to save your design settings." -msgstr "No s'ha pogut guardar la teva configuració de Twitter!" +msgstr "No s'han pogut desar els paràmetres de disseny." #: actions/apiaccountupdateprofilebackgroundimage.php:187 #: actions/apiaccountupdateprofilecolors.php:142 -#, fuzzy msgid "Could not update your design." -msgstr "No s'ha pogut actualitzar l'usuari." +msgstr "No s'ha pogut actualitzar el vostre disseny." #: actions/apiblockcreate.php:105 msgid "You cannot block yourself!" @@ -388,9 +390,8 @@ msgid "Could not determine source user." msgstr "No s'ha pogut determinar l'usuari d'origen." #: actions/apifriendshipsshow.php:142 -#, fuzzy msgid "Could not find target user." -msgstr "No es pot trobar cap estatus." +msgstr "No s'ha pogut trobar l'usuari de destinació." #: actions/apigroupcreate.php:166 actions/editgroup.php:186 #: actions/newgroup.php:126 actions/profilesettings.php:215 @@ -513,12 +514,11 @@ msgstr "grups sobre %s" #: actions/apioauthauthorize.php:101 msgid "No oauth_token parameter provided." -msgstr "" +msgstr "No s'ha proporcionat cap paràmetre oauth_token." #: actions/apioauthauthorize.php:106 -#, fuzzy msgid "Invalid token." -msgstr "Mida invàlida." +msgstr "El testimoni no és vàlid." #: actions/apioauthauthorize.php:123 actions/avatarsettings.php:268 #: actions/deletenotice.php:169 actions/disfavor.php:74 @@ -665,7 +665,7 @@ msgstr "No s'ha trobat." #: actions/apistatusesupdate.php:316 actions/newnotice.php:178 #, php-format msgid "Max notice size is %d chars, including attachment URL." -msgstr "" +msgstr "La mida màxima de l'avís és %d caràcters, incloent l'URL de l'adjunt." #: actions/apisubscriptions.php:231 actions/apisubscriptions.php:261 msgid "Unsupported format." @@ -677,14 +677,14 @@ msgid "%1$s / Favorites from %2$s" msgstr "%1$s / Preferits de %2$s" #: actions/apitimelinefavorites.php:118 -#, fuzzy, php-format +#, php-format msgid "%1$s updates favorited by %2$s / %2$s." -msgstr "%s actualitzacions favorites per %s / %s." +msgstr "%1$s actualitzacions preferides per %2$s / %2$s." #: actions/apitimelinementions.php:117 -#, fuzzy, php-format +#, php-format msgid "%1$s / Updates mentioning %2$s" -msgstr "%1$s / Notificacions contestant a %2$s" +msgstr "%1$s / Actualitzacions que mencionen %2$s" #: actions/apitimelinementions.php:130 #, php-format @@ -1075,6 +1075,8 @@ msgid "" "Are you sure you want to delete this user? This will clear all data about " "the user from the database, without a backup." msgstr "" +"Esteu segur que voleu suprimir l'usuari? S'esborraran totes les dades de " +"l'usuari de la base de dades, sense cap còpia de seguretat." #. TRANS: Submit button title for 'Yes' when deleting a user. #: actions/deleteuser.php:163 lib/deleteuserform.php:77 @@ -1278,9 +1280,8 @@ msgid "Callback URL is not valid." msgstr "" #: actions/editapplication.php:258 -#, fuzzy msgid "Could not update application." -msgstr "No s'ha pogut actualitzar el grup." +msgstr "No s'ha pogut actualitzar l'aplicació." #: actions/editgroup.php:56 #, php-format @@ -1293,9 +1294,8 @@ msgstr "Has d'haver entrat per crear un grup." #: actions/editgroup.php:107 actions/editgroup.php:172 #: actions/groupdesignsettings.php:107 actions/grouplogo.php:109 -#, fuzzy msgid "You must be an admin to edit the group." -msgstr "Has de ser admin per editar aquest grup" +msgstr "Heu de ser administrador per a editar el grup." #: actions/editgroup.php:158 msgid "Use this form to edit the group." @@ -1671,9 +1671,8 @@ msgid "Could not convert request token to access token." msgstr "No s'han pogut convertir els senyals de petició a senyals d'accés." #: actions/finishremotesubscribe.php:118 -#, fuzzy msgid "Remote service uses unknown version of OMB protocol." -msgstr "Versió desconeguda del protocol OMB." +msgstr "El servei remot utilitza una versió desconeguda del protocol OMB." #: actions/finishremotesubscribe.php:138 msgid "Error updating remote profile." @@ -1887,13 +1886,13 @@ msgid "Create a new group" msgstr "Crea un grup nou" #: actions/groupsearch.php:52 -#, fuzzy, php-format +#, php-format msgid "" "Search for groups on %%site.name%% by their name, location, or description. " "Separate the terms by spaces; they must be 3 characters or more." msgstr "" -"Troba gent a %%site.name%% per nom, ubicació o interessos. Separa els termes " -"de cerca amb espais; han de ser majors a 3 caràcters." +"Cerca grups a %%site.name%% per nom, ubicació o descripció. Separeu els " +"termes de cerca amb espais; han de contenir com a mínim 3 caràcters." #: actions/groupsearch.php:58 msgid "Group search" @@ -2061,9 +2060,8 @@ msgstr "Aquesta adreça de missatgeria instantània és incorrecta." #. TRANS: Server error thrown on database error canceling IM address confirmation. #: actions/imsettings.php:397 -#, fuzzy msgid "Couldn't delete IM confirmation." -msgstr "No s'ha pogut eliminar la confirmació de correu electrònic." +msgstr "No s'ha pogut suprimir la confirmació de MI." #. TRANS: Message given after successfully canceling IM address confirmation. #: actions/imsettings.php:402 @@ -2082,9 +2080,9 @@ msgid "The IM address was removed." msgstr "S'ha suprimit l'adreça de MI." #: actions/inbox.php:59 -#, fuzzy, php-format +#, php-format msgid "Inbox for %1$s - page %2$d" -msgstr "Safata d'entrada per %s" +msgstr "Safata d'entrada per a %1$s - pàgina %2$d" #: actions/inbox.php:62 #, php-format @@ -2102,11 +2100,10 @@ msgid "Invites have been disabled." msgstr "S'han inhabilitat les invitacions." #: actions/invite.php:41 -#, fuzzy, php-format +#, php-format msgid "You must be logged in to invite other users to use %s." msgstr "" -"Has d'estar dins del servei per poder convidar altres usuaris a utilitzar-lo " -"%s" +"Heu d'haver iniciat una sessió per a convidar altres usuaris a utilitzar %s" #: actions/invite.php:72 #, php-format @@ -2181,9 +2178,9 @@ msgstr "Envia" #. TRANS: Subject for invitation email. Note that 'them' is correct as a gender-neutral singular 3rd-person pronoun in English. #: actions/invite.php:228 -#, fuzzy, php-format +#, php-format msgid "%1$s has invited you to join them on %2$s" -msgstr "%1$s t'ha convidat us ha convidat a unir-te al grup %2$s" +msgstr "%1$s us ha convidat a unir-vos al grup %2$s" #. TRANS: Body text for invitation email. Note that 'them' is correct as a gender-neutral singular 3rd-person pronoun in English. #: actions/invite.php:231 @@ -2322,13 +2319,12 @@ msgid "Login with your username and password." msgstr "Inicieu una sessió amb nom d'usuari i contrasenya" #: actions/login.php:273 -#, fuzzy, php-format +#, php-format msgid "" "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 " -"[OpenID] (%%action.openidlogin%%)." +"No teniu cap nom d'usuari encara? [Registreu-hi](%%action.register%%) un nou " +"compte." #: actions/makeadmin.php:92 msgid "Only an admin can make another user an admin." @@ -2340,14 +2336,14 @@ msgid "%1$s is already an admin for group \"%2$s\"." msgstr "%1$s ja és un administrador del grup «%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 "No s'ha pogut eliminar l'usuari %s del grup %s" +msgstr "No s'ha pogut obtenir el registre de pertinència de %1$s al grup %2$s." #: actions/makeadmin.php:146 -#, fuzzy, php-format +#, php-format msgid "Can't make %1$s an admin for group %2$s." -msgstr "No es pot fer %s un administrador del grup %s" +msgstr "No es pot fer %1$s administrador del grup %2$s." #: actions/microsummary.php:69 msgid "No current status." @@ -2358,9 +2354,8 @@ msgid "New Application" msgstr "Nova Aplicació" #: actions/newapplication.php:64 -#, fuzzy msgid "You must be logged in to register an application." -msgstr "Has d'haver entrat per crear un grup." +msgstr "Heu d'haver iniciat una sessió per a registrar-hi una aplicació." #: actions/newapplication.php:143 msgid "Use this form to register a new application." @@ -2484,9 +2479,8 @@ msgid "Nudge sent!" msgstr "Reclamació enviada!" #: actions/oauthappssettings.php:59 -#, fuzzy msgid "You must be logged in to list your applications." -msgstr "Heu d'iniciar una sessió per editar un grup." +msgstr "Heu d'haver iniciat una sessió per a llistar les vostres aplicacions." #: actions/oauthappssettings.php:74 msgid "OAuth applications" @@ -2537,9 +2531,9 @@ msgstr "estat de %1$s a %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 "tipus de contingut " +msgstr "El tipus de contingut %s no està permès." #. TRANS: Error message displaying attachments. %s is the site's base URL. #: actions/oembed.php:162 @@ -2867,9 +2861,9 @@ msgid "Not a valid people tag: %s." msgstr "Etiqueta no vàlida per a la gent: %s" #: actions/peopletag.php:142 -#, fuzzy, php-format +#, php-format msgid "Users self-tagged with %1$s - page %2$d" -msgstr "Usuaris que s'han etiquetat %s - pàgina %d" +msgstr "Usuaris que s'han etiquetat amb %1$s - pàgina %2$d" #: actions/postnotice.php:95 msgid "Invalid notice content." @@ -3422,14 +3416,12 @@ msgid "Couldn’t get a request token." msgstr "No s'ha pogut obtenir un senyal de petició." #: actions/repeat.php:57 -#, fuzzy msgid "Only logged-in users can repeat notices." -msgstr "Només l'usuari pot llegir les seves safates de correu." +msgstr "Només els usuaris que han iniciat una sessió poden enviar avisos." #: actions/repeat.php:64 actions/repeat.php:71 -#, fuzzy msgid "No notice specified." -msgstr "No s'ha especificat perfil." +msgstr "No s'ha especificat cap avís." #: actions/repeat.php:76 #, fuzzy @@ -3460,14 +3452,14 @@ msgid "Replies to %1$s, page %2$d" msgstr "Respostes a %1$s, pàgina %2$d" #: actions/replies.php:145 -#, fuzzy, php-format +#, php-format msgid "Replies feed for %s (RSS 1.0)" -msgstr "Feed d'avisos de %s" +msgstr "Canal de respostes de %s (RSS 1.0)" #: actions/replies.php:152 -#, fuzzy, php-format +#, php-format msgid "Replies feed for %s (RSS 2.0)" -msgstr "Feed d'avisos de %s" +msgstr "Canal de respostes de %s (RSS 2.0)" #: actions/replies.php:159 #, php-format @@ -3609,7 +3601,7 @@ msgstr "" #: actions/showapplication.php:261 msgid "Application info" -msgstr "" +msgstr "Informació de l'aplicació" #: actions/showapplication.php:263 msgid "Consumer key" @@ -3724,19 +3716,19 @@ msgid "Group actions" msgstr "Accions del grup" #: actions/showgroup.php:338 -#, fuzzy, php-format +#, php-format msgid "Notice feed for %s group (RSS 1.0)" -msgstr "Feed d'avisos del grup %s" +msgstr "Canal d'avisos del grup %s (RSS 1.0)" #: actions/showgroup.php:344 -#, fuzzy, php-format +#, php-format msgid "Notice feed for %s group (RSS 2.0)" -msgstr "Feed d'avisos del grup %s" +msgstr "Canal d'avisos del grup %s (RSS 2.0)" #: actions/showgroup.php:350 -#, fuzzy, php-format +#, php-format msgid "Notice feed for %s group (Atom)" -msgstr "Feed d'avisos del grup %s" +msgstr "Canal d'avisos del grup %s (Atom)" #: actions/showgroup.php:355 #, php-format @@ -4003,9 +3995,8 @@ msgid "Site Notice" msgstr "Avís del lloc" #: actions/sitenoticeadminpanel.php:67 -#, fuzzy msgid "Edit site-wide message" -msgstr "Nou missatge" +msgstr "Edita el missatge per a tot el lloc" #: actions/sitenoticeadminpanel.php:103 msgid "Unable to save site notice." @@ -4073,10 +4064,9 @@ msgstr "Escriu el codi que has rebut en el teu telèfon mòbil." #. TRANS: Button label to confirm SMS confirmation code in SMS settings. #: actions/smssettings.php:148 -#, fuzzy msgctxt "BUTTON" msgid "Confirm" -msgstr "Confirmar" +msgstr "Confirma" #. TRANS: Field label for SMS phone number input in SMS settings form. #: actions/smssettings.php:153 @@ -4090,9 +4080,8 @@ msgstr "Número de telèfon, no puntuació ni espais, en l'àrea del codi" #. TRANS: Form legend for SMS preferences form. #: actions/smssettings.php:195 -#, fuzzy msgid "SMS preferences" -msgstr "Preferències" +msgstr "Preferències de l'SMS" #. TRANS: Checkbox label in SMS preferences form. #: actions/smssettings.php:201 @@ -4105,9 +4094,8 @@ msgstr "" #. TRANS: Confirmation message for successful SMS preferences save. #: actions/smssettings.php:315 -#, fuzzy msgid "SMS preferences saved." -msgstr "S'han desat les preferències." +msgstr "S'han desat les preferències de l'SMS." #. TRANS: Message given saving SMS phone number without having provided one. #: actions/smssettings.php:338 @@ -4263,9 +4251,8 @@ msgid "This action only accepts POST requests." msgstr "" #: actions/subscribe.php:107 -#, fuzzy msgid "No such profile." -msgstr "No existeix el fitxer." +msgstr "No existeix el perfil." #: actions/subscribe.php:117 #, fuzzy @@ -4282,9 +4269,9 @@ msgid "%s subscribers" msgstr "%s subscriptors" #: actions/subscribers.php:52 -#, fuzzy, php-format +#, php-format msgid "%1$s subscribers, page %2$d" -msgstr "%s subscriptors, pàgina %d" +msgstr "%1$s subscriptors, pàgina %2$d" #: actions/subscribers.php:63 msgid "These are the people who listen to your notices." @@ -4685,9 +4672,9 @@ msgid "Updates from %1$s on %2$s!" msgstr "Actualitzacions de %1$s a %2$s!" #: actions/version.php:73 -#, fuzzy, php-format +#, php-format msgid "StatusNet %s" -msgstr "Estadístiques" +msgstr "StatusNet %s" #: actions/version.php:153 #, php-format @@ -4729,12 +4716,10 @@ msgstr "Connectors" #. TRANS: Secondary navigation menu option leading to version information on the StatusNet site. #: actions/version.php:196 lib/action.php:779 -#, fuzzy msgid "Version" -msgstr "Sessions" +msgstr "Versió" #: actions/version.php:197 -#, fuzzy msgid "Author(s)" msgstr "Autoria" @@ -4756,19 +4741,16 @@ msgid "A file this large would exceed your monthly quota of %d bytes." msgstr "" #: classes/Group_member.php:41 -#, fuzzy msgid "Group join failed." -msgstr "Perfil del grup" +msgstr "No s'ha pogut unir al grup." #: classes/Group_member.php:53 -#, fuzzy msgid "Not part of group." -msgstr "No s'ha pogut actualitzar el grup." +msgstr "No s'és part del grup." #: classes/Group_member.php:60 -#, fuzzy msgid "Group leave failed." -msgstr "Perfil del grup" +msgstr "La sortida del grup ha fallat." #: classes/Local_group.php:41 #, fuzzy @@ -4837,7 +4819,7 @@ 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:1535 +#: classes/Notice.php:1533 #, php-format msgid "RT @%1$s %2$s" msgstr "RT @%1$s %2$s" @@ -4917,9 +4899,8 @@ msgstr "Canvieu la gestió del correu" #. TRANS: Link title attribute in user account settings menu. #: lib/accountsettingsaction.php:137 -#, fuzzy msgid "Design your profile" -msgstr "Perfil de l'usuari" +msgstr "Dissenyeu el vostre perfil" #. TRANS: Link title attribute in user account settings menu. #: lib/accountsettingsaction.php:144 @@ -4967,10 +4948,9 @@ 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 -#, fuzzy msgctxt "TOOLTIP" msgid "Connect to services" -msgstr "No s'ha pogut redirigir al servidor: %s" +msgstr "Connecta als serveis" #. TRANS: Main menu option when logged in and connection are possible for access to options to connect to other services #: lib/action.php:445 @@ -4979,63 +4959,55 @@ msgstr "Connexió" #. TRANS: Tooltip for menu option "Admin" #: lib/action.php:448 -#, fuzzy msgctxt "TOOLTIP" msgid "Change site configuration" msgstr "Canvia la configuració del lloc" #. 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" +msgstr "Administrador" #. 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 amics i companys perquè participin a %s" +msgstr "Convida amics i coneguts perquè participin a %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 "Convida" #. TRANS: Tooltip for main menu option "Logout" #: lib/action.php:464 -#, fuzzy msgctxt "TOOLTIP" msgid "Logout from the site" msgstr "Finalitza la sessió del lloc" #. TRANS: Main menu option when logged in to log out the current user #: lib/action.php:467 -#, fuzzy msgctxt "MENU" msgid "Logout" msgstr "Finalitza la sessió" #. TRANS: Tooltip for main menu option "Register" #: lib/action.php:472 -#, fuzzy msgctxt "TOOLTIP" msgid "Create an account" msgstr "Crea un compte" #. TRANS: Main menu option when not logged in to register a new account #: lib/action.php:475 -#, fuzzy msgctxt "MENU" msgid "Register" msgstr "Registre" #. TRANS: Tooltip for main menu option "Login" #: lib/action.php:478 -#, fuzzy msgctxt "TOOLTIP" msgid "Login to the site" msgstr "Inicia una sessió al lloc" @@ -5208,7 +5180,7 @@ msgid "Before" msgstr "Anteriors" #. TRANS: Client exception thrown when a feed instance is a DOMDocument. -#: lib/activity.php:121 +#: lib/activity.php:122 msgid "Expecting a root feed element but got a whole XML document." msgstr "" @@ -5216,11 +5188,11 @@ msgstr "" msgid "Can't handle remote content yet." msgstr "" -#: lib/activityutils.php:236 +#: lib/activityutils.php:244 msgid "Can't handle embedded XML content yet." msgstr "" -#: lib/activityutils.php:240 +#: lib/activityutils.php:248 msgid "Can't handle embedded Base64 content yet." msgstr "" @@ -5261,7 +5233,6 @@ msgstr "Configuració bàsica del lloc" #. TRANS: Menu item for site administration #: lib/adminpanelaction.php:351 -#, fuzzy msgctxt "MENU" msgid "Site" msgstr "Lloc" @@ -5273,16 +5244,14 @@ msgstr "Configuració del disseny" #. TRANS: Menu item for site administration #: lib/adminpanelaction.php:359 -#, fuzzy msgctxt "MENU" msgid "Design" msgstr "Disseny" #. TRANS: Menu item title/tooltip #: lib/adminpanelaction.php:365 -#, fuzzy msgid "User configuration" -msgstr "Configuració dels camins" +msgstr "Configuració de l'usuari" #. TRANS: Menu item for site administration #: lib/adminpanelaction.php:367 lib/personalgroupnav.php:115 @@ -5291,9 +5260,8 @@ msgstr "Usuari" #. TRANS: Menu item title/tooltip #: lib/adminpanelaction.php:373 -#, fuzzy msgid "Access configuration" -msgstr "Configuració del disseny" +msgstr "Configuració de l'accés" #. TRANS: Menu item title/tooltip #: lib/adminpanelaction.php:381 @@ -5302,9 +5270,8 @@ msgstr "Configuració dels camins" #. TRANS: Menu item title/tooltip #: lib/adminpanelaction.php:389 -#, fuzzy msgid "Sessions configuration" -msgstr "Configuració del disseny" +msgstr "Configuració de les sessions" #. TRANS: Menu item title/tooltip #: lib/adminpanelaction.php:397 @@ -5326,36 +5293,33 @@ msgstr "" #. TRANS: Form legend. #: lib/applicationeditform.php:137 msgid "Edit application" -msgstr "" +msgstr "Edita l'aplicació" #. TRANS: Form guide. #: lib/applicationeditform.php:187 msgid "Icon for this application" -msgstr "" +msgstr "Icona de l'aplicació" #. TRANS: Form input field instructions. #: lib/applicationeditform.php:209 -#, fuzzy, php-format +#, php-format msgid "Describe your application in %d characters" -msgstr "Descriu el grup amb 140 caràcters" +msgstr "Descriviu la vostra aplicació en %d caràcters" #. TRANS: Form input field instructions. #: lib/applicationeditform.php:213 -#, fuzzy msgid "Describe your application" -msgstr "Descriu el grup amb 140 caràcters" +msgstr "Descriviu la vostra aplicació" #. TRANS: Form input field instructions. #: lib/applicationeditform.php:224 -#, fuzzy msgid "URL of the homepage of this application" -msgstr "URL del teu web, blog del grup u tema" +msgstr "URL de la pàgina d'inici de l'aplicació" #. TRANS: Form input field label. #: lib/applicationeditform.php:226 -#, fuzzy msgid "Source URL" -msgstr "Font" +msgstr "URL d'origen" #. TRANS: Form input field instructions. #: lib/applicationeditform.php:233 @@ -5376,32 +5340,33 @@ msgstr "" #. 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 "Escriptori" #. TRANS: Form guide. #: lib/applicationeditform.php:297 msgid "Type of application, browser or desktop" -msgstr "" +msgstr "Tipus d'aplicació, navegador o escriptori" #. TRANS: Radio button label for access type. #: lib/applicationeditform.php:320 msgid "Read-only" -msgstr "" +msgstr "Només lectura" #. TRANS: Radio button label for access type. #: lib/applicationeditform.php:339 msgid "Read-write" -msgstr "" +msgstr "Lectura i escriptura" #. TRANS: Form guide. #: lib/applicationeditform.php:341 msgid "Default access for this application: read-only, or read-write" msgstr "" +"Accés per defecte per a l'aplicació: només lectura, o lectura i escriptura" #. TRANS: Submit button title #: lib/applicationeditform.php:359 @@ -5411,25 +5376,24 @@ msgstr "Cancel·la" #. TRANS: Application access type #: lib/applicationlist.php:136 msgid "read-write" -msgstr "" +msgstr "lectura i escriptura" #. TRANS: Application access type #: lib/applicationlist.php:138 msgid "read-only" -msgstr "" +msgstr "només 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 "Aprovat: %1$s - accés «%2$s»." #. TRANS: Button label #: lib/applicationlist.php:159 -#, fuzzy msgctxt "BUTTON" msgid "Revoke" -msgstr "Suprimeix" +msgstr "Revoca" #. TRANS: DT element label in attachment list. #: lib/attachmentlist.php:88 @@ -5448,7 +5412,7 @@ msgstr "Proveïdor" #: lib/attachmentnoticesection.php:67 msgid "Notices where this attachment appears" -msgstr "" +msgstr "Avisos on apareix l'adjunt" #: lib/attachmenttagcloudsection.php:48 msgid "Tags for this attachment" @@ -5509,9 +5473,9 @@ msgstr "" #. TRANS: Message given having nudged another user. #. TRANS: %s is the nickname of the user that was nudged. #: lib/command.php:234 -#, fuzzy, php-format +#, php-format msgid "Nudge sent to %s" -msgstr "Reclamació enviada" +msgstr "S'ha enviat un avís a %s" #: lib/command.php:260 #, php-format @@ -5520,6 +5484,9 @@ msgid "" "Subscribers: %2$s\n" "Notices: %3$s" msgstr "" +"Subscripcions: %1$s\n" +"Subscriptors: %2$s\n" +"Avisos: %3$s" #: lib/command.php:302 msgid "Notice marked as fave." @@ -5539,7 +5506,7 @@ msgstr "No s'ha pogut afegir l'usuari %1$s al grup %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 "No s'ha pogut suprimir l'usuari %1$s del grup %2$s." @@ -5575,13 +5542,16 @@ msgid "" "%s is a remote profile; you can only send direct messages to users on the " "same server." msgstr "" +"%s és un perfil remot; només podeu enviar missatges directess a usuaris del " +"mateix 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 "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" #. TRANS: Message given have sent a direct message to another user. #. TRANS: %s is the name of the other user. @@ -5595,26 +5565,23 @@ msgid "Error sending direct message." msgstr "Error al enviar el missatge directe." #: lib/command.php:514 -#, fuzzy msgid "Cannot repeat your own notice" -msgstr "No es poden posar en on les notificacions." +msgstr "No es pot repetir el vostre propi avís" #: lib/command.php:519 -#, fuzzy msgid "Already repeated that notice" -msgstr "Eliminar aquesta nota" +msgstr "Ja s'ha repetit l'avís" #. 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 -#, fuzzy, php-format +#, php-format msgid "Notice from %s repeated" -msgstr "Notificació publicada" +msgstr "S'ha repetit l'avís de %s" #: lib/command.php:531 -#, fuzzy msgid "Error repeating notice." -msgstr "Problema en guardar l'avís." +msgstr "S'ha produït un error en repetir l'avís." #: lib/command.php:562 #, fuzzy, php-format @@ -5627,9 +5594,8 @@ msgid "Reply to %s sent" msgstr "S'ha enviat la resposta a %s" #: lib/command.php:573 -#, fuzzy msgid "Error saving notice." -msgstr "Problema en guardar l'avís." +msgstr "S'ha produït un error en desar l'avís." #: lib/command.php:620 msgid "Specify the name of the user to subscribe to" @@ -5676,12 +5642,14 @@ msgstr "No es poden posar en on les notificacions." #: lib/command.php:723 msgid "Login command is disabled" -msgstr "" +msgstr "L'ordre d'inici de sessió està inhabilitada" #: lib/command.php:734 #, php-format msgid "This link is useable only once, and is good for only 2 minutes: %s" msgstr "" +"L'enllaç només es pot fer servir una vegada, i només funciona durant 2 " +"minuts: %s" #: lib/command.php:761 #, fuzzy, php-format @@ -5768,7 +5736,7 @@ msgstr "No s'ha trobat cap fitxer de configuració. " #: lib/common.php:136 msgid "I looked for configuration files in the following places: " -msgstr "" +msgstr "S'han cercat fitxers de configuracions en els llocs següents: " #: lib/common.php:138 msgid "You may wish to run the installer to fix this." @@ -5956,9 +5924,9 @@ msgid "Unsupported image file format." msgstr "Format d'imatge no suportat." #: lib/imagefile.php:88 -#, fuzzy, php-format +#, php-format msgid "That file is too big. The maximum file size is %s." -msgstr "Pots pujar una imatge de logo per al grup." +msgstr "La mida del fitxer és massa gran, La mida màxima és %s." #: lib/imagefile.php:93 msgid "Partial upload." @@ -5991,12 +5959,12 @@ msgstr "kB" #: lib/jabber.php:387 #, php-format msgid "[%s]" -msgstr "" +msgstr "[%s]" #: lib/jabber.php:567 -#, fuzzy, php-format +#, php-format msgid "Unknown inbox source %d." -msgstr "Llengua desconeguda «%s»" +msgstr "Font %d de la safata d'entrada desconeguda." #: lib/joinform.php:114 msgid "Join" @@ -6067,11 +6035,9 @@ msgstr "" #. TRANS: Profile info line in new-subscriber notification e-mail #: lib/mail.php:269 -#, fuzzy, php-format +#, php-format msgid "Bio: %s" -msgstr "" -"Biografia: %s\n" -"\n" +msgstr "Biografia: %s" #. TRANS: Subject of notification mail for new posting email address #: lib/mail.php:298 @@ -6114,9 +6080,9 @@ msgstr "Confirmació 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 "Esperant confirmació per aquest número de telèfon." +msgstr "%s: confirmeu-ho si teniu aquest número de telèfon amb aquest codi:" #. TRANS: Subject for 'nudge' notification email #: lib/mail.php:478 @@ -6169,9 +6135,9 @@ msgstr "" #. TRANS: Subject for favorite notification email #: lib/mail.php:583 -#, fuzzy, php-format +#, php-format msgid "%s (@%s) added your notice as a favorite" -msgstr "%s ha afegit la teva nota com a favorita" +msgstr "%s (@%s) ha afegit el vostre avís com a preferit" #. TRANS: Body for favorite notification email #: lib/mail.php:586 @@ -6268,9 +6234,9 @@ msgid "Sorry, no incoming email allowed." msgstr "Ho sentim, no s'hi permet correu d'entrada." #: lib/mailhandler.php:228 -#, fuzzy, php-format +#, php-format msgid "Unsupported message type: %s" -msgstr "Format d'imatge no suportat." +msgstr "Tipus de missatge no permès: %s" #: lib/mediafile.php:98 lib/mediafile.php:123 msgid "There was a database error while saving your file. Please try again." @@ -6296,7 +6262,7 @@ msgstr "Manca una carpeta temporal." #: lib/mediafile.php:162 msgid "Failed to write file to disk." -msgstr "" +msgstr "No s'ha pogut escriure el fitxer al disc." #: lib/mediafile.php:165 msgid "File upload stopped by extension." @@ -6311,9 +6277,8 @@ msgid "File could not be moved to destination directory." msgstr "" #: lib/mediafile.php:201 lib/mediafile.php:237 -#, fuzzy msgid "Could not determine file's MIME type." -msgstr "No s'ha pogut recuperar la conversa pública." +msgstr "No s'ha pogut determinar el tipus MIME del fitxer." #: lib/mediafile.php:270 #, php-format @@ -6338,7 +6303,6 @@ msgid "Available characters" msgstr "Caràcters disponibles" #: lib/messageform.php:178 lib/noticeform.php:236 -#, fuzzy msgctxt "Send button for sending notice" msgid "Send" msgstr "Envia" @@ -6361,50 +6325,49 @@ msgid "Attach a file" msgstr "Adjunta un fitxer" #: lib/noticeform.php:212 -#, fuzzy msgid "Share my location" -msgstr "Comparteix la vostra ubicació" +msgstr "Comparteix la meva ubicació" #: lib/noticeform.php:215 -#, fuzzy msgid "Do not share my location" -msgstr "Comparteix la vostra ubicació" +msgstr "No comparteixis la meva ubicació" #: lib/noticeform.php:216 msgid "" "Sorry, retrieving your geo location is taking longer than expected, please " "try again later" msgstr "" +"Ho sentim, la obtenció de la vostra ubicació geogràfic està trigant més de " +"l'esperat; torneu-ho a provar més tard" #. TRANS: Used in coordinates as abbreviation of north #: lib/noticelist.php:430 -#, fuzzy msgid "N" -msgstr "No" +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 "E" #. 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\"%4$s %5$u°%6$u'%7$u\"%8$s" #: lib/noticelist.php:447 msgid "at" -msgstr "" +msgstr "a" #: lib/noticelist.php:567 msgid "in context" @@ -6423,9 +6386,8 @@ msgid "Reply" msgstr "Respon" #: lib/noticelist.php:674 -#, fuzzy msgid "Notice repeated" -msgstr "Notificació publicada" +msgstr "Avís repetit" #: lib/nudgeform.php:116 msgid "Nudge this user" @@ -6456,9 +6418,8 @@ msgid "Error inserting remote profile" msgstr "Error en inserir perfil remot" #: lib/oauthstore.php:345 -#, fuzzy msgid "Duplicate notice" -msgstr "Eliminar nota." +msgstr "Duplica l'avís" #: lib/oauthstore.php:490 msgid "Couldn't insert new subscription." @@ -6497,10 +6458,9 @@ msgstr "Els teus missatges enviats" msgid "Tags in %s's notices" msgstr "Etiquetes en les notificacions de %s's" -#: lib/plugin.php:114 -#, fuzzy +#: lib/plugin.php:115 msgid "Unknown" -msgstr "Acció desconeguda" +msgstr "Desconegut" #: lib/profileaction.php:109 lib/profileaction.php:205 lib/subgroupnav.php:82 msgid "Subscriptions" @@ -6560,14 +6520,12 @@ msgid "Popular" msgstr "Popular" #: lib/redirectingaction.php:94 -#, fuzzy msgid "No return-to arguments." -msgstr "No argument de la id." +msgstr "No hi ha arguments de retorn." #: lib/repeatform.php:107 -#, fuzzy msgid "Repeat this notice?" -msgstr "Repeteix l'avís" +msgstr "Voleu repetir l'avís?" #: lib/repeatform.php:132 msgid "Yes" @@ -6578,9 +6536,9 @@ msgid "Repeat this notice" msgstr "Repeteix l'avís" #: lib/revokeroleform.php:91 -#, fuzzy, php-format +#, php-format msgid "Revoke the \"%s\" role from this user" -msgstr "Bloca l'usuari del grup" +msgstr "Revoca el rol «%s» de l'usuari" #: lib/router.php:704 msgid "No single user defined for single-user mode." @@ -6712,9 +6670,9 @@ msgid "Unsubscribe" msgstr "Cancel·lar subscripció" #: lib/usernoprofileexception.php:58 -#, fuzzy, php-format +#, php-format msgid "User %s (%d) has no profile record." -msgstr "L'usuari no té perfil." +msgstr "L'usuari %s (%d) no té un registre de perfil." #: lib/userprofile.php:117 msgid "Edit Avatar" diff --git a/locale/cs/LC_MESSAGES/statusnet.po b/locale/cs/LC_MESSAGES/statusnet.po index e619430aa..2180ad6ce 100644 --- a/locale/cs/LC_MESSAGES/statusnet.po +++ b/locale/cs/LC_MESSAGES/statusnet.po @@ -10,11 +10,11 @@ msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2010-04-24 14:16+0000\n" -"PO-Revision-Date: 2010-04-26 22:16:18+0000\n" +"PO-Revision-Date: 2010-05-03 19:17:33+0000\n" "Language-Team: Czech\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r65552); Translate extension (2010-04-25)\n" +"X-Generator: MediaWiki 1.17alpha (r65870); Translate extension (2010-05-01)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: cs\n" "X-Message-Group: out-statusnet\n" @@ -4846,7 +4846,7 @@ 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:1535 +#: classes/Notice.php:1533 #, php-format msgid "RT @%1$s %2$s" msgstr "" @@ -5231,7 +5231,7 @@ msgid "Before" msgstr "Starší »" #. TRANS: Client exception thrown when a feed instance is a DOMDocument. -#: lib/activity.php:121 +#: lib/activity.php:122 msgid "Expecting a root feed element but got a whole XML document." msgstr "" @@ -5239,11 +5239,11 @@ msgstr "" msgid "Can't handle remote content yet." msgstr "" -#: lib/activityutils.php:236 +#: lib/activityutils.php:244 msgid "Can't handle embedded XML content yet." msgstr "" -#: lib/activityutils.php:240 +#: lib/activityutils.php:248 msgid "Can't handle embedded Base64 content yet." msgstr "" @@ -6532,7 +6532,7 @@ msgstr "" msgid "Tags in %s's notices" msgstr "" -#: lib/plugin.php:114 +#: lib/plugin.php:115 msgid "Unknown" msgstr "" diff --git a/locale/de/LC_MESSAGES/statusnet.po b/locale/de/LC_MESSAGES/statusnet.po index f0225630f..eda01937a 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-24 14:16+0000\n" -"PO-Revision-Date: 2010-04-26 22:16:22+0000\n" +"POT-Creation-Date: 2010-04-29 23:21+0000\n" +"PO-Revision-Date: 2010-05-03 19:17:36+0000\n" "Language-Team: German\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r65552); Translate extension (2010-04-25)\n" +"X-Generator: MediaWiki 1.17alpha (r65870); Translate extension (2010-05-01)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: de\n" "X-Message-Group: out-statusnet\n" @@ -506,9 +506,9 @@ msgstr "%s’s Gruppen" #. 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 "Gruppen in denen %s Mitglied ist" +msgstr "%1$s Gruppen in denen %2$s Mitglied ist" #. 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. @@ -3316,13 +3316,12 @@ msgid "Invalid username or password." msgstr "Benutzername oder Passwort falsch." #: 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. " msgstr "" -"Hier kannst du einen neuen Zugang einrichten. Danach kannst du Nachrichten " -"und Links an deine Freunde und Kollegen schicken. " +"Hier kannst du einen neuen Zugang einrichten. Anschließend kannst du " +"Nachrichten und Links mit deinen Freunden und Kollegen teilen. " #: actions/register.php:425 msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required." @@ -3355,13 +3354,13 @@ msgid "Longer name, preferably your \"real\" name" msgstr "Längerer Name, bevorzugt dein „echter“ 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 "" -"außer folgende private Daten: Passwort, E-Mail-Adresse, IM-Adresse und " -"Telefonnummer." +"Abgesehen von folgenden Daten: Passwort, Email Adresse, IM Adresse und " +"Telefonnummer, sind all meine Texte und Dateien unter %s verfügbar." #: actions/register.php:542 #, php-format @@ -4898,7 +4897,7 @@ 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:1535 +#: classes/Notice.php:1533 #, php-format msgid "RT @%1$s %2$s" msgstr "RT @%1$s %2$s" @@ -5260,7 +5259,7 @@ msgid "Before" msgstr "Vorher" #. TRANS: Client exception thrown when a feed instance is a DOMDocument. -#: lib/activity.php:121 +#: lib/activity.php:122 msgid "Expecting a root feed element but got a whole XML document." msgstr "root-Element eines Feeds erwartet aber ganzes XML Dokument erhalten." @@ -5268,11 +5267,11 @@ msgstr "root-Element eines Feeds erwartet aber ganzes XML Dokument erhalten." msgid "Can't handle remote content yet." msgstr "Fremdinhalt kann noch nicht eingebunden werden." -#: lib/activityutils.php:236 +#: lib/activityutils.php:244 msgid "Can't handle embedded XML content yet." msgstr "Kann eingebundenen XML Inhalt nicht verarbeiten." -#: lib/activityutils.php:240 +#: lib/activityutils.php:248 msgid "Can't handle embedded Base64 content yet." msgstr "Eingebundener Base64 Inhalt kann noch nicht verarbeitet werden." @@ -6657,7 +6656,7 @@ msgstr "Deine gesendeten Nachrichten" msgid "Tags in %s's notices" msgstr "Stichworte in %ss Nachrichten" -#: lib/plugin.php:114 +#: lib/plugin.php:115 msgid "Unknown" msgstr "Unbekannter Befehl" diff --git a/locale/el/LC_MESSAGES/statusnet.po b/locale/el/LC_MESSAGES/statusnet.po index 8fa761ae8..a75fef345 100644 --- a/locale/el/LC_MESSAGES/statusnet.po +++ b/locale/el/LC_MESSAGES/statusnet.po @@ -11,11 +11,11 @@ msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2010-04-24 14:16+0000\n" -"PO-Revision-Date: 2010-04-26 22:16:29+0000\n" +"PO-Revision-Date: 2010-05-03 19:17:39+0000\n" "Language-Team: Greek\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r65552); Translate extension (2010-04-25)\n" +"X-Generator: MediaWiki 1.17alpha (r65870); Translate extension (2010-05-01)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: el\n" "X-Message-Group: out-statusnet\n" @@ -4769,7 +4769,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:1535 +#: classes/Notice.php:1533 #, php-format msgid "RT @%1$s %2$s" msgstr "" @@ -5142,7 +5142,7 @@ msgid "Before" msgstr "" #. TRANS: Client exception thrown when a feed instance is a DOMDocument. -#: lib/activity.php:121 +#: lib/activity.php:122 msgid "Expecting a root feed element but got a whole XML document." msgstr "" @@ -5150,11 +5150,11 @@ msgstr "" msgid "Can't handle remote content yet." msgstr "" -#: lib/activityutils.php:236 +#: lib/activityutils.php:244 msgid "Can't handle embedded XML content yet." msgstr "" -#: lib/activityutils.php:240 +#: lib/activityutils.php:248 msgid "Can't handle embedded Base64 content yet." msgstr "" @@ -6409,7 +6409,7 @@ msgstr "" msgid "Tags in %s's notices" msgstr "" -#: lib/plugin.php:114 +#: lib/plugin.php:115 msgid "Unknown" msgstr "" diff --git a/locale/en_GB/LC_MESSAGES/statusnet.po b/locale/en_GB/LC_MESSAGES/statusnet.po index a52c4b570..bb3c577b6 100644 --- a/locale/en_GB/LC_MESSAGES/statusnet.po +++ b/locale/en_GB/LC_MESSAGES/statusnet.po @@ -11,11 +11,11 @@ msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2010-04-24 14:16+0000\n" -"PO-Revision-Date: 2010-04-26 22:16:33+0000\n" +"PO-Revision-Date: 2010-05-03 19:17:42+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 (r65552); Translate extension (2010-04-25)\n" +"X-Generator: MediaWiki 1.17alpha (r65870); Translate extension (2010-05-01)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: en-gb\n" "X-Message-Group: out-statusnet\n" @@ -4779,7 +4779,7 @@ 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:1535 +#: classes/Notice.php:1533 #, php-format msgid "RT @%1$s %2$s" msgstr "RT @%1$s %2$s" @@ -4889,7 +4889,7 @@ msgstr "Primary site navigation" #: lib/action.php:432 msgctxt "TOOLTIP" msgid "Personal profile and friends timeline" -msgstr "ersonal profile and friends timeline" +msgstr "Personal profile and friends timeline" #. TRANS: Main menu option when logged in for access to personal profile and friends timeline #: lib/action.php:435 @@ -5137,7 +5137,7 @@ msgid "Before" msgstr "Before" #. TRANS: Client exception thrown when a feed instance is a DOMDocument. -#: lib/activity.php:121 +#: lib/activity.php:122 msgid "Expecting a root feed element but got a whole XML document." msgstr "" @@ -5145,11 +5145,11 @@ msgstr "" msgid "Can't handle remote content yet." msgstr "" -#: lib/activityutils.php:236 +#: lib/activityutils.php:244 msgid "Can't handle embedded XML content yet." msgstr "" -#: lib/activityutils.php:240 +#: lib/activityutils.php:248 msgid "Can't handle embedded Base64 content yet." msgstr "" @@ -6396,7 +6396,7 @@ msgstr "Your sent messages" msgid "Tags in %s's notices" msgstr "Tags in %s's notices" -#: lib/plugin.php:114 +#: lib/plugin.php:115 msgid "Unknown" msgstr "Unknown" diff --git a/locale/es/LC_MESSAGES/statusnet.po b/locale/es/LC_MESSAGES/statusnet.po index 4e4d4bf06..7147c728f 100644 --- a/locale/es/LC_MESSAGES/statusnet.po +++ b/locale/es/LC_MESSAGES/statusnet.po @@ -15,11 +15,11 @@ msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2010-04-24 14:16+0000\n" -"PO-Revision-Date: 2010-04-26 22:16:36+0000\n" +"PO-Revision-Date: 2010-05-03 19:17:46+0000\n" "Language-Team: Spanish\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r65552); Translate extension (2010-04-25)\n" +"X-Generator: MediaWiki 1.17alpha (r65870); Translate extension (2010-05-01)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: es\n" "X-Message-Group: out-statusnet\n" @@ -4883,7 +4883,7 @@ 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:1535 +#: classes/Notice.php:1533 #, php-format msgid "RT @%1$s %2$s" msgstr "RT @%1$s %2$s" @@ -5246,7 +5246,7 @@ msgid "Before" msgstr "Antes" #. TRANS: Client exception thrown when a feed instance is a DOMDocument. -#: lib/activity.php:121 +#: lib/activity.php:122 msgid "Expecting a root feed element but got a whole XML document." msgstr "" "A espera de un elemento de alimentación de raíz, pero se obtuvo un documento " @@ -5256,11 +5256,11 @@ msgstr "" msgid "Can't handle remote content yet." msgstr "Aún no se puede manejar contenido remoto." -#: lib/activityutils.php:236 +#: lib/activityutils.php:244 msgid "Can't handle embedded XML content yet." msgstr "Aún no se puede manejar contenido XML incrustado." -#: lib/activityutils.php:240 +#: lib/activityutils.php:248 msgid "Can't handle embedded Base64 content yet." msgstr "Aún no se puede manejar contenido incrustado Base64." @@ -6652,7 +6652,7 @@ msgstr "Mensajes enviados" msgid "Tags in %s's notices" msgstr "Etiquetas en avisos de %s" -#: lib/plugin.php:114 +#: lib/plugin.php:115 msgid "Unknown" msgstr "Desconocido" diff --git a/locale/fa/LC_MESSAGES/statusnet.po b/locale/fa/LC_MESSAGES/statusnet.po index 76e68fda7..77e38b3a8 100644 --- a/locale/fa/LC_MESSAGES/statusnet.po +++ b/locale/fa/LC_MESSAGES/statusnet.po @@ -11,7 +11,7 @@ msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2010-04-24 14:16+0000\n" -"PO-Revision-Date: 2010-04-26 22:16:48+0000\n" +"PO-Revision-Date: 2010-05-03 19:17:52+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 (r65552); Translate extension (2010-04-25)\n" +"X-Generator: MediaWiki 1.17alpha (r65870); Translate extension (2010-05-01)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" #. TRANS: Page title @@ -4775,7 +4775,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:1535 +#: classes/Notice.php:1533 #, php-format msgid "RT @%1$s %2$s" msgstr "" @@ -5146,7 +5146,7 @@ msgid "Before" msgstr "قبل از" #. TRANS: Client exception thrown when a feed instance is a DOMDocument. -#: lib/activity.php:121 +#: lib/activity.php:122 msgid "Expecting a root feed element but got a whole XML document." msgstr "" @@ -5154,11 +5154,11 @@ msgstr "" msgid "Can't handle remote content yet." msgstr "" -#: lib/activityutils.php:236 +#: lib/activityutils.php:244 msgid "Can't handle embedded XML content yet." msgstr "" -#: lib/activityutils.php:240 +#: lib/activityutils.php:248 msgid "Can't handle embedded Base64 content yet." msgstr "" @@ -6415,7 +6415,7 @@ msgstr "پیام های فرستاده شده به وسیله ی شما" msgid "Tags in %s's notices" msgstr "" -#: lib/plugin.php:114 +#: lib/plugin.php:115 msgid "Unknown" msgstr "" diff --git a/locale/fi/LC_MESSAGES/statusnet.po b/locale/fi/LC_MESSAGES/statusnet.po index b015ccdbe..a09c1415d 100644 --- a/locale/fi/LC_MESSAGES/statusnet.po +++ b/locale/fi/LC_MESSAGES/statusnet.po @@ -11,11 +11,11 @@ msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2010-04-24 14:16+0000\n" -"PO-Revision-Date: 2010-04-26 22:16:45+0000\n" +"PO-Revision-Date: 2010-05-03 19:17:49+0000\n" "Language-Team: Finnish\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r65552); Translate extension (2010-04-25)\n" +"X-Generator: MediaWiki 1.17alpha (r65870); Translate extension (2010-05-01)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: fi\n" "X-Message-Group: out-statusnet\n" @@ -4949,7 +4949,7 @@ 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:1535 +#: classes/Notice.php:1533 #, fuzzy, php-format msgid "RT @%1$s %2$s" msgstr "%1$s (%2$s)" @@ -5332,7 +5332,7 @@ msgid "Before" msgstr "Aiemmin" #. TRANS: Client exception thrown when a feed instance is a DOMDocument. -#: lib/activity.php:121 +#: lib/activity.php:122 msgid "Expecting a root feed element but got a whole XML document." msgstr "" @@ -5340,11 +5340,11 @@ msgstr "" msgid "Can't handle remote content yet." msgstr "" -#: lib/activityutils.php:236 +#: lib/activityutils.php:244 msgid "Can't handle embedded XML content yet." msgstr "" -#: lib/activityutils.php:240 +#: lib/activityutils.php:248 msgid "Can't handle embedded Base64 content yet." msgstr "" @@ -6643,7 +6643,7 @@ msgstr "Lähettämäsi viestit" msgid "Tags in %s's notices" msgstr "Tagit käyttäjän %s päivityksissä" -#: lib/plugin.php:114 +#: lib/plugin.php:115 #, fuzzy msgid "Unknown" msgstr "Tuntematon toiminto" diff --git a/locale/fr/LC_MESSAGES/statusnet.po b/locale/fr/LC_MESSAGES/statusnet.po index 07c850bdd..cf3f5d3b5 100644 --- a/locale/fr/LC_MESSAGES/statusnet.po +++ b/locale/fr/LC_MESSAGES/statusnet.po @@ -16,11 +16,11 @@ msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2010-04-24 14:16+0000\n" -"PO-Revision-Date: 2010-04-26 22:16:52+0000\n" +"PO-Revision-Date: 2010-05-03 19:17:56+0000\n" "Language-Team: French\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r65552); Translate extension (2010-04-25)\n" +"X-Generator: MediaWiki 1.17alpha (r65870); Translate extension (2010-05-01)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: fr\n" "X-Message-Group: out-statusnet\n" @@ -4913,7 +4913,7 @@ msgstr "Problème lors de l’enregistrement de la boîte de réception du group #. 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:1535 +#: classes/Notice.php:1533 #, php-format msgid "RT @%1$s %2$s" msgstr "RT @%1$s %2$s" @@ -5275,7 +5275,7 @@ msgid "Before" msgstr "Avant" #. TRANS: Client exception thrown when a feed instance is a DOMDocument. -#: lib/activity.php:121 +#: lib/activity.php:122 msgid "Expecting a root feed element but got a whole XML document." msgstr "Attendait un élément racine mais a reçu tout un document XML." @@ -5283,11 +5283,11 @@ msgstr "Attendait un élément racine mais a reçu tout un document XML." msgid "Can't handle remote content yet." msgstr "Impossible de gérer le contenu distant pour le moment." -#: lib/activityutils.php:236 +#: lib/activityutils.php:244 msgid "Can't handle embedded XML content yet." msgstr "Impossible de gérer le contenu XML embarqué pour le moment." -#: lib/activityutils.php:240 +#: lib/activityutils.php:248 msgid "Can't handle embedded Base64 content yet." msgstr "Impossible de gérer le contenu en Base64 embarqué pour le moment." @@ -6685,7 +6685,7 @@ msgstr "Vos messages envoyés" msgid "Tags in %s's notices" msgstr "Marques dans les avis de %s" -#: lib/plugin.php:114 +#: lib/plugin.php:115 msgid "Unknown" msgstr "Inconnu" diff --git a/locale/ga/LC_MESSAGES/statusnet.po b/locale/ga/LC_MESSAGES/statusnet.po index d16b9d2d9..6fd558045 100644 --- a/locale/ga/LC_MESSAGES/statusnet.po +++ b/locale/ga/LC_MESSAGES/statusnet.po @@ -9,11 +9,11 @@ msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2010-04-24 14:16+0000\n" -"PO-Revision-Date: 2010-04-26 22:16:55+0000\n" +"PO-Revision-Date: 2010-05-03 19:18:04+0000\n" "Language-Team: Irish\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r65552); Translate extension (2010-04-25)\n" +"X-Generator: MediaWiki 1.17alpha (r65870); Translate extension (2010-05-01)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: ga\n" "X-Message-Group: out-statusnet\n" @@ -5004,7 +5004,7 @@ 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:1535 +#: classes/Notice.php:1533 #, fuzzy, php-format msgid "RT @%1$s %2$s" msgstr "%1$s (%2$s)" @@ -5391,7 +5391,7 @@ msgid "Before" msgstr "Antes »" #. TRANS: Client exception thrown when a feed instance is a DOMDocument. -#: lib/activity.php:121 +#: lib/activity.php:122 msgid "Expecting a root feed element but got a whole XML document." msgstr "" @@ -5399,11 +5399,11 @@ msgstr "" msgid "Can't handle remote content yet." msgstr "" -#: lib/activityutils.php:236 +#: lib/activityutils.php:244 msgid "Can't handle embedded XML content yet." msgstr "" -#: lib/activityutils.php:240 +#: lib/activityutils.php:248 msgid "Can't handle embedded Base64 content yet." msgstr "" @@ -6800,7 +6800,7 @@ msgstr "As túas mensaxes enviadas" msgid "Tags in %s's notices" msgstr "O usuario non ten último chio." -#: lib/plugin.php:114 +#: lib/plugin.php:115 #, fuzzy msgid "Unknown" msgstr "Acción descoñecida" diff --git a/locale/gl/LC_MESSAGES/statusnet.po b/locale/gl/LC_MESSAGES/statusnet.po index ee17dbd29..0b59b9adb 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-24 14:16+0000\n" -"PO-Revision-Date: 2010-04-26 22:17:07+0000\n" +"POT-Creation-Date: 2010-04-29 23:21+0000\n" +"PO-Revision-Date: 2010-05-03 19:18:08+0000\n" "Language-Team: Galician\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r65552); Translate extension (2010-04-25)\n" +"X-Generator: MediaWiki 1.17alpha (r65870); Translate extension (2010-05-01)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: gl\n" "X-Message-Group: out-statusnet\n" @@ -4880,7 +4880,7 @@ 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:1535 +#: classes/Notice.php:1533 #, php-format msgid "RT @%1$s %2$s" msgstr "♻ @%1$s %2$s" @@ -5242,7 +5242,7 @@ msgid "Before" msgstr "Anteriores" #. TRANS: Client exception thrown when a feed instance is a DOMDocument. -#: lib/activity.php:121 +#: lib/activity.php:122 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." @@ -5251,11 +5251,11 @@ msgstr "" msgid "Can't handle remote content yet." msgstr "Aínda non é posible manexar contidos remotos." -#: lib/activityutils.php:236 +#: lib/activityutils.php:244 msgid "Can't handle embedded XML content yet." msgstr "Aínda non se poden manexar contidos XML integrados." -#: lib/activityutils.php:240 +#: lib/activityutils.php:248 msgid "Can't handle embedded Base64 content yet." msgstr "Aínda non se poden manexar contidos Base64." @@ -5793,8 +5793,8 @@ msgstr "" "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" +"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" @@ -5803,11 +5803,11 @@ msgstr "" "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" +"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" @@ -5841,7 +5841,7 @@ msgstr "MI" #: lib/connectsettingsaction.php:111 msgid "Updates by instant messenger (IM)" -msgstr "" +msgstr "Actualizacións por mensaxería instantánea (MI)" #: lib/connectsettingsaction.php:116 msgid "Updates by SMS" @@ -5868,7 +5868,7 @@ 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." +"2MB." #: lib/designsettings.php:418 msgid "Design defaults restored." @@ -5900,7 +5900,7 @@ msgstr "Atom" #: lib/feed.php:91 msgid "FOAF" -msgstr "FOAF" +msgstr "Amigo dun amigo" #: lib/feedlist.php:64 msgid "Export data" @@ -5908,7 +5908,7 @@ msgstr "Exportar os datos" #: lib/galleryaction.php:121 msgid "Filter tags" -msgstr "Filtrar etiquetas" +msgstr "Filtrar as etiquetas" #: lib/galleryaction.php:131 msgid "All" @@ -5933,7 +5933,7 @@ msgstr "Continuar" #: lib/grantroleform.php:91 #, php-format msgid "Grant this user the \"%s\" role" -msgstr "Atribuírlle a este usuario o rol «%s»" +msgstr "Outorgarlle a este usuario o rol \"%s\"" #: lib/groupeditform.php:163 msgid "URL of the homepage or blog of the group or topic" @@ -5952,8 +5952,8 @@ msgstr "Describa o grupo ou o tema en %d caracteres" 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»." +"Localidade do grupo, se a ten, como por exemplo \"Cidade, Provincia, " +"Comunidade, País\"" #: lib/groupeditform.php:187 #, php-format @@ -6043,11 +6043,11 @@ msgstr "Non se coñece o tipo de ficheiro" #: lib/imagefile.php:244 msgid "MB" -msgstr "MiB" +msgstr "MB" #: lib/imagefile.php:246 msgid "kB" -msgstr "KiB" +msgstr "kB" #: lib/jabber.php:387 #, php-format @@ -6264,7 +6264,7 @@ msgstr "" "\n" "%4$s\n" "\n" -"Non responda a este correo, non lle chegará ao remitente.\n" +"Non responda a esta mensaxe, non lle chegará ao remitente.\n" "\n" "Atentamente,\n" "%5$s\n" @@ -6322,7 +6322,7 @@ msgid "" "\n" "\t%s" msgstr "" -"Pode ler a conversación completa en:\n" +"Pode ler a conversa completa en:\n" "\n" "%s" @@ -6358,7 +6358,7 @@ 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" +"%1$s (@%9$s) acaba de enviar unha nota á súa atención (unha resposta) en %2" "$s.\n" "\n" "A nota está en:\n" @@ -6373,14 +6373,14 @@ msgstr "" "\n" "%6$s\n" "\n" -"A lista de todas as notas á súa @tención está en:\n" +"A lista de todas as respostas está en:\n" "\n" "%7$s\n" "\n" "Atentamente,\n" "%2$s\n" "\n" -"P.S: pode desactivar estas notificacións por correo electrónico en %8$s\n" +"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." @@ -6417,7 +6417,7 @@ msgstr "Non se permite recibir correo electrónico." #: lib/mailhandler.php:228 #, php-format msgid "Unsupported message type: %s" -msgstr "Non se soporta o tipo de mensaxe %s" +msgstr "Non se soporta o tipo de mensaxe: %s" #: lib/mediafile.php:98 lib/mediafile.php:123 msgid "There was a database error while saving your file. Please try again." @@ -6446,7 +6446,7 @@ msgstr "Falta un cartafol temporal." #: lib/mediafile.php:162 msgid "Failed to write file to disk." -msgstr "Non se puido escribir o ficheiro en disco." +msgstr "Non se puido escribir o ficheiro no disco." #: lib/mediafile.php:165 msgid "File upload stopped by extension." @@ -6480,7 +6480,7 @@ msgstr "Enviar unha nota directa" #: lib/messageform.php:146 msgid "To" -msgstr "a" +msgstr "A" #: lib/messageform.php:159 lib/noticeform.php:185 msgid "Available characters" @@ -6522,7 +6522,7 @@ msgid "" "try again later" msgstr "" "Estase tardando máis do esperado en obter a súa xeolocalización, vólvao " -"intentar máis tarde." +"intentar máis tarde" #. TRANS: Used in coordinates as abbreviation of north #: lib/noticelist.php:430 @@ -6547,7 +6547,7 @@ 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 "1% u $ ½% 2 $ u '% 3 $ u \"s% 4% 5 $ u $ ½% 6 $ u' 7% $ u\" 8% $ s" +msgstr "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s" #: lib/noticelist.php:447 msgid "at" @@ -6642,7 +6642,7 @@ msgstr "As mensaxes enviadas" msgid "Tags in %s's notices" msgstr "Etiquetas nas notas de %s" -#: lib/plugin.php:114 +#: lib/plugin.php:115 msgid "Unknown" msgstr "Descoñecida" @@ -6705,11 +6705,11 @@ msgstr "Populares" #: lib/redirectingaction.php:94 msgid "No return-to arguments." -msgstr "Sen argumentos “return-to”." +msgstr "Sen argumentos \"return-to\"." #: lib/repeatform.php:107 msgid "Repeat this notice?" -msgstr "Quere repetir esta nova?" +msgstr "Quere repetir esta nota?" #: lib/repeatform.php:132 msgid "Yes" @@ -6717,12 +6717,12 @@ msgstr "Si" #: lib/repeatform.php:132 msgid "Repeat this notice" -msgstr "Repetir esta nova" +msgstr "Repetir esta nota" #: lib/revokeroleform.php:91 #, php-format msgid "Revoke the \"%s\" role from this user" -msgstr "Revogarlle o rol “%s” a este usuario" +msgstr "Revogarlle o rol \"%s\" a este usuario" #: lib/router.php:704 msgid "No single user defined for single-user mode." @@ -6806,7 +6806,7 @@ msgstr "Convidar" #: lib/subgroupnav.php:106 #, php-format msgid "Invite friends and colleagues to join you on %s" -msgstr "Convida a amigos e compañeiros a unírseche en %s" +msgstr "Convide a amigos e compañeiros a unírselle en %s" #: lib/subscriberspeopleselftagcloudsection.php:48 #: lib/subscriptionspeopleselftagcloudsection.php:48 diff --git a/locale/he/LC_MESSAGES/statusnet.po b/locale/he/LC_MESSAGES/statusnet.po index 857ce5a2c..2c9927ebf 100644 --- a/locale/he/LC_MESSAGES/statusnet.po +++ b/locale/he/LC_MESSAGES/statusnet.po @@ -8,11 +8,11 @@ msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2010-04-24 14:16+0000\n" -"PO-Revision-Date: 2010-04-26 22:17:10+0000\n" +"PO-Revision-Date: 2010-05-03 19:18:12+0000\n" "Language-Team: Hebrew\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r65552); Translate extension (2010-04-25)\n" +"X-Generator: MediaWiki 1.17alpha (r65870); Translate extension (2010-05-01)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: he\n" "X-Message-Group: out-statusnet\n" @@ -4849,7 +4849,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:1535 +#: classes/Notice.php:1533 #, php-format msgid "RT @%1$s %2$s" msgstr "" @@ -5234,7 +5234,7 @@ msgid "Before" msgstr "לפני >>" #. TRANS: Client exception thrown when a feed instance is a DOMDocument. -#: lib/activity.php:121 +#: lib/activity.php:122 msgid "Expecting a root feed element but got a whole XML document." msgstr "" @@ -5242,11 +5242,11 @@ msgstr "" msgid "Can't handle remote content yet." msgstr "" -#: lib/activityutils.php:236 +#: lib/activityutils.php:244 msgid "Can't handle embedded XML content yet." msgstr "" -#: lib/activityutils.php:240 +#: lib/activityutils.php:248 msgid "Can't handle embedded Base64 content yet." msgstr "" @@ -6533,7 +6533,7 @@ msgstr "" msgid "Tags in %s's notices" msgstr "" -#: lib/plugin.php:114 +#: lib/plugin.php:115 msgid "Unknown" msgstr "" diff --git a/locale/hsb/LC_MESSAGES/statusnet.po b/locale/hsb/LC_MESSAGES/statusnet.po index 5d226be60..a5126d75a 100644 --- a/locale/hsb/LC_MESSAGES/statusnet.po +++ b/locale/hsb/LC_MESSAGES/statusnet.po @@ -10,11 +10,11 @@ msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2010-04-24 14:16+0000\n" -"PO-Revision-Date: 2010-04-26 22:17:21+0000\n" +"PO-Revision-Date: 2010-05-03 19:18:15+0000\n" "Language-Team: Dutch\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r65552); Translate extension (2010-04-25)\n" +"X-Generator: MediaWiki 1.17alpha (r65870); Translate extension (2010-05-01)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: hsb\n" "X-Message-Group: out-statusnet\n" @@ -4589,7 +4589,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:1535 +#: classes/Notice.php:1533 #, php-format msgid "RT @%1$s %2$s" msgstr "" @@ -4941,7 +4941,7 @@ msgid "Before" msgstr "" #. TRANS: Client exception thrown when a feed instance is a DOMDocument. -#: lib/activity.php:121 +#: lib/activity.php:122 msgid "Expecting a root feed element but got a whole XML document." msgstr "" @@ -4949,11 +4949,11 @@ msgstr "" msgid "Can't handle remote content yet." msgstr "" -#: lib/activityutils.php:236 +#: lib/activityutils.php:244 msgid "Can't handle embedded XML content yet." msgstr "" -#: lib/activityutils.php:240 +#: lib/activityutils.php:248 msgid "Can't handle embedded Base64 content yet." msgstr "" @@ -6186,7 +6186,7 @@ msgstr "Twoje pósłane powěsće" msgid "Tags in %s's notices" msgstr "" -#: lib/plugin.php:114 +#: lib/plugin.php:115 msgid "Unknown" msgstr "Njeznaty" diff --git a/locale/ia/LC_MESSAGES/statusnet.po b/locale/ia/LC_MESSAGES/statusnet.po index 62ec146c3..1b05490b9 100644 --- a/locale/ia/LC_MESSAGES/statusnet.po +++ b/locale/ia/LC_MESSAGES/statusnet.po @@ -9,11 +9,11 @@ msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2010-04-24 14:16+0000\n" -"PO-Revision-Date: 2010-04-26 22:17:24+0000\n" +"PO-Revision-Date: 2010-05-03 19:18:18+0000\n" "Language-Team: Interlingua\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r65552); Translate extension (2010-04-25)\n" +"X-Generator: MediaWiki 1.17alpha (r65870); Translate extension (2010-05-01)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: ia\n" "X-Message-Group: out-statusnet\n" @@ -4857,7 +4857,7 @@ 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:1535 +#: classes/Notice.php:1533 #, php-format msgid "RT @%1$s %2$s" msgstr "RT @%1$s %2$s" @@ -5215,7 +5215,7 @@ msgid "Before" msgstr "Ante" #. TRANS: Client exception thrown when a feed instance is a DOMDocument. -#: lib/activity.php:121 +#: lib/activity.php:122 msgid "Expecting a root feed element but got a whole XML document." msgstr "" "Expectava le elemento-radice de un syndication, ma recipeva un documento XML " @@ -5225,11 +5225,11 @@ msgstr "" msgid "Can't handle remote content yet." msgstr "Non pote ancora tractar contento remote." -#: lib/activityutils.php:236 +#: lib/activityutils.php:244 msgid "Can't handle embedded XML content yet." msgstr "Non pote ancora tractar contento XML incastrate." -#: lib/activityutils.php:240 +#: lib/activityutils.php:248 msgid "Can't handle embedded Base64 content yet." msgstr "Non pote ancora tractar contento Base64 incastrate." @@ -6615,7 +6615,7 @@ msgstr "Tu messages inviate" msgid "Tags in %s's notices" msgstr "Etiquettas in le notas de %s" -#: lib/plugin.php:114 +#: lib/plugin.php:115 msgid "Unknown" msgstr "Incognite" diff --git a/locale/is/LC_MESSAGES/statusnet.po b/locale/is/LC_MESSAGES/statusnet.po index 34f87d244..2b2f19f5d 100644 --- a/locale/is/LC_MESSAGES/statusnet.po +++ b/locale/is/LC_MESSAGES/statusnet.po @@ -9,11 +9,11 @@ msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2010-04-24 14:16+0000\n" -"PO-Revision-Date: 2010-04-26 22:17:27+0000\n" +"PO-Revision-Date: 2010-05-03 19:18:21+0000\n" "Language-Team: Icelandic\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r65552); Translate extension (2010-04-25)\n" +"X-Generator: MediaWiki 1.17alpha (r65870); Translate extension (2010-05-01)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: is\n" "X-Message-Group: out-statusnet\n" @@ -4899,7 +4899,7 @@ 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:1535 +#: classes/Notice.php:1533 #, fuzzy, php-format msgid "RT @%1$s %2$s" msgstr "%1$s (%2$s)" @@ -5282,7 +5282,7 @@ msgid "Before" msgstr "Áður" #. TRANS: Client exception thrown when a feed instance is a DOMDocument. -#: lib/activity.php:121 +#: lib/activity.php:122 msgid "Expecting a root feed element but got a whole XML document." msgstr "" @@ -5290,11 +5290,11 @@ msgstr "" msgid "Can't handle remote content yet." msgstr "" -#: lib/activityutils.php:236 +#: lib/activityutils.php:244 msgid "Can't handle embedded XML content yet." msgstr "" -#: lib/activityutils.php:240 +#: lib/activityutils.php:248 msgid "Can't handle embedded Base64 content yet." msgstr "" @@ -6577,7 +6577,7 @@ msgstr "Skilaboð sem þú hefur sent" msgid "Tags in %s's notices" msgstr "Merki í babli %s" -#: lib/plugin.php:114 +#: lib/plugin.php:115 #, fuzzy msgid "Unknown" msgstr "Óþekkt aðgerð" diff --git a/locale/it/LC_MESSAGES/statusnet.po b/locale/it/LC_MESSAGES/statusnet.po index de429fe9b..6b6351f89 100644 --- a/locale/it/LC_MESSAGES/statusnet.po +++ b/locale/it/LC_MESSAGES/statusnet.po @@ -10,11 +10,11 @@ msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2010-04-24 14:16+0000\n" -"PO-Revision-Date: 2010-04-26 22:17:37+0000\n" +"PO-Revision-Date: 2010-05-03 19:18:25+0000\n" "Language-Team: Italian\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r65552); Translate extension (2010-04-25)\n" +"X-Generator: MediaWiki 1.17alpha (r65870); Translate extension (2010-05-01)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: it\n" "X-Message-Group: out-statusnet\n" @@ -4857,7 +4857,7 @@ 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:1535 +#: classes/Notice.php:1533 #, php-format msgid "RT @%1$s %2$s" msgstr "RT @%1$s %2$s" @@ -5219,7 +5219,7 @@ msgid "Before" msgstr "Precedenti" #. TRANS: Client exception thrown when a feed instance is a DOMDocument. -#: lib/activity.php:121 +#: lib/activity.php:122 msgid "Expecting a root feed element but got a whole XML document." msgstr "Atteso un elemento root del feed, ma ricevuto un documento XML intero." @@ -5227,11 +5227,11 @@ msgstr "Atteso un elemento root del feed, ma ricevuto un documento XML intero." msgid "Can't handle remote content yet." msgstr "Impossibile gestire contenuti remoti." -#: lib/activityutils.php:236 +#: lib/activityutils.php:244 msgid "Can't handle embedded XML content yet." msgstr "Impossibile gestire contenuti XML incorporati." -#: lib/activityutils.php:240 +#: lib/activityutils.php:248 msgid "Can't handle embedded Base64 content yet." msgstr "Impossibile gestire contenuti Base64." @@ -6621,7 +6621,7 @@ msgstr "I tuoi messaggi inviati" msgid "Tags in %s's notices" msgstr "Etichette nei messaggi di %s" -#: lib/plugin.php:114 +#: lib/plugin.php:115 msgid "Unknown" msgstr "Sconosciuto" diff --git a/locale/ja/LC_MESSAGES/statusnet.po b/locale/ja/LC_MESSAGES/statusnet.po index 76ca28c24..d3943819a 100644 --- a/locale/ja/LC_MESSAGES/statusnet.po +++ b/locale/ja/LC_MESSAGES/statusnet.po @@ -11,11 +11,11 @@ msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2010-04-24 14:16+0000\n" -"PO-Revision-Date: 2010-04-26 22:17:40+0000\n" +"PO-Revision-Date: 2010-05-03 19:18:28+0000\n" "Language-Team: Japanese\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r65552); Translate extension (2010-04-25)\n" +"X-Generator: MediaWiki 1.17alpha (r65870); Translate extension (2010-05-01)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: ja\n" "X-Message-Group: out-statusnet\n" @@ -4890,7 +4890,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:1535 +#: classes/Notice.php:1533 #, php-format msgid "RT @%1$s %2$s" msgstr "" @@ -5267,7 +5267,7 @@ msgid "Before" msgstr "前>>" #. TRANS: Client exception thrown when a feed instance is a DOMDocument. -#: lib/activity.php:121 +#: lib/activity.php:122 msgid "Expecting a root feed element but got a whole XML document." msgstr "" @@ -5275,11 +5275,11 @@ msgstr "" msgid "Can't handle remote content yet." msgstr "" -#: lib/activityutils.php:236 +#: lib/activityutils.php:244 msgid "Can't handle embedded XML content yet." msgstr "" -#: lib/activityutils.php:240 +#: lib/activityutils.php:248 msgid "Can't handle embedded Base64 content yet." msgstr "" @@ -6610,7 +6610,7 @@ msgstr "あなたが送ったメッセージ" msgid "Tags in %s's notices" msgstr "%s のつぶやきのタグ" -#: lib/plugin.php:114 +#: lib/plugin.php:115 msgid "Unknown" msgstr "不明" diff --git a/locale/ko/LC_MESSAGES/statusnet.po b/locale/ko/LC_MESSAGES/statusnet.po index 841192041..835611a9f 100644 --- a/locale/ko/LC_MESSAGES/statusnet.po +++ b/locale/ko/LC_MESSAGES/statusnet.po @@ -9,11 +9,11 @@ msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2010-04-24 14:16+0000\n" -"PO-Revision-Date: 2010-04-26 22:17:43+0000\n" +"PO-Revision-Date: 2010-05-03 19:18:31+0000\n" "Language-Team: Korean\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r65552); Translate extension (2010-04-25)\n" +"X-Generator: MediaWiki 1.17alpha (r65870); Translate extension (2010-05-01)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: ko\n" "X-Message-Group: out-statusnet\n" @@ -4871,7 +4871,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:1535 +#: classes/Notice.php:1533 #, fuzzy, php-format msgid "RT @%1$s %2$s" msgstr "%1$s (%2$s)" @@ -5252,7 +5252,7 @@ msgid "Before" msgstr "앞 페이지" #. TRANS: Client exception thrown when a feed instance is a DOMDocument. -#: lib/activity.php:121 +#: lib/activity.php:122 msgid "Expecting a root feed element but got a whole XML document." msgstr "" @@ -5260,11 +5260,11 @@ msgstr "" msgid "Can't handle remote content yet." msgstr "" -#: lib/activityutils.php:236 +#: lib/activityutils.php:244 msgid "Can't handle embedded XML content yet." msgstr "" -#: lib/activityutils.php:240 +#: lib/activityutils.php:248 msgid "Can't handle embedded Base64 content yet." msgstr "" @@ -6546,7 +6546,7 @@ msgstr "당신의 보낸 메시지들" msgid "Tags in %s's notices" msgstr "%s의 게시글의 태그" -#: lib/plugin.php:114 +#: lib/plugin.php:115 #, fuzzy msgid "Unknown" msgstr "알려지지 않은 행동" diff --git a/locale/mk/LC_MESSAGES/statusnet.po b/locale/mk/LC_MESSAGES/statusnet.po index 76cd8f711..215f5089c 100644 --- a/locale/mk/LC_MESSAGES/statusnet.po +++ b/locale/mk/LC_MESSAGES/statusnet.po @@ -10,11 +10,11 @@ msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2010-04-24 14:16+0000\n" -"PO-Revision-Date: 2010-04-26 22:17:47+0000\n" +"PO-Revision-Date: 2010-05-03 19:18:38+0000\n" "Language-Team: Macedonian\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r65552); Translate extension (2010-04-25)\n" +"X-Generator: MediaWiki 1.17alpha (r65870); Translate extension (2010-05-01)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: mk\n" "X-Message-Group: out-statusnet\n" @@ -4878,7 +4878,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:1535 +#: classes/Notice.php:1533 #, php-format msgid "RT @%1$s %2$s" msgstr "RT @%1$s %2$s" @@ -5240,7 +5240,7 @@ msgid "Before" msgstr "Пред" #. TRANS: Client exception thrown when a feed instance is a DOMDocument. -#: lib/activity.php:121 +#: lib/activity.php:122 msgid "Expecting a root feed element but got a whole XML document." msgstr "Се очекува коренски каналски елемент, но добив цел XML документ." @@ -5248,11 +5248,11 @@ msgstr "Се очекува коренски каналски елемент, н msgid "Can't handle remote content yet." msgstr "Сè уште не е поддржана обработката на далечинска содржина." -#: lib/activityutils.php:236 +#: lib/activityutils.php:244 msgid "Can't handle embedded XML content yet." msgstr "Сè уште не е поддржана обработката на XML содржина." -#: lib/activityutils.php:240 +#: lib/activityutils.php:248 msgid "Can't handle embedded Base64 content yet." msgstr "Сè уште не е достапна обработката на вметната Base64 содржина." @@ -6642,7 +6642,7 @@ msgstr "Ваши испратени пораки" msgid "Tags in %s's notices" msgstr "Ознаки во забелешките на %s" -#: lib/plugin.php:114 +#: lib/plugin.php:115 msgid "Unknown" msgstr "Непознато" diff --git a/locale/nb/LC_MESSAGES/statusnet.po b/locale/nb/LC_MESSAGES/statusnet.po index 4ac3bff57..c36addf55 100644 --- a/locale/nb/LC_MESSAGES/statusnet.po +++ b/locale/nb/LC_MESSAGES/statusnet.po @@ -10,11 +10,11 @@ msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2010-04-24 14:16+0000\n" -"PO-Revision-Date: 2010-04-26 22:17:50+0000\n" +"PO-Revision-Date: 2010-05-03 19:18:41+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 (r65552); Translate extension (2010-04-25)\n" +"X-Generator: MediaWiki 1.17alpha (r65870); Translate extension (2010-05-01)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: no\n" "X-Message-Group: out-statusnet\n" @@ -4273,12 +4273,12 @@ msgstr "Alle abonnementer" #: actions/subscribers.php:63 msgid "These are the people who listen to your notices." -msgstr "" +msgstr "Dette er personene som lytter til dine notiser." #: actions/subscribers.php:67 #, php-format msgid "These are the people who listen to %s's notices." -msgstr "" +msgstr "Dette er personene som lytter til %ss notiser." #: actions/subscribers.php:108 msgid "" @@ -4310,12 +4310,12 @@ msgstr "Alle abonnementer" #: actions/subscriptions.php:65 msgid "These are the people whose notices you listen to." -msgstr "" +msgstr "Dette er personene hvis notiser du lytter til." #: actions/subscriptions.php:69 #, php-format msgid "These are the people whose notices %s listens to." -msgstr "" +msgstr "Dette er personene hvis notiser %s lytter til." #: actions/subscriptions.php:126 #, php-format @@ -4792,7 +4792,7 @@ 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:1535 +#: classes/Notice.php:1533 #, php-format msgid "RT @%1$s %2$s" msgstr "RT @%1$s %2$s" @@ -5150,7 +5150,7 @@ msgid "Before" msgstr "Før" #. TRANS: Client exception thrown when a feed instance is a DOMDocument. -#: lib/activity.php:121 +#: lib/activity.php:122 msgid "Expecting a root feed element but got a whole XML document." msgstr "" @@ -5158,11 +5158,11 @@ msgstr "" msgid "Can't handle remote content yet." msgstr "" -#: lib/activityutils.php:236 +#: lib/activityutils.php:244 msgid "Can't handle embedded XML content yet." msgstr "" -#: lib/activityutils.php:240 +#: lib/activityutils.php:248 msgid "Can't handle embedded Base64 content yet." msgstr "" @@ -6500,7 +6500,7 @@ msgstr "Dine sendte meldinger" msgid "Tags in %s's notices" msgstr "" -#: lib/plugin.php:114 +#: lib/plugin.php:115 msgid "Unknown" msgstr "Ukjent" diff --git a/locale/nl/LC_MESSAGES/statusnet.po b/locale/nl/LC_MESSAGES/statusnet.po index cef426ff5..f42b33941 100644 --- a/locale/nl/LC_MESSAGES/statusnet.po +++ b/locale/nl/LC_MESSAGES/statusnet.po @@ -11,11 +11,11 @@ msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2010-04-24 14:16+0000\n" -"PO-Revision-Date: 2010-04-26 22:17:57+0000\n" +"PO-Revision-Date: 2010-05-03 19:18:47+0000\n" "Language-Team: Dutch\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r65552); Translate extension (2010-04-25)\n" +"X-Generator: MediaWiki 1.17alpha (r65870); Translate extension (2010-05-01)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: nl\n" "X-Message-Group: out-statusnet\n" @@ -4920,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:1535 +#: classes/Notice.php:1533 #, php-format msgid "RT @%1$s %2$s" msgstr "RT @%1$s %2$s" @@ -5283,7 +5283,7 @@ msgid "Before" msgstr "Eerder" #. TRANS: Client exception thrown when a feed instance is a DOMDocument. -#: lib/activity.php:121 +#: lib/activity.php:122 msgid "Expecting a root feed element but got a whole XML document." msgstr "Verwachtte een root-feed element maar kreeg een heel XML-document." @@ -5291,11 +5291,11 @@ msgstr "Verwachtte een root-feed element maar kreeg een heel XML-document." msgid "Can't handle remote content yet." msgstr "Het is nog niet mogelijk inhoud uit andere omgevingen te verwerken." -#: lib/activityutils.php:236 +#: lib/activityutils.php:244 msgid "Can't handle embedded XML content yet." msgstr "Het is nog niet mogelijk ingebedde XML-inhoud te verwerken" -#: lib/activityutils.php:240 +#: lib/activityutils.php:248 msgid "Can't handle embedded Base64 content yet." msgstr "Het is nog niet mogelijk ingebedde Base64-inhoud te verwerken" @@ -6696,7 +6696,7 @@ msgstr "Uw verzonden berichten" msgid "Tags in %s's notices" msgstr "Labels in de mededelingen van %s" -#: lib/plugin.php:114 +#: lib/plugin.php:115 msgid "Unknown" msgstr "Onbekend" diff --git a/locale/nn/LC_MESSAGES/statusnet.po b/locale/nn/LC_MESSAGES/statusnet.po index 6a2a705d7..ddff42772 100644 --- a/locale/nn/LC_MESSAGES/statusnet.po +++ b/locale/nn/LC_MESSAGES/statusnet.po @@ -9,11 +9,11 @@ msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2010-04-24 14:16+0000\n" -"PO-Revision-Date: 2010-04-26 22:17:54+0000\n" +"PO-Revision-Date: 2010-05-03 19:18:44+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 (r65552); Translate extension (2010-04-25)\n" +"X-Generator: MediaWiki 1.17alpha (r65870); Translate extension (2010-05-01)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: nn\n" "X-Message-Group: out-statusnet\n" @@ -4938,7 +4938,7 @@ 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:1535 +#: classes/Notice.php:1533 #, fuzzy, php-format msgid "RT @%1$s %2$s" msgstr "%1$s (%2$s)" @@ -5321,7 +5321,7 @@ msgid "Before" msgstr "Før »" #. TRANS: Client exception thrown when a feed instance is a DOMDocument. -#: lib/activity.php:121 +#: lib/activity.php:122 msgid "Expecting a root feed element but got a whole XML document." msgstr "" @@ -5329,11 +5329,11 @@ msgstr "" msgid "Can't handle remote content yet." msgstr "" -#: lib/activityutils.php:236 +#: lib/activityutils.php:244 msgid "Can't handle embedded XML content yet." msgstr "" -#: lib/activityutils.php:240 +#: lib/activityutils.php:248 msgid "Can't handle embedded Base64 content yet." msgstr "" @@ -6624,7 +6624,7 @@ msgstr "Dine sende meldingar" msgid "Tags in %s's notices" msgstr "Merkelappar i %s sine notisar" -#: lib/plugin.php:114 +#: lib/plugin.php:115 #, fuzzy msgid "Unknown" msgstr "Uventa handling." diff --git a/locale/pl/LC_MESSAGES/statusnet.po b/locale/pl/LC_MESSAGES/statusnet.po index cd23aea29..c816475e1 100644 --- a/locale/pl/LC_MESSAGES/statusnet.po +++ b/locale/pl/LC_MESSAGES/statusnet.po @@ -12,7 +12,7 @@ msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2010-04-24 14:16+0000\n" -"PO-Revision-Date: 2010-04-26 22:18:01+0000\n" +"PO-Revision-Date: 2010-05-03 19:18:50+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 (r65552); Translate extension (2010-04-25)\n" +"X-Generator: MediaWiki 1.17alpha (r65870); Translate extension (2010-05-01)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: pl\n" "X-Message-Group: out-statusnet\n" @@ -4851,7 +4851,7 @@ 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:1535 +#: classes/Notice.php:1533 #, php-format msgid "RT @%1$s %2$s" msgstr "RT @%1$s %2$s" @@ -5214,7 +5214,7 @@ msgid "Before" msgstr "Wcześniej" #. TRANS: Client exception thrown when a feed instance is a DOMDocument. -#: lib/activity.php:121 +#: lib/activity.php:122 msgid "Expecting a root feed element but got a whole XML document." msgstr "Oczekiwano elementu kanału roota, ale otrzymano cały dokument XML." @@ -5222,11 +5222,11 @@ msgstr "Oczekiwano elementu kanału roota, ale otrzymano cały dokument XML." msgid "Can't handle remote content yet." msgstr "Nie można jeszcze obsługiwać zdalnej treści." -#: lib/activityutils.php:236 +#: lib/activityutils.php:244 msgid "Can't handle embedded XML content yet." msgstr "Nie można jeszcze obsługiwać zagnieżdżonej treści XML." -#: lib/activityutils.php:240 +#: lib/activityutils.php:248 msgid "Can't handle embedded Base64 content yet." msgstr "Nie można jeszcze obsługiwać zagnieżdżonej treści Base64." @@ -6615,7 +6615,7 @@ msgstr "Wysłane wiadomości" msgid "Tags in %s's notices" msgstr "Znaczniki we wpisach użytkownika %s" -#: lib/plugin.php:114 +#: lib/plugin.php:115 msgid "Unknown" msgstr "Nieznane" diff --git a/locale/pt/LC_MESSAGES/statusnet.po b/locale/pt/LC_MESSAGES/statusnet.po index 048664eb8..2d6571767 100644 --- a/locale/pt/LC_MESSAGES/statusnet.po +++ b/locale/pt/LC_MESSAGES/statusnet.po @@ -11,11 +11,11 @@ msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2010-04-24 14:16+0000\n" -"PO-Revision-Date: 2010-04-26 22:18:04+0000\n" +"PO-Revision-Date: 2010-05-03 19:18:53+0000\n" "Language-Team: Portuguese\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r65552); Translate extension (2010-04-25)\n" +"X-Generator: MediaWiki 1.17alpha (r65870); Translate extension (2010-05-01)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: pt\n" "X-Message-Group: out-statusnet\n" @@ -4849,7 +4849,7 @@ 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:1535 +#: classes/Notice.php:1533 #, php-format msgid "RT @%1$s %2$s" msgstr "RT @%1$s %2$s" @@ -5212,7 +5212,7 @@ msgid "Before" msgstr "Anteriores" #. TRANS: Client exception thrown when a feed instance is a DOMDocument. -#: lib/activity.php:121 +#: lib/activity.php:122 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 " @@ -5222,11 +5222,11 @@ msgstr "" msgid "Can't handle remote content yet." msgstr "Ainda não é possível processar conteúdos remotos." -#: lib/activityutils.php:236 +#: lib/activityutils.php:244 msgid "Can't handle embedded XML content yet." msgstr "Ainda não é possível processar conteúdo XML embutido." -#: lib/activityutils.php:240 +#: lib/activityutils.php:248 msgid "Can't handle embedded Base64 content yet." msgstr "Ainda não é possível processar conteúdo Base64 embutido." @@ -6608,7 +6608,7 @@ msgstr "Mensagens enviadas" msgid "Tags in %s's notices" msgstr "Categorias nas notas de %s" -#: lib/plugin.php:114 +#: lib/plugin.php:115 msgid "Unknown" msgstr "Desconhecida" diff --git a/locale/pt_BR/LC_MESSAGES/statusnet.po b/locale/pt_BR/LC_MESSAGES/statusnet.po index 4263dde6b..1409dc614 100644 --- a/locale/pt_BR/LC_MESSAGES/statusnet.po +++ b/locale/pt_BR/LC_MESSAGES/statusnet.po @@ -13,11 +13,11 @@ msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2010-04-24 14:16+0000\n" -"PO-Revision-Date: 2010-04-26 22:18:12+0000\n" +"PO-Revision-Date: 2010-05-03 19:18:56+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 (r65552); Translate extension (2010-04-25)\n" +"X-Generator: MediaWiki 1.17alpha (r65870); Translate extension (2010-05-01)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: pt-br\n" "X-Message-Group: out-statusnet\n" @@ -1536,9 +1536,8 @@ msgstr "Esse é o endereço de e-mail errado." #. TRANS: Message given after successfully canceling e-mail address confirmation. #: actions/emailsettings.php:438 -#, fuzzy msgid "Email confirmation cancelled." -msgstr "A confirmação foi cancelada." +msgstr "A confirmação por e-mail foi cancelada." #. TRANS: Message given trying to remove an e-mail address that is not #. TRANS: registered for the active user. @@ -1548,9 +1547,8 @@ msgstr "Esse não é seu endereço de email." #. 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 e-mail foi removido." #: actions/emailsettings.php:493 actions/smssettings.php:568 msgid "No incoming email address." @@ -1690,9 +1688,8 @@ msgid "Remote service uses unknown version of OMB protocol." msgstr "O serviço remoto usa uma versão desconhecida do protocolo OMB." #: actions/finishremotesubscribe.php:138 -#, fuzzy msgid "Error updating remote profile." -msgstr "Ocorreu um erro na atualização do perfil remoto" +msgstr "Ocorreu um erro durante a atualização do perfil remoto." #: actions/getfile.php:79 msgid "No such file." @@ -2014,9 +2011,8 @@ msgstr "" #. TRANS: Form legend for IM preferences form. #: actions/imsettings.php:155 -#, fuzzy msgid "IM preferences" -msgstr "Preferências" +msgstr "Preferências do mensageiro instantâneo" #. TRANS: Checkbox label in IM preferences form. #: actions/imsettings.php:160 @@ -2088,15 +2084,13 @@ msgstr "Isso é um endereço de MI 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 excluir a confirmação de e-mail." +msgstr "Não foi possível excluir 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 "A confirmação foi cancelada." +msgstr "A confirmação do mensageiro instantâneo foi cancelada." #. TRANS: Message given trying to remove an IM address that is not #. TRANS: registered for the active user. @@ -2106,9 +2100,8 @@ msgstr "Essa não é sua ID do Jabber." #. 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 de mensageiro instantâneo foi removido." #: actions/inbox.php:59 #, php-format @@ -2131,10 +2124,10 @@ msgid "Invites have been disabled." msgstr "Os 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 "" -"Você deve estar autenticado para convidar outros usuários para usar o %s" +"Você deve estar autenticado para convidar outros usuários para usar o %s." #: actions/invite.php:72 #, php-format @@ -2344,17 +2337,15 @@ msgstr "" "senha antes de alterar suas configurações." #: actions/login.php:270 -#, fuzzy msgid "Login with your username and password." -msgstr "Autentique-se com um nome de usuário e uma senha" +msgstr "Autentique-se com seu nome de usuário e senha." #: actions/login.php:273 -#, fuzzy, php-format +#, php-format msgid "" "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." +"Ainda não possui um usuário? [Registre](%%action.register%%) uma nova conta." #: actions/makeadmin.php:92 msgid "Only an admin can make another user an admin." @@ -2378,9 +2369,8 @@ msgid "Can't make %1$s an admin for group %2$s." msgstr "Não foi possível tornar %1$s um administrador do grupo %2$s." #: actions/microsummary.php:69 -#, fuzzy msgid "No current status." -msgstr "Nenhuma mensagem atual" +msgstr "Nenhuma mensagem atual." #: actions/newapplication.php:52 msgid "New Application" @@ -2547,9 +2537,9 @@ msgid "You are not a user of that application." msgstr "Você não é um usuário dessa aplicação." #: actions/oauthconnectionssettings.php:186 -#, fuzzy, php-format +#, php-format msgid "Unable to revoke access for app: %s." -msgstr "Não foi possível revogar o acesso para a aplicação: " +msgstr "Não foi possível revogar o acesso para a aplicação: %s." #: actions/oauthconnectionssettings.php:198 msgid "You have not authorized any applications to use your account." @@ -4903,7 +4893,7 @@ 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:1535 +#: classes/Notice.php:1533 #, php-format msgid "RT @%1$s %2$s" msgstr "RT @%1$s %2$s" @@ -5262,7 +5252,7 @@ msgid "Before" msgstr "Anterior" #. TRANS: Client exception thrown when a feed instance is a DOMDocument. -#: lib/activity.php:121 +#: lib/activity.php:122 msgid "Expecting a root feed element but got a whole XML document." msgstr "" "Era esperado um elemento raiz da fonte, mas foi obtido o documento XML " @@ -5272,11 +5262,11 @@ msgstr "" msgid "Can't handle remote content yet." msgstr "Ainda não é possível manipular conteúdo remoto." -#: lib/activityutils.php:236 +#: lib/activityutils.php:244 msgid "Can't handle embedded XML content yet." msgstr "Ainda não é possível manipular conteúdo XML incorporado." -#: lib/activityutils.php:240 +#: lib/activityutils.php:248 msgid "Can't handle embedded Base64 content yet." msgstr "Ainda não é possível manipular conteúdo Base64." @@ -6643,7 +6633,7 @@ msgstr "Suas mensagens enviadas" msgid "Tags in %s's notices" msgstr "Etiquetas nas mensagens de %s" -#: lib/plugin.php:114 +#: lib/plugin.php:115 msgid "Unknown" msgstr "Desconhecido" diff --git a/locale/ru/LC_MESSAGES/statusnet.po b/locale/ru/LC_MESSAGES/statusnet.po index 7f697bd8d..054ed2bc2 100644 --- a/locale/ru/LC_MESSAGES/statusnet.po +++ b/locale/ru/LC_MESSAGES/statusnet.po @@ -13,11 +13,11 @@ msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2010-04-24 14:16+0000\n" -"PO-Revision-Date: 2010-04-26 22:18:15+0000\n" +"PO-Revision-Date: 2010-05-03 19:18:59+0000\n" "Language-Team: Russian\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r65552); Translate extension (2010-04-25)\n" +"X-Generator: MediaWiki 1.17alpha (r65870); Translate extension (2010-05-01)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: ru\n" "X-Message-Group: out-statusnet\n" @@ -4869,7 +4869,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:1535 +#: classes/Notice.php:1533 #, php-format msgid "RT @%1$s %2$s" msgstr "RT @%1$s %2$s" @@ -5230,7 +5230,7 @@ msgid "Before" msgstr "Туда" #. TRANS: Client exception thrown when a feed instance is a DOMDocument. -#: lib/activity.php:121 +#: lib/activity.php:122 msgid "Expecting a root feed element but got a whole XML document." msgstr "Ожидался корневой элемент потока, а получен XML-документ целиком." @@ -5238,11 +5238,11 @@ msgstr "Ожидался корневой элемент потока, а пол msgid "Can't handle remote content yet." msgstr "Пока ещё нельзя обрабатывать удалённое содержимое." -#: lib/activityutils.php:236 +#: lib/activityutils.php:244 msgid "Can't handle embedded XML content yet." msgstr "Пока ещё нельзя обрабатывать встроенный XML." -#: lib/activityutils.php:240 +#: lib/activityutils.php:248 msgid "Can't handle embedded Base64 content yet." msgstr "Пока ещё нельзя обрабатывать встроенное содержание Base64." @@ -6629,7 +6629,7 @@ msgstr "Ваши исходящие сообщения" msgid "Tags in %s's notices" msgstr "Теги записей пользователя %s" -#: lib/plugin.php:114 +#: lib/plugin.php:115 msgid "Unknown" msgstr "Неизвестно" diff --git a/locale/statusnet.pot b/locale/statusnet.pot index e0aad7146..caa8258f9 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-26 22:15+0000\n" +"POT-Creation-Date: 2010-05-03 19:17+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" @@ -4575,7 +4575,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:1535 +#: classes/Notice.php:1533 #, php-format msgid "RT @%1$s %2$s" msgstr "" @@ -4927,7 +4927,7 @@ msgid "Before" msgstr "" #. TRANS: Client exception thrown when a feed instance is a DOMDocument. -#: lib/activity.php:121 +#: lib/activity.php:122 msgid "Expecting a root feed element but got a whole XML document." msgstr "" @@ -4935,11 +4935,11 @@ msgstr "" msgid "Can't handle remote content yet." msgstr "" -#: lib/activityutils.php:236 +#: lib/activityutils.php:244 msgid "Can't handle embedded XML content yet." msgstr "" -#: lib/activityutils.php:240 +#: lib/activityutils.php:248 msgid "Can't handle embedded Base64 content yet." msgstr "" @@ -6166,7 +6166,7 @@ msgstr "" msgid "Tags in %s's notices" msgstr "" -#: lib/plugin.php:114 +#: lib/plugin.php:115 msgid "Unknown" msgstr "" diff --git a/locale/sv/LC_MESSAGES/statusnet.po b/locale/sv/LC_MESSAGES/statusnet.po index 65a64dc32..e50bf1a32 100644 --- a/locale/sv/LC_MESSAGES/statusnet.po +++ b/locale/sv/LC_MESSAGES/statusnet.po @@ -10,11 +10,11 @@ msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2010-04-24 14:16+0000\n" -"PO-Revision-Date: 2010-04-26 22:18:20+0000\n" +"PO-Revision-Date: 2010-05-03 19:19:02+0000\n" "Language-Team: Swedish\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r65552); Translate extension (2010-04-25)\n" +"X-Generator: MediaWiki 1.17alpha (r65870); Translate extension (2010-05-01)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: sv\n" "X-Message-Group: out-statusnet\n" @@ -4846,7 +4846,7 @@ 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:1535 +#: classes/Notice.php:1533 #, php-format msgid "RT @%1$s %2$s" msgstr "RT @%1$s %2$s" @@ -5204,7 +5204,7 @@ msgid "Before" msgstr "Tidigare" #. TRANS: Client exception thrown when a feed instance is a DOMDocument. -#: lib/activity.php:121 +#: lib/activity.php:122 msgid "Expecting a root feed element but got a whole XML document." msgstr "Förväntade ett flödes rotelement, men fick ett helt XML-dokument." @@ -5212,11 +5212,11 @@ msgstr "Förväntade ett flödes rotelement, men fick ett helt XML-dokument." msgid "Can't handle remote content yet." msgstr "Kan inte hantera fjärrinnehåll ännu." -#: lib/activityutils.php:236 +#: lib/activityutils.php:244 msgid "Can't handle embedded XML content yet." msgstr "Kan inte hantera inbäddat XML-innehåll ännu." -#: lib/activityutils.php:240 +#: lib/activityutils.php:248 msgid "Can't handle embedded Base64 content yet." msgstr "Kan inte hantera inbäddat Base64-innehåll ännu." @@ -6596,7 +6596,7 @@ msgstr "Dina skickade meddelanden" msgid "Tags in %s's notices" msgstr "Taggar i %ss notiser" -#: lib/plugin.php:114 +#: lib/plugin.php:115 msgid "Unknown" msgstr "Okänd" diff --git a/locale/te/LC_MESSAGES/statusnet.po b/locale/te/LC_MESSAGES/statusnet.po index 54e7d0de1..7084c9114 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-24 14:16+0000\n" -"PO-Revision-Date: 2010-04-26 22:18:38+0000\n" +"POT-Creation-Date: 2010-04-29 23:21+0000\n" +"PO-Revision-Date: 2010-05-03 19:19:06+0000\n" "Language-Team: Telugu\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r65552); Translate extension (2010-04-25)\n" +"X-Generator: MediaWiki 1.17alpha (r65870); Translate extension (2010-05-01)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: te\n" "X-Message-Group: out-statusnet\n" @@ -2113,6 +2113,8 @@ msgid "" "You will be notified when your invitees accept the invitation and register " "on the site. Thanks for growing the community!" msgstr "" +"ఆహ్వానితులు మీ ఆహ్వానాన్ని అంగీకరించి సైటులో నమోదైనప్పుడు మీకు తెలియజేస్తాము. ఇక్కడి ప్రజని " +"పెంచుతున్నందుకు ధన్యవాదాలు!" #: actions/invite.php:162 msgid "" @@ -2450,7 +2452,7 @@ msgstr "మీరు నమోదు చేసివున్న ఉపకరణ #: actions/oauthappssettings.php:135 #, php-format msgid "You have not registered any applications yet." -msgstr "" +msgstr "మీరు ఇంకా ఏ ఉపకరణాన్నీ నమోదు చేసుకోలేదు." #: actions/oauthconnectionssettings.php:72 msgid "Connected applications" @@ -2471,7 +2473,7 @@ msgstr "" #: actions/oauthconnectionssettings.php:198 msgid "You have not authorized any applications to use your account." -msgstr "" +msgstr "మీ ఖాతాని ఉపయోగించుకోడానికి మీరు ఏ ఉపకరణాన్నీ అధీకరించలేదు." #: actions/oauthconnectionssettings.php:211 msgid "Developers can edit the registration settings for their applications " @@ -3907,7 +3909,7 @@ msgstr "అప్రమేయ భాష" #: actions/siteadminpanel.php:263 msgid "Site language when autodetection from browser settings is not available" -msgstr "" +msgstr "విహారిణి అమరికల నుండి భాషని స్వయంచాలకంగా పొందలేకపోయినప్పుడు ఉపయోగించే సైటు భాష" #: actions/siteadminpanel.php:271 msgid "Limits" @@ -3927,7 +3929,7 @@ msgstr "" #: actions/siteadminpanel.php:278 msgid "How long users must wait (in seconds) to post the same thing again." -msgstr "" +msgstr "అదే విషయాన్ని మళ్ళీ టపా చేయడానికి వాడుకరులు ఎంత సమయం (క్షణాల్లో) వేచివుండాలి." #: actions/sitenoticeadminpanel.php:56 msgid "Site Notice" @@ -4234,6 +4236,8 @@ msgid "" "%s has no subscribers. Why not [register an account](%%%%action.register%%%" "%) and be the first?" msgstr "" +"%sకి చందాదార్లు ఎవరూ లేరు. [ఒక ఖాతాని నమోదు చేసుకుని](%%%%action.register%%%%) మీరు " +"ఎందుకు మొదటి చందాదారు కాకూడదు?" #: actions/subscriptions.php:52 #, php-format @@ -4247,12 +4251,12 @@ msgstr "%1$s చందాలు, పేజీ %2$d" #: actions/subscriptions.php:65 msgid "These are the people whose notices you listen to." -msgstr "" +msgstr "మీరు ఈ వ్యక్తుల నోటీసులని వింటున్నారు." #: actions/subscriptions.php:69 #, php-format msgid "These are the people whose notices %s listens to." -msgstr "" +msgstr "%s వీరి నోటీసులని వింటున్నారు." #: actions/subscriptions.php:126 #, php-format @@ -4729,7 +4733,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:1535 +#: classes/Notice.php:1533 #, php-format msgid "RT @%1$s %2$s" msgstr "RT @%1$s %2$s" @@ -5096,7 +5100,7 @@ msgid "Before" msgstr "ఇంతక్రితం" #. TRANS: Client exception thrown when a feed instance is a DOMDocument. -#: lib/activity.php:121 +#: lib/activity.php:122 msgid "Expecting a root feed element but got a whole XML document." msgstr "" @@ -5104,11 +5108,11 @@ msgstr "" msgid "Can't handle remote content yet." msgstr "" -#: lib/activityutils.php:236 +#: lib/activityutils.php:244 msgid "Can't handle embedded XML content yet." msgstr "" -#: lib/activityutils.php:240 +#: lib/activityutils.php:248 msgid "Can't handle embedded Base64 content yet." msgstr "" @@ -5465,9 +5469,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 "నోటిసు చాలా పొడవుగా ఉంది - %1$d అక్షరాలు గరిష్ఠం, మీరు %2$d పంపించారు." +msgstr "సందేశం చాలా పొడవుగా ఉంది - %1$d అక్షరాలు గరిష్ఠం, మీరు %2$d పంపించారు" #. TRANS: Message given have sent a direct message to another user. #. TRANS: %s is the name of the other user. @@ -6452,7 +6456,7 @@ msgstr "మీరు పంపిన సందేశాలు" msgid "Tags in %s's notices" msgstr "" -#: lib/plugin.php:114 +#: lib/plugin.php:115 msgid "Unknown" msgstr "" diff --git a/locale/tr/LC_MESSAGES/statusnet.po b/locale/tr/LC_MESSAGES/statusnet.po index 8514f78d5..28869e63f 100644 --- a/locale/tr/LC_MESSAGES/statusnet.po +++ b/locale/tr/LC_MESSAGES/statusnet.po @@ -10,11 +10,11 @@ msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2010-04-24 14:16+0000\n" -"PO-Revision-Date: 2010-04-26 22:18:42+0000\n" +"PO-Revision-Date: 2010-05-03 19:19:10+0000\n" "Language-Team: Turkish\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r65552); Translate extension (2010-04-25)\n" +"X-Generator: MediaWiki 1.17alpha (r65870); Translate extension (2010-05-01)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: tr\n" "X-Message-Group: out-statusnet\n" @@ -4852,7 +4852,7 @@ 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:1535 +#: classes/Notice.php:1533 #, php-format msgid "RT @%1$s %2$s" msgstr "" @@ -5237,7 +5237,7 @@ msgid "Before" msgstr "Önce »" #. TRANS: Client exception thrown when a feed instance is a DOMDocument. -#: lib/activity.php:121 +#: lib/activity.php:122 msgid "Expecting a root feed element but got a whole XML document." msgstr "" @@ -5245,11 +5245,11 @@ msgstr "" msgid "Can't handle remote content yet." msgstr "" -#: lib/activityutils.php:236 +#: lib/activityutils.php:244 msgid "Can't handle embedded XML content yet." msgstr "" -#: lib/activityutils.php:240 +#: lib/activityutils.php:248 msgid "Can't handle embedded Base64 content yet." msgstr "" @@ -6538,7 +6538,7 @@ msgstr "" msgid "Tags in %s's notices" msgstr "" -#: lib/plugin.php:114 +#: lib/plugin.php:115 msgid "Unknown" msgstr "" diff --git a/locale/uk/LC_MESSAGES/statusnet.po b/locale/uk/LC_MESSAGES/statusnet.po index efdcae240..349e2da72 100644 --- a/locale/uk/LC_MESSAGES/statusnet.po +++ b/locale/uk/LC_MESSAGES/statusnet.po @@ -12,11 +12,11 @@ msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2010-04-24 14:16+0000\n" -"PO-Revision-Date: 2010-04-26 22:18:45+0000\n" +"PO-Revision-Date: 2010-05-03 19:19:13+0000\n" "Language-Team: Ukrainian\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r65552); Translate extension (2010-04-25)\n" +"X-Generator: MediaWiki 1.17alpha (r65870); Translate extension (2010-05-01)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: uk\n" "X-Message-Group: out-statusnet\n" @@ -4854,7 +4854,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:1535 +#: classes/Notice.php:1533 #, php-format msgid "RT @%1$s %2$s" msgstr "RT @%1$s %2$s" @@ -5212,7 +5212,7 @@ msgid "Before" msgstr "Назад" #. TRANS: Client exception thrown when a feed instance is a DOMDocument. -#: lib/activity.php:121 +#: lib/activity.php:122 msgid "Expecting a root feed element but got a whole XML document." msgstr "" "В очікуванні кореневого елементу веб-стрічки, отримали цілий документ XML." @@ -5221,11 +5221,11 @@ msgstr "" msgid "Can't handle remote content yet." msgstr "Поки що не можу обробити віддалений контент." -#: lib/activityutils.php:236 +#: lib/activityutils.php:244 msgid "Can't handle embedded XML content yet." msgstr "Поки що не можу обробити вбудований XML контент." -#: lib/activityutils.php:240 +#: lib/activityutils.php:248 msgid "Can't handle embedded Base64 content yet." msgstr "Поки що не можу обробити вбудований контент Base64." @@ -6611,7 +6611,7 @@ msgstr "Надіслані вами повідомлення" msgid "Tags in %s's notices" msgstr "Теґи у дописах %s" -#: lib/plugin.php:114 +#: lib/plugin.php:115 msgid "Unknown" msgstr "Невідомо" diff --git a/locale/vi/LC_MESSAGES/statusnet.po b/locale/vi/LC_MESSAGES/statusnet.po index 4dd5e6ceb..5c22fbad6 100644 --- a/locale/vi/LC_MESSAGES/statusnet.po +++ b/locale/vi/LC_MESSAGES/statusnet.po @@ -8,11 +8,11 @@ msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2010-04-24 14:16+0000\n" -"PO-Revision-Date: 2010-04-26 22:18:48+0000\n" +"PO-Revision-Date: 2010-05-03 19:19:17+0000\n" "Language-Team: Vietnamese\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r65552); Translate extension (2010-04-25)\n" +"X-Generator: MediaWiki 1.17alpha (r65870); Translate extension (2010-05-01)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: vi\n" "X-Message-Group: out-statusnet\n" @@ -5006,7 +5006,7 @@ 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:1535 +#: classes/Notice.php:1533 #, fuzzy, php-format msgid "RT @%1$s %2$s" msgstr "%s (%s)" @@ -5395,7 +5395,7 @@ msgid "Before" msgstr "Trước" #. TRANS: Client exception thrown when a feed instance is a DOMDocument. -#: lib/activity.php:121 +#: lib/activity.php:122 msgid "Expecting a root feed element but got a whole XML document." msgstr "" @@ -5403,11 +5403,11 @@ msgstr "" msgid "Can't handle remote content yet." msgstr "" -#: lib/activityutils.php:236 +#: lib/activityutils.php:244 msgid "Can't handle embedded XML content yet." msgstr "" -#: lib/activityutils.php:240 +#: lib/activityutils.php:248 msgid "Can't handle embedded Base64 content yet." msgstr "" @@ -6768,7 +6768,7 @@ msgstr "Thư bạn đã gửi" msgid "Tags in %s's notices" msgstr "cảnh báo tin nhắn" -#: lib/plugin.php:114 +#: lib/plugin.php:115 #, fuzzy msgid "Unknown" msgstr "Không tìm thấy action" diff --git a/locale/zh_CN/LC_MESSAGES/statusnet.po b/locale/zh_CN/LC_MESSAGES/statusnet.po index e38cda2ec..71d3293f4 100644 --- a/locale/zh_CN/LC_MESSAGES/statusnet.po +++ b/locale/zh_CN/LC_MESSAGES/statusnet.po @@ -11,11 +11,11 @@ msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2010-04-24 14:16+0000\n" -"PO-Revision-Date: 2010-04-26 22:18:51+0000\n" +"PO-Revision-Date: 2010-05-03 19:19:20+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 (r65552); Translate extension (2010-04-25)\n" +"X-Generator: MediaWiki 1.17alpha (r65870); Translate extension (2010-05-01)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: zh-hans\n" "X-Message-Group: out-statusnet\n" @@ -4935,7 +4935,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:1535 +#: classes/Notice.php:1533 #, fuzzy, php-format msgid "RT @%1$s %2$s" msgstr "%1$s (%2$s)" @@ -5325,7 +5325,7 @@ msgid "Before" msgstr "之前 »" #. TRANS: Client exception thrown when a feed instance is a DOMDocument. -#: lib/activity.php:121 +#: lib/activity.php:122 msgid "Expecting a root feed element but got a whole XML document." msgstr "" @@ -5333,11 +5333,11 @@ msgstr "" msgid "Can't handle remote content yet." msgstr "" -#: lib/activityutils.php:236 +#: lib/activityutils.php:244 msgid "Can't handle embedded XML content yet." msgstr "" -#: lib/activityutils.php:240 +#: lib/activityutils.php:248 msgid "Can't handle embedded Base64 content yet." msgstr "" @@ -6643,7 +6643,7 @@ msgstr "您发送的消息" msgid "Tags in %s's notices" msgstr "%s's 的消息的标签" -#: lib/plugin.php:114 +#: lib/plugin.php:115 #, fuzzy msgid "Unknown" msgstr "未知动作" diff --git a/locale/zh_TW/LC_MESSAGES/statusnet.po b/locale/zh_TW/LC_MESSAGES/statusnet.po index 4240b921a..b7aca62bc 100644 --- a/locale/zh_TW/LC_MESSAGES/statusnet.po +++ b/locale/zh_TW/LC_MESSAGES/statusnet.po @@ -8,11 +8,11 @@ msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2010-04-24 14:16+0000\n" -"PO-Revision-Date: 2010-04-26 22:18:54+0000\n" +"PO-Revision-Date: 2010-05-03 19:19:23+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 (r65552); Translate extension (2010-04-25)\n" +"X-Generator: MediaWiki 1.17alpha (r65870); Translate extension (2010-05-01)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: zh-hant\n" "X-Message-Group: out-statusnet\n" @@ -4760,7 +4760,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:1535 +#: classes/Notice.php:1533 #, php-format msgid "RT @%1$s %2$s" msgstr "" @@ -5138,7 +5138,7 @@ msgid "Before" msgstr "之前的內容»" #. TRANS: Client exception thrown when a feed instance is a DOMDocument. -#: lib/activity.php:121 +#: lib/activity.php:122 msgid "Expecting a root feed element but got a whole XML document." msgstr "" @@ -5146,11 +5146,11 @@ msgstr "" msgid "Can't handle remote content yet." msgstr "" -#: lib/activityutils.php:236 +#: lib/activityutils.php:244 msgid "Can't handle embedded XML content yet." msgstr "" -#: lib/activityutils.php:240 +#: lib/activityutils.php:248 msgid "Can't handle embedded Base64 content yet." msgstr "" @@ -6420,7 +6420,7 @@ msgstr "" msgid "Tags in %s's notices" msgstr "" -#: lib/plugin.php:114 +#: lib/plugin.php:115 msgid "Unknown" msgstr "" diff --git a/plugins/AutoSandbox/locale/AutoSandbox.pot b/plugins/AutoSandbox/locale/AutoSandbox.pot new file mode 100644 index 000000000..b01f9dc89 --- /dev/null +++ b/plugins/AutoSandbox/locale/AutoSandbox.pot @@ -0,0 +1,21 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2010-04-29 23:39+0000\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" +"Language-Team: LANGUAGE <LL@li.org>\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=CHARSET\n" +"Content-Transfer-Encoding: 8bit\n" + +#: AutoSandboxPlugin.php:66 +msgid "Automatically sandboxes newly registered members." +msgstr "" diff --git a/plugins/Autocomplete/locale/Autocomplete.pot b/plugins/Autocomplete/locale/Autocomplete.pot new file mode 100644 index 000000000..c0274af85 --- /dev/null +++ b/plugins/Autocomplete/locale/Autocomplete.pot @@ -0,0 +1,24 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2010-04-29 23:39+0000\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" +"Language-Team: LANGUAGE <LL@li.org>\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=CHARSET\n" +"Content-Transfer-Encoding: 8bit\n" + +#: AutocompletePlugin.php:79 +msgid "" +"The autocomplete plugin allows users to autocomplete screen names in @ " +"replies. When an \"@\" is typed into the notice text area, an autocomplete " +"box is displayed populated with the user's friend' screen names." +msgstr "" diff --git a/plugins/BitlyUrl/locale/BitlyUrl.pot b/plugins/BitlyUrl/locale/BitlyUrl.pot new file mode 100644 index 000000000..28023759a --- /dev/null +++ b/plugins/BitlyUrl/locale/BitlyUrl.pot @@ -0,0 +1,22 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2010-04-29 23:39+0000\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" +"Language-Team: LANGUAGE <LL@li.org>\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=CHARSET\n" +"Content-Transfer-Encoding: 8bit\n" + +#: BitlyUrlPlugin.php:60 +#, php-format +msgid "Uses <a href=\"http://%1$s/\">%1$s</a> URL-shortener service." +msgstr "" diff --git a/plugins/Blacklist/locale/Blacklist.pot b/plugins/Blacklist/locale/Blacklist.pot new file mode 100644 index 000000000..90eda0941 --- /dev/null +++ b/plugins/Blacklist/locale/Blacklist.pot @@ -0,0 +1,54 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2010-04-29 23:39+0000\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" +"Language-Team: LANGUAGE <LL@li.org>\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=CHARSET\n" +"Content-Transfer-Encoding: 8bit\n" + +#: BlacklistPlugin.php:153 +#, php-format +msgid "You may not register with homepage '%s'" +msgstr "" + +#: BlacklistPlugin.php:163 +#, php-format +msgid "You may not register with nickname '%s'" +msgstr "" + +#: BlacklistPlugin.php:188 +#, php-format +msgid "You may not use homepage '%s'" +msgstr "" + +#: BlacklistPlugin.php:198 +#, php-format +msgid "You may not use nickname '%s'" +msgstr "" + +#: BlacklistPlugin.php:242 +#, php-format +msgid "You may not use url '%s' in notices" +msgstr "" + +#: BlacklistPlugin.php:351 +msgid "Keep a blacklist of forbidden nickname and URL patterns." +msgstr "" + +#: blacklistadminpanel.php:185 +msgid "Nicknames" +msgstr "" + +#: blacklistadminpanel.php:193 +msgid "URLs" +msgstr "" diff --git a/plugins/CasAuthentication/locale/CasAuthentication.pot b/plugins/CasAuthentication/locale/CasAuthentication.pot new file mode 100644 index 000000000..20a2bf233 --- /dev/null +++ b/plugins/CasAuthentication/locale/CasAuthentication.pot @@ -0,0 +1,35 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2010-04-29 23:39+0000\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" +"Language-Team: LANGUAGE <LL@li.org>\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=CHARSET\n" +"Content-Transfer-Encoding: 8bit\n" + +#: CasAuthenticationPlugin.php:82 +msgid "CAS" +msgstr "" + +#: CasAuthenticationPlugin.php:83 +msgid "Login or register with CAS" +msgstr "" + +#: CasAuthenticationPlugin.php:150 +msgid "" +"The CAS Authentication plugin allows for StatusNet to handle authentication " +"through CAS (Central Authentication Service)." +msgstr "" + +#: caslogin.php:28 +msgid "Already logged in." +msgstr "" diff --git a/plugins/ClientSideShorten/locale/ClientSideShorten.pot b/plugins/ClientSideShorten/locale/ClientSideShorten.pot new file mode 100644 index 000000000..83caff322 --- /dev/null +++ b/plugins/ClientSideShorten/locale/ClientSideShorten.pot @@ -0,0 +1,27 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2010-04-29 23:39+0000\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" +"Language-Team: LANGUAGE <LL@li.org>\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=CHARSET\n" +"Content-Transfer-Encoding: 8bit\n" + +#: ClientSideShortenPlugin.php:74 +msgid "" +"ClientSideShorten causes the web interface's notice form to automatically " +"shorten urls as they entered, and before the notice is submitted." +msgstr "" + +#: shorten.php:55 +msgid "'text' argument must be specified." +msgstr "" diff --git a/plugins/DirectionDetector/DirectionDetectorPlugin.php b/plugins/DirectionDetector/DirectionDetectorPlugin.php index 303e60d5f..34c511e21 100644 --- a/plugins/DirectionDetector/DirectionDetectorPlugin.php +++ b/plugins/DirectionDetector/DirectionDetectorPlugin.php @@ -38,7 +38,7 @@ class DirectionDetectorPlugin extends Plugin { * @param object $notice notice is going to be saved */ public function onStartNoticeSave(&$notice){ - if(self::isRTL($notice->content)) + if(!preg_match('/<span class="rtl">/', $notice->rendered) && self::isRTL($notice->content)) $notice->rendered = '<span class="rtl">'.$notice->rendered.'</span>'; return true; } @@ -48,7 +48,7 @@ class DirectionDetectorPlugin extends Plugin { * * @param */ - public function onEndShowStatusNetStyles(&$xml){ + public function onEndShowStatusNetStyles($xml){ $xml->element('style', array('type' => 'text/css'), 'span.rtl {display:block;direction:rtl;text-align:right;float:right;width:490px;} .notice .author {float:left}'); } /** @@ -102,7 +102,7 @@ class DirectionDetectorPlugin extends Plugin { * * Returns false if the input string isn't a valid UTF-8 octet sequence. */ - private static function utf8ToUnicode(&$str){ + private static function utf8ToUnicode($str){ $mState = 0; // cached expected number of octets after the current octet // until the beginning of the next UTF8 character sequence $mUcs4 = 0; // cached Unicode character diff --git a/plugins/DirectionDetector/locale/DirectionDetector.pot b/plugins/DirectionDetector/locale/DirectionDetector.pot new file mode 100644 index 000000000..ebeda2dc4 --- /dev/null +++ b/plugins/DirectionDetector/locale/DirectionDetector.pot @@ -0,0 +1,21 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2010-04-29 23:39+0000\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" +"Language-Team: LANGUAGE <LL@li.org>\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=CHARSET\n" +"Content-Transfer-Encoding: 8bit\n" + +#: DirectionDetectorPlugin.php:221 +msgid "shows notices with right-to-left content in correct direction." +msgstr "" diff --git a/plugins/EmailAuthentication/locale/EmailAuthentication.pot b/plugins/EmailAuthentication/locale/EmailAuthentication.pot new file mode 100644 index 000000000..d945e2537 --- /dev/null +++ b/plugins/EmailAuthentication/locale/EmailAuthentication.pot @@ -0,0 +1,23 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2010-04-29 23:39+0000\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" +"Language-Team: LANGUAGE <LL@li.org>\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=CHARSET\n" +"Content-Transfer-Encoding: 8bit\n" + +#: EmailAuthenticationPlugin.php:61 +msgid "" +"The Email Authentication plugin allows users to login using their email " +"address." +msgstr "" diff --git a/plugins/Facebook/facebookutil.php b/plugins/Facebook/facebookutil.php index ac532e18b..ab2d42726 100644 --- a/plugins/Facebook/facebookutil.php +++ b/plugins/Facebook/facebookutil.php @@ -104,9 +104,13 @@ function facebookBroadcastNotice($notice) $status = "$prefix $notice->content"; + common_debug("FacebookPlugin - checking for publish_stream permission for user $user->id"); + $can_publish = $facebook->api_client->users_hasAppPermission('publish_stream', $fbuid); + common_debug("FacebookPlugin - checking for status_update permission for user $user->id"); + $can_update = $facebook->api_client->users_hasAppPermission('status_update', $fbuid); if (!empty($attachments) && $can_publish == 1) { @@ -114,15 +118,15 @@ function facebookBroadcastNotice($notice) $facebook->api_client->stream_publish($status, $fbattachment, null, null, $fbuid); common_log(LOG_INFO, - "Posted notice $notice->id w/attachment " . + "FacebookPlugin - Posted notice $notice->id w/attachment " . "to Facebook user's stream (fbuid = $fbuid)."); } elseif ($can_update == 1 || $can_publish == 1) { $facebook->api_client->users_setStatus($status, $fbuid, false, true); common_log(LOG_INFO, - "Posted notice $notice->id to Facebook " . + "FacebookPlugin - Posted notice $notice->id to Facebook " . "as a status update (fbuid = $fbuid)."); } else { - $msg = "Not sending notice $notice->id to Facebook " . + $msg = "FacebookPlugin - Not sending notice $notice->id to Facebook " . "because user $user->nickname hasn't given the " . 'Facebook app \'status_update\' or \'publish_stream\' permission.'; common_log(LOG_WARNING, $msg); @@ -138,7 +142,7 @@ function facebookBroadcastNotice($notice) $code = $e->getCode(); - $msg = "Facebook returned error code $code: " . + $msg = "FacebookPlugin - Facebook returned error code $code: " . $e->getMessage() . ' - ' . "Unable to update Facebook status (notice $notice->id) " . "for $user->nickname (user id: $user->id)!"; @@ -272,12 +276,12 @@ function remove_facebook_app($flink) function mail_facebook_app_removed($user) { - common_init_locale($user->language); - $profile = $user->getProfile(); $site_name = common_config('site', 'name'); + common_switch_locale($user->language); + $subject = sprintf( _m('Your %1$s Facebook application access has been disabled.', $site_name)); @@ -291,7 +295,7 @@ function mail_facebook_app_removed($user) "re-installing the %2\$s Facebook application.\n\nRegards,\n\n%2\$s"), $user->nickname, $site_name); - common_init_locale(); + common_switch_locale(); return mail_to_user($user, $subject, $body); } diff --git a/plugins/Facebook/locale/Facebook.pot b/plugins/Facebook/locale/Facebook.pot index 4bc00248c..dce10d230 100644 --- a/plugins/Facebook/locale/Facebook.pot +++ b/plugins/Facebook/locale/Facebook.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-03-01 14:58-0800\n" +"POT-Creation-Date: 2010-04-29 23:39+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -16,72 +16,129 @@ msgstr "" "Content-Type: text/plain; charset=CHARSET\n" "Content-Transfer-Encoding: 8bit\n" -#: facebookaction.php:171 -msgid "Home" +#: facebookutil.php:285 +#, php-format +msgid "" +"Hi, %1$s. We're sorry to inform you that we are unable to update your " +"Facebook status from %2$s, and have disabled the Facebook application for " +"your account. This may be because you have removed the Facebook " +"application's authorization, or have deleted your Facebook account. You can " +"re-enable the Facebook application and automatic status updating by re-" +"installing the %2$s Facebook application.\n" +"\n" +"Regards,\n" +"\n" +"%2$s" msgstr "" -#: facebookaction.php:179 -msgid "Invite" +#: FBConnectAuth.php:51 +msgid "You must be logged into Facebook to use Facebook Connect." msgstr "" -#: facebookaction.php:188 -msgid "Settings" +#: FBConnectAuth.php:77 +msgid "There is already a local user linked with this Facebook." msgstr "" -#: facebookaction.php:228 +#: FBConnectAuth.php:90 FBConnectSettings.php:164 +msgid "There was a problem with your session token. Try again, please." +msgstr "" + +#: FBConnectAuth.php:95 +msgid "You can't register if you don't agree to the license." +msgstr "" + +#: FBConnectAuth.php:105 +msgid "Something weird happened." +msgstr "" + +#: FBConnectAuth.php:119 #, php-format msgid "" -"To use the %s Facebook Application you need to login with your username and " -"password. Don't have a username yet? " +"This is the first time you've logged into %s so we must connect your " +"Facebook to a local account. You can either create a new account, or connect " +"with your existing account, if you have one." msgstr "" -#: facebookaction.php:230 -msgid " a new account." +#: FBConnectAuth.php:125 +msgid "Facebook Account Setup" msgstr "" -#: facebookaction.php:236 -msgid "Register" +#: FBConnectAuth.php:158 +msgid "Connection options" msgstr "" -#: facebookaction.php:249 facebookaction.php:275 facebooklogin.php:91 -msgid "Login" +#: FBConnectAuth.php:183 +msgid "Create new account" msgstr "" -#: facebookaction.php:268 -msgid "Nickname" +#: FBConnectAuth.php:185 +msgid "Create a new user with this nickname." msgstr "" -#: facebookaction.php:271 FBConnectAuth.php:196 +#: FBConnectAuth.php:188 +msgid "New nickname" +msgstr "" + +#: FBConnectAuth.php:190 +msgid "1-64 lowercase letters or numbers, no punctuation or spaces" +msgstr "" + +#: FBConnectAuth.php:193 +msgid "Create" +msgstr "" + +#: FBConnectAuth.php:198 +msgid "Connect existing account" +msgstr "" + +#: FBConnectAuth.php:200 +msgid "" +"If you already have an account, login with your username and password to " +"connect it to your Facebook." +msgstr "" + +#: FBConnectAuth.php:203 +msgid "Existing nickname" +msgstr "" + +#: FBConnectAuth.php:206 facebookaction.php:271 msgid "Password" msgstr "" -#: facebookaction.php:281 -msgid "Lost or forgotten password?" +#: FBConnectAuth.php:209 +msgid "Connect" msgstr "" -#: facebookaction.php:330 facebookhome.php:248 -msgid "Pagination" +#: FBConnectAuth.php:225 FBConnectAuth.php:234 +msgid "Registration not allowed." msgstr "" -#: facebookaction.php:339 facebookhome.php:257 -msgid "After" +#: FBConnectAuth.php:241 +msgid "Not a valid invitation code." msgstr "" -#: facebookaction.php:347 facebookhome.php:265 -msgid "Before" +#: FBConnectAuth.php:251 +msgid "Nickname must have only lowercase letters and numbers and no spaces." msgstr "" -#: facebookaction.php:365 -msgid "No notice content!" +#: FBConnectAuth.php:256 +msgid "Nickname not allowed." msgstr "" -#: facebookaction.php:371 -#, php-format -msgid "That's too long. Max notice size is %d chars." +#: FBConnectAuth.php:261 +msgid "Nickname already in use. Try another one." msgstr "" -#: facebookaction.php:430 -msgid "Notices" +#: FBConnectAuth.php:279 FBConnectAuth.php:313 FBConnectAuth.php:333 +msgid "Error connecting user to Facebook." +msgstr "" + +#: FBConnectAuth.php:299 +msgid "Invalid username or password." +msgstr "" + +#: facebooklogin.php:91 facebookaction.php:249 facebookaction.php:275 +msgid "Login" msgstr "" #: facebookhome.php:111 @@ -117,6 +174,18 @@ msgstr "" msgid "Skip" msgstr "" +#: facebookhome.php:248 facebookaction.php:330 +msgid "Pagination" +msgstr "" + +#: facebookhome.php:257 facebookaction.php:339 +msgid "After" +msgstr "" + +#: facebookhome.php:265 facebookaction.php:347 +msgid "Before" +msgstr "" + #: facebookinvite.php:72 #, php-format msgid "Thanks for inviting your friends to use %s" @@ -145,208 +214,123 @@ msgstr "" msgid "Send invitations" msgstr "" -#: FacebookPlugin.php:413 FacebookPlugin.php:433 +#: FacebookPlugin.php:195 FacebookPlugin.php:488 FacebookPlugin.php:510 +#: facebookadminpanel.php:54 msgid "Facebook" msgstr "" -#: FacebookPlugin.php:414 +#: FacebookPlugin.php:196 +msgid "Facebook integration configuration" +msgstr "" + +#: FacebookPlugin.php:489 msgid "Login or register using Facebook" msgstr "" -#: FacebookPlugin.php:434 FBConnectSettings.php:56 +#: FacebookPlugin.php:511 FBConnectSettings.php:56 msgid "Facebook Connect Settings" msgstr "" -#: FacebookPlugin.php:533 +#: FacebookPlugin.php:617 msgid "" "The Facebook plugin allows you to integrate your StatusNet instance with <a " "href=\"http://facebook.com/\">Facebook</a> and Facebook Connect." msgstr "" -#: facebookremove.php:58 -msgid "Couldn't remove Facebook user." -msgstr "" - -#: facebooksettings.php:74 -msgid "There was a problem saving your sync preferences!" -msgstr "" - -#: facebooksettings.php:76 -msgid "Sync preferences saved." -msgstr "" - -#: facebooksettings.php:99 -msgid "Automatically update my Facebook status with my notices." -msgstr "" - -#: facebooksettings.php:106 -msgid "Send \"@\" replies to Facebook." +#: FBConnectLogin.php:33 +msgid "Already logged in." msgstr "" -#: facebooksettings.php:115 -msgid "Prefix" +#: FBConnectLogin.php:41 +msgid "Login with your Facebook Account" msgstr "" -#: facebooksettings.php:117 -msgid "A string to prefix notices with." +#: FBConnectLogin.php:55 +msgid "Facebook Login" msgstr "" -#: facebooksettings.php:123 -msgid "Save" +#: facebookremove.php:58 +msgid "Couldn't remove Facebook user." msgstr "" -#: facebooksettings.php:133 -#, php-format -msgid "" -"If you would like %s to automatically update your Facebook status with your " -"latest notice, you need to give it permission." +#: facebookaction.php:171 +msgid "Home" msgstr "" -#: facebooksettings.php:146 -#, php-format -msgid "Allow %s to update my Facebook status" +#: facebookaction.php:179 +msgid "Invite" msgstr "" -#: facebooksettings.php:156 -msgid "Sync preferences" +#: facebookaction.php:188 +msgid "Settings" msgstr "" -#: facebookutil.php:285 +#: facebookaction.php:228 #, php-format msgid "" -"Hi, %1$s. We're sorry to inform you that we are unable to update your " -"Facebook status from %2$s, and have disabled the Facebook application for " -"your account. This may be because you have removed the Facebook " -"application's authorization, or have deleted your Facebook account. You can " -"re-enable the Facebook application and automatic status updating by re-" -"installing the %2$s Facebook application.\n" -"\n" -"Regards,\n" -"\n" -"%2$s" +"To use the %s Facebook Application you need to login with your username and " +"password. Don't have a username yet? " msgstr "" -#: FBConnectAuth.php:51 -msgid "You must be logged into Facebook to use Facebook Connect." +#: facebookaction.php:230 +msgid " a new account." msgstr "" -#: FBConnectAuth.php:77 -msgid "There is already a local user linked with this Facebook." +#: facebookaction.php:236 +msgid "Register" msgstr "" -#: FBConnectAuth.php:90 FBConnectSettings.php:164 -msgid "There was a problem with your session token. Try again, please." +#: facebookaction.php:268 +msgid "Nickname" msgstr "" -#: FBConnectAuth.php:95 -msgid "You can't register if you don't agree to the license." +#: facebookaction.php:281 +msgid "Lost or forgotten password?" msgstr "" -#: FBConnectAuth.php:105 -msgid "Something weird happened." +#: facebookaction.php:365 +msgid "No notice content!" msgstr "" -#: FBConnectAuth.php:119 +#: facebookaction.php:371 #, php-format -msgid "" -"This is the first time you've logged into %s so we must connect your " -"Facebook to a local account. You can either create a new account, or connect " -"with your existing account, if you have one." -msgstr "" - -#: FBConnectAuth.php:125 -msgid "Facebook Account Setup" -msgstr "" - -#: FBConnectAuth.php:153 -msgid "Connection options" -msgstr "" - -#: FBConnectAuth.php:162 -msgid "My text and files are available under " -msgstr "" - -#: FBConnectAuth.php:165 -msgid "" -" except this private data: password, email address, IM address, phone number." -msgstr "" - -#: FBConnectAuth.php:173 -msgid "Create new account" -msgstr "" - -#: FBConnectAuth.php:175 -msgid "Create a new user with this nickname." -msgstr "" - -#: FBConnectAuth.php:178 -msgid "New nickname" -msgstr "" - -#: FBConnectAuth.php:180 -msgid "1-64 lowercase letters or numbers, no punctuation or spaces" -msgstr "" - -#: FBConnectAuth.php:183 -msgid "Create" -msgstr "" - -#: FBConnectAuth.php:188 -msgid "Connect existing account" -msgstr "" - -#: FBConnectAuth.php:190 -msgid "" -"If you already have an account, login with your username and password to " -"connect it to your Facebook." -msgstr "" - -#: FBConnectAuth.php:193 -msgid "Existing nickname" -msgstr "" - -#: FBConnectAuth.php:199 -msgid "Connect" -msgstr "" - -#: FBConnectAuth.php:215 FBConnectAuth.php:224 -msgid "Registration not allowed." +msgid "That's too long. Max notice size is %d chars." msgstr "" -#: FBConnectAuth.php:231 -msgid "Not a valid invitation code." +#: facebookaction.php:430 +msgid "Notices" msgstr "" -#: FBConnectAuth.php:241 -msgid "Nickname must have only lowercase letters and numbers and no spaces." +#: facebookadminpanel.php:65 +msgid "Facebook integration settings" msgstr "" -#: FBConnectAuth.php:246 -msgid "Nickname not allowed." +#: facebookadminpanel.php:129 +msgid "Invalid Facebook API key. Max length is 255 characters." msgstr "" -#: FBConnectAuth.php:251 -msgid "Nickname already in use. Try another one." +#: facebookadminpanel.php:135 +msgid "Invalid Facebook API secret. Max length is 255 characters." msgstr "" -#: FBConnectAuth.php:269 FBConnectAuth.php:303 FBConnectAuth.php:323 -msgid "Error connecting user to Facebook." +#: facebookadminpanel.php:188 +msgid "Facebook application settings" msgstr "" -#: FBConnectAuth.php:289 -msgid "Invalid username or password." +#: facebookadminpanel.php:194 +msgid "API key" msgstr "" -#: FBConnectLogin.php:33 -msgid "Already logged in." +#: facebookadminpanel.php:195 +msgid "API key provided by Facebook" msgstr "" -#: FBConnectLogin.php:41 -msgid "Login with your Facebook Account" +#: facebookadminpanel.php:203 +msgid "Secret" msgstr "" -#: FBConnectLogin.php:55 -msgid "Facebook Login" +#: facebookadminpanel.php:204 +msgid "API secret provided by Facebook" msgstr "" #: FBConnectSettings.php:67 @@ -393,3 +377,47 @@ msgstr "" #: FBConnectSettings.php:197 msgid "Not sure what you're trying to do." msgstr "" + +#: facebooksettings.php:74 +msgid "There was a problem saving your sync preferences!" +msgstr "" + +#: facebooksettings.php:76 +msgid "Sync preferences saved." +msgstr "" + +#: facebooksettings.php:99 +msgid "Automatically update my Facebook status with my notices." +msgstr "" + +#: facebooksettings.php:106 +msgid "Send \"@\" replies to Facebook." +msgstr "" + +#: facebooksettings.php:115 +msgid "Prefix" +msgstr "" + +#: facebooksettings.php:117 +msgid "A string to prefix notices with." +msgstr "" + +#: facebooksettings.php:123 +msgid "Save" +msgstr "" + +#: facebooksettings.php:133 +#, php-format +msgid "" +"If you would like %s to automatically update your Facebook status with your " +"latest notice, you need to give it permission." +msgstr "" + +#: facebooksettings.php:146 +#, php-format +msgid "Allow %s to update my Facebook status" +msgstr "" + +#: facebooksettings.php:156 +msgid "Sync preferences" +msgstr "" diff --git a/plugins/FirePHP/locale/FirePHP.pot b/plugins/FirePHP/locale/FirePHP.pot new file mode 100644 index 000000000..fa16f283e --- /dev/null +++ b/plugins/FirePHP/locale/FirePHP.pot @@ -0,0 +1,21 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2010-04-29 23:39+0000\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" +"Language-Team: LANGUAGE <LL@li.org>\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=CHARSET\n" +"Content-Transfer-Encoding: 8bit\n" + +#: FirePHPPlugin.php:66 +msgid "The FirePHP plugin writes StatusNet's log output to FirePHP." +msgstr "" diff --git a/plugins/Gravatar/locale/Gravatar.pot b/plugins/Gravatar/locale/Gravatar.pot index d7275b929..d3a4cd86b 100644 --- a/plugins/Gravatar/locale/Gravatar.pot +++ b/plugins/Gravatar/locale/Gravatar.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-03-01 14:58-0800\n" +"POT-Creation-Date: 2010-04-29 23:39+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" diff --git a/plugins/Imap/locale/Imap.pot b/plugins/Imap/locale/Imap.pot new file mode 100644 index 000000000..ee8452aaa --- /dev/null +++ b/plugins/Imap/locale/Imap.pot @@ -0,0 +1,27 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2010-04-29 23:39+0000\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" +"Language-Team: LANGUAGE <LL@li.org>\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=CHARSET\n" +"Content-Transfer-Encoding: 8bit\n" + +#: imapmailhandler.php:28 +msgid "Error" +msgstr "" + +#: ImapPlugin.php:101 +msgid "" +"The IMAP plugin allows for StatusNet to check a POP or IMAP mailbox for " +"incoming mail containing user posts." +msgstr "" diff --git a/plugins/InfiniteScroll/locale/InfiniteScroll.pot b/plugins/InfiniteScroll/locale/InfiniteScroll.pot new file mode 100644 index 000000000..a0f466fcb --- /dev/null +++ b/plugins/InfiniteScroll/locale/InfiniteScroll.pot @@ -0,0 +1,25 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2010-04-29 23:39+0000\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" +"Language-Team: LANGUAGE <LL@li.org>\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=CHARSET\n" +"Content-Transfer-Encoding: 8bit\n" + +#: InfiniteScrollPlugin.php:54 +msgid "" +"Infinite Scroll adds the following functionality to your StatusNet " +"installation: When a user scrolls towards the bottom of the page, the next " +"page of notices is automatically retrieved and appended. This means they " +"never need to click \"Next Page\", which dramatically increases stickiness." +msgstr "" diff --git a/plugins/LdapAuthentication/locale/LdapAuthentication.pot b/plugins/LdapAuthentication/locale/LdapAuthentication.pot new file mode 100644 index 000000000..8f09b1e51 --- /dev/null +++ b/plugins/LdapAuthentication/locale/LdapAuthentication.pot @@ -0,0 +1,23 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2010-04-29 23:39+0000\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" +"Language-Team: LANGUAGE <LL@li.org>\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=CHARSET\n" +"Content-Transfer-Encoding: 8bit\n" + +#: LdapAuthenticationPlugin.php:146 +msgid "" +"The LDAP Authentication plugin allows for StatusNet to handle authentication " +"through LDAP." +msgstr "" diff --git a/plugins/LdapAuthorization/locale/LdapAuthorization.pot b/plugins/LdapAuthorization/locale/LdapAuthorization.pot new file mode 100644 index 000000000..8156f6146 --- /dev/null +++ b/plugins/LdapAuthorization/locale/LdapAuthorization.pot @@ -0,0 +1,23 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2010-04-29 23:39+0000\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" +"Language-Team: LANGUAGE <LL@li.org>\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=CHARSET\n" +"Content-Transfer-Encoding: 8bit\n" + +#: LdapAuthorizationPlugin.php:124 +msgid "" +"The LDAP Authorization plugin allows for StatusNet to handle authorization " +"through LDAP." +msgstr "" diff --git a/plugins/LilUrl/locale/LilUrl.pot b/plugins/LilUrl/locale/LilUrl.pot new file mode 100644 index 000000000..47ed36727 --- /dev/null +++ b/plugins/LilUrl/locale/LilUrl.pot @@ -0,0 +1,22 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2010-04-29 23:39+0000\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" +"Language-Team: LANGUAGE <LL@li.org>\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=CHARSET\n" +"Content-Transfer-Encoding: 8bit\n" + +#: LilUrlPlugin.php:68 +#, php-format +msgid "Uses <a href=\"http://%1$s/\">%1$s</a> URL-shortener service." +msgstr "" diff --git a/plugins/Mapstraction/locale/Mapstraction.pot b/plugins/Mapstraction/locale/Mapstraction.pot index 1dd5dbbcc..764bf7b29 100644 --- a/plugins/Mapstraction/locale/Mapstraction.pot +++ b/plugins/Mapstraction/locale/Mapstraction.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-03-01 14:58-0800\n" +"POT-Creation-Date: 2010-04-29 23:39+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -16,14 +16,18 @@ msgstr "" "Content-Type: text/plain; charset=CHARSET\n" "Content-Transfer-Encoding: 8bit\n" -#: allmap.php:71 -#, php-format -msgid "%s friends map" +#: MapstractionPlugin.php:182 +msgid "Map" msgstr "" -#: allmap.php:74 -#, php-format -msgid "%s friends map, page %d" +#: MapstractionPlugin.php:193 +msgid "Full size" +msgstr "" + +#: MapstractionPlugin.php:205 +msgid "" +"Show maps of users' and friends' notices with <a href=\"http://www." +"mapstraction.com/\">Mapstraction</a> JavaScript library." msgstr "" #: map.php:72 @@ -34,18 +38,14 @@ msgstr "" msgid "User has no profile." msgstr "" -#: MapstractionPlugin.php:182 -msgid "Map" -msgstr "" - -#: MapstractionPlugin.php:193 -msgid "Full size" +#: allmap.php:71 +#, php-format +msgid "%s friends map" msgstr "" -#: MapstractionPlugin.php:205 -msgid "" -"Show maps of users' and friends' notices with <a href=\"http://www." -"mapstraction.com/\">Mapstraction</a> JavaScript library." +#: allmap.php:74 +#, php-format +msgid "%s friends map, page %d" msgstr "" #: usermap.php:71 diff --git a/plugins/Minify/locale/Minify.pot b/plugins/Minify/locale/Minify.pot new file mode 100644 index 000000000..6f7372d40 --- /dev/null +++ b/plugins/Minify/locale/Minify.pot @@ -0,0 +1,23 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2010-04-29 23:39+0000\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" +"Language-Team: LANGUAGE <LL@li.org>\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=CHARSET\n" +"Content-Transfer-Encoding: 8bit\n" + +#: MinifyPlugin.php:179 +msgid "" +"The Minify plugin minifies your CSS and Javascript, removing whitespace and " +"comments." +msgstr "" diff --git a/plugins/MobileProfile/MobileProfilePlugin.php b/plugins/MobileProfile/MobileProfilePlugin.php index 1c61b4fe5..6076bbde0 100644 --- a/plugins/MobileProfile/MobileProfilePlugin.php +++ b/plugins/MobileProfile/MobileProfilePlugin.php @@ -138,6 +138,7 @@ class MobileProfilePlugin extends WAP20Plugin 'vodafone', 'wap1', 'wap2', + 'webos', 'windows ce' ); @@ -254,6 +255,10 @@ class MobileProfilePlugin extends WAP20Plugin $action->cssLink('plugins/MobileProfile/mp-handheld.css',null,'handheld'); } + // Allow other plugins to load their styles. + Event::handle('EndShowStatusNetStyles', array($action)); + Event::handle('EndShowLaconicaStyles', array($action)); + return false; } diff --git a/plugins/MobileProfile/locale/MobileProfile.pot b/plugins/MobileProfile/locale/MobileProfile.pot new file mode 100644 index 000000000..9495e975b --- /dev/null +++ b/plugins/MobileProfile/locale/MobileProfile.pot @@ -0,0 +1,21 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2010-04-29 23:39+0000\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" +"Language-Team: LANGUAGE <LL@li.org>\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=CHARSET\n" +"Content-Transfer-Encoding: 8bit\n" + +#: MobileProfilePlugin.php:424 +msgid "XHTML MobileProfile output for supporting user agents." +msgstr "" diff --git a/plugins/OStatus/OStatusPlugin.php b/plugins/OStatus/OStatusPlugin.php index f183bc7ae..5b153216e 100644 --- a/plugins/OStatus/OStatusPlugin.php +++ b/plugins/OStatus/OStatusPlugin.php @@ -257,7 +257,7 @@ class OStatusPlugin extends Plugin $matches = array(); // Webfinger matches: @user@example.com - if (preg_match_all('!(?:^|\s+)@((?:\w+\.)*\w+@(?:\w+\.)*\w+(?:\w+\-\w+)*\.\w+)!', + if (preg_match_all('!(?:^|\s+)@((?:\w+\.)*\w+@(?:\w+\-?\w+\.)*\w+(?:\w+\-\w+)*\.\w+)!', $text, $wmatches, PREG_OFFSET_CAPTURE)) { @@ -452,6 +452,7 @@ class OStatusPlugin extends Plugin return false; } } + return true; } /** diff --git a/plugins/OStatus/lib/discoveryhints.php b/plugins/OStatus/lib/discoveryhints.php index 80cfbbf15..34c9be277 100644 --- a/plugins/OStatus/lib/discoveryhints.php +++ b/plugins/OStatus/lib/discoveryhints.php @@ -30,6 +30,7 @@ class DiscoveryHints { case Discovery::PROFILEPAGE: $hints['profileurl'] = $link['href']; break; + case Salmon::NS_MENTIONS: case Salmon::NS_REPLIES: $hints['salmon'] = $link['href']; break; @@ -83,7 +84,7 @@ class DiscoveryHints { $hints['fullname'] = implode(' ', $hcard['n']); } - if (array_key_exists('photo', $hcard)) { + if (array_key_exists('photo', $hcard) && count($hcard['photo'])) { $hints['avatar'] = $hcard['photo'][0]; } diff --git a/plugins/OStatus/lib/feeddiscovery.php b/plugins/OStatus/lib/feeddiscovery.php index 4809f9d35..4ac243832 100644 --- a/plugins/OStatus/lib/feeddiscovery.php +++ b/plugins/OStatus/lib/feeddiscovery.php @@ -104,7 +104,7 @@ class FeedDiscovery $response = $client->get($url); } catch (HTTP_Request2_Exception $e) { common_log(LOG_ERR, __METHOD__ . " Failure for $url - " . $e->getMessage()); - throw new FeedSubBadURLException($e); + throw new FeedSubBadURLException($e->getMessage()); } if ($htmlOk) { diff --git a/plugins/OStatus/locale/OStatus.pot b/plugins/OStatus/locale/OStatus.pot index 7e33a0eed..97d593ead 100644 --- a/plugins/OStatus/locale/OStatus.pot +++ b/plugins/OStatus/locale/OStatus.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-03-01 14:58-0800\n" +"POT-Creation-Date: 2010-04-29 23:39+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -16,297 +16,316 @@ msgstr "" "Content-Type: text/plain; charset=CHARSET\n" "Content-Transfer-Encoding: 8bit\n" -#: actions/groupsalmon.php:51 -msgid "Can't accept remote posts for a remote group." -msgstr "" - -#: actions/groupsalmon.php:123 -msgid "Can't read profile to set up group membership." +#: OStatusPlugin.php:210 OStatusPlugin.php:913 actions/ostatusinit.php:99 +msgid "Subscribe" msgstr "" -#: actions/groupsalmon.php:126 actions/groupsalmon.php:169 -msgid "Groups can't join groups." +#: OStatusPlugin.php:228 OStatusPlugin.php:635 actions/ostatussub.php:105 +#: actions/ostatusinit.php:96 +msgid "Join" msgstr "" -#: actions/groupsalmon.php:153 +#: OStatusPlugin.php:451 #, php-format -msgid "Could not join remote user %1$s to group %2$s." +msgid "Sent from %s via OStatus" msgstr "" -#: actions/groupsalmon.php:166 -msgid "Can't read profile to cancel group membership." +#: OStatusPlugin.php:503 +msgid "Could not set up remote subscription." msgstr "" -#: actions/groupsalmon.php:182 -#, php-format -msgid "Could not remove remote user %1$s from group %2$s." +#: OStatusPlugin.php:619 +msgid "Could not set up remote group membership." msgstr "" -#: actions/ostatusinit.php:40 -msgid "You can use the local subscription!" +#: OStatusPlugin.php:636 +#, php-format +msgid "%s has joined group %s." msgstr "" -#: actions/ostatusinit.php:61 -msgid "There was a problem with your session token. Try again, please." +#: OStatusPlugin.php:644 +msgid "Failed joining remote group." msgstr "" -#: actions/ostatusinit.php:79 actions/ostatussub.php:439 -msgid "Subscribe to user" +#: OStatusPlugin.php:684 +msgid "Leave" msgstr "" -#: actions/ostatusinit.php:97 +#: OStatusPlugin.php:685 #, php-format -msgid "Subscribe to %s" +msgid "%s has left group %s." msgstr "" -#: actions/ostatusinit.php:102 -msgid "User nickname" +#: OStatusPlugin.php:844 +msgid "Remote" msgstr "" -#: actions/ostatusinit.php:103 -msgid "Nickname of the user you want to follow" +#: OStatusPlugin.php:883 +msgid "Profile update" msgstr "" -#: actions/ostatusinit.php:106 -msgid "Profile Account" +#: OStatusPlugin.php:884 +#, php-format +msgid "%s has updated their profile page." msgstr "" -#: actions/ostatusinit.php:107 -msgid "Your account id (i.e. user@identi.ca)" +#: OStatusPlugin.php:928 +msgid "" +"Follow people across social networks that implement <a href=\"http://ostatus." +"org/\">OStatus</a>." msgstr "" -#: actions/ostatusinit.php:110 actions/ostatussub.php:115 -#: OStatusPlugin.php:205 -msgid "Subscribe" +#: classes/Ostatus_profile.php:566 +msgid "Show more" msgstr "" -#: actions/ostatusinit.php:128 -msgid "Must provide a remote profile." +#: classes/Ostatus_profile.php:1004 +#, php-format +msgid "Invalid avatar URL %s" msgstr "" -#: actions/ostatusinit.php:138 -msgid "Couldn't look up OStatus account profile." +#: classes/Ostatus_profile.php:1014 +#, php-format +msgid "Tried to update avatar for unsaved remote profile %s" msgstr "" -#: actions/ostatusinit.php:153 -msgid "Couldn't confirm remote profile address." +#: classes/Ostatus_profile.php:1022 +#, php-format +msgid "Unable to fetch avatar from %s" msgstr "" -#: actions/ostatusinit.php:171 -msgid "OStatus Connect" +#: lib/salmonaction.php:41 +msgid "This method requires a POST." msgstr "" -#: actions/ostatussub.php:68 -msgid "Address or profile URL" +#: lib/salmonaction.php:45 +msgid "Salmon requires application/magic-envelope+xml" msgstr "" -#: actions/ostatussub.php:70 -msgid "Enter the profile URL of a PubSubHubbub-enabled feed" +#: lib/salmonaction.php:55 +msgid "Salmon signature verification failed." msgstr "" -#: actions/ostatussub.php:74 -msgid "Continue" +#: lib/salmonaction.php:67 +msgid "Salmon post must be an Atom entry." msgstr "" -#: actions/ostatussub.php:112 OStatusPlugin.php:503 -msgid "Join" +#: lib/salmonaction.php:115 +msgid "Unrecognized activity type." msgstr "" -#: actions/ostatussub.php:113 -msgid "Join this group" +#: lib/salmonaction.php:123 +msgid "This target doesn't understand posts." msgstr "" -#: actions/ostatussub.php:116 -msgid "Subscribe to this user" +#: lib/salmonaction.php:128 +msgid "This target doesn't understand follows." msgstr "" -#: actions/ostatussub.php:137 -msgid "You are already subscribed to this user." +#: lib/salmonaction.php:133 +msgid "This target doesn't understand unfollows." msgstr "" -#: actions/ostatussub.php:165 -msgid "You are already a member of this group." +#: lib/salmonaction.php:138 +msgid "This target doesn't understand favorites." msgstr "" -#: actions/ostatussub.php:286 -msgid "Empty remote profile URL!" +#: lib/salmonaction.php:143 +msgid "This target doesn't understand unfavorites." msgstr "" -#: actions/ostatussub.php:297 -msgid "Invalid address format." +#: lib/salmonaction.php:148 +msgid "This target doesn't understand share events." msgstr "" -#: actions/ostatussub.php:302 -msgid "Invalid URL or could not reach server." +#: lib/salmonaction.php:153 +msgid "This target doesn't understand joins." msgstr "" -#: actions/ostatussub.php:304 -msgid "Cannot read feed; server returned error." +#: lib/salmonaction.php:158 +msgid "This target doesn't understand leave events." msgstr "" -#: actions/ostatussub.php:306 -msgid "Cannot read feed; server returned an empty page." +#: tests/gettext-speedtest.php:57 +msgid "Feeds" msgstr "" -#: actions/ostatussub.php:308 -msgid "Bad HTML, could not find feed link." +#: actions/ostatusgroup.php:75 +msgid "Join group" msgstr "" -#: actions/ostatussub.php:310 -msgid "Could not find a feed linked from this URL." +#: actions/ostatusgroup.php:77 +msgid "OStatus group's address, like http://example.net/group/nickname" msgstr "" -#: actions/ostatussub.php:312 -msgid "Not a recognized feed type." +#: actions/ostatusgroup.php:81 actions/ostatussub.php:71 +msgid "Continue" msgstr "" -#: actions/ostatussub.php:315 -#, php-format -msgid "Bad feed URL: %s %s" +#: actions/ostatusgroup.php:100 +msgid "You are already a member of this group." msgstr "" #. TRANS: OStatus remote group subscription dialog error. -#: actions/ostatussub.php:336 +#: actions/ostatusgroup.php:135 msgid "Already a member!" msgstr "" #. TRANS: OStatus remote group subscription dialog error. -#: actions/ostatussub.php:346 +#: actions/ostatusgroup.php:146 msgid "Remote group join failed!" msgstr "" #. TRANS: OStatus remote group subscription dialog error. -#: actions/ostatussub.php:350 +#: actions/ostatusgroup.php:150 msgid "Remote group join aborted!" msgstr "" -#. TRANS: OStatus remote subscription dialog error. -#: actions/ostatussub.php:356 -msgid "Already subscribed!" +#. TRANS: Page title for OStatus remote group join form +#: actions/ostatusgroup.php:163 +msgid "Confirm joining remote group" msgstr "" -#. TRANS: OStatus remote subscription dialog error. -#: actions/ostatussub.php:361 -msgid "Remote subscription failed!" +#: actions/ostatusgroup.php:174 +msgid "" +"You can subscribe to groups from other supported sites. Paste the group's " +"profile URI below:" msgstr "" -#. TRANS: Page title for OStatus remote subscription form -#: actions/ostatussub.php:459 -msgid "Authorize subscription" +#: actions/groupsalmon.php:51 +msgid "Can't accept remote posts for a remote group." msgstr "" -#: actions/ostatussub.php:470 -msgid "" -"You can subscribe to users from other supported sites. Paste their address " -"or profile URI below:" +#: actions/groupsalmon.php:124 +msgid "Can't read profile to set up group membership." msgstr "" -#: classes/Ostatus_profile.php:789 -#, php-format -msgid "Tried to update avatar for unsaved remote profile %s" +#: actions/groupsalmon.php:127 actions/groupsalmon.php:170 +msgid "Groups can't join groups." msgstr "" -#: classes/Ostatus_profile.php:797 +#: actions/groupsalmon.php:154 #, php-format -msgid "Unable to fetch avatar from %s" +msgid "Could not join remote user %1$s to group %2$s." msgstr "" -#: lib/salmonaction.php:41 -msgid "This method requires a POST." +#: actions/groupsalmon.php:167 +msgid "Can't read profile to cancel group membership." msgstr "" -#: lib/salmonaction.php:45 -msgid "Salmon requires application/magic-envelope+xml" +#: actions/groupsalmon.php:183 +#, php-format +msgid "Could not remove remote user %1$s from group %2$s." msgstr "" -#: lib/salmonaction.php:55 -msgid "Salmon signature verification failed." +#: actions/ostatussub.php:65 +msgid "Subscribe to" msgstr "" -#: lib/salmonaction.php:67 -msgid "Salmon post must be an Atom entry." +#: actions/ostatussub.php:67 +msgid "" +"OStatus user's address, like nickname@example.com or http://example.net/" +"nickname" msgstr "" -#: lib/salmonaction.php:115 -msgid "Unrecognized activity type." +#: actions/ostatussub.php:106 +msgid "Join this group" msgstr "" -#: lib/salmonaction.php:123 -msgid "This target doesn't understand posts." +#. TRANS: Page title for OStatus remote subscription form +#: actions/ostatussub.php:108 actions/ostatussub.php:400 +msgid "Confirm" msgstr "" -#: lib/salmonaction.php:128 -msgid "This target doesn't understand follows." +#: actions/ostatussub.php:109 +msgid "Subscribe to this user" msgstr "" -#: lib/salmonaction.php:133 -msgid "This target doesn't understand unfollows." +#: actions/ostatussub.php:130 +msgid "You are already subscribed to this user." msgstr "" -#: lib/salmonaction.php:138 -msgid "This target doesn't understand favorites." +#: actions/ostatussub.php:247 actions/ostatussub.php:253 +#: actions/ostatussub.php:272 +msgid "" +"Sorry, we could not reach that address. Please make sure that the OStatus " +"address is like nickname@example.com or http://example.net/nickname" msgstr "" -#: lib/salmonaction.php:143 -msgid "This target doesn't understand unfavorites." +#: actions/ostatussub.php:256 actions/ostatussub.php:259 +#: actions/ostatussub.php:262 actions/ostatussub.php:265 +#: actions/ostatussub.php:268 +msgid "" +"Sorry, we could not reach that feed. Please try that OStatus address again " +"later." msgstr "" -#: lib/salmonaction.php:148 -msgid "This target doesn't understand share events." +#. TRANS: OStatus remote subscription dialog error. +#: actions/ostatussub.php:301 +msgid "Already subscribed!" msgstr "" -#: lib/salmonaction.php:153 -msgid "This target doesn't understand joins." +#. TRANS: OStatus remote subscription dialog error. +#: actions/ostatussub.php:306 +msgid "Remote subscription failed!" msgstr "" -#: lib/salmonaction.php:158 -msgid "This target doesn't understand leave events." +#: actions/ostatussub.php:380 actions/ostatusinit.php:81 +msgid "Subscribe to user" msgstr "" -#: OStatusPlugin.php:319 -#, php-format -msgid "Sent from %s via OStatus" +#: actions/ostatussub.php:411 +msgid "" +"You can subscribe to users from other supported sites. Paste their address " +"or profile URI below:" msgstr "" -#: OStatusPlugin.php:371 -msgid "Could not set up remote subscription." +#: actions/ostatusinit.php:41 +msgid "You can use the local subscription!" msgstr "" -#: OStatusPlugin.php:487 -msgid "Could not set up remote group membership." +#: actions/ostatusinit.php:63 +msgid "There was a problem with your session token. Try again, please." msgstr "" -#: OStatusPlugin.php:504 +#: actions/ostatusinit.php:95 #, php-format -msgid "%s has joined group %s." +msgid "Join group %s" msgstr "" -#: OStatusPlugin.php:512 -msgid "Failed joining remote group." +#: actions/ostatusinit.php:98 +#, php-format +msgid "Subscribe to %s" msgstr "" -#: OStatusPlugin.php:553 -msgid "Leave" +#: actions/ostatusinit.php:111 +msgid "User nickname" msgstr "" -#: OStatusPlugin.php:554 -#, php-format -msgid "%s has left group %s." +#: actions/ostatusinit.php:112 +msgid "Nickname of the user you want to follow" msgstr "" -#: OStatusPlugin.php:685 -msgid "Subscribe to remote user" +#: actions/ostatusinit.php:116 +msgid "Profile Account" msgstr "" -#: OStatusPlugin.php:726 -msgid "Profile update" +#: actions/ostatusinit.php:117 +msgid "Your account id (i.e. user@identi.ca)" msgstr "" -#: OStatusPlugin.php:727 -#, php-format -msgid "%s has updated their profile page." +#: actions/ostatusinit.php:138 +msgid "Must provide a remote profile." msgstr "" -#: tests/gettext-speedtest.php:57 -msgid "Feeds" +#: actions/ostatusinit.php:149 +msgid "Couldn't look up OStatus account profile." +msgstr "" + +#: actions/ostatusinit.php:161 +msgid "Couldn't confirm remote profile address." +msgstr "" + +#: actions/ostatusinit.php:202 +msgid "OStatus Connect" msgstr "" diff --git a/plugins/OpenExternalLinkTarget/locale/OpenExternalLinkTarget.pot b/plugins/OpenExternalLinkTarget/locale/OpenExternalLinkTarget.pot new file mode 100644 index 000000000..f9bd4af10 --- /dev/null +++ b/plugins/OpenExternalLinkTarget/locale/OpenExternalLinkTarget.pot @@ -0,0 +1,21 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2010-04-29 23:39+0000\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" +"Language-Team: LANGUAGE <LL@li.org>\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=CHARSET\n" +"Content-Transfer-Encoding: 8bit\n" + +#: OpenExternalLinkTargetPlugin.php:60 +msgid "Opens external links (i.e., with rel=external) on a new window or tab" +msgstr "" diff --git a/plugins/OpenID/locale/OpenID.pot b/plugins/OpenID/locale/OpenID.pot index 7ed879835..70908422e 100644 --- a/plugins/OpenID/locale/OpenID.pot +++ b/plugins/OpenID/locale/OpenID.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-03-01 14:58-0800\n" +"POT-Creation-Date: 2010-04-29 23:39+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -16,311 +16,347 @@ msgstr "" "Content-Type: text/plain; charset=CHARSET\n" "Content-Transfer-Encoding: 8bit\n" -#: finishaddopenid.php:67 -msgid "Not logged in." +#: openidsettings.php:59 +msgid "OpenID settings" msgstr "" -#: finishaddopenid.php:88 finishopenidlogin.php:149 -msgid "OpenID authentication cancelled." +#: openidsettings.php:70 +#, php-format +msgid "" +"[OpenID](%%doc.openid%%) lets you log into many sites with the same user " +"account. Manage your associated OpenIDs from here." msgstr "" -#: finishaddopenid.php:92 finishopenidlogin.php:153 -#, php-format -msgid "OpenID authentication failed: %s" +#: openidsettings.php:99 +msgid "Add OpenID" msgstr "" -#: finishaddopenid.php:112 -msgid "You already have this OpenID!" +#: openidsettings.php:102 +msgid "" +"If you want to add an OpenID to your account, enter it in the box below and " +"click \"Add\"." msgstr "" -#: finishaddopenid.php:114 -msgid "Someone else already has this OpenID." +#: openidsettings.php:107 openidlogin.php:119 +msgid "OpenID URL" msgstr "" -#: finishaddopenid.php:126 -msgid "Error connecting user." +#: openidsettings.php:117 +msgid "Add" msgstr "" -#: finishaddopenid.php:131 -msgid "Error updating profile" +#: openidsettings.php:129 +msgid "Remove OpenID" msgstr "" -#: finishaddopenid.php:170 openidlogin.php:95 -msgid "OpenID Login" +#: openidsettings.php:134 +msgid "" +"Removing your only OpenID would make it impossible to log in! If you need to " +"remove it, add another OpenID first." msgstr "" -#: finishopenidlogin.php:34 openidlogin.php:30 -msgid "Already logged in." +#: openidsettings.php:149 +msgid "" +"You can remove an OpenID from your account by clicking the button marked " +"\"Remove\"." msgstr "" -#: finishopenidlogin.php:38 openidlogin.php:37 openidsettings.php:194 -msgid "There was a problem with your session token. Try again, please." +#: openidsettings.php:172 openidsettings.php:213 +msgid "Remove" msgstr "" -#: finishopenidlogin.php:43 -msgid "You can't register if you don't agree to the license." +#: openidsettings.php:186 +msgid "OpenID Trusted Sites" +msgstr "" + +#: openidsettings.php:189 +msgid "" +"The following sites are allowed to access your identity and log you in. You " +"can remove a site from this list to deny it access to your OpenID." msgstr "" -#: finishopenidlogin.php:52 openidsettings.php:208 +#: openidsettings.php:231 finishopenidlogin.php:38 openidlogin.php:39 +msgid "There was a problem with your session token. Try again, please." +msgstr "" + +#: openidsettings.php:247 finishopenidlogin.php:51 msgid "Something weird happened." msgstr "" -#: finishopenidlogin.php:66 -#, php-format -msgid "" -"This is the first time you've logged into %s so we must connect your OpenID " -"to a local account. You can either create a new account, or connect with " -"your existing account, if you have one." +#: openidsettings.php:271 +msgid "No such OpenID trustroot." msgstr "" -#: finishopenidlogin.php:72 -msgid "OpenID Account Setup" +#: openidsettings.php:275 +msgid "Trustroots removed" msgstr "" -#: finishopenidlogin.php:97 -msgid "Create new account" +#: openidsettings.php:298 +msgid "No such OpenID." msgstr "" -#: finishopenidlogin.php:99 -msgid "Create a new user with this nickname." +#: openidsettings.php:303 +msgid "That OpenID does not belong to you." msgstr "" -#: finishopenidlogin.php:102 -msgid "New nickname" +#: openidsettings.php:307 +msgid "OpenID removed." msgstr "" -#: finishopenidlogin.php:104 -msgid "1-64 lowercase letters or numbers, no punctuation or spaces" +#: openid.php:137 +msgid "Cannot instantiate OpenID consumer object." msgstr "" -#: finishopenidlogin.php:114 -msgid "My text and files are available under " +#: openid.php:147 +msgid "Not a valid OpenID." msgstr "" -#: finishopenidlogin.php:117 -msgid "" -" except this private data: password, email address, IM address, phone number." +#: openid.php:149 +#, php-format +msgid "OpenID failure: %s" msgstr "" -#: finishopenidlogin.php:121 -msgid "Create" +#: openid.php:176 +#, php-format +msgid "Could not redirect to server: %s" msgstr "" -#: finishopenidlogin.php:126 -msgid "Connect existing account" +#: openid.php:194 +#, php-format +msgid "Could not create OpenID form: %s" msgstr "" -#: finishopenidlogin.php:128 +#: openid.php:210 msgid "" -"If you already have an account, login with your username and password to " -"connect it to your OpenID." +"This form should automatically submit itself. If not, click the submit " +"button to go to your OpenID provider." msgstr "" -#: finishopenidlogin.php:131 -msgid "Existing nickname" +#: openid.php:242 +msgid "Error saving the profile." msgstr "" -#: finishopenidlogin.php:134 -msgid "Password" +#: openid.php:253 +msgid "Error saving the user." msgstr "" -#: finishopenidlogin.php:137 -msgid "Connect" +#: openid.php:282 +msgid "Unauthorized URL used for OpenID login." msgstr "" -#: finishopenidlogin.php:215 finishopenidlogin.php:224 -msgid "Registration not allowed." +#: openid.php:302 +msgid "OpenID Login Submission" msgstr "" -#: finishopenidlogin.php:231 -msgid "Not a valid invitation code." +#: openid.php:312 +msgid "Requesting authorization from your login provider..." msgstr "" -#: finishopenidlogin.php:241 -msgid "Nickname must have only lowercase letters and numbers and no spaces." +#: openid.php:315 +msgid "" +"If you are not redirected to your login provider in a few seconds, try " +"pushing the button below." msgstr "" -#: finishopenidlogin.php:246 -msgid "Nickname not allowed." +#. TRANS: Tooltip for main menu option "Login" +#: OpenIDPlugin.php:204 +msgctxt "TOOLTIP" +msgid "Login to the site" msgstr "" -#: finishopenidlogin.php:251 -msgid "Nickname already in use. Try another one." +#: OpenIDPlugin.php:207 +msgctxt "MENU" +msgid "Login" msgstr "" -#: finishopenidlogin.php:258 finishopenidlogin.php:338 -msgid "Stored OpenID not found." +#. TRANS: Tooltip for main menu option "Help" +#: OpenIDPlugin.php:212 +msgctxt "TOOLTIP" +msgid "Help me!" msgstr "" -#: finishopenidlogin.php:267 -msgid "Creating new account for OpenID that already has a user." +#: OpenIDPlugin.php:215 +msgctxt "MENU" +msgid "Help" msgstr "" -#: finishopenidlogin.php:327 -msgid "Invalid username or password." +#. TRANS: Tooltip for main menu option "Search" +#: OpenIDPlugin.php:221 +msgctxt "TOOLTIP" +msgid "Search for people or text" msgstr "" -#: finishopenidlogin.php:345 -msgid "Error connecting user to OpenID." +#: OpenIDPlugin.php:224 +msgctxt "MENU" +msgid "Search" msgstr "" -#: openid.php:141 -msgid "Cannot instantiate OpenID consumer object." +#: OpenIDPlugin.php:283 OpenIDPlugin.php:319 +msgid "OpenID" msgstr "" -#: openid.php:151 -msgid "Not a valid OpenID." +#: OpenIDPlugin.php:284 +msgid "Login or register with OpenID" msgstr "" -#: openid.php:153 -#, php-format -msgid "OpenID failure: %s" +#: OpenIDPlugin.php:320 +msgid "Add or remove OpenIDs" msgstr "" -#: openid.php:180 -#, php-format -msgid "Could not redirect to server: %s" +#: OpenIDPlugin.php:595 +msgid "Use <a href=\"http://openid.net/\">OpenID</a> to login to the site." msgstr "" -#: openid.php:198 +#: openidserver.php:106 #, php-format -msgid "Could not create OpenID form: %s" -msgstr "" - -#: openid.php:214 -msgid "" -"This form should automatically submit itself. If not, click the submit " -"button to go to your OpenID provider." +msgid "You are not authorized to use the identity %s." msgstr "" -#: openid.php:246 -msgid "Error saving the profile." +#: openidserver.php:126 +msgid "Just an OpenID provider. Nothing to see here, move along..." msgstr "" -#: openid.php:257 -msgid "Error saving the user." +#: finishopenidlogin.php:34 openidlogin.php:30 +msgid "Already logged in." msgstr "" -#: openid.php:277 -msgid "OpenID Auto-Submit" +#: finishopenidlogin.php:43 +msgid "You can't register if you don't agree to the license." msgstr "" -#: openidlogin.php:66 +#: finishopenidlogin.php:65 #, php-format msgid "" -"For security reasons, please re-login with your [OpenID](%%doc.openid%%) " -"before changing your settings." +"This is the first time you've logged into %s so we must connect your OpenID " +"to a local account. You can either create a new account, or connect with " +"your existing account, if you have one." msgstr "" -#: openidlogin.php:70 -#, php-format -msgid "Login with an [OpenID](%%doc.openid%%) account." +#: finishopenidlogin.php:71 +msgid "OpenID Account Setup" msgstr "" -#: openidlogin.php:112 -msgid "OpenID login" +#: finishopenidlogin.php:101 +msgid "Create new account" msgstr "" -#: openidlogin.php:117 openidsettings.php:107 -msgid "OpenID URL" +#: finishopenidlogin.php:103 +msgid "Create a new user with this nickname." msgstr "" -#: openidlogin.php:119 -msgid "Your OpenID URL" +#: finishopenidlogin.php:106 +msgid "New nickname" msgstr "" -#: openidlogin.php:122 -msgid "Remember me" +#: finishopenidlogin.php:108 +msgid "1-64 lowercase letters or numbers, no punctuation or spaces" msgstr "" -#: openidlogin.php:123 -msgid "Automatically login in the future; not for shared computers!" +#: finishopenidlogin.php:130 +msgid "Create" msgstr "" -#: openidlogin.php:127 -msgid "Login" +#: finishopenidlogin.php:135 +msgid "Connect existing account" msgstr "" -#: OpenIDPlugin.php:123 OpenIDPlugin.php:135 -msgid "OpenID" +#: finishopenidlogin.php:137 +msgid "" +"If you already have an account, login with your username and password to " +"connect it to your OpenID." msgstr "" -#: OpenIDPlugin.php:124 -msgid "Login or register with OpenID" +#: finishopenidlogin.php:140 +msgid "Existing nickname" msgstr "" -#: OpenIDPlugin.php:136 -msgid "Add or remove OpenIDs" +#: finishopenidlogin.php:143 +msgid "Password" msgstr "" -#: OpenIDPlugin.php:324 -msgid "Use <a href=\"http://openid.net/\">OpenID</a> to login to the site." +#: finishopenidlogin.php:146 +msgid "Connect" msgstr "" -#: openidserver.php:106 +#: finishopenidlogin.php:158 finishaddopenid.php:88 +msgid "OpenID authentication cancelled." +msgstr "" + +#: finishopenidlogin.php:162 finishaddopenid.php:92 #, php-format -msgid "You are not authorized to use the identity %s." +msgid "OpenID authentication failed: %s" msgstr "" -#: openidserver.php:126 -msgid "Just an OpenID provider. Nothing to see here, move along..." +#: finishopenidlogin.php:227 finishopenidlogin.php:236 +msgid "Registration not allowed." msgstr "" -#: openidsettings.php:59 -msgid "OpenID settings" +#: finishopenidlogin.php:243 +msgid "Not a valid invitation code." msgstr "" -#: openidsettings.php:70 -#, php-format -msgid "" -"[OpenID](%%doc.openid%%) lets you log into many sites with the same user " -"account. Manage your associated OpenIDs from here." +#: finishopenidlogin.php:253 +msgid "Nickname must have only lowercase letters and numbers and no spaces." msgstr "" -#: openidsettings.php:99 -msgid "Add OpenID" +#: finishopenidlogin.php:258 +msgid "Nickname not allowed." msgstr "" -#: openidsettings.php:102 -msgid "" -"If you want to add an OpenID to your account, enter it in the box below and " -"click \"Add\"." +#: finishopenidlogin.php:263 +msgid "Nickname already in use. Try another one." msgstr "" -#: openidsettings.php:117 -msgid "Add" +#: finishopenidlogin.php:270 finishopenidlogin.php:350 +msgid "Stored OpenID not found." msgstr "" -#: openidsettings.php:129 -msgid "Remove OpenID" +#: finishopenidlogin.php:279 +msgid "Creating new account for OpenID that already has a user." msgstr "" -#: openidsettings.php:134 -msgid "" -"Removing your only OpenID would make it impossible to log in! If you need to " -"remove it, add another OpenID first." +#: finishopenidlogin.php:339 +msgid "Invalid username or password." msgstr "" -#: openidsettings.php:149 +#: finishopenidlogin.php:357 +msgid "Error connecting user to OpenID." +msgstr "" + +#: openidlogin.php:68 +#, php-format msgid "" -"You can remove an OpenID from your account by clicking the button marked " -"\"Remove\"." +"For security reasons, please re-login with your [OpenID](%%doc.openid%%) " +"before changing your settings." msgstr "" -#: openidsettings.php:172 -msgid "Remove" +#: openidlogin.php:72 +#, php-format +msgid "Login with an [OpenID](%%doc.openid%%) account." msgstr "" -#: openidsettings.php:228 -msgid "No such OpenID." +#: openidlogin.php:97 finishaddopenid.php:170 +msgid "OpenID Login" msgstr "" -#: openidsettings.php:233 -msgid "That OpenID does not belong to you." +#: openidlogin.php:114 +msgid "OpenID login" msgstr "" -#: openidsettings.php:237 -msgid "OpenID removed." +#: openidlogin.php:121 +msgid "Your OpenID URL" +msgstr "" + +#: openidlogin.php:124 +msgid "Remember me" +msgstr "" + +#: openidlogin.php:125 +msgid "Automatically login in the future; not for shared computers!" +msgstr "" + +#: openidlogin.php:129 +msgid "Login" msgstr "" #: openidtrust.php:51 @@ -332,17 +368,37 @@ msgid "" "This page should only be reached during OpenID processing, not directly." msgstr "" -#: openidtrust.php:118 +#: openidtrust.php:117 #, php-format msgid "" "%s has asked to verify your identity. Click Continue to verify your " "identity and login without creating a new password." msgstr "" -#: openidtrust.php:136 +#: openidtrust.php:135 msgid "Continue" msgstr "" -#: openidtrust.php:137 +#: openidtrust.php:136 msgid "Cancel" msgstr "" + +#: finishaddopenid.php:67 +msgid "Not logged in." +msgstr "" + +#: finishaddopenid.php:112 +msgid "You already have this OpenID!" +msgstr "" + +#: finishaddopenid.php:114 +msgid "Someone else already has this OpenID." +msgstr "" + +#: finishaddopenid.php:126 +msgid "Error connecting user." +msgstr "" + +#: finishaddopenid.php:131 +msgid "Error updating profile" +msgstr "" diff --git a/plugins/OpenID/locale/nl/LC_MESSAGES/OpenID.po b/plugins/OpenID/locale/nl/LC_MESSAGES/OpenID.po index ae0329376..5cda9b129 100644 --- a/plugins/OpenID/locale/nl/LC_MESSAGES/OpenID.po +++ b/plugins/OpenID/locale/nl/LC_MESSAGES/OpenID.po @@ -8,315 +8,351 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-04-11 21:42+0000\n" -"PO-Revision-Date: 2010-04-12 00:53+0100\n" +"POT-Creation-Date: 2010-04-29 23:39+0000\n" +"PO-Revision-Date: 2010-04-30 02:16+0100\n" +"Last-Translator: Siebrand Mazeland <s.mazeland@xs4all.nl>\n" "Language-Team: Dutch\n" +"MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"Last-Translator: Siebrand Mazeland <s.mazeland@xs4all.nl>\n" -"MIME-Version: 1.0\n" -#: finishaddopenid.php:67 -msgid "Not logged in." -msgstr "Niet aangemeld." +#: openidsettings.php:59 +msgid "OpenID settings" +msgstr "OpenID-instellingen" -#: finishaddopenid.php:88 -#: finishopenidlogin.php:149 -msgid "OpenID authentication cancelled." -msgstr "De authenticatie via OpenID is afgebroken." +#: openidsettings.php:70 +#, php-format +msgid "[OpenID](%%doc.openid%%) lets you log into many sites with the same user account. Manage your associated OpenIDs from here." +msgstr "Met [OpenID](%%doc.openid%%) kunt u aanmelden bij veel websites met dezelfde gebruiker. U kunt hier uw gekoppelde OpenID's beheren." -#: finishaddopenid.php:92 -#: finishopenidlogin.php:153 +#: openidsettings.php:99 +msgid "Add OpenID" +msgstr "OpenID toevoegen" + +#: openidsettings.php:102 +msgid "If you want to add an OpenID to your account, enter it in the box below and click \"Add\"." +msgstr "Als u een OpenID aan uw gebruiker wilt toevoegen, voer deze dan hieronder in en klik op \"Toevoegen\"." + +#: openidsettings.php:107 +#: openidlogin.php:119 +msgid "OpenID URL" +msgstr "OpenID-URL" + +#: openidsettings.php:117 +msgid "Add" +msgstr "Toevoegen" + +#: openidsettings.php:129 +msgid "Remove OpenID" +msgstr "OpenID verwijderen" + +#: openidsettings.php:134 +msgid "Removing your only OpenID would make it impossible to log in! If you need to remove it, add another OpenID first." +msgstr "Door uw enige OpenID te verwijderen zou het niet meer mogelijk zijn om aan te melden. Als u het wilt verwijderen, voeg dan eerst een andere OpenID toe." + +#: openidsettings.php:149 +msgid "You can remove an OpenID from your account by clicking the button marked \"Remove\"." +msgstr "U kunt een OpenID van uw gebruiker verwijderen door te klikken op de knop \"Verwijderen\"." + +#: openidsettings.php:172 +#: openidsettings.php:213 +msgid "Remove" +msgstr "Verwijderen" + +#: openidsettings.php:186 +msgid "OpenID Trusted Sites" +msgstr "Vertrouwde OpenID-sites" + +#: openidsettings.php:189 +msgid "The following sites are allowed to access your identity and log you in. You can remove a site from this list to deny it access to your OpenID." +msgstr "De volgende sites hebben toegang tot uw indentiteit en kunnen u aanmelden. U kunt een site verwijderen uit deze lijst zodat deze niet langer toegang heeft tot uw OpenID." + +#: openidsettings.php:231 +#: finishopenidlogin.php:38 +#: openidlogin.php:39 +msgid "There was a problem with your session token. Try again, please." +msgstr "Er was een probleem met uw sessietoken. Probeer het opnieuw." + +#: openidsettings.php:247 +#: finishopenidlogin.php:51 +msgid "Something weird happened." +msgstr "Er is iets vreemds gebeurd." + +#: openidsettings.php:271 +msgid "No such OpenID trustroot." +msgstr "Die OpenID trustroot bestaat niet." + +#: openidsettings.php:275 +msgid "Trustroots removed" +msgstr "De trustroots zijn verwijderd" + +#: openidsettings.php:298 +msgid "No such OpenID." +msgstr "De OpenID bestaat niet." + +#: openidsettings.php:303 +msgid "That OpenID does not belong to you." +msgstr "Die OpenID is niet van u." + +#: openidsettings.php:307 +msgid "OpenID removed." +msgstr "OpenID verwijderd." + +#: openid.php:137 +msgid "Cannot instantiate OpenID consumer object." +msgstr "Het was niet mogelijk een OpenID-object aan te maken." + +#: openid.php:147 +msgid "Not a valid OpenID." +msgstr "Geen geldige OpenID." + +#: openid.php:149 #, php-format -msgid "OpenID authentication failed: %s" -msgstr "De authenticatie via OpenID is mislukt: %s" +msgid "OpenID failure: %s" +msgstr "OpenID-fout: %s" -#: finishaddopenid.php:112 -msgid "You already have this OpenID!" -msgstr "U hebt deze OpenID al!" +#: openid.php:176 +#, php-format +msgid "Could not redirect to server: %s" +msgstr "Het was niet mogelijk door te verwijzen naar de server: %s" -#: finishaddopenid.php:114 -msgid "Someone else already has this OpenID." -msgstr "Iemand anders gebruikt deze OpenID al." +#: openid.php:194 +#, php-format +msgid "Could not create OpenID form: %s" +msgstr "Het was niet mogelijk het OpenID-formulier aan te maken: %s" -#: finishaddopenid.php:126 -msgid "Error connecting user." -msgstr "Fout bij het verbinden met de gebruiker." +#: openid.php:210 +msgid "This form should automatically submit itself. If not, click the submit button to go to your OpenID provider." +msgstr "Dit formulier hoort zichzelf automatisch op te slaan. Als dat niet gebeurt, klik dan op de knop \"Aanmelden\" om naar uw OpenID-provider te gaan." -#: finishaddopenid.php:131 -msgid "Error updating profile" -msgstr "Fout bij het bijwerken van het profiel." +#: openid.php:242 +msgid "Error saving the profile." +msgstr "Fout bij het opslaan van het profiel." -#: finishaddopenid.php:170 -#: openidlogin.php:95 -msgid "OpenID Login" +#: openid.php:253 +msgid "Error saving the user." +msgstr "Fout bij het opslaan van de gebruiker." + +#: openid.php:282 +msgid "Unauthorized URL used for OpenID login." +msgstr "Ongeautoriseerde URL gebruikt voor aanmelden via OpenID" + +#: openid.php:302 +#, fuzzy +msgid "OpenID Login Submission" msgstr "Aanmelden via OpenID" +#: openid.php:312 +msgid "Requesting authorization from your login provider..." +msgstr "Bezig met het vragen van autorisatie van uw aanmeldprovider..." + +#: openid.php:315 +msgid "If you are not redirected to your login provider in a few seconds, try pushing the button below." +msgstr "Als u binnen een aantal seconden niet wordt doorverwezen naar uw aanmeldprovider, klik dan op de onderstaande knop." + +#. TRANS: Tooltip for main menu option "Login" +#: OpenIDPlugin.php:204 +msgctxt "TOOLTIP" +msgid "Login to the site" +msgstr "Aanmelden bij de site" + +#: OpenIDPlugin.php:207 +#, fuzzy +msgctxt "MENU" +msgid "Login" +msgstr "Aanmelden" + +#. TRANS: Tooltip for main menu option "Help" +#: OpenIDPlugin.php:212 +msgctxt "TOOLTIP" +msgid "Help me!" +msgstr "Help me" + +#: OpenIDPlugin.php:215 +msgctxt "MENU" +msgid "Help" +msgstr "Hulp" + +#. TRANS: Tooltip for main menu option "Search" +#: OpenIDPlugin.php:221 +msgctxt "TOOLTIP" +msgid "Search for people or text" +msgstr "Zoeken naar mensen of tekst" + +#: OpenIDPlugin.php:224 +msgctxt "MENU" +msgid "Search" +msgstr "Zoeken" + +#: OpenIDPlugin.php:283 +#: OpenIDPlugin.php:319 +msgid "OpenID" +msgstr "OpenID" + +#: OpenIDPlugin.php:284 +msgid "Login or register with OpenID" +msgstr "Aanmelden of registreren met OpenID" + +#: OpenIDPlugin.php:320 +msgid "Add or remove OpenIDs" +msgstr "OpenID's toevoegen of verwijderen" + +#: OpenIDPlugin.php:595 +msgid "Use <a href=\"http://openid.net/\">OpenID</a> to login to the site." +msgstr "Gebruik <a href=\"http://openid.net/\">OpenID</a> om aan te melden bij de site." + +#: openidserver.php:106 +#, php-format +msgid "You are not authorized to use the identity %s." +msgstr "U mag de identiteit %s niet gebruiken." + +#: openidserver.php:126 +msgid "Just an OpenID provider. Nothing to see here, move along..." +msgstr "Gewoon een OpenID-provider. Niets te zien hier..." + #: finishopenidlogin.php:34 #: openidlogin.php:30 msgid "Already logged in." msgstr "U bent al aangemeld." -#: finishopenidlogin.php:38 -#: openidlogin.php:37 -#: openidsettings.php:194 -msgid "There was a problem with your session token. Try again, please." -msgstr "Er was een probleem met uw sessietoken. Probeer het opnieuw." - #: finishopenidlogin.php:43 msgid "You can't register if you don't agree to the license." msgstr "U kunt niet registreren als u niet akkoord gaat met de licentie." -#: finishopenidlogin.php:52 -#: openidsettings.php:208 -msgid "Something weird happened." -msgstr "Er is iets vreemds gebeurd." - -#: finishopenidlogin.php:66 +#: finishopenidlogin.php:65 #, php-format msgid "This is the first time you've logged into %s so we must connect your OpenID to a local account. You can either create a new account, or connect with your existing account, if you have one." msgstr "Dit is de eerste keer dat u aameldt bij %s en uw OpenID moet gekoppeld worden aan uw lokale gebruiker. U kunt een nieuwe gebruiker aanmaken of koppelen met uw bestaande gebruiker als u die al hebt." -#: finishopenidlogin.php:72 +#: finishopenidlogin.php:71 msgid "OpenID Account Setup" msgstr "Instellingen OpenID" -#: finishopenidlogin.php:97 +#: finishopenidlogin.php:101 msgid "Create new account" msgstr "Nieuwe gebruiker aanmaken" -#: finishopenidlogin.php:99 +#: finishopenidlogin.php:103 msgid "Create a new user with this nickname." msgstr "Nieuwe gebruiker met deze naam aanmaken." -#: finishopenidlogin.php:102 +#: finishopenidlogin.php:106 msgid "New nickname" msgstr "Nieuwe gebruiker" -#: finishopenidlogin.php:104 +#: finishopenidlogin.php:108 msgid "1-64 lowercase letters or numbers, no punctuation or spaces" msgstr "1-64 kleine letters of getallen; geen leestekens of spaties" -#: finishopenidlogin.php:114 -msgid "My text and files are available under " -msgstr "Mijn teksten en bestanden zijn beschikbaar onder" - -#: finishopenidlogin.php:117 -msgid " except this private data: password, email address, IM address, phone number." -msgstr "behalve de volgende privégegevens: wachtwoord, e-mailadres, IM-adres, telefoonnummer." - -#: finishopenidlogin.php:121 +#: finishopenidlogin.php:130 msgid "Create" msgstr "Aanmaken" -#: finishopenidlogin.php:126 +#: finishopenidlogin.php:135 msgid "Connect existing account" msgstr "Koppelen met bestaande gebruiker" -#: finishopenidlogin.php:128 +#: finishopenidlogin.php:137 msgid "If you already have an account, login with your username and password to connect it to your OpenID." msgstr "Als u al een gebruiker hebt, meld u dan aan met uw gebruikersnaam en wachtwoord om de gebruiker te koppelen met uw OpenID." -#: finishopenidlogin.php:131 +#: finishopenidlogin.php:140 msgid "Existing nickname" msgstr "Bestaande gebruiker" -#: finishopenidlogin.php:134 +#: finishopenidlogin.php:143 msgid "Password" msgstr "Wachtwoord" -#: finishopenidlogin.php:137 +#: finishopenidlogin.php:146 msgid "Connect" msgstr "Koppelen" -#: finishopenidlogin.php:215 -#: finishopenidlogin.php:224 +#: finishopenidlogin.php:158 +#: finishaddopenid.php:88 +msgid "OpenID authentication cancelled." +msgstr "De authenticatie via OpenID is afgebroken." + +#: finishopenidlogin.php:162 +#: finishaddopenid.php:92 +#, php-format +msgid "OpenID authentication failed: %s" +msgstr "De authenticatie via OpenID is mislukt: %s" + +#: finishopenidlogin.php:227 +#: finishopenidlogin.php:236 msgid "Registration not allowed." msgstr "Registreren is niet mogelijk." -#: finishopenidlogin.php:231 +#: finishopenidlogin.php:243 msgid "Not a valid invitation code." msgstr "De uitnodigingscode is niet geldig." -#: finishopenidlogin.php:241 +#: finishopenidlogin.php:253 msgid "Nickname must have only lowercase letters and numbers and no spaces." msgstr "De gebruikersnaam mag alleen uit kleine letters en cijfers bestaan, en geen spaties bevatten." -#: finishopenidlogin.php:246 +#: finishopenidlogin.php:258 msgid "Nickname not allowed." msgstr "Deze gebruikersnaam is niet toegestaan." -#: finishopenidlogin.php:251 +#: finishopenidlogin.php:263 msgid "Nickname already in use. Try another one." msgstr "Deze gebruikersnaam wordt al gebruikt. Kies een andere." -#: finishopenidlogin.php:258 -#: finishopenidlogin.php:338 +#: finishopenidlogin.php:270 +#: finishopenidlogin.php:350 msgid "Stored OpenID not found." msgstr "Het opgeslagen OpenID is niet aangetroffen." -#: finishopenidlogin.php:267 +#: finishopenidlogin.php:279 msgid "Creating new account for OpenID that already has a user." msgstr "Bezig met het aanmaken van een gebruiker voor OpenID die al een gebruiker heeft." -#: finishopenidlogin.php:327 +#: finishopenidlogin.php:339 msgid "Invalid username or password." msgstr "Ongeldige gebruikersnaam of wachtwoord." -#: finishopenidlogin.php:345 +#: finishopenidlogin.php:357 msgid "Error connecting user to OpenID." msgstr "Fout bij het koppelen met OpenID." -#: openid.php:141 -msgid "Cannot instantiate OpenID consumer object." -msgstr "Het was niet mogelijk een OpenID-object aan te maken." - -#: openid.php:151 -msgid "Not a valid OpenID." -msgstr "Geen geldige OpenID." - -#: openid.php:153 -#, php-format -msgid "OpenID failure: %s" -msgstr "OpenID-fout: %s" - -#: openid.php:180 -#, php-format -msgid "Could not redirect to server: %s" -msgstr "Het was niet mogelijk door te verwijzen naar de server: %s" - -#: openid.php:198 -#, php-format -msgid "Could not create OpenID form: %s" -msgstr "Het was niet mogelijk het OpenID-formulier aan te maken: %s" - -#: openid.php:214 -msgid "This form should automatically submit itself. If not, click the submit button to go to your OpenID provider." -msgstr "Dit formulier hoort zichzelf automatisch op te slaan. Als dat niet gebeurt, klik dan op de knop \"Aanmelden\" om naar uw OpenID-provider te gaan." - -#: openid.php:246 -msgid "Error saving the profile." -msgstr "Fout bij het opslaan van het profiel." - -#: openid.php:257 -msgid "Error saving the user." -msgstr "Fout bij het opslaan van de gebruiker." - -#: openid.php:277 -msgid "OpenID Auto-Submit" -msgstr "OpenID automatisch opslaan" - -#: openidlogin.php:66 +#: openidlogin.php:68 #, php-format msgid "For security reasons, please re-login with your [OpenID](%%doc.openid%%) before changing your settings." msgstr "Om veiligheidsreden moet u opnieuw aanmelden met uw [OpenID](%%doc.openid%%) voordat u uw instellingen kunt wijzigen." -#: openidlogin.php:70 +#: openidlogin.php:72 #, php-format msgid "Login with an [OpenID](%%doc.openid%%) account." msgstr "Aanmelden met een [OpenID](%%doc.openid%%)-gebruiker." -#: openidlogin.php:112 -msgid "OpenID login" +#: openidlogin.php:97 +#: finishaddopenid.php:170 +msgid "OpenID Login" msgstr "Aanmelden via OpenID" -#: openidlogin.php:117 -#: openidsettings.php:107 -msgid "OpenID URL" -msgstr "OpenID-URL" +#: openidlogin.php:114 +msgid "OpenID login" +msgstr "Aanmelden via OpenID" -#: openidlogin.php:119 +#: openidlogin.php:121 msgid "Your OpenID URL" msgstr "Uw OpenID-URL" -#: openidlogin.php:122 +#: openidlogin.php:124 msgid "Remember me" msgstr "Aanmeldgegevens onthouden" -#: openidlogin.php:123 +#: openidlogin.php:125 msgid "Automatically login in the future; not for shared computers!" msgstr "In het vervolg automatisch aanmelden. Niet gebruiken op gedeelde computers!" -#: openidlogin.php:127 +#: openidlogin.php:129 msgid "Login" msgstr "Aanmelden" -#: OpenIDPlugin.php:123 -#: OpenIDPlugin.php:135 -msgid "OpenID" -msgstr "OpenID" - -#: OpenIDPlugin.php:124 -msgid "Login or register with OpenID" -msgstr "Aanmelden of registreren met OpenID" - -#: OpenIDPlugin.php:136 -msgid "Add or remove OpenIDs" -msgstr "OpenID's toevoegen of verwijderen" - -#: OpenIDPlugin.php:324 -msgid "Use <a href=\"http://openid.net/\">OpenID</a> to login to the site." -msgstr "Gebruik <a href=\"http://openid.net/\">OpenID</a> om aan te melden bij de site." - -#: openidserver.php:106 -#, php-format -msgid "You are not authorized to use the identity %s." -msgstr "U mag de identiteit %s niet gebruiken." - -#: openidserver.php:126 -msgid "Just an OpenID provider. Nothing to see here, move along..." -msgstr "Gewoon een OpenID-provider. Niets te zien hier..." - -#: openidsettings.php:59 -msgid "OpenID settings" -msgstr "OpenID-instellingen" - -#: openidsettings.php:70 -#, php-format -msgid "[OpenID](%%doc.openid%%) lets you log into many sites with the same user account. Manage your associated OpenIDs from here." -msgstr "Met [OpenID](%%doc.openid%%) kunt u aanmelden bij veel websites met dezelfde gebruiker. U kunt hier uw gekoppelde OpenID's beheren." - -#: openidsettings.php:99 -msgid "Add OpenID" -msgstr "OpenID toevoegen" - -#: openidsettings.php:102 -msgid "If you want to add an OpenID to your account, enter it in the box below and click \"Add\"." -msgstr "Als u een OpenID aan uw gebruiker wilt toevoegen, voer deze dan hieronder in en klik op \"Toevoegen\"." - -#: openidsettings.php:117 -msgid "Add" -msgstr "Toevoegen" - -#: openidsettings.php:129 -msgid "Remove OpenID" -msgstr "OpenID verwijderen" - -#: openidsettings.php:134 -msgid "Removing your only OpenID would make it impossible to log in! If you need to remove it, add another OpenID first." -msgstr "Door uw enige OpenID te verwijderen zou het niet meer mogelijk zijn om aan te melden. Als u het wilt verwijderen, voeg dan eerst een andere OpenID toe." - -#: openidsettings.php:149 -msgid "You can remove an OpenID from your account by clicking the button marked \"Remove\"." -msgstr "U kunt een OpenID van uw gebruiker verwijderen door te klikken op de knop \"Verwijderen\"." - -#: openidsettings.php:172 -msgid "Remove" -msgstr "Verwijderen" - -#: openidsettings.php:228 -msgid "No such OpenID." -msgstr "De OpenID bestaat niet." - -#: openidsettings.php:233 -msgid "That OpenID does not belong to you." -msgstr "Die OpenID is niet van u." - -#: openidsettings.php:237 -msgid "OpenID removed." -msgstr "OpenID verwijderd." - #: openidtrust.php:51 msgid "OpenID Identity Verification" msgstr "OpenID-identiteitscontrole" @@ -325,16 +361,35 @@ msgstr "OpenID-identiteitscontrole" msgid "This page should only be reached during OpenID processing, not directly." msgstr "Deze pagina hoort alleen bezocht te worden tijdens het verwerken van een OpenID, en niet direct." -#: openidtrust.php:118 +#: openidtrust.php:117 #, php-format msgid "%s has asked to verify your identity. Click Continue to verify your identity and login without creating a new password." msgstr "%s heeft gevraagd uw identiteit te bevestigen. Klik op \"Doorgaan\" om uw indentiteit te controleren en aan te melden zonder een wachtwoord te hoeven invoeren." -#: openidtrust.php:136 +#: openidtrust.php:135 msgid "Continue" msgstr "Doorgaan" -#: openidtrust.php:137 +#: openidtrust.php:136 msgid "Cancel" msgstr "Annuleren" +#: finishaddopenid.php:67 +msgid "Not logged in." +msgstr "Niet aangemeld." + +#: finishaddopenid.php:112 +msgid "You already have this OpenID!" +msgstr "U hebt deze OpenID al!" + +#: finishaddopenid.php:114 +msgid "Someone else already has this OpenID." +msgstr "Iemand anders gebruikt deze OpenID al." + +#: finishaddopenid.php:126 +msgid "Error connecting user." +msgstr "Fout bij het verbinden met de gebruiker." + +#: finishaddopenid.php:131 +msgid "Error updating profile" +msgstr "Fout bij het bijwerken van het profiel." diff --git a/plugins/PostDebug/locale/PostDebug.pot b/plugins/PostDebug/locale/PostDebug.pot new file mode 100644 index 000000000..b7107d4c1 --- /dev/null +++ b/plugins/PostDebug/locale/PostDebug.pot @@ -0,0 +1,21 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2010-04-29 23:39+0000\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" +"Language-Team: LANGUAGE <LL@li.org>\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=CHARSET\n" +"Content-Transfer-Encoding: 8bit\n" + +#: PostDebugPlugin.php:58 +msgid "Debugging tool to record request details on POST." +msgstr "" diff --git a/plugins/PoweredByStatusNet/locale/PoweredByStatusNet.pot b/plugins/PoweredByStatusNet/locale/PoweredByStatusNet.pot index 8f8434a85..bc0e814f2 100644 --- a/plugins/PoweredByStatusNet/locale/PoweredByStatusNet.pot +++ b/plugins/PoweredByStatusNet/locale/PoweredByStatusNet.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-03-01 14:58-0800\n" +"POT-Creation-Date: 2010-04-29 23:39+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" diff --git a/plugins/PtitUrl/locale/PtitUrl.pot b/plugins/PtitUrl/locale/PtitUrl.pot new file mode 100644 index 000000000..a888f80e4 --- /dev/null +++ b/plugins/PtitUrl/locale/PtitUrl.pot @@ -0,0 +1,22 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2010-04-29 23:39+0000\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" +"Language-Team: LANGUAGE <LL@li.org>\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=CHARSET\n" +"Content-Transfer-Encoding: 8bit\n" + +#: PtitUrlPlugin.php:67 +#, php-format +msgid "Uses <a href=\"http://%1$s/\">%1$s</a> URL-shortener service." +msgstr "" diff --git a/plugins/RSSCloud/locale/RSSCloud.pot b/plugins/RSSCloud/locale/RSSCloud.pot new file mode 100644 index 000000000..4078cc749 --- /dev/null +++ b/plugins/RSSCloud/locale/RSSCloud.pot @@ -0,0 +1,24 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2010-04-29 23:39+0000\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" +"Language-Team: LANGUAGE <LL@li.org>\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=CHARSET\n" +"Content-Transfer-Encoding: 8bit\n" + +#: RSSCloudPlugin.php:260 +msgid "" +"The RSSCloud plugin enables your StatusNet instance to publish real-time " +"updates for profile RSS feeds using the <a href=\"http://rsscloud.org/" +"\">RSSCloud protocol</a>\"." +msgstr "" diff --git a/plugins/Realtime/README b/plugins/Realtime/README index 524382696..99c79cfab 100644 --- a/plugins/Realtime/README +++ b/plugins/Realtime/README @@ -1,6 +1,5 @@ == TODO == * i18n -* Change in context URL to conversation (try not to construct the URL in JS) * Update mark behaviour (on notice send) * Pause, Send a notice ~ should not update counter * Pause ~ retain up to 50-100 most recent notices diff --git a/plugins/Realtime/RealtimePlugin.php b/plugins/Realtime/RealtimePlugin.php index b559d80c6..352afcf78 100644 --- a/plugins/Realtime/RealtimePlugin.php +++ b/plugins/Realtime/RealtimePlugin.php @@ -250,14 +250,7 @@ class RealtimePlugin extends Plugin $arr['url'] = $notice->bestUrl(); $arr['html'] = htmlspecialchars($notice->rendered); $arr['source'] = htmlspecialchars($arr['source']); - - if (!empty($notice->reply_to)) { - $reply_to = Notice::staticGet('id', $notice->reply_to); - if (!empty($reply_to)) { - $arr['in_reply_to_status_url'] = $reply_to->bestUrl(); - } - $reply_to = null; - } + $arr['conversation_url'] = $this->getConversationUrl($notice); $profile = $notice->getProfile(); $arr['user']['profile_url'] = $profile->profileurl; @@ -272,10 +265,7 @@ class RealtimePlugin extends Plugin $arr['retweeted_status']['source'] = htmlspecialchars($original->source); $originalProfile = $original->getProfile(); $arr['retweeted_status']['user']['profile_url'] = $originalProfile->profileurl; - if (!empty($original->reply_to)) { - $originalReply = Notice::staticGet('id', $original->reply_to); - $arr['retweeted_status']['in_reply_to_status_url'] = $originalReply->bestUrl(); - } + $arr['retweeted_status']['conversation_url'] = $this->getConversationUrl($original); } $original = null; } @@ -303,6 +293,34 @@ class RealtimePlugin extends Plugin return $tags; } + function getConversationUrl($notice) + { + $convurl = null; + + if ($notice->hasConversation()) { + $conv = Conversation::staticGet( + 'id', + $notice->conversation + ); + $convurl = $conv->uri; + + if(empty($convurl)) { + $msg = sprintf( + "Couldn't find Conversation ID %d to make 'in context'" + . "link for Notice ID %d", + $notice->conversation, + $notice->id + ); + + common_log(LOG_WARNING, $msg); + } else { + $convurl .= '#notice-' . $notice->id; + } + } + + return $convurl; + } + function _getScripts() { return array('plugins/Realtime/realtimeupdate.js'); diff --git a/plugins/Realtime/realtimeupdate.js b/plugins/Realtime/realtimeupdate.js index 2e5851ae5..25dc12d58 100644 --- a/plugins/Realtime/realtimeupdate.js +++ b/plugins/Realtime/realtimeupdate.js @@ -149,8 +149,8 @@ RealtimeUpdate = { "from "+ "<span class=\"device\">"+source+"</span>"+ // may have a link "</span>"; - if (data['in_reply_to_status_id']) { - ni = ni+" <a class=\"response\" href=\""+data['in_reply_to_status_url']+"\">in context</a>"; + if (data['conversation_url']) { + ni = ni+" <a class=\"response\" href=\""+data['conversation_url']+"\">in context</a>"; } if (repeat) { diff --git a/plugins/Recaptcha/locale/Recaptcha.pot b/plugins/Recaptcha/locale/Recaptcha.pot new file mode 100644 index 000000000..6611ff604 --- /dev/null +++ b/plugins/Recaptcha/locale/Recaptcha.pot @@ -0,0 +1,23 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2010-04-29 23:39+0000\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" +"Language-Team: LANGUAGE <LL@li.org>\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=CHARSET\n" +"Content-Transfer-Encoding: 8bit\n" + +#: RecaptchaPlugin.php:97 +msgid "" +"Uses <a href=\"http://recaptcha.org/\">Recaptcha</a> service to add a " +"captcha to the registration page." +msgstr "" diff --git a/plugins/RegisterThrottle/locale/RegisterThrottle.pot b/plugins/RegisterThrottle/locale/RegisterThrottle.pot new file mode 100644 index 000000000..834f5fd4a --- /dev/null +++ b/plugins/RegisterThrottle/locale/RegisterThrottle.pot @@ -0,0 +1,29 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2010-04-29 23:39+0000\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" +"Language-Team: LANGUAGE <LL@li.org>\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=CHARSET\n" +"Content-Transfer-Encoding: 8bit\n" + +#: RegisterThrottlePlugin.php:122 RegisterThrottlePlugin.php:161 +msgid "Cannot find IP address." +msgstr "" + +#: RegisterThrottlePlugin.php:167 +msgid "Cannot find user after successful registration." +msgstr "" + +#: RegisterThrottlePlugin.php:200 +msgid "Throttles excessive registration from a single IP." +msgstr "" diff --git a/plugins/RequireValidatedEmail/README b/plugins/RequireValidatedEmail/README index 46ee24d5f..84b1485b2 100644 --- a/plugins/RequireValidatedEmail/README +++ b/plugins/RequireValidatedEmail/README @@ -12,6 +12,20 @@ registered prior to that timestamp. addPlugin('RequireValidatedEmail', array('grandfatherCutoff' => 'Dec 7, 2009'); +You can also exclude the validation checks from OpenID accounts +connected to a trusted provider, by providing a list of regular +expressions to match their provider URLs. + +For example, to trust WikiHow and Wikipedia users: + + addPlugin('RequireValidatedEmailPlugin', array( + 'trustedOpenIDs' => array( + '!^http://\w+\.wikihow\.com/!', + '!^http://\w+\.wikipedia\.org/!', + ), + )); + + Todo: * add a more visible indicator that validation is still outstanding diff --git a/plugins/RequireValidatedEmail/RequireValidatedEmailPlugin.php b/plugins/RequireValidatedEmail/RequireValidatedEmailPlugin.php index ccefa14f6..009a2f78e 100644 --- a/plugins/RequireValidatedEmail/RequireValidatedEmailPlugin.php +++ b/plugins/RequireValidatedEmail/RequireValidatedEmailPlugin.php @@ -37,6 +37,20 @@ class RequireValidatedEmailPlugin extends Plugin // without the validation requirement. public $grandfatherCutoff=null; + // If OpenID plugin is installed, users with a verified OpenID + // association whose provider URL matches one of these regexes + // will be considered to be sufficiently valid for our needs. + // + // For example, to trust WikiHow and Wikipedia OpenID users: + // + // addPlugin('RequireValidatedEmailPlugin', array( + // 'trustedOpenIDs' => array( + // '!^http://\w+\.wikihow\.com/!', + // '!^http://\w+\.wikipedia\.org/!', + // ), + // )); + public $trustedOpenIDs=array(); + function __construct() { parent::__construct(); @@ -90,13 +104,17 @@ class RequireValidatedEmailPlugin extends Plugin */ protected function validated($user) { - if ($this->grandfathered($user)) { - return true; - } - // The email field is only stored after validation... // Until then you'll find them in confirm_address. - return !empty($user->email); + $knownGood = !empty($user->email) || + $this->grandfathered($user) || + $this->hasTrustedOpenID($user); + + // Give other plugins a chance to override, if they can validate + // that somebody's ok despite a non-validated email. + Event::handle('RequireValidatedEmailPlugin_Override', array($user, &$knownGood)); + + return $knownGood; } /** @@ -118,6 +136,28 @@ class RequireValidatedEmailPlugin extends Plugin return false; } + /** + * Override for RequireValidatedEmail plugin. If we have a user who's + * not validated an e-mail, but did come from a trusted provider, + * we'll consider them ok. + */ + function hasTrustedOpenID($user) + { + if ($this->trustedOpenIDs && class_exists('User_openid')) { + foreach ($this->trustedOpenIDs as $regex) { + $oid = new User_openid(); + $oid->user_id = $user->id; + $oid->find(); + while ($oid->fetch()) { + if (preg_match($regex, $oid->canonical)) { + return true; + } + } + } + } + return false; + } + function onPluginVersion(&$versions) { $versions[] = array('name' => 'Require Validated Email', diff --git a/plugins/RequireValidatedEmail/locale/RequireValidatedEmail.pot b/plugins/RequireValidatedEmail/locale/RequireValidatedEmail.pot index 49ac4f6f4..c8953a1fa 100644 --- a/plugins/RequireValidatedEmail/locale/RequireValidatedEmail.pot +++ b/plugins/RequireValidatedEmail/locale/RequireValidatedEmail.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-03-10 10:05-0800\n" +"POT-Creation-Date: 2010-04-29 23:39+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" diff --git a/plugins/ReverseUsernameAuthentication/locale/ReverseUsernameAuthentication.pot b/plugins/ReverseUsernameAuthentication/locale/ReverseUsernameAuthentication.pot new file mode 100644 index 000000000..6fa18c464 --- /dev/null +++ b/plugins/ReverseUsernameAuthentication/locale/ReverseUsernameAuthentication.pot @@ -0,0 +1,24 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2010-04-29 23:39+0000\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" +"Language-Team: LANGUAGE <LL@li.org>\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=CHARSET\n" +"Content-Transfer-Encoding: 8bit\n" + +#: ReverseUsernameAuthenticationPlugin.php:67 +msgid "" +"The Reverse Username Authentication plugin allows for StatusNet to handle " +"authentication by checking if the provided password is the same as the " +"reverse of the username." +msgstr "" diff --git a/plugins/Sample/User_greeting_count.php b/plugins/Sample/User_greeting_count.php index d9a59770d..fc0cbd28f 100644 --- a/plugins/Sample/User_greeting_count.php +++ b/plugins/Sample/User_greeting_count.php @@ -94,29 +94,34 @@ class User_greeting_count extends Memcached_DataObject /** * return key definitions for DB_DataObject * - * DB_DataObject needs to know about keys that the table has; this function - * defines them. + * DB_DataObject needs to know about keys that the table has, since it + * won't appear in StatusNet's own keys list. In most cases, this will + * simply reference your keyTypes() function. * - * @return array key definitions + * @return array list of key field names */ function keys() { - return array('user_id' => 'K'); + return array_keys($this->keyTypes()); } /** * return key definitions for Memcached_DataObject * * Our caching system uses the same key definitions, but uses a different - * method to get them. + * method to get them. This key information is used to store and clear + * cached data, so be sure to list any key that will be used for static + * lookups. * - * @return array key definitions + * @return array associative array of key definitions, field name to type: + * 'K' for primary key: for compound keys, add an entry for each component; + * 'U' for unique keys: compound keys are not well supported here. */ function keyTypes() { - return $this->keys(); + return array('user_id' => 'K'); } /** diff --git a/plugins/Sample/locale/Sample.pot b/plugins/Sample/locale/Sample.pot index a52c4ec01..bd21dd3c4 100644 --- a/plugins/Sample/locale/Sample.pot +++ b/plugins/Sample/locale/Sample.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-03-01 14:58-0800\n" +"POT-Creation-Date: 2010-04-29 23:39+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -17,26 +17,20 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n" -#: hello.php:115 SamplePlugin.php:266 -msgid "Hello" +#: User_greeting_count.php:163 +#, php-format +msgid "Could not save new greeting count for %d" msgstr "" -#: hello.php:117 hello.php:141 +#: User_greeting_count.php:176 #, php-format -msgid "Hello, %s" +msgid "Could not increment greeting count for %d" msgstr "" -#: hello.php:138 -msgid "Hello, stranger!" +#: SamplePlugin.php:266 hello.php:115 +msgid "Hello" msgstr "" -#: hello.php:143 -#, php-format -msgid "I have greeted you %d time." -msgid_plural "I have greeted you %d times." -msgstr[0] "" -msgstr[1] "" - #: SamplePlugin.php:266 msgid "A warm greeting" msgstr "" @@ -45,12 +39,18 @@ msgstr "" msgid "A sample plugin to show basics of development for new hackers." msgstr "" -#: User_greeting_count.php:163 +#: hello.php:117 hello.php:141 #, php-format -msgid "Could not save new greeting count for %d" +msgid "Hello, %s" msgstr "" -#: User_greeting_count.php:176 -#, php-format -msgid "Could not increment greeting count for %d" +#: hello.php:138 +msgid "Hello, stranger!" msgstr "" + +#: hello.php:143 +#, php-format +msgid "I have greeted you %d time." +msgid_plural "I have greeted you %d times." +msgstr[0] "" +msgstr[1] "" diff --git a/plugins/SimpleUrl/locale/SimpleUrl.pot b/plugins/SimpleUrl/locale/SimpleUrl.pot new file mode 100644 index 000000000..e3c241d53 --- /dev/null +++ b/plugins/SimpleUrl/locale/SimpleUrl.pot @@ -0,0 +1,22 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2010-04-29 23:39+0000\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" +"Language-Team: LANGUAGE <LL@li.org>\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=CHARSET\n" +"Content-Transfer-Encoding: 8bit\n" + +#: SimpleUrlPlugin.php:58 +#, php-format +msgid "Uses <a href=\"http://%1$s/\">%1$s</a> URL-shortener service." +msgstr "" diff --git a/plugins/TabFocus/locale/TabFocus.pot b/plugins/TabFocus/locale/TabFocus.pot new file mode 100644 index 000000000..3b0e3c261 --- /dev/null +++ b/plugins/TabFocus/locale/TabFocus.pot @@ -0,0 +1,24 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2010-04-29 23:39+0000\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" +"Language-Team: LANGUAGE <LL@li.org>\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=CHARSET\n" +"Content-Transfer-Encoding: 8bit\n" + +#: TabFocusPlugin.php:54 +msgid "" +"TabFocus changes the notice form behavior so that, while in the text area, " +"pressing the tab key focuses the \"Send\" button, matching the behavor of " +"Twitter." +msgstr "" diff --git a/plugins/TightUrl/locale/TightUrl.pot b/plugins/TightUrl/locale/TightUrl.pot new file mode 100644 index 000000000..10f59a1e8 --- /dev/null +++ b/plugins/TightUrl/locale/TightUrl.pot @@ -0,0 +1,22 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2010-04-29 23:39+0000\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" +"Language-Team: LANGUAGE <LL@li.org>\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=CHARSET\n" +"Content-Transfer-Encoding: 8bit\n" + +#: TightUrlPlugin.php:68 +#, php-format +msgid "Uses <a href=\"http://%1$s/\">%1$s</a> URL-shortener service." +msgstr "" diff --git a/plugins/TwitterBridge/locale/TwitterBridge.pot b/plugins/TwitterBridge/locale/TwitterBridge.pot index eff125579..c7ac8053c 100644 --- a/plugins/TwitterBridge/locale/TwitterBridge.pot +++ b/plugins/TwitterBridge/locale/TwitterBridge.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-03-01 14:58-0800\n" +"POT-Creation-Date: 2010-04-29 23:39+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -16,11 +16,11 @@ msgstr "" "Content-Type: text/plain; charset=CHARSET\n" "Content-Transfer-Encoding: 8bit\n" -#: twitter.php:320 +#: twitter.php:342 msgid "Your Twitter bridge has been disabled." msgstr "" -#: twitter.php:324 +#: twitter.php:346 #, php-format msgid "" "Hi, %1$s. We're sorry to inform you that your link to Twitter has been " @@ -36,28 +36,97 @@ msgid "" "%3$s\n" msgstr "" -#: twitterauthorization.php:181 twitterauthorization.php:229 -msgid "Couldn't link your Twitter account." +#: TwitterBridgePlugin.php:155 TwitterBridgePlugin.php:178 +#: TwitterBridgePlugin.php:291 twitteradminpanel.php:54 +msgid "Twitter" msgstr "" -#: twitterauthorization.php:201 -msgid "Couldn't link your Twitter account: oauth_token mismatch." +#: TwitterBridgePlugin.php:156 +msgid "Login or register using Twitter" msgstr "" -#: TwitterBridgePlugin.php:114 -msgid "Twitter" +#: TwitterBridgePlugin.php:179 +msgid "Twitter integration options" msgstr "" -#: TwitterBridgePlugin.php:115 -msgid "Twitter integration options" +#: TwitterBridgePlugin.php:292 +msgid "Twitter bridge configuration" msgstr "" -#: TwitterBridgePlugin.php:207 +#: TwitterBridgePlugin.php:317 msgid "" "The Twitter \"bridge\" plugin allows you to integrate your StatusNet " "instance with <a href=\"http://twitter.com/\">Twitter</a>." msgstr "" +#: twitteradminpanel.php:65 +msgid "Twitter bridge settings" +msgstr "" + +#: twitteradminpanel.php:148 +msgid "Invalid consumer key. Max length is 255 characters." +msgstr "" + +#: twitteradminpanel.php:154 +msgid "Invalid consumer secret. Max length is 255 characters." +msgstr "" + +#: twitteradminpanel.php:207 +msgid "Twitter application settings" +msgstr "" + +#: twitteradminpanel.php:213 +msgid "Consumer key" +msgstr "" + +#: twitteradminpanel.php:214 +msgid "Consumer key assigned by Twitter" +msgstr "" + +#: twitteradminpanel.php:222 +msgid "Consumer secret" +msgstr "" + +#: twitteradminpanel.php:223 +msgid "Consumer secret assigned by Twitter" +msgstr "" + +#: twitteradminpanel.php:240 +msgid "Integration source" +msgstr "" + +#: twitteradminpanel.php:241 +msgid "Name of your Twitter application" +msgstr "" + +#: twitteradminpanel.php:253 +msgid "Options" +msgstr "" + +#: twitteradminpanel.php:260 +msgid "Enable \"Sign-in with Twitter\"" +msgstr "" + +#: twitteradminpanel.php:262 +msgid "Allow users to login with their Twitter credentials" +msgstr "" + +#: twitteradminpanel.php:268 +msgid "Enable Twitter import" +msgstr "" + +#: twitteradminpanel.php:270 +msgid "Allow users to import their Twitter friends' timelines" +msgstr "" + +#: twitterauthorization.php:181 twitterauthorization.php:229 +msgid "Couldn't link your Twitter account." +msgstr "" + +#: twitterauthorization.php:201 +msgid "Couldn't link your Twitter account: oauth_token mismatch." +msgstr "" + #: twittersettings.php:59 msgid "Twitter settings" msgstr "" diff --git a/plugins/TwitterBridge/twitter.php b/plugins/TwitterBridge/twitter.php index 21adc7a90..896eee2da 100644 --- a/plugins/TwitterBridge/twitter.php +++ b/plugins/TwitterBridge/twitter.php @@ -335,10 +335,10 @@ function remove_twitter_link($flink) function mail_twitter_bridge_removed($user) { - common_init_locale($user->language); - $profile = $user->getProfile(); + common_switch_locale($user->language); + $subject = sprintf(_m('Your Twitter bridge has been disabled.')); $site_name = common_config('site', 'name'); @@ -354,7 +354,7 @@ function mail_twitter_bridge_removed($user) common_local_url('twittersettings'), common_config('site', 'name')); - common_init_locale(); + common_switch_locale(); return mail_to_user($user, $subject, $body); } diff --git a/plugins/UserFlag/clearflag.php b/plugins/UserFlag/clearflag.php index bd6732e2d..f032527ed 100644 --- a/plugins/UserFlag/clearflag.php +++ b/plugins/UserFlag/clearflag.php @@ -81,7 +81,7 @@ class ClearflagAction extends ProfileFormAction if ($_SERVER['REQUEST_METHOD'] == 'POST') { $this->handlePost(); if (!$this->boolean('ajax')) { - $this->returnToArgs(); + $this->returnToPrevious(); } } } diff --git a/plugins/UserFlag/flagprofile.php b/plugins/UserFlag/flagprofile.php index 2d0f0abb9..018c1e8ac 100644 --- a/plugins/UserFlag/flagprofile.php +++ b/plugins/UserFlag/flagprofile.php @@ -87,7 +87,7 @@ class FlagprofileAction extends ProfileFormAction if ($_SERVER['REQUEST_METHOD'] == 'POST') { $this->handlePost(); if (!$this->boolean('ajax')) { - $this->returnToArgs(); + $this->returnToPrevious(); } } } |