From a0a9acb9a284910e6b7dd95c847e8226dde7732d Mon Sep 17 00:00:00 2001 From: Zach Copley Date: Sun, 21 Mar 2010 18:47:43 -0700 Subject: [PATCH 01/34] Fix broken assertion --- tests/ActivityParseTests.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/ActivityParseTests.php b/tests/ActivityParseTests.php index 9d8fd47af0..02d2ed734c 100644 --- a/tests/ActivityParseTests.php +++ b/tests/ActivityParseTests.php @@ -207,7 +207,7 @@ class ActivityParseTests extends PHPUnit_Framework_TestCase $this->assertTrue(is_array($actor->avatarLinks)); $this->assertEquals(1, count($actor->avatarLinks)); $this->assertEquals('http://files.posterous.com/user_profile_pics/480326/2009-08-05-142447.jpg', - $actor->avatarLinks[0]); + $actor->avatarLinks[0]->url); $this->assertNotNull($actor->poco); $this->assertEquals('evanpro', $actor->poco->preferredUsername); $this->assertEquals('Evan Prodromou', $actor->poco->displayName); From 5697e4edb0fc4bb1d4c9365100501e795b2553de Mon Sep 17 00:00:00 2001 From: Brion Vibber Date: Mon, 22 Mar 2010 10:35:54 -0700 Subject: [PATCH 02/34] Replace the "give up and dump object" attachment view fallback with a client-side redirect to the target URL, which will at least be useful. --- lib/attachmentlist.php | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/lib/attachmentlist.php b/lib/attachmentlist.php index 51ceca8576..fe38281af9 100644 --- a/lib/attachmentlist.php +++ b/lib/attachmentlist.php @@ -306,7 +306,7 @@ class Attachment extends AttachmentListItem function showRepresentation() { if (empty($this->oembed->type)) { if (empty($this->attachment->mimetype)) { - $this->out->element('pre', null, 'oh well... not sure how to handle the following: ' . print_r($this->attachment, true)); + $this->showFallback(); } else { switch ($this->attachment->mimetype) { case 'image/gif': @@ -332,6 +332,8 @@ class Attachment extends AttachmentListItem $this->out->element('param', array('name' => 'autoStart', 'value' => 1)); $this->out->elementEnd('object'); break; + default: + $this->showFallback(); } } } else { @@ -354,9 +356,23 @@ class Attachment extends AttachmentListItem break; default: - $this->out->element('pre', null, 'oh well... not sure how to handle the following oembed: ' . print_r($this->oembed, true)); + $this->showFallback(); } } } + + function showFallback() + { + // If we don't know how to display an attachment inline, we probably + // shouldn't have gotten to this point. + // + // But, here we are... displaying details on a file or remote URL + // either on the main view or in an ajax-loaded lightbox. As a lesser + // of several evils, we'll try redirecting to the actual target via + // client-side JS. + + common_log(LOG_ERR, "Empty or unknown type for file id {$this->attachment->id}; falling back to client-side redirect."); + $this->out->raw(''); + } } From 3678e7b89bd0cc683c98369e5dec3b940134532b Mon Sep 17 00:00:00 2001 From: Brion Vibber Date: Mon, 22 Mar 2010 15:55:13 -0700 Subject: [PATCH 03/34] OStatus remote sending test cases. Doesn't actually run within PHPUnit right now, must be run from command line -- specify base URLs to two StatusNet sites that will be able to communicate with each other. Current test run includes: * register accounts (via web form) * local post * @-mention using path (@domain/path/to/user) Subscriptions, webfinger mentions, various paths to subscription and unsubscription, etc to come. --- plugins/OStatus/tests/remote-tests.php | 392 +++++++++++++++++++++++++ 1 file changed, 392 insertions(+) create mode 100644 plugins/OStatus/tests/remote-tests.php diff --git a/plugins/OStatus/tests/remote-tests.php b/plugins/OStatus/tests/remote-tests.php new file mode 100644 index 0000000000..103ca066c0 --- /dev/null +++ b/plugins/OStatus/tests/remote-tests.php @@ -0,0 +1,392 @@ +a = $a; + $this->b = $b; + + $base = 'test' . mt_rand(1, 1000000); + $this->pub = new SNTestClient($this->a, 'pub' . $base, 'pw-' . mt_rand(1, 1000000)); + $this->sub = new SNTestClient($this->b, 'sub' . $base, 'pw-' . mt_rand(1, 1000000)); + } + + function run() + { + $this->setup(); + $this->testLocalPost(); + $this->testMentionUrl(); + $this->log("DONE!"); + } + + function setup() + { + $this->pub->register(); + $this->pub->assertRegistered(); + + $this->sub->register(); + $this->sub->assertRegistered(); + } + + function testLocalPost() + { + $post = $this->pub->post("Local post, no subscribers yet."); + $this->assertNotEqual('', $post); + + $post = $this->sub->post("Local post, no subscriptions yet."); + $this->assertNotEqual('', $post); + } + + /** + * pub posts: @b/sub + */ + function testMentionUrl() + { + $bits = parse_url($this->b); + $base = $bits['host']; + if (isset($bits['path'])) { + $base .= $bits['path']; + } + $name = $this->sub->username; + + $post = $this->pub->post("@$base/$name should have this in home and replies"); + $this->sub->assertReceived($post); + } +} + +class SNTestClient extends TestBase +{ + function __construct($base, $username, $password) + { + $this->basepath = $base; + $this->username = $username; + $this->password = $password; + + $this->fullname = ucfirst($username) . ' Smith'; + $this->homepage = 'http://example.org/' . $username; + $this->bio = 'Stub account for OStatus tests.'; + $this->location = 'Montreal, QC'; + } + + /** + * Make a low-level web hit to this site, with authentication. + * @param string $path URL fragment for something under the base path + * @param array $params POST parameters to send + * @param boolean $auth whether to include auth data + * @return string + * @throws Exception on low-level error conditions + */ + protected function hit($path, $params=array(), $auth=false, $cookies=array()) + { + $url = $this->basepath . '/' . $path; + + $http = new HTTP_Request2($url, 'POST'); + if ($auth) { + $http->setAuth($this->username, $this->password, HTTP_Request2::AUTH_BASIC); + } + foreach ($cookies as $name => $val) { + $http->addCookie($name, $val); + } + $http->addPostParameter($params); + $response = $http->send(); + + $code = $response->getStatus(); + if ($code < '200' || $code >= '400') { + throw new Exception("Failed API hit to $url: $code\n" . $response->getBody()); + } + + return $response; + } + + /** + * Make a hit to a web form, without authentication but with a session. + * @param string $path URL fragment relative to site base + * @param string $form id of web form to pull initial parameters from + * @param array $params POST parameters, will be merged with defaults in form + */ + protected function web($path, $form, $params=array()) + { + $url = $this->basepath . '/' . $path; + $http = new HTTP_Request2($url, 'GET'); + $response = $http->send(); + + $dom = $this->checkWeb($url, 'GET', $response); + $cookies = array(); + foreach ($response->getCookies() as $cookie) { + // @fixme check for expirations etc + $cookies[$cookie['name']] = $cookie['value']; + } + + $form = $dom->getElementById($form); + if (!$form) { + throw new Exception("Form $form not found on $url"); + } + $inputs = $form->getElementsByTagName('input'); + foreach ($inputs as $item) { + $type = $item->getAttribute('type'); + if ($type != 'check') { + $name = $item->getAttribute('name'); + $val = $item->getAttribute('value'); + if ($name && $val && !isset($params[$name])) { + $params[$name] = $val; + } + } + } + + $response = $this->hit($path, $params, false, $cookies); + $dom = $this->checkWeb($url, 'POST', $response); + + return $dom; + } + + protected function checkWeb($url, $method, $response) + { + $dom = new DOMDocument(); + if (!$dom->loadHTML($response->getBody())) { + throw new Exception("Invalid HTML from $method to $url"); + } + + $xpath = new DOMXPath($dom); + $error = $xpath->query('//p[@class="error"]'); + if ($error && $error->length) { + throw new Exception("Error on $method to $url: " . + $error->item(0)->textContent); + } + + return $dom; + } + + /** + * Make an API hit to this site, with authentication. + * @param string $path URL fragment for something under 'api' folder + * @param string $style one of 'json', 'xml', or 'atom' + * @param array $params POST parameters to send + * @return mixed associative array for JSON, DOMDocument for XML/Atom + * @throws Exception on low-level error conditions + */ + protected function api($path, $style, $params=array()) + { + $response = $this->hit("api/$path.$style", $params, true); + $body = $response->getBody(); + if ($style == 'json') { + $data = json_decode($body, true); + if ($data !== null) { + if (!empty($data['error'])) { + throw new Exception("JSON API returned error: " . $data['error']); + } + return $data; + } else { + throw new Exception("Bogus JSON data from $path:\n$body"); + } + } else if ($style == 'xml' || $style == 'atom') { + $dom = new DOMDocument(); + if ($dom->loadXML($body)) { + return $dom; + } else { + throw new Exception("Bogus XML data from $path:\n$body"); + } + } else { + throw new Exception("API needs to be JSON, XML, or Atom"); + } + } + + /** + * Register the account. + * + * Unfortunately there's not an API method for registering, so we fake it. + */ + function register() + { + $this->log("Registering user %s on %s", + $this->username, + $this->basepath); + $ret = $this->web('main/register', 'form_register', + array('nickname' => $this->username, + 'password' => $this->password, + 'confirm' => $this->password, + 'fullname' => $this->fullname, + 'homepage' => $this->homepage, + 'bio' => $this->bio, + 'license' => 1, + 'submit' => 'Register')); + } + + /** + * Check that the account has been registered and can be used. + * On failure, throws a test failure exception. + */ + function assertRegistered() + { + $this->log("Confirming %s is registered on %s", + $this->username, + $this->basepath); + $data = $this->api('account/verify_credentials', 'json'); + $this->assertEqual($this->username, $data['screen_name']); + $this->assertEqual($this->fullname, $data['name']); + $this->assertEqual($this->homepage, $data['url']); + $this->assertEqual($this->bio, $data['description']); + } + + /** + * Post a given message from this account + * @param string $message + * @return string URL/URI of notice + * @todo reply, location options + */ + function post($message) + { + $this->log("Posting notice as %s on %s: %s", + $this->username, + $this->basepath, + $message); + $data = $this->api('statuses/update', 'json', + array('status' => $message)); + + $url = $this->basepath . '/notice/' . $data['id']; + return $url; + } + + /** + * Check that this account has received the notice. + * @param string $notice_uri URI for the notice to check for + */ + function assertReceived($notice_uri) + { + $timeout = 5; + $tries = 6; + while ($tries) { + $ok = $this->checkReceived($notice_uri); + if ($ok) { + return true; + } + $tries--; + if ($tries) { + $this->log("Didn't see it yet, waiting $timeout seconds"); + sleep($timeout); + } + } + throw new Exception("Message $notice_uri not received by $this->username"); + } + + /** + * Pull the user's home timeline to check if a notice with the given + * source URL has been received recently. + * If we don't see it, we'll try a couple more times up to 10 seconds. + * + * @param string $notice_uri + */ + function checkReceived($notice_uri) + { + $this->log("Checking if %s on %s received notice %s", + $this->username, + $this->basepath, + $notice_uri); + $params = array(); + $dom = $this->api('statuses/home_timeline', 'atom', $params); + + $xml = simplexml_import_dom($dom); + if (!$xml->entry) { + return false; + } + if (is_array($xml->entry)) { + $entries = $xml->entry; + } else { + $entries = array($xml->entry); + } + foreach ($entries as $entry) { + if ($entry->id == $notice_uri) { + $this->log("found it $notice_uri"); + return true; + } + //$this->log("nope... " . $entry->id); + } + return false; + } + + /** + * Check that this account is subscribed to the given profile. + * @param string $profile_uri URI for the profile to check for + */ + function assertHasSubscription($profile_uri) + { + throw new Exception('tbi'); + } + + /** + * Check that this account is subscribed to by the given profile. + * @param string $profile_uri URI for the profile to check for + */ + function assertHasSubscriber($profile_uri) + { + throw new Exception('tbi'); + } + +} + +$args = array_slice($_SERVER['argv'], 1); +if (count($args) < 2) { + print << + url1: base URL of a StatusNet instance + url2: base URL of another StatusNet instance + +This will register user accounts on the two given StatusNet instances +and run some tests to confirm that OStatus subscription and posting +between the two sites works correctly. + +END_HELP; +exit(1); +} + +$a = $args[0]; +$b = $args[1]; + +$tester = new OStatusTester($a, $b); +$tester->run(); + From b8e97ac7098783f0380c7f8f61c20a100e814dc0 Mon Sep 17 00:00:00 2001 From: Zach Copley Date: Mon, 22 Mar 2010 18:53:09 -0700 Subject: [PATCH 04/34] Some initial media parsing - Activity now returns a list of activity objects - Processing of photo objects --- lib/activity.php | 24 +- lib/activityobject.php | 20 ++ plugins/OStatus/actions/groupsalmon.php | 3 +- plugins/OStatus/actions/usersalmon.php | 5 +- plugins/OStatus/classes/Ostatus_profile.php | 2 +- scripts/importtwitteratom.php | 2 +- tests/ActivityParseTests.php | 233 ++++++++++++++++++-- tests/UserFeedParseTest.php | 8 +- 8 files changed, 266 insertions(+), 31 deletions(-) diff --git a/lib/activity.php b/lib/activity.php index bd1d5d56c0..f9192c6b80 100644 --- a/lib/activity.php +++ b/lib/activity.php @@ -53,6 +53,7 @@ class Activity { const SPEC = 'http://activitystrea.ms/spec/1.0/'; const SCHEMA = 'http://activitystrea.ms/schema/1.0/'; + const MEDIA = 'http://purl.org/syndication/atommedia'; const VERB = 'verb'; const OBJECT = 'object'; @@ -85,7 +86,7 @@ class Activity public $actor; // an ActivityObject public $verb; // a string (the URL) - public $object; // an ActivityObject + public $objects = array(); // an array of ActivityObjects public $target; // an ActivityObject public $context; // an ActivityObject public $time; // Time of the activity @@ -161,12 +162,15 @@ class Activity // XXX: do other implied stuff here } - $objectEl = $this->_child($entry, self::OBJECT); + $objectEls = $entry->getElementsByTagNameNS(self::SPEC, self::OBJECT); - if (!empty($objectEl)) { - $this->object = new ActivityObject($objectEl); + if ($objectEls->length > 0) { + for ($i = 0; $i < $objectEls->length; $i++) { + $objectEl = $objectEls->item($i); + $this->objects[] = new ActivityObject($objectEl); + } } else { - $this->object = new ActivityObject($entry); + $this->objects[] = new ActivityObject($entry); } $actorEl = $this->_child($entry, self::ACTOR); @@ -280,8 +284,8 @@ class Activity } } - $this->object = new ActivityObject($item); - $this->context = new ActivityContext($item); + $this->objects[] = new ActivityObject($item); + $this->context = new ActivityContext($item); } /** @@ -339,8 +343,10 @@ class Activity $xs->element('activity:verb', null, $this->verb); - if ($this->object) { - $xs->raw($this->object->asString()); + if (!empty($this->objects)) { + foreach($this->objects as $object) { + $xs->raw($object->asString()); + } } if ($this->target) { diff --git a/lib/activityobject.php b/lib/activityobject.php index 0a358ccabb..34d1b91700 100644 --- a/lib/activityobject.php +++ b/lib/activityobject.php @@ -100,6 +100,13 @@ class ActivityObject public $poco; public $displayName; + // @todo move this stuff to it's own PHOTO activity object + const MEDIA_DESCRIPTION = 'description'; + + public $thumbnail; + public $largerImage; + public $description; + /** * Constructor * @@ -150,6 +157,19 @@ class ActivityObject $this->poco = new PoCo($element); } + + if ($this->type == self::PHOTO) { + + $this->thumbnail = ActivityUtils::getLink($element, 'preview'); + $this->largerImage = ActivityUtils::getLink($element, 'enclosure'); + + $this->description = ActivityUtils::childContent( + $element, + ActivityObject::MEDIA_DESCRIPTION, + Activity::MEDIA + ); + + } } private function _fromAuthor($element) diff --git a/plugins/OStatus/actions/groupsalmon.php b/plugins/OStatus/actions/groupsalmon.php index 29377b5fa0..d60725a71b 100644 --- a/plugins/OStatus/actions/groupsalmon.php +++ b/plugins/OStatus/actions/groupsalmon.php @@ -60,7 +60,8 @@ class GroupsalmonAction extends SalmonAction function handlePost() { - switch ($this->act->object->type) { + // @fixme process all objects? + switch ($this->act->objects[0]->type) { case ActivityObject::ARTICLE: case ActivityObject::BLOGENTRY: case ActivityObject::NOTE: diff --git a/plugins/OStatus/actions/usersalmon.php b/plugins/OStatus/actions/usersalmon.php index 15e8c1869d..ecdcfa1939 100644 --- a/plugins/OStatus/actions/usersalmon.php +++ b/plugins/OStatus/actions/usersalmon.php @@ -55,9 +55,10 @@ class UsersalmonAction extends SalmonAction */ function handlePost() { - common_log(LOG_INFO, "Received post of '{$this->act->object->id}' from '{$this->act->actor->id}'"); + common_log(LOG_INFO, "Received post of '{$this->act->objects[0]->id}' from '{$this->act->actor->id}'"); - switch ($this->act->object->type) { + // @fixme: process all activity objects? + switch ($this->act->objects[0]->type) { case ActivityObject::ARTICLE: case ActivityObject::BLOGENTRY: case ActivityObject::NOTE: diff --git a/plugins/OStatus/classes/Ostatus_profile.php b/plugins/OStatus/classes/Ostatus_profile.php index 0eb5b8b82a..df937643bf 100644 --- a/plugins/OStatus/classes/Ostatus_profile.php +++ b/plugins/OStatus/classes/Ostatus_profile.php @@ -494,7 +494,7 @@ class Ostatus_profile extends Memcached_DataObject // It's not always an ActivityObject::NOTE, but... let's just say it is. - $note = $activity->object; + $note = $activity->objects[0]; // The id URI will be used as a unique identifier for for the notice, // protecting against duplicate saves. It isn't required to be a URL; diff --git a/scripts/importtwitteratom.php b/scripts/importtwitteratom.php index 7316f21080..c12e3b91a8 100644 --- a/scripts/importtwitteratom.php +++ b/scripts/importtwitteratom.php @@ -102,7 +102,7 @@ function importActivityStream($user, $doc) for ($i = $entries->length - 1; $i >= 0; $i--) { $entry = $entries->item($i); $activity = new Activity($entry, $feed); - $object = $activity->object; + $object = $activity->objects[0]; if (!have_option('q', 'quiet')) { print $activity->content . "\n"; } diff --git a/tests/ActivityParseTests.php b/tests/ActivityParseTests.php index 02d2ed734c..fec8829eba 100644 --- a/tests/ActivityParseTests.php +++ b/tests/ActivityParseTests.php @@ -25,11 +25,11 @@ class ActivityParseTests extends PHPUnit_Framework_TestCase $this->assertEquals($act->time, 1243860840); $this->assertEquals($act->verb, ActivityVerb::POST); - $this->assertFalse(empty($act->object)); - $this->assertEquals($act->object->title, 'Punctuation Changeset'); - $this->assertEquals($act->object->type, 'http://versioncentral.example.org/activity/changeset'); - $this->assertEquals($act->object->summary, 'Fixing punctuation because it makes it more readable.'); - $this->assertEquals($act->object->id, 'tag:versioncentral.example.org,2009:/change/1643245'); + $this->assertFalse(empty($act->objects[0])); + $this->assertEquals($act->objects[0]->title, 'Punctuation Changeset'); + $this->assertEquals($act->objects[0]->type, 'http://versioncentral.example.org/activity/changeset'); + $this->assertEquals($act->objects[0]->summary, 'Fixing punctuation because it makes it more readable.'); + $this->assertEquals($act->objects[0]->id, 'tag:versioncentral.example.org,2009:/change/1643245'); } public function testExample3() @@ -56,12 +56,12 @@ class ActivityParseTests extends PHPUnit_Framework_TestCase $this->assertEquals($act->actor->title, 'John Doe'); $this->assertEquals($act->actor->id, 'mailto:johndoe@example.com'); - $this->assertFalse(empty($act->object)); - $this->assertEquals($act->object->type, ActivityObject::NOTE); - $this->assertEquals($act->object->id, 'urn:uuid:1225c695-cfb8-4ebb-aaaa-80da344efa6a'); - $this->assertEquals($act->object->title, 'Atom-Powered Robots Run Amok'); - $this->assertEquals($act->object->summary, 'Some text.'); - $this->assertEquals($act->object->link, 'http://example.org/2003/12/13/atom03.html'); + $this->assertFalse(empty($act->objects[0])); + $this->assertEquals($act->objects[0]->type, ActivityObject::NOTE); + $this->assertEquals($act->objects[0]->id, 'urn:uuid:1225c695-cfb8-4ebb-aaaa-80da344efa6a'); + $this->assertEquals($act->objects[0]->title, 'Atom-Powered Robots Run Amok'); + $this->assertEquals($act->objects[0]->summary, 'Some text.'); + $this->assertEquals($act->objects[0]->link, 'http://example.org/2003/12/13/atom03.html'); $this->assertFalse(empty($act->context)); @@ -90,8 +90,8 @@ class ActivityParseTests extends PHPUnit_Framework_TestCase $this->assertEquals('http://example.net/conversation/11', $act->context->conversation); $this->assertEquals(array('http://example.net/user/1'), $act->context->attention); - $this->assertFalse(empty($act->object)); - $this->assertEquals($act->object->content, + $this->assertFalse(empty($act->objects[0])); + $this->assertEquals($act->objects[0]->content, '@evan now is the time for all good men to come to the aid of their country. #'); $this->assertFalse(empty($act->actor)); @@ -215,6 +215,96 @@ class ActivityParseTests extends PHPUnit_Framework_TestCase $this->assertNull($actor->poco->address); $this->assertEquals(0, count($actor->poco->urls)); } + + // Media test - cliqset + public function testExample8() + { + global $_example8; + $dom = DOMDocument::loadXML($_example8); + + $feed = $dom->documentElement; + + $entries = $feed->getElementsByTagName('entry'); + + $entry = $entries->item(0); + + $act = new Activity($entry, $feed); + + $this->assertFalse(empty($act)); + $this->assertEquals($act->time, 1269221753); + $this->assertEquals($act->verb, ActivityVerb::POST); + $this->assertEquals($act->summary, 'zcopley posted 5 photos on Flickr'); + + $this->assertFalse(empty($act->objects)); + $this->assertEquals(sizeof($act->objects), 5); + + $this->assertEquals($act->objects[0]->type, ActivityObject::PHOTO); + $this->assertEquals($act->objects[0]->title, 'IMG_1368'); + $this->assertNull($act->objects[0]->description); + $this->assertEquals( + $act->objects[0]->thumbnail, + 'http://media.cliqset.com/6f6fbee9d7dfbffc73b6ef626275eb5f_thumb.jpg' + ); + $this->assertEquals( + $act->objects[0]->link, + 'http://www.flickr.com/photos/zcopley/4452933806/' + ); + + $this->assertEquals($act->objects[1]->type, ActivityObject::PHOTO); + $this->assertEquals($act->objects[1]->title, 'IMG_1365'); + $this->assertNull($act->objects[1]->description); + $this->assertEquals( + $act->objects[1]->thumbnail, + 'http://media.cliqset.com/b8f3932cd0bba1b27f7c8b3ef986915e_thumb.jpg' + ); + $this->assertEquals( + $act->objects[1]->link, + 'http://www.flickr.com/photos/zcopley/4442630390/' + ); + + $this->assertEquals($act->objects[2]->type, ActivityObject::PHOTO); + $this->assertEquals($act->objects[2]->title, 'Classic'); + $this->assertEquals( + $act->objects[2]->description, + '-Powered by pikchur.com/n0u' + ); + $this->assertEquals( + $act->objects[2]->thumbnail, + 'http://media.cliqset.com/fc54c15f850b7a9a8efa644087a48c91_thumb.jpg' + ); + $this->assertEquals( + $act->objects[2]->link, + 'http://www.flickr.com/photos/zcopley/4430754103/' + ); + + $this->assertEquals($act->objects[3]->type, ActivityObject::PHOTO); + $this->assertEquals($act->objects[3]->title, 'IMG_1363'); + $this->assertNull($act->objects[3]->description); + + $this->assertEquals( + $act->objects[3]->thumbnail, + 'http://media.cliqset.com/4b1d307c9217e2114391a8b229d612cb_thumb.jpg' + ); + $this->assertEquals( + $act->objects[3]->link, + 'http://www.flickr.com/photos/zcopley/4416969717/' + ); + + $this->assertEquals($act->objects[4]->type, ActivityObject::PHOTO); + $this->assertEquals($act->objects[4]->title, 'IMG_1361'); + $this->assertNull($act->objects[4]->description); + + $this->assertEquals( + $act->objects[4]->thumbnail, + 'http://media.cliqset.com/23d9b4b96b286e0347d36052f22f6e60_thumb.jpg' + ); + $this->assertEquals( + $act->objects[4]->link, + 'http://www.flickr.com/photos/zcopley/4417734232/' + ); + + } + } $_example1 = << EXAMPLE7; + +$_example8 = << + + + Activity Stream for: zcopley + http://cliqset.com/feed/atom?uid=zcopley + + 0 + http://activitystrea.ms/schema/1.0/post + 2010-03-22T01:35:53.000Z + + flickr + http://flickr.com + http://cliqset-services.s3.amazonaws.com/flickr.png + + + http://activitystrea.ms/schema/1.0/photo + IMG_1368 + + + + + http://activitystrea.ms/schema/1.0/photo + IMG_1365 + + + + + http://activitystrea.ms/schema/1.0/photo + Classic + + + -Powered by pikchur.com/n0u + + + http://activitystrea.ms/schema/1.0/photo + IMG_1363 + + + + + http://activitystrea.ms/schema/1.0/photo + IMG_1361 + + + + zcopley posted some photos on Flickr + zcopley posted 5 photos on Flickr + + 2010-03-22T20:46:42.778Z + tag:cliqset.com,2010-03-22:/user/zcopley/SVgAZubGhtAnSAee + + + zcopley + http://cliqset.com/user/zcopley + + + http://activitystrea.ms/schema/1.0/person + zcopley + + Zach + Copley + + + + + + + +EXAMPLE8; + +$_example9 = << + + + + Google Buzz + 2010-03-22T01:55:53.596Z + tag:google.com,2009:buzz-feed/public/posted/117848251937215158042 + Google - Google Buzz + + Buzz by Zach Copley from Flickr + IMG_1366 + 2010-03-18T04:29:23.000Z + 2010-03-18T05:14:03.325Z + tag:google.com,2009:buzz/z12zwdhxowq2d13q204cjr04kzu0cns5gh0 + + + Zach Copley + http://www.google.com/profiles/zcopley + + <div>IMG_1366</div> + + + IMG_1366 + + + + + IMG_1365 + + + http://activitystrea.ms/schema/1.0/post + + http://activitystrea.ms/schema/1.0/photo + tag:google.com,2009:buzz/z12zwdhxowq2d13q204cjr04kzu0cns5gh0 + Buzz by Zach Copley from Flickr + <div>IMG_1366</div> + + + + + 0 + + +EXAMPLE9; diff --git a/tests/UserFeedParseTest.php b/tests/UserFeedParseTest.php index b3f9a64171..208e71be69 100644 --- a/tests/UserFeedParseTest.php +++ b/tests/UserFeedParseTest.php @@ -66,11 +66,11 @@ class UserFeedParseTests extends PHPUnit_Framework_TestCase // test the post //var_export($act1); - $this->assertEquals($act1->object->type, 'http://activitystrea.ms/schema/1.0/note'); - $this->assertEquals($act1->object->title, 'And now for something completely insane...'); + $this->assertEquals($act1->objects[0]->type, 'http://activitystrea.ms/schema/1.0/note'); + $this->assertEquals($act1->objects[0]->title, 'And now for something completely insane...'); - $this->assertEquals($act1->object->content, 'And now for something completely insane...'); - $this->assertEquals($act1->object->id, 'http://localhost/statusnet/notice/3'); + $this->assertEquals($act1->objects[0]->content, 'And now for something completely insane...'); + $this->assertEquals($act1->objects[0]->id, 'http://localhost/statusnet/notice/3'); } From 5b0b6097e0e47c84c2e47c8a14421a58be1fac19 Mon Sep 17 00:00:00 2001 From: Zach Copley Date: Mon, 22 Mar 2010 21:48:21 -0700 Subject: [PATCH 05/34] Fix reference. Look at the first ActivityObject in the list. --- plugins/OStatus/classes/Ostatus_profile.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/plugins/OStatus/classes/Ostatus_profile.php b/plugins/OStatus/classes/Ostatus_profile.php index df937643bf..c7e3b05096 100644 --- a/plugins/OStatus/classes/Ostatus_profile.php +++ b/plugins/OStatus/classes/Ostatus_profile.php @@ -442,7 +442,8 @@ class Ostatus_profile extends Memcached_DataObject { $activity = new Activity($entry, $feed); - switch ($activity->object->type) { + // @todo process all activity objects + switch ($activity->objects[0]->type) { case ActivityObject::ARTICLE: case ActivityObject::BLOGENTRY: case ActivityObject::NOTE: From fcdbf421ab2bbbe4d1b601a8c80d4612c91f62fe Mon Sep 17 00:00:00 2001 From: Evan Prodromou Date: Tue, 23 Mar 2010 11:36:02 -0400 Subject: [PATCH 06/34] reformat OpenIDPlugin for PHPCS --- plugins/OpenID/OpenIDPlugin.php | 268 ++++++++++++++++++++++++-------- 1 file changed, 199 insertions(+), 69 deletions(-) diff --git a/plugins/OpenID/OpenIDPlugin.php b/plugins/OpenID/OpenIDPlugin.php index 6b35ec3e14..1724b5f7be 100644 --- a/plugins/OpenID/OpenIDPlugin.php +++ b/plugins/OpenID/OpenIDPlugin.php @@ -59,6 +59,8 @@ class OpenIDPlugin extends Plugin * * Hook for RouterInitialized event. * + * @param Net_URL_Mapper $m URL mapper + * * @return boolean hook return */ @@ -67,54 +69,87 @@ class OpenIDPlugin extends Plugin $m->connect('main/openid', array('action' => 'openidlogin')); $m->connect('main/openidtrust', array('action' => 'openidtrust')); $m->connect('settings/openid', array('action' => 'openidsettings')); - $m->connect('index.php?action=finishopenidlogin', array('action' => 'finishopenidlogin')); - $m->connect('index.php?action=finishaddopenid', array('action' => 'finishaddopenid')); + $m->connect('index.php?action=finishopenidlogin', + array('action' => 'finishopenidlogin')); + $m->connect('index.php?action=finishaddopenid', + array('action' => 'finishaddopenid')); $m->connect('main/openidserver', array('action' => 'openidserver')); return true; } + /** + * Public XRDS output hook + * + * Puts the bits of code needed by some OpenID providers to show + * we're good citizens. + * + * @param Action $action Action being executed + * @param XMLOutputter &$xrdsOutputter Output channel + * + * @return boolean hook return + */ + function onEndPublicXRDS($action, &$xrdsOutputter) { $xrdsOutputter->elementStart('XRD', array('xmlns' => 'xri://$xrd*($v*2.0)', - 'xmlns:simple' => 'http://xrds-simple.net/core/1.0', - 'version' => '2.0')); + 'xmlns:simple' => 'http://xrds-simple.net/core/1.0', + 'version' => '2.0')); $xrdsOutputter->element('Type', null, 'xri://$xrds*simple'); //consumer foreach (array('finishopenidlogin', 'finishaddopenid') as $finish) { $xrdsOutputter->showXrdsService(Auth_OpenID_RP_RETURN_TO_URL_TYPE, - common_local_url($finish)); + common_local_url($finish)); } //provider $xrdsOutputter->showXrdsService('http://specs.openid.net/auth/2.0/server', - common_local_url('openidserver'), - null, - null, - 'http://specs.openid.net/auth/2.0/identifier_select'); + common_local_url('openidserver'), + null, + null, + 'http://specs.openid.net/auth/2.0/identifier_select'); $xrdsOutputter->elementEnd('XRD'); } + /** + * User XRDS output hook + * + * Puts the bits of code needed to discover OpenID endpoints. + * + * @param Action $action Action being executed + * @param XMLOutputter &$xrdsOutputter Output channel + * + * @return boolean hook return + */ + function onEndUserXRDS($action, &$xrdsOutputter) { $xrdsOutputter->elementStart('XRD', array('xmlns' => 'xri://$xrd*($v*2.0)', - 'xml:id' => 'openid', - 'xmlns:simple' => 'http://xrds-simple.net/core/1.0', - 'version' => '2.0')); + 'xml:id' => 'openid', + 'xmlns:simple' => 'http://xrds-simple.net/core/1.0', + 'version' => '2.0')); $xrdsOutputter->element('Type', null, 'xri://$xrds*simple'); //consumer $xrdsOutputter->showXrdsService('http://specs.openid.net/auth/2.0/return_to', - common_local_url('finishopenidlogin')); + common_local_url('finishopenidlogin')); //provider $xrdsOutputter->showXrdsService('http://specs.openid.net/auth/2.0/signon', - common_local_url('openidserver'), - null, - null, - common_profile_url($action->user->nickname)); + common_local_url('openidserver'), + null, + null, + common_profile_url($action->user->nickname)); $xrdsOutputter->elementEnd('XRD'); } + /** + * Menu item for login + * + * @param Action &$action Action being executed + * + * @return boolean hook return + */ + function onEndLoginGroupNav(&$action) { $action_name = $action->trimmed('action'); @@ -127,6 +162,14 @@ class OpenIDPlugin extends Plugin return true; } + /** + * Menu item for OpenID admin + * + * @param Action &$action Action being executed + * + * @return boolean hook return + */ + function onEndAccountSettingsNav(&$action) { $action_name = $action->trimmed('action'); @@ -139,68 +182,102 @@ class OpenIDPlugin extends Plugin return true; } + /** + * Autoloader + * + * Loads our classes if they're requested. + * + * @param string $cls Class requested + * + * @return boolean hook return + */ + function onAutoload($cls) { switch ($cls) { - case 'OpenidloginAction': - case 'FinishopenidloginAction': - case 'FinishaddopenidAction': - case 'XrdsAction': - case 'PublicxrdsAction': - case 'OpenidsettingsAction': - case 'OpenidserverAction': - case 'OpenidtrustAction': - require_once(INSTALLDIR.'/plugins/OpenID/' . strtolower(mb_substr($cls, 0, -6)) . '.php'); + case 'OpenidloginAction': + case 'FinishopenidloginAction': + case 'FinishaddopenidAction': + case 'XrdsAction': + case 'PublicxrdsAction': + case 'OpenidsettingsAction': + case 'OpenidserverAction': + case 'OpenidtrustAction': + require_once INSTALLDIR.'/plugins/OpenID/' . strtolower(mb_substr($cls, 0, -6)) . '.php'; return false; - case 'User_openid': - require_once(INSTALLDIR.'/plugins/OpenID/User_openid.php'); + case 'User_openid': + require_once INSTALLDIR.'/plugins/OpenID/User_openid.php'; return false; - case 'User_openid_trustroot': - require_once(INSTALLDIR.'/plugins/OpenID/User_openid_trustroot.php'); + case 'User_openid_trustroot': + require_once INSTALLDIR.'/plugins/OpenID/User_openid_trustroot.php'; return false; - default: - return true; - } - } - - function onSensitiveAction($action, &$ssl) - { - switch ($action) - { - case 'finishopenidlogin': - case 'finishaddopenid': - $ssl = true; - return false; - default: - return true; - } - } - - function onLoginAction($action, &$login) - { - switch ($action) - { - case 'openidlogin': - case 'finishopenidlogin': - case 'openidserver': - $login = true; - return false; - default: + default: return true; } } /** - * We include a element linking to the publicxrds page, for OpenID + * Sensitive actions + * + * These actions should use https when SSL support is 'sometimes' + * + * @param Action $action Action to form an URL for + * @param boolean &$ssl Whether to mark it for SSL + * + * @return boolean hook return + */ + + function onSensitiveAction($action, &$ssl) + { + switch ($action) + { + case 'finishopenidlogin': + case 'finishaddopenid': + $ssl = true; + return false; + default: + return true; + } + } + + /** + * Login actions + * + * These actions should be visible even when the site is marked private + * + * @param Action $action Action to show + * @param boolean &$login Whether it's a login action + * + * @return boolean hook return + */ + + function onLoginAction($action, &$login) + { + switch ($action) + { + case 'openidlogin': + case 'finishopenidlogin': + case 'openidserver': + $login = true; + return false; + default: + return true; + } + } + + /** + * We include a element linking to the userxrds page, for OpenID * client-side authentication. * + * @param Action $action Action being shown + * * @return void */ function onEndShowHeadElements($action) { - if($action instanceof ShowstreamAction){ + if ($action instanceof ShowstreamAction) { $action->element('link', array('rel' => 'openid2.provider', 'href' => common_local_url('openidserver'))); $action->element('link', array('rel' => 'openid2.local_id', @@ -216,6 +293,9 @@ class OpenIDPlugin extends Plugin /** * Redirect to OpenID login if they have an OpenID * + * @param Action $action Action being executed + * @param User $user User doing the action + * * @return boolean whether to continue */ @@ -228,13 +308,21 @@ class OpenIDPlugin extends Plugin return true; } + /** + * Show some extra instructions for using OpenID + * + * @param Action $action Action being executed + * + * @return boolean hook value + */ + function onEndShowPageNotice($action) { $name = $action->trimmed('action'); switch ($name) { - case 'register': + case 'register': if (common_logged_in()) { $instr = '(Have an [OpenID](http://openid.net/)? ' . '[Add an OpenID to your account](%%action.openidsettings%%)!'; @@ -244,12 +332,12 @@ class OpenIDPlugin extends Plugin '(%%action.openidlogin%%)!)'; } break; - case 'login': + case 'login': $instr = '(Have an [OpenID](http://openid.net/)? ' . 'Try our [OpenID login]'. '(%%action.openidlogin%%)!)'; break; - default: + default: return true; } @@ -258,13 +346,21 @@ class OpenIDPlugin extends Plugin return true; } + /** + * Load our document if requested + * + * @param string &$title Title to fetch + * @param string &$output HTML to output + * + * @return boolean hook value + */ + function onStartLoadDoc(&$title, &$output) { - if ($title == 'openid') - { + if ($title == 'openid') { $filename = INSTALLDIR.'/plugins/OpenID/doc-src/openid'; - $c = file_get_contents($filename); + $c = file_get_contents($filename); $output = common_markup_to_html($c); return false; // success! } @@ -272,10 +368,18 @@ class OpenIDPlugin extends Plugin return true; } + /** + * Add our document to the global menu + * + * @param string $title Title being fetched + * @param string &$output HTML being output + * + * @return boolean hook value + */ + function onEndLoadDoc($title, &$output) { - if ($title == 'help') - { + if ($title == 'help') { $menuitem = '* [OpenID](%%doc.openid%%) - what OpenID is and how to use it with this service'; $output .= common_markup_to_html($menuitem); @@ -284,7 +388,16 @@ class OpenIDPlugin extends Plugin return true; } - function onCheckSchema() { + /** + * Data definitions + * + * Assure that our data objects are available in the DB + * + * @return boolean hook value + */ + + function onCheckSchema() + { $schema = Schema::get(); $schema->ensureTable('user_openid', array(new ColumnDef('canonical', 'varchar', @@ -307,6 +420,15 @@ class OpenIDPlugin extends Plugin return true; } + /** + * Add our tables to be deleted when a user is deleted + * + * @param User $user User being deleted + * @param array &$tables Array of table names + * + * @return boolean hook value + */ + function onUserDeleteRelated($user, &$tables) { $tables[] = 'User_openid'; @@ -314,6 +436,14 @@ class OpenIDPlugin extends Plugin return true; } + /** + * Add our version information to output + * + * @param array &$versions Array of version-data arrays + * + * @return boolean hook value + */ + function onPluginVersion(&$versions) { $versions[] = array('name' => 'OpenID', From 2d79455a1fb7627a23a6ca77fbab060193f6c43a Mon Sep 17 00:00:00 2001 From: Brion Vibber Date: Tue, 23 Mar 2010 09:50:01 -0700 Subject: [PATCH 07/34] Don't add PHPSESSID parameter onto notice and conversation URIs if we save a notice during a session override. This was being triggered by welcomebot messages created at account creation time, then propagated through replies. --- classes/Conversation.php | 3 ++- lib/util.php | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/classes/Conversation.php b/classes/Conversation.php index ea8bd87b56..f540004ef3 100755 --- a/classes/Conversation.php +++ b/classes/Conversation.php @@ -63,7 +63,8 @@ class Conversation extends Memcached_DataObject } $orig = clone($conv); - $orig->uri = common_local_url('conversation', array('id' => $id)); + $orig->uri = common_local_url('conversation', array('id' => $id), + null, null, false); $result = $orig->update($conv); if (empty($result)) { diff --git a/lib/util.php b/lib/util.php index a30d691002..7959978683 100644 --- a/lib/util.php +++ b/lib/util.php @@ -1529,7 +1529,8 @@ function common_user_uri(&$user) function common_notice_uri(&$notice) { return common_local_url('shownotice', - array('notice' => $notice->id)); + array('notice' => $notice->id), + null, null, false); } // 36 alphanums - lookalikes (0, O, 1, I) = 32 chars = 5 bits From 80b16c8499d0cfdb4deb442ba18345befed4e29d Mon Sep 17 00:00:00 2001 From: Brion Vibber Date: Tue, 23 Mar 2010 09:50:01 -0700 Subject: [PATCH 08/34] Don't add PHPSESSID parameter onto notice and conversation URIs if we save a notice during a session override. This was being triggered by welcomebot messages created at account creation time, then propagated through replies. --- classes/Conversation.php | 3 ++- lib/util.php | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/classes/Conversation.php b/classes/Conversation.php index ea8bd87b56..f540004ef3 100755 --- a/classes/Conversation.php +++ b/classes/Conversation.php @@ -63,7 +63,8 @@ class Conversation extends Memcached_DataObject } $orig = clone($conv); - $orig->uri = common_local_url('conversation', array('id' => $id)); + $orig->uri = common_local_url('conversation', array('id' => $id), + null, null, false); $result = $orig->update($conv); if (empty($result)) { diff --git a/lib/util.php b/lib/util.php index 44ccc0deff..3d4ed087f9 100644 --- a/lib/util.php +++ b/lib/util.php @@ -1521,7 +1521,8 @@ function common_user_uri(&$user) function common_notice_uri(&$notice) { return common_local_url('shownotice', - array('notice' => $notice->id)); + array('notice' => $notice->id), + null, null, false); } // 36 alphanums - lookalikes (0, O, 1, I) = 32 chars = 5 bits From 533a3bf6a3180237cfffb8baf29ea3a3f7ec34f8 Mon Sep 17 00:00:00 2001 From: Brion Vibber Date: Tue, 23 Mar 2010 11:06:37 -0700 Subject: [PATCH 09/34] Consistently send Profiles into Fave::addNew() --- actions/apifavoritecreate.php | 2 +- classes/Fave.php | 10 +++++++++- lib/command.php | 2 +- 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/actions/apifavoritecreate.php b/actions/apifavoritecreate.php index 3618f94018..00b6349b0a 100644 --- a/actions/apifavoritecreate.php +++ b/actions/apifavoritecreate.php @@ -123,7 +123,7 @@ class ApiFavoriteCreateAction extends ApiAuthAction return; } - $fave = Fave::addNew($this->user, $this->notice); + $fave = Fave::addNew($this->user->getProfile(), $this->notice); if (empty($fave)) { $this->clientError( diff --git a/classes/Fave.php b/classes/Fave.php index a04f15e9c4..7ca9ade7f0 100644 --- a/classes/Fave.php +++ b/classes/Fave.php @@ -21,7 +21,15 @@ class Fave extends Memcached_DataObject /* the code above is auto generated do not remove the tag below */ ###END_AUTOCODE - static function addNew($profile, $notice) { + /** + * Save a favorite record. + * @fixme post-author notification should be moved here + * + * @param Profile $profile the local or remote user who likes + * @param Notice $notice the notice that is liked + * @return mixed false on failure, or Fave record on success + */ + static function addNew(Profile $profile, Notice $notice) { $fave = null; diff --git a/lib/command.php b/lib/command.php index f7421269d0..216f9e649a 100644 --- a/lib/command.php +++ b/lib/command.php @@ -273,7 +273,7 @@ class FavCommand extends Command function handle($channel) { $notice = $this->getNotice($this->other); - $fave = Fave::addNew($this->user, $notice); + $fave = Fave::addNew($this->user->getProfile(), $notice); if (!$fave) { $channel->error($this->user, _('Could not create favorite.')); From 44caa3a93f452777c795006edb52ef4c5c2c4997 Mon Sep 17 00:00:00 2001 From: Brion Vibber Date: Tue, 23 Mar 2010 11:06:37 -0700 Subject: [PATCH 10/34] Consistently send Profiles into Fave::addNew() --- actions/apifavoritecreate.php | 2 +- classes/Fave.php | 10 +++++++++- lib/command.php | 2 +- 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/actions/apifavoritecreate.php b/actions/apifavoritecreate.php index 3618f94018..00b6349b0a 100644 --- a/actions/apifavoritecreate.php +++ b/actions/apifavoritecreate.php @@ -123,7 +123,7 @@ class ApiFavoriteCreateAction extends ApiAuthAction return; } - $fave = Fave::addNew($this->user, $this->notice); + $fave = Fave::addNew($this->user->getProfile(), $this->notice); if (empty($fave)) { $this->clientError( diff --git a/classes/Fave.php b/classes/Fave.php index a04f15e9c4..7ca9ade7f0 100644 --- a/classes/Fave.php +++ b/classes/Fave.php @@ -21,7 +21,15 @@ class Fave extends Memcached_DataObject /* the code above is auto generated do not remove the tag below */ ###END_AUTOCODE - static function addNew($profile, $notice) { + /** + * Save a favorite record. + * @fixme post-author notification should be moved here + * + * @param Profile $profile the local or remote user who likes + * @param Notice $notice the notice that is liked + * @return mixed false on failure, or Fave record on success + */ + static function addNew(Profile $profile, Notice $notice) { $fave = null; diff --git a/lib/command.php b/lib/command.php index 9d550550f7..8080fb8bc0 100644 --- a/lib/command.php +++ b/lib/command.php @@ -273,7 +273,7 @@ class FavCommand extends Command function handle($channel) { $notice = $this->getNotice($this->other); - $fave = Fave::addNew($this->user, $notice); + $fave = Fave::addNew($this->user->getProfile(), $notice); if (!$fave) { $channel->error($this->user, _('Could not create favorite.')); From 16fa03212bc6cabe2f47e93d06c0def10d46b353 Mon Sep 17 00:00:00 2001 From: Brion Vibber Date: Tue, 23 Mar 2010 11:25:36 -0700 Subject: [PATCH 11/34] Ticket 2188: add a daily average post count to profile statistics sidebar. When we have more detailed history stats, this'd be a good place to link to details/graphs. --- lib/profileaction.php | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/lib/profileaction.php b/lib/profileaction.php index 029c21845d..072c024c74 100644 --- a/lib/profileaction.php +++ b/lib/profileaction.php @@ -169,6 +169,12 @@ class ProfileAction extends OwnerDesignAction $subbed_count = $this->profile->subscriberCount(); $notice_count = $this->profile->noticeCount(); $group_count = $this->user->getGroups()->N; + $age_days = (time() - strtotime($this->profile->created)) / 86400; + if ($age_days < 1) { + // Rather than extrapolating out to a bajillion... + $age_days = 1; + } + $daily_count = round($notice_count / $age_days); $this->elementStart('div', array('id' => 'entity_statistics', 'class' => 'section')); @@ -219,6 +225,12 @@ class ProfileAction extends OwnerDesignAction $this->element('dd', null, $notice_count); $this->elementEnd('dl'); + $this->elementStart('dl', 'entity_daily_notices'); + // TRANS: Average count of posts made per day since account registration + $this->element('dt', null, _('Daily average')); + $this->element('dd', null, $daily_count); + $this->elementEnd('dl'); + $this->elementEnd('div'); } From 7dc24b4ca7dffda85338d35da3618ec50ce0dbf7 Mon Sep 17 00:00:00 2001 From: Brion Vibber Date: Tue, 23 Mar 2010 13:10:23 -0700 Subject: [PATCH 12/34] FOAF was missing OStatus remote subscriptions, now fixed. --- actions/foaf.php | 68 ++++++++++++++++-------------------------------- 1 file changed, 23 insertions(+), 45 deletions(-) diff --git a/actions/foaf.php b/actions/foaf.php index fc2ec9b12f..fc56e19b4f 100644 --- a/actions/foaf.php +++ b/actions/foaf.php @@ -162,40 +162,29 @@ class FoafAction extends Action if ($sub->find()) { while ($sub->fetch()) { - if ($sub->token) { - $other = Remote_profile::staticGet('id', $sub->subscriber); - $profile = Profile::staticGet('id', $sub->subscriber); - } else { - $other = User::staticGet('id', $sub->subscriber); - $profile = Profile::staticGet('id', $sub->subscriber); - } - if (!$other) { + $profile = Profile::staticGet('id', $sub->subscriber); + if (empty($profile)) { common_debug('Got a bad subscription: '.print_r($sub,true)); continue; } - if (array_key_exists($other->uri, $person)) { - $person[$other->uri][0] = BOTH; + $user = $profile->getUser(); + $other_uri = $profile->getUri(); + if (array_key_exists($other_uri, $person)) { + $person[$other_uri][0] = BOTH; } else { - $person[$other->uri] = array(LISTENER, - $other->id, - $profile->nickname, - (empty($sub->token)) ? 'User' : 'Remote_profile'); + $person[$other_uri] = array(LISTENER, + $profile->id, + $profile->nickname, + $user ? 'local' : 'remote'); } - $other->free(); - $other = null; - unset($other); - $profile->free(); - $profile = null; unset($profile); } } - $sub->free(); - $sub = null; unset($sub); foreach ($person as $uri => $p) { - list($type, $id, $nickname, $cls) = $p; + list($type, $id, $nickname, $local) = $p; if ($type == BOTH) { $this->element('knows', array('rdf:resource' => $uri)); } @@ -206,8 +195,8 @@ class FoafAction extends Action foreach ($person as $uri => $p) { $foaf_url = null; - list($type, $id, $nickname, $cls) = $p; - if ($cls == 'User') { + list($type, $id, $nickname, $local) = $p; + if ($local == 'local') { $foaf_url = common_local_url('foaf', array('nickname' => $nickname)); } $profile = Profile::staticGet($id); @@ -216,7 +205,7 @@ class FoafAction extends Action $this->element('knows', array('rdf:resource' => $this->user->uri)); } $this->showMicrobloggingAccount($profile, - ($cls == 'User') ? common_root_url() : null, + ($local == 'local') ? common_root_url() : null, $uri, true); if ($foaf_url) { @@ -275,33 +264,22 @@ class FoafAction extends Action if ($sub->find()) { while ($sub->fetch()) { - if (!empty($sub->token)) { - $other = Remote_profile::staticGet('id', $sub->subscribed); - $profile = Profile::staticGet('id', $sub->subscribed); - } else { - $other = User::staticGet('id', $sub->subscribed); - $profile = Profile::staticGet('id', $sub->subscribed); - } - if (empty($other)) { + $profile = Profile::staticGet('id', $sub->subscribed); + if (empty($profile)) { common_debug('Got a bad subscription: '.print_r($sub,true)); continue; } - $this->element('sioc:follows', array('rdf:resource' => $other->uri.'#acct')); - $person[$other->uri] = array(LISTENEE, - $other->id, - $profile->nickname, - (empty($sub->token)) ? 'User' : 'Remote_profile'); - $other->free(); - $other = null; - unset($other); - $profile->free(); - $profile = null; + $user = $profile->getUser(); + $other_uri = $profile->getUri(); + $this->element('sioc:follows', array('rdf:resource' => $other_uri.'#acct')); + $person[$other_uri] = array(LISTENEE, + $profile->id, + $profile->nickname, + $user ? 'local' : 'remote'); unset($profile); } } - $sub->free(); - $sub = null; unset($sub); } From 80ed39132890a78c9bade22c43b25781fe7c12c8 Mon Sep 17 00:00:00 2001 From: Siebrand Mazeland Date: Tue, 23 Mar 2010 21:15:20 +0100 Subject: [PATCH 13/34] Localisation updates for !StatusNet from !translatewiki.net !sntrans Signed-off-by: Siebrand Mazeland --- locale/ar/LC_MESSAGES/statusnet.po | 111 +++++++------ locale/arz/LC_MESSAGES/statusnet.po | 111 +++++++------ locale/bg/LC_MESSAGES/statusnet.po | 111 +++++++------ locale/br/LC_MESSAGES/statusnet.po | 147 +++++++++-------- locale/ca/LC_MESSAGES/statusnet.po | 110 +++++++------ locale/cs/LC_MESSAGES/statusnet.po | 110 +++++++------ locale/de/LC_MESSAGES/statusnet.po | 113 +++++++------ locale/el/LC_MESSAGES/statusnet.po | 109 ++++++------ locale/en_GB/LC_MESSAGES/statusnet.po | 111 +++++++------ locale/es/LC_MESSAGES/statusnet.po | 110 +++++++------ locale/fa/LC_MESSAGES/statusnet.po | 110 +++++++------ locale/fi/LC_MESSAGES/statusnet.po | 110 +++++++------ locale/fr/LC_MESSAGES/statusnet.po | 113 +++++++------ locale/ga/LC_MESSAGES/statusnet.po | 110 +++++++------ locale/he/LC_MESSAGES/statusnet.po | 110 +++++++------ locale/hsb/LC_MESSAGES/statusnet.po | 110 +++++++------ locale/ia/LC_MESSAGES/statusnet.po | 111 +++++++------ locale/is/LC_MESSAGES/statusnet.po | 110 +++++++------ locale/it/LC_MESSAGES/statusnet.po | 111 +++++++------ locale/ja/LC_MESSAGES/statusnet.po | 111 +++++++------ locale/ko/LC_MESSAGES/statusnet.po | 110 +++++++------ locale/mk/LC_MESSAGES/statusnet.po | 113 +++++++------ locale/nb/LC_MESSAGES/statusnet.po | 110 +++++++------ locale/nl/LC_MESSAGES/statusnet.po | 113 +++++++------ locale/nn/LC_MESSAGES/statusnet.po | 110 +++++++------ locale/pl/LC_MESSAGES/statusnet.po | 113 +++++++------ locale/pt/LC_MESSAGES/statusnet.po | 111 +++++++------ locale/pt_BR/LC_MESSAGES/statusnet.po | 229 ++++++++++++-------------- locale/ru/LC_MESSAGES/statusnet.po | 113 +++++++------ locale/statusnet.po | 105 ++++++------ locale/sv/LC_MESSAGES/statusnet.po | 113 +++++++------ locale/te/LC_MESSAGES/statusnet.po | 111 +++++++------ locale/tr/LC_MESSAGES/statusnet.po | 110 +++++++------ locale/uk/LC_MESSAGES/statusnet.po | 114 +++++++------ locale/vi/LC_MESSAGES/statusnet.po | 110 +++++++------ locale/zh_CN/LC_MESSAGES/statusnet.po | 110 +++++++------ locale/zh_TW/LC_MESSAGES/statusnet.po | 109 ++++++------ 37 files changed, 2378 insertions(+), 1875 deletions(-) diff --git a/locale/ar/LC_MESSAGES/statusnet.po b/locale/ar/LC_MESSAGES/statusnet.po index 16ea19752c..e4142e9b1b 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-03-17 21:39+0000\n" -"PO-Revision-Date: 2010-03-17 21:39:53+0000\n" +"POT-Creation-Date: 2010-03-23 20:09+0000\n" +"PO-Revision-Date: 2010-03-23 20:09:08+0000\n" "Language-Team: Arabic\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r63880); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.17alpha (r64087); Translate extension (2010-01-16)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: ar\n" "X-Message-Group: out-statusnet\n" @@ -751,23 +751,28 @@ msgstr "ارفع" msgid "Crop" msgstr "" -#: actions/avatarsettings.php:328 +#: actions/avatarsettings.php:305 +#, fuzzy +msgid "No file uploaded." +msgstr "لا ملف شخصي مُحدّد." + +#: actions/avatarsettings.php:332 msgid "Pick a square area of the image to be your avatar" msgstr "" -#: actions/avatarsettings.php:343 actions/grouplogo.php:380 +#: actions/avatarsettings.php:347 actions/grouplogo.php:380 msgid "Lost our file data." msgstr "" -#: actions/avatarsettings.php:366 +#: actions/avatarsettings.php:370 msgid "Avatar updated." msgstr "رُفع الأفتار." -#: actions/avatarsettings.php:369 +#: actions/avatarsettings.php:373 msgid "Failed updating avatar." msgstr "فشل تحديث الأفتار." -#: actions/avatarsettings.php:393 +#: actions/avatarsettings.php:397 msgid "Avatar deleted." msgstr "حُذف الأفتار." @@ -902,7 +907,7 @@ msgid "Conversation" msgstr "محادثة" #: actions/conversation.php:154 lib/mailbox.php:116 lib/noticelist.php:87 -#: lib/profileaction.php:218 lib/searchgroupnav.php:82 +#: lib/profileaction.php:224 lib/searchgroupnav.php:82 msgid "Notices" msgstr "الإشعارات" @@ -1700,7 +1705,7 @@ msgstr "مسار %s الزمني" msgid "Updates from members of %1$s on %2$s!" msgstr "" -#: actions/groups.php:62 lib/profileaction.php:212 lib/profileaction.php:232 +#: actions/groups.php:62 lib/profileaction.php:218 lib/profileaction.php:244 #: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98 msgid "Groups" msgstr "مجموعات" @@ -3240,7 +3245,7 @@ msgid "Description" msgstr "الوصف" #: actions/showapplication.php:192 actions/showgroup.php:439 -#: lib/profileaction.php:176 +#: lib/profileaction.php:182 msgid "Statistics" msgstr "إحصاءات" @@ -3402,7 +3407,7 @@ msgid "Members" msgstr "الأعضاء" #: actions/showgroup.php:396 lib/profileaction.php:117 -#: lib/profileaction.php:150 lib/profileaction.php:238 lib/section.php:95 +#: lib/profileaction.php:150 lib/profileaction.php:250 lib/section.php:95 #: lib/subscriptionlist.php:126 lib/tagcloudsection.php:71 msgid "(None)" msgstr "(لا شيء)" @@ -3574,7 +3579,8 @@ msgid "Unknown language \"%s\"." msgstr "لغة غير معروفة \"%s\"." #: actions/siteadminpanel.php:165 -msgid "Minimum text limit is 140 characters." +#, fuzzy +msgid "Minimum text limit is 0 (unlimited)." msgstr "حد النص الأدنى هو 140 حرفًا." #: actions/siteadminpanel.php:171 @@ -3838,8 +3844,7 @@ msgstr "اذف إعدادت الموقع" msgid "You are not subscribed to that profile." msgstr "" -#: actions/subedit.php:83 classes/Subscription.php:89 -#: classes/Subscription.php:116 +#: actions/subedit.php:83 classes/Subscription.php:132 msgid "Could not save subscription." msgstr "تعذّر حفظ الاشتراك." @@ -4378,36 +4383,36 @@ msgstr "مشكلة أثناء حفظ الإشعار." msgid "RT @%1$s %2$s" msgstr "آر تي @%1$s %2$s" -#: classes/Subscription.php:66 lib/oauthstore.php:465 +#: classes/Subscription.php:74 lib/oauthstore.php:465 msgid "You have been banned from subscribing." msgstr "" -#: classes/Subscription.php:70 +#: classes/Subscription.php:78 msgid "Already subscribed!" msgstr "مُشترك أصلا!" -#: classes/Subscription.php:74 +#: classes/Subscription.php:82 msgid "User has blocked you." msgstr "لقد منعك المستخدم." -#: classes/Subscription.php:157 +#: classes/Subscription.php:167 msgid "Not subscribed!" msgstr "غير مشترك!" -#: classes/Subscription.php:163 +#: classes/Subscription.php:173 msgid "Couldn't delete self-subscription." msgstr "لم يمكن حذف اشتراك ذاتي." -#: classes/Subscription.php:190 +#: classes/Subscription.php:200 #, fuzzy msgid "Couldn't delete subscription OMB token." msgstr "تعذّر حذف الاشتراك." -#: classes/Subscription.php:201 +#: classes/Subscription.php:211 msgid "Couldn't delete subscription." msgstr "تعذّر حذف الاشتراك." -#: classes/User.php:378 +#: classes/User.php:363 #, php-format msgid "Welcome to %1$s, @%2$s!" msgstr "أهلا بكم في %1$s يا @%2$s!" @@ -4694,22 +4699,22 @@ msgstr "بعد" msgid "Before" msgstr "قبل" -#: lib/activity.php:453 +#: lib/activity.php:120 +msgid "Expecting a root feed element but got a whole XML document." +msgstr "" + +#: lib/activityutils.php:208 msgid "Can't handle remote content yet." msgstr "" -#: lib/activity.php:481 +#: lib/activityutils.php:236 msgid "Can't handle embedded XML content yet." msgstr "" -#: lib/activity.php:485 +#: lib/activityutils.php:240 msgid "Can't handle embedded Base64 content yet." msgstr "" -#: lib/activity.php:1089 -msgid "Expecting a root feed element but got a whole XML document." -msgstr "" - #. TRANS: Client error message #: lib/adminpanelaction.php:98 msgid "You cannot make changes to this site." @@ -5227,19 +5232,19 @@ msgstr "" "tracks - لم يطبق بعد.\n" "tracking - لم يطبق بعد.\n" -#: lib/common.php:136 +#: lib/common.php:135 msgid "No configuration file found. " msgstr "" -#: lib/common.php:137 +#: lib/common.php:136 msgid "I looked for configuration files in the following places: " msgstr "" -#: lib/common.php:139 +#: lib/common.php:138 msgid "You may wish to run the installer to fix this." msgstr "" -#: lib/common.php:140 +#: lib/common.php:139 msgid "Go to the installer." msgstr "اذهب إلى المُثبّت." @@ -5413,40 +5418,40 @@ msgstr "وسوم في إشعارات المجموعة %s" msgid "This page is not available in a media type you accept" msgstr "" -#: lib/imagefile.php:74 +#: lib/imagefile.php:72 msgid "Unsupported image file format." msgstr "" -#: lib/imagefile.php:90 +#: lib/imagefile.php:88 #, php-format msgid "That file is too big. The maximum file size is %s." msgstr "هذا الملف كبير جدًا. إن أقصى حجم للملفات هو %s." -#: lib/imagefile.php:95 +#: lib/imagefile.php:93 msgid "Partial upload." msgstr "" -#: lib/imagefile.php:103 lib/mediafile.php:170 +#: lib/imagefile.php:101 lib/mediafile.php:170 msgid "System error uploading file." msgstr "" -#: lib/imagefile.php:111 +#: lib/imagefile.php:109 msgid "Not an image or corrupt file." msgstr "" -#: lib/imagefile.php:124 +#: lib/imagefile.php:122 msgid "Lost our file." msgstr "" -#: lib/imagefile.php:168 lib/imagefile.php:233 +#: lib/imagefile.php:163 lib/imagefile.php:224 msgid "Unknown file type" msgstr "نوع ملف غير معروف" -#: lib/imagefile.php:253 +#: lib/imagefile.php:244 msgid "MB" msgstr "ميجابايت" -#: lib/imagefile.php:255 +#: lib/imagefile.php:246 msgid "kB" msgstr "كيلوبايت" @@ -5911,7 +5916,7 @@ msgstr "وسوم في إشعارات %s" msgid "Unknown" msgstr "غير معروفة" -#: lib/profileaction.php:109 lib/profileaction.php:194 lib/subgroupnav.php:82 +#: lib/profileaction.php:109 lib/profileaction.php:200 lib/subgroupnav.php:82 msgid "Subscriptions" msgstr "الاشتراكات" @@ -5919,7 +5924,7 @@ msgstr "الاشتراكات" msgid "All subscriptions" msgstr "جميع الاشتراكات" -#: lib/profileaction.php:142 lib/profileaction.php:203 lib/subgroupnav.php:90 +#: lib/profileaction.php:142 lib/profileaction.php:209 lib/subgroupnav.php:90 msgid "Subscribers" msgstr "المشتركون" @@ -5927,15 +5932,20 @@ msgstr "المشتركون" msgid "All subscribers" msgstr "جميع المشتركين" -#: lib/profileaction.php:180 +#: lib/profileaction.php:186 msgid "User ID" msgstr "هوية المستخدم" -#: lib/profileaction.php:185 +#: lib/profileaction.php:191 msgid "Member since" msgstr "عضو منذ" -#: lib/profileaction.php:247 +#. TRANS: Average count of posts made per day since account registration +#: lib/profileaction.php:230 +msgid "Daily average" +msgstr "" + +#: lib/profileaction.php:259 msgid "All groups" msgstr "كل المجموعات" @@ -6106,6 +6116,11 @@ msgstr "ألغِ الاشتراك مع هذا المستخدم" msgid "Unsubscribe" msgstr "ألغِ الاشتراك" +#: lib/usernoprofileexception.php:58 +#, fuzzy, php-format +msgid "User %s (%d) has no profile record." +msgstr "ليس للمستخدم ملف شخصي." + #: lib/userprofile.php:117 msgid "Edit Avatar" msgstr "عدّل الأفتار" diff --git a/locale/arz/LC_MESSAGES/statusnet.po b/locale/arz/LC_MESSAGES/statusnet.po index 1426c4d049..77e246f82b 100644 --- a/locale/arz/LC_MESSAGES/statusnet.po +++ b/locale/arz/LC_MESSAGES/statusnet.po @@ -10,12 +10,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-03-17 21:39+0000\n" -"PO-Revision-Date: 2010-03-17 21:39:57+0000\n" +"POT-Creation-Date: 2010-03-23 20:09+0000\n" +"PO-Revision-Date: 2010-03-23 20:09:11+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 (r63880); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.17alpha (r64087); Translate extension (2010-01-16)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: arz\n" "X-Message-Group: out-statusnet\n" @@ -757,23 +757,28 @@ msgstr "ارفع" msgid "Crop" msgstr "" -#: actions/avatarsettings.php:328 +#: actions/avatarsettings.php:305 +#, fuzzy +msgid "No file uploaded." +msgstr "لا ملف شخصى مُحدّد." + +#: actions/avatarsettings.php:332 msgid "Pick a square area of the image to be your avatar" msgstr "" -#: actions/avatarsettings.php:343 actions/grouplogo.php:380 +#: actions/avatarsettings.php:347 actions/grouplogo.php:380 msgid "Lost our file data." msgstr "" -#: actions/avatarsettings.php:366 +#: actions/avatarsettings.php:370 msgid "Avatar updated." msgstr "رُفع الأفتار." -#: actions/avatarsettings.php:369 +#: actions/avatarsettings.php:373 msgid "Failed updating avatar." msgstr "فشل تحديث الأفتار." -#: actions/avatarsettings.php:393 +#: actions/avatarsettings.php:397 msgid "Avatar deleted." msgstr "حُذف الأفتار." @@ -908,7 +913,7 @@ msgid "Conversation" msgstr "محادثة" #: actions/conversation.php:154 lib/mailbox.php:116 lib/noticelist.php:87 -#: lib/profileaction.php:218 lib/searchgroupnav.php:82 +#: lib/profileaction.php:224 lib/searchgroupnav.php:82 msgid "Notices" msgstr "الإشعارات" @@ -1712,7 +1717,7 @@ msgstr "مسار %s الزمني" msgid "Updates from members of %1$s on %2$s!" msgstr "" -#: actions/groups.php:62 lib/profileaction.php:212 lib/profileaction.php:232 +#: actions/groups.php:62 lib/profileaction.php:218 lib/profileaction.php:244 #: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98 msgid "Groups" msgstr "مجموعات" @@ -3250,7 +3255,7 @@ msgid "Description" msgstr "الوصف" #: actions/showapplication.php:192 actions/showgroup.php:439 -#: lib/profileaction.php:176 +#: lib/profileaction.php:182 msgid "Statistics" msgstr "إحصاءات" @@ -3412,7 +3417,7 @@ msgid "Members" msgstr "الأعضاء" #: actions/showgroup.php:396 lib/profileaction.php:117 -#: lib/profileaction.php:150 lib/profileaction.php:238 lib/section.php:95 +#: lib/profileaction.php:150 lib/profileaction.php:250 lib/section.php:95 #: lib/subscriptionlist.php:126 lib/tagcloudsection.php:71 msgid "(None)" msgstr "(لا شيء)" @@ -3572,7 +3577,8 @@ msgid "Unknown language \"%s\"." msgstr "لغه مش معروفه \"%s\"." #: actions/siteadminpanel.php:165 -msgid "Minimum text limit is 140 characters." +#, fuzzy +msgid "Minimum text limit is 0 (unlimited)." msgstr "حد النص الأدنى هو 140 حرفًا." #: actions/siteadminpanel.php:171 @@ -3841,8 +3847,7 @@ msgstr "اذف إعدادت الموقع" msgid "You are not subscribed to that profile." msgstr "" -#: actions/subedit.php:83 classes/Subscription.php:89 -#: classes/Subscription.php:116 +#: actions/subedit.php:83 classes/Subscription.php:132 msgid "Could not save subscription." msgstr "تعذّر حفظ الاشتراك." @@ -4382,36 +4387,36 @@ msgstr "مشكله أثناء حفظ الإشعار." msgid "RT @%1$s %2$s" msgstr "آر تى @%1$s %2$s" -#: classes/Subscription.php:66 lib/oauthstore.php:465 +#: classes/Subscription.php:74 lib/oauthstore.php:465 msgid "You have been banned from subscribing." msgstr "" -#: classes/Subscription.php:70 +#: classes/Subscription.php:78 msgid "Already subscribed!" msgstr "مُشترك أصلا!" -#: classes/Subscription.php:74 +#: classes/Subscription.php:82 msgid "User has blocked you." msgstr "لقد منعك المستخدم." -#: classes/Subscription.php:157 +#: classes/Subscription.php:167 msgid "Not subscribed!" msgstr "غير مشترك!" -#: classes/Subscription.php:163 +#: classes/Subscription.php:173 msgid "Couldn't delete self-subscription." msgstr "ما نفعش يمسح الاشتراك الشخصى." -#: classes/Subscription.php:190 +#: classes/Subscription.php:200 #, fuzzy msgid "Couldn't delete subscription OMB token." msgstr "تعذّر حذف الاشتراك." -#: classes/Subscription.php:201 +#: classes/Subscription.php:211 msgid "Couldn't delete subscription." msgstr "تعذّر حذف الاشتراك." -#: classes/User.php:378 +#: classes/User.php:363 #, php-format msgid "Welcome to %1$s, @%2$s!" msgstr "أهلا بكم فى %1$s يا @%2$s!" @@ -4714,22 +4719,22 @@ msgstr "بعد" msgid "Before" msgstr "قبل" -#: lib/activity.php:453 +#: lib/activity.php:120 +msgid "Expecting a root feed element but got a whole XML document." +msgstr "" + +#: lib/activityutils.php:208 msgid "Can't handle remote content yet." msgstr "" -#: lib/activity.php:481 +#: lib/activityutils.php:236 msgid "Can't handle embedded XML content yet." msgstr "" -#: lib/activity.php:485 +#: lib/activityutils.php:240 msgid "Can't handle embedded Base64 content yet." msgstr "" -#: lib/activity.php:1089 -msgid "Expecting a root feed element but got a whole XML document." -msgstr "" - #. TRANS: Client error message #: lib/adminpanelaction.php:98 msgid "You cannot make changes to this site." @@ -5215,19 +5220,19 @@ msgid "" "tracking - not yet implemented.\n" msgstr "" -#: lib/common.php:136 +#: lib/common.php:135 msgid "No configuration file found. " msgstr "" -#: lib/common.php:137 +#: lib/common.php:136 msgid "I looked for configuration files in the following places: " msgstr "" -#: lib/common.php:139 +#: lib/common.php:138 msgid "You may wish to run the installer to fix this." msgstr "" -#: lib/common.php:140 +#: lib/common.php:139 msgid "Go to the installer." msgstr "اذهب إلى المُثبّت." @@ -5401,40 +5406,40 @@ msgstr "" msgid "This page is not available in a media type you accept" msgstr "" -#: lib/imagefile.php:74 +#: lib/imagefile.php:72 msgid "Unsupported image file format." msgstr "" -#: lib/imagefile.php:90 +#: lib/imagefile.php:88 #, php-format msgid "That file is too big. The maximum file size is %s." msgstr "هذا الملف كبير جدًا. إن أقصى حجم للملفات هو %s." -#: lib/imagefile.php:95 +#: lib/imagefile.php:93 msgid "Partial upload." msgstr "" -#: lib/imagefile.php:103 lib/mediafile.php:170 +#: lib/imagefile.php:101 lib/mediafile.php:170 msgid "System error uploading file." msgstr "" -#: lib/imagefile.php:111 +#: lib/imagefile.php:109 msgid "Not an image or corrupt file." msgstr "" -#: lib/imagefile.php:124 +#: lib/imagefile.php:122 msgid "Lost our file." msgstr "" -#: lib/imagefile.php:168 lib/imagefile.php:233 +#: lib/imagefile.php:163 lib/imagefile.php:224 msgid "Unknown file type" msgstr "نوع ملف غير معروف" -#: lib/imagefile.php:253 +#: lib/imagefile.php:244 msgid "MB" msgstr "ميجابايت" -#: lib/imagefile.php:255 +#: lib/imagefile.php:246 msgid "kB" msgstr "كيلوبايت" @@ -5878,7 +5883,7 @@ msgstr "" msgid "Unknown" msgstr "مش معروف" -#: lib/profileaction.php:109 lib/profileaction.php:194 lib/subgroupnav.php:82 +#: lib/profileaction.php:109 lib/profileaction.php:200 lib/subgroupnav.php:82 msgid "Subscriptions" msgstr "الاشتراكات" @@ -5886,7 +5891,7 @@ msgstr "الاشتراكات" msgid "All subscriptions" msgstr "جميع الاشتراكات" -#: lib/profileaction.php:142 lib/profileaction.php:203 lib/subgroupnav.php:90 +#: lib/profileaction.php:142 lib/profileaction.php:209 lib/subgroupnav.php:90 msgid "Subscribers" msgstr "المشتركون" @@ -5894,15 +5899,20 @@ msgstr "المشتركون" msgid "All subscribers" msgstr "جميع المشتركين" -#: lib/profileaction.php:180 +#: lib/profileaction.php:186 msgid "User ID" msgstr "هويه المستخدم" -#: lib/profileaction.php:185 +#: lib/profileaction.php:191 msgid "Member since" msgstr "عضو منذ" -#: lib/profileaction.php:247 +#. TRANS: Average count of posts made per day since account registration +#: lib/profileaction.php:230 +msgid "Daily average" +msgstr "" + +#: lib/profileaction.php:259 msgid "All groups" msgstr "كل المجموعات" @@ -6073,6 +6083,11 @@ msgstr "ألغِ الاشتراك مع هذا المستخدم" msgid "Unsubscribe" msgstr "ألغِ الاشتراك" +#: lib/usernoprofileexception.php:58 +#, fuzzy, php-format +msgid "User %s (%d) has no profile record." +msgstr "ليس للمستخدم ملف شخصى." + #: lib/userprofile.php:117 msgid "Edit Avatar" msgstr "عدّل الأفتار" diff --git a/locale/bg/LC_MESSAGES/statusnet.po b/locale/bg/LC_MESSAGES/statusnet.po index 83acdaab6c..c1f83849aa 100644 --- a/locale/bg/LC_MESSAGES/statusnet.po +++ b/locale/bg/LC_MESSAGES/statusnet.po @@ -9,12 +9,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-03-17 21:39+0000\n" -"PO-Revision-Date: 2010-03-17 21:40:00+0000\n" +"POT-Creation-Date: 2010-03-23 20:09+0000\n" +"PO-Revision-Date: 2010-03-23 20:09:15+0000\n" "Language-Team: Bulgarian\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r63880); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.17alpha (r64087); Translate extension (2010-01-16)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: bg\n" "X-Message-Group: out-statusnet\n" @@ -766,23 +766,28 @@ msgstr "Качване" msgid "Crop" msgstr "Изрязване" -#: actions/avatarsettings.php:328 +#: actions/avatarsettings.php:305 +#, fuzzy +msgid "No file uploaded." +msgstr "Не е указан профил." + +#: actions/avatarsettings.php:332 msgid "Pick a square area of the image to be your avatar" msgstr "Изберете квадратна област от изображението за аватар" -#: actions/avatarsettings.php:343 actions/grouplogo.php:380 +#: actions/avatarsettings.php:347 actions/grouplogo.php:380 msgid "Lost our file data." msgstr "" -#: actions/avatarsettings.php:366 +#: actions/avatarsettings.php:370 msgid "Avatar updated." msgstr "Аватарът е обновен." -#: actions/avatarsettings.php:369 +#: actions/avatarsettings.php:373 msgid "Failed updating avatar." msgstr "Неуспешно обновяване на аватара." -#: actions/avatarsettings.php:393 +#: actions/avatarsettings.php:397 msgid "Avatar deleted." msgstr "Аватарът е изтрит." @@ -919,7 +924,7 @@ msgid "Conversation" msgstr "Разговор" #: actions/conversation.php:154 lib/mailbox.php:116 lib/noticelist.php:87 -#: lib/profileaction.php:218 lib/searchgroupnav.php:82 +#: lib/profileaction.php:224 lib/searchgroupnav.php:82 msgid "Notices" msgstr "Бележки" @@ -1762,7 +1767,7 @@ msgstr "Поток на %s" msgid "Updates from members of %1$s on %2$s!" msgstr "Бележки от %1$s в %2$s." -#: actions/groups.php:62 lib/profileaction.php:212 lib/profileaction.php:232 +#: actions/groups.php:62 lib/profileaction.php:218 lib/profileaction.php:244 #: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98 msgid "Groups" msgstr "Групи" @@ -3399,7 +3404,7 @@ msgid "Description" msgstr "Описание" #: actions/showapplication.php:192 actions/showgroup.php:439 -#: lib/profileaction.php:176 +#: lib/profileaction.php:182 msgid "Statistics" msgstr "Статистики" @@ -3558,7 +3563,7 @@ msgid "Members" msgstr "Членове" #: actions/showgroup.php:396 lib/profileaction.php:117 -#: lib/profileaction.php:150 lib/profileaction.php:238 lib/section.php:95 +#: lib/profileaction.php:150 lib/profileaction.php:250 lib/section.php:95 #: lib/subscriptionlist.php:126 lib/tagcloudsection.php:71 msgid "(None)" msgstr "" @@ -3719,7 +3724,8 @@ msgid "Unknown language \"%s\"." msgstr "Непознат език \"%s\"." #: actions/siteadminpanel.php:165 -msgid "Minimum text limit is 140 characters." +#, fuzzy +msgid "Minimum text limit is 0 (unlimited)." msgstr "Минималното ограничение на текста е 140 знака." #: actions/siteadminpanel.php:171 @@ -3998,8 +4004,7 @@ msgstr "Запазване настройките на сайта" msgid "You are not subscribed to that profile." msgstr "Не сте абонирани за този профил" -#: actions/subedit.php:83 classes/Subscription.php:89 -#: classes/Subscription.php:116 +#: actions/subedit.php:83 classes/Subscription.php:132 #, fuzzy msgid "Could not save subscription." msgstr "Грешка при създаване на нов абонамент." @@ -4572,39 +4577,39 @@ msgstr "Проблем при записване на бележката." msgid "RT @%1$s %2$s" msgstr "RT @%1$s %2$s" -#: classes/Subscription.php:66 lib/oauthstore.php:465 +#: classes/Subscription.php:74 lib/oauthstore.php:465 #, fuzzy msgid "You have been banned from subscribing." msgstr "Потребителят е забранил да се абонирате за него." -#: classes/Subscription.php:70 +#: classes/Subscription.php:78 msgid "Already subscribed!" msgstr "" -#: classes/Subscription.php:74 +#: classes/Subscription.php:82 msgid "User has blocked you." msgstr "Потребителят ви е блокирал." -#: classes/Subscription.php:157 +#: classes/Subscription.php:167 #, fuzzy msgid "Not subscribed!" msgstr "Не сте абонирани!" -#: classes/Subscription.php:163 +#: classes/Subscription.php:173 #, fuzzy msgid "Couldn't delete self-subscription." msgstr "Грешка при изтриване на абонамента." -#: classes/Subscription.php:190 +#: classes/Subscription.php:200 #, fuzzy msgid "Couldn't delete subscription OMB token." msgstr "Грешка при изтриване на абонамента." -#: classes/Subscription.php:201 +#: classes/Subscription.php:211 msgid "Couldn't delete subscription." msgstr "Грешка при изтриване на абонамента." -#: classes/User.php:378 +#: classes/User.php:363 #, php-format msgid "Welcome to %1$s, @%2$s!" msgstr "Добре дошли в %1$s, @%2$s!" @@ -4911,22 +4916,22 @@ msgstr "След" msgid "Before" msgstr "Преди" -#: lib/activity.php:453 +#: lib/activity.php:120 +msgid "Expecting a root feed element but got a whole XML document." +msgstr "" + +#: lib/activityutils.php:208 msgid "Can't handle remote content yet." msgstr "" -#: lib/activity.php:481 +#: lib/activityutils.php:236 msgid "Can't handle embedded XML content yet." msgstr "" -#: lib/activity.php:485 +#: lib/activityutils.php:240 msgid "Can't handle embedded Base64 content yet." msgstr "" -#: lib/activity.php:1089 -msgid "Expecting a root feed element but got a whole XML document." -msgstr "" - #. TRANS: Client error message #: lib/adminpanelaction.php:98 msgid "You cannot make changes to this site." @@ -5415,19 +5420,19 @@ msgid "" "tracking - not yet implemented.\n" msgstr "" -#: lib/common.php:136 +#: lib/common.php:135 msgid "No configuration file found. " msgstr "Не е открит файл с настройки. " -#: lib/common.php:137 +#: lib/common.php:136 msgid "I looked for configuration files in the following places: " msgstr "" -#: lib/common.php:139 +#: lib/common.php:138 msgid "You may wish to run the installer to fix this." msgstr "" -#: lib/common.php:140 +#: lib/common.php:139 #, fuzzy msgid "Go to the installer." msgstr "Влизане в сайта" @@ -5607,41 +5612,41 @@ msgstr "Етикети в бележките към групата %s" msgid "This page is not available in a media type you accept" msgstr "Страницата не е достъпна във вида медия, който приемате" -#: lib/imagefile.php:74 +#: lib/imagefile.php:72 msgid "Unsupported image file format." msgstr "Форматът на файла с изображението не се поддържа." -#: lib/imagefile.php:90 +#: lib/imagefile.php:88 #, fuzzy, php-format msgid "That file is too big. The maximum file size is %s." msgstr "Може да качите лого за групата ви." -#: lib/imagefile.php:95 +#: lib/imagefile.php:93 msgid "Partial upload." msgstr "Частично качване на файла." -#: lib/imagefile.php:103 lib/mediafile.php:170 +#: lib/imagefile.php:101 lib/mediafile.php:170 msgid "System error uploading file." msgstr "Системна грешка при качване на файл." -#: lib/imagefile.php:111 +#: lib/imagefile.php:109 msgid "Not an image or corrupt file." msgstr "Файлът не е изображение или е повреден." -#: lib/imagefile.php:124 +#: lib/imagefile.php:122 #, fuzzy msgid "Lost our file." msgstr "Няма такава бележка." -#: lib/imagefile.php:168 lib/imagefile.php:233 +#: lib/imagefile.php:163 lib/imagefile.php:224 msgid "Unknown file type" msgstr "Неподдържан вид файл" -#: lib/imagefile.php:253 +#: lib/imagefile.php:244 msgid "MB" msgstr "MB" -#: lib/imagefile.php:255 +#: lib/imagefile.php:246 msgid "kB" msgstr "kB" @@ -6100,7 +6105,7 @@ msgstr "Етикети в бележките на %s" msgid "Unknown" msgstr "Непознато действие" -#: lib/profileaction.php:109 lib/profileaction.php:194 lib/subgroupnav.php:82 +#: lib/profileaction.php:109 lib/profileaction.php:200 lib/subgroupnav.php:82 msgid "Subscriptions" msgstr "Абонаменти" @@ -6108,7 +6113,7 @@ msgstr "Абонаменти" msgid "All subscriptions" msgstr "Всички абонаменти" -#: lib/profileaction.php:142 lib/profileaction.php:203 lib/subgroupnav.php:90 +#: lib/profileaction.php:142 lib/profileaction.php:209 lib/subgroupnav.php:90 msgid "Subscribers" msgstr "Абонати" @@ -6116,16 +6121,21 @@ msgstr "Абонати" msgid "All subscribers" msgstr "Всички абонати" -#: lib/profileaction.php:180 +#: lib/profileaction.php:186 #, fuzzy msgid "User ID" msgstr "Потребител" -#: lib/profileaction.php:185 +#: lib/profileaction.php:191 msgid "Member since" msgstr "Участник от" -#: lib/profileaction.php:247 +#. TRANS: Average count of posts made per day since account registration +#: lib/profileaction.php:230 +msgid "Daily average" +msgstr "" + +#: lib/profileaction.php:259 msgid "All groups" msgstr "Всички групи" @@ -6303,6 +6313,11 @@ msgstr "Отписване от този потребител" msgid "Unsubscribe" msgstr "Отписване" +#: lib/usernoprofileexception.php:58 +#, fuzzy, php-format +msgid "User %s (%d) has no profile record." +msgstr "Потребителят няма профил." + #: lib/userprofile.php:117 msgid "Edit Avatar" msgstr "Редактиране на аватара" diff --git a/locale/br/LC_MESSAGES/statusnet.po b/locale/br/LC_MESSAGES/statusnet.po index 6e241f553c..8316ecc155 100644 --- a/locale/br/LC_MESSAGES/statusnet.po +++ b/locale/br/LC_MESSAGES/statusnet.po @@ -9,12 +9,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-03-17 21:39+0000\n" -"PO-Revision-Date: 2010-03-17 21:40:14+0000\n" +"POT-Creation-Date: 2010-03-23 20:09+0000\n" +"PO-Revision-Date: 2010-03-23 20:09:18+0000\n" "Language-Team: Dutch\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r63880); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.17alpha (r64087); Translate extension (2010-01-16)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: br\n" "X-Message-Group: out-statusnet\n" @@ -750,23 +750,28 @@ msgstr "Enporzhiañ" msgid "Crop" msgstr "Adframmañ" -#: actions/avatarsettings.php:328 +#: actions/avatarsettings.php:305 +#, fuzzy +msgid "No file uploaded." +msgstr "N'eo bet resisaet profil ebet" + +#: actions/avatarsettings.php:332 msgid "Pick a square area of the image to be your avatar" msgstr "" -#: actions/avatarsettings.php:343 actions/grouplogo.php:380 +#: actions/avatarsettings.php:347 actions/grouplogo.php:380 msgid "Lost our file data." msgstr "Kollet eo bet roadennoù." -#: actions/avatarsettings.php:366 +#: actions/avatarsettings.php:370 msgid "Avatar updated." msgstr "Hizivaet eo bet an avatar." -#: actions/avatarsettings.php:369 +#: actions/avatarsettings.php:373 msgid "Failed updating avatar." msgstr "Ur gudenn 'zo bet e-pad hizivadenn an avatar." -#: actions/avatarsettings.php:393 +#: actions/avatarsettings.php:397 msgid "Avatar deleted." msgstr "Dilammet eo bet an Avatar." @@ -902,7 +907,7 @@ msgid "Conversation" msgstr "Kaozeadenn" #: actions/conversation.php:154 lib/mailbox.php:116 lib/noticelist.php:87 -#: lib/profileaction.php:218 lib/searchgroupnav.php:82 +#: lib/profileaction.php:224 lib/searchgroupnav.php:82 msgid "Notices" msgstr "Ali" @@ -1697,7 +1702,7 @@ msgstr "Oberezhioù %s" msgid "Updates from members of %1$s on %2$s!" msgstr "Hizivadenn izili %1$s e %2$s !" -#: actions/groups.php:62 lib/profileaction.php:212 lib/profileaction.php:232 +#: actions/groups.php:62 lib/profileaction.php:218 lib/profileaction.php:244 #: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98 msgid "Groups" msgstr "Strolladoù" @@ -3238,7 +3243,7 @@ msgid "Description" msgstr "" #: actions/showapplication.php:192 actions/showgroup.php:439 -#: lib/profileaction.php:176 +#: lib/profileaction.php:182 msgid "Statistics" msgstr "Stadegoù" @@ -3395,7 +3400,7 @@ msgid "Members" msgstr "Izili" #: actions/showgroup.php:396 lib/profileaction.php:117 -#: lib/profileaction.php:150 lib/profileaction.php:238 lib/section.php:95 +#: lib/profileaction.php:150 lib/profileaction.php:250 lib/section.php:95 #: lib/subscriptionlist.php:126 lib/tagcloudsection.php:71 msgid "(None)" msgstr "(hini ebet)" @@ -3555,7 +3560,7 @@ msgid "Unknown language \"%s\"." msgstr "" #: actions/siteadminpanel.php:165 -msgid "Minimum text limit is 140 characters." +msgid "Minimum text limit is 0 (unlimited)." msgstr "" #: actions/siteadminpanel.php:171 @@ -3607,9 +3612,8 @@ msgid "Default timezone for the site; usually UTC." msgstr "" #: actions/siteadminpanel.php:262 -#, fuzzy msgid "Default language" -msgstr "Yezh d'ober ganti da gentañ" +msgstr "Yezh dre ziouer" #: actions/siteadminpanel.php:263 msgid "Site language when autodetection from browser settings is not available" @@ -3663,9 +3667,8 @@ msgid "Site-wide notice text (255 chars max; HTML okay)" msgstr "" #: actions/sitenoticeadminpanel.php:198 -#, fuzzy msgid "Save site notice" -msgstr "Dilemel un ali" +msgstr "Enrollañ ali ul lec'hienn" #: actions/smssettings.php:58 msgid "SMS settings" @@ -3822,8 +3825,7 @@ msgstr "Enrollañ an arventennoù moned" msgid "You are not subscribed to that profile." msgstr "" -#: actions/subedit.php:83 classes/Subscription.php:89 -#: classes/Subscription.php:116 +#: actions/subedit.php:83 classes/Subscription.php:132 msgid "Could not save subscription." msgstr "" @@ -4359,36 +4361,36 @@ msgstr "" msgid "RT @%1$s %2$s" msgstr "RT @%1$s %2$s" -#: classes/Subscription.php:66 lib/oauthstore.php:465 +#: classes/Subscription.php:74 lib/oauthstore.php:465 msgid "You have been banned from subscribing." msgstr "" -#: classes/Subscription.php:70 +#: classes/Subscription.php:78 msgid "Already subscribed!" msgstr "" -#: classes/Subscription.php:74 +#: classes/Subscription.php:82 msgid "User has blocked you." msgstr "" -#: classes/Subscription.php:157 +#: classes/Subscription.php:167 msgid "Not subscribed!" msgstr "" -#: classes/Subscription.php:163 +#: classes/Subscription.php:173 msgid "Couldn't delete self-subscription." msgstr "" -#: classes/Subscription.php:190 +#: classes/Subscription.php:200 #, fuzzy msgid "Couldn't delete subscription OMB token." msgstr "Diposubl eo dilemel ar postel kadarnadur." -#: classes/Subscription.php:201 +#: classes/Subscription.php:211 msgid "Couldn't delete subscription." msgstr "" -#: classes/User.php:378 +#: classes/User.php:363 #, php-format msgid "Welcome to %1$s, @%2$s!" msgstr "" @@ -4667,22 +4669,22 @@ msgstr "War-lerc'h" msgid "Before" msgstr "Kent" -#: lib/activity.php:453 +#: lib/activity.php:120 +msgid "Expecting a root feed element but got a whole XML document." +msgstr "" + +#: lib/activityutils.php:208 msgid "Can't handle remote content yet." msgstr "" -#: lib/activity.php:481 +#: lib/activityutils.php:236 msgid "Can't handle embedded XML content yet." msgstr "" -#: lib/activity.php:485 +#: lib/activityutils.php:240 msgid "Can't handle embedded Base64 content yet." msgstr "" -#: lib/activity.php:1089 -msgid "Expecting a root feed element but got a whole XML document." -msgstr "" - #. TRANS: Client error message #: lib/adminpanelaction.php:98 msgid "You cannot make changes to this site." @@ -4757,9 +4759,8 @@ msgstr "" #. TRANS: Menu item title/tooltip #: lib/adminpanelaction.php:396 -#, fuzzy msgid "Edit site notice" -msgstr "Eilañ an ali" +msgstr "Kemmañ ali al lec'hienn" #. TRANS: Menu item title/tooltip #: lib/adminpanelaction.php:404 @@ -4818,7 +4819,7 @@ msgstr "Merdeer" #: lib/applicationeditform.php:274 msgid "Desktop" -msgstr "" +msgstr "Burev" #: lib/applicationeditform.php:275 msgid "Type of application, browser or desktop" @@ -4826,11 +4827,11 @@ msgstr "" #: lib/applicationeditform.php:297 msgid "Read-only" -msgstr "" +msgstr "Lenn hepken" #: lib/applicationeditform.php:315 msgid "Read-write" -msgstr "" +msgstr "Lenn-skrivañ" #: lib/applicationeditform.php:316 msgid "Default access for this application: read-only, or read-write" @@ -4842,7 +4843,7 @@ msgstr "" #: lib/attachmentlist.php:87 msgid "Attachments" -msgstr "" +msgstr "Pezhioù stag" #: lib/attachmentlist.php:263 msgid "Author" @@ -4909,7 +4910,7 @@ msgstr "" #: lib/command.php:228 #, php-format msgid "Nudge sent to %s" -msgstr "" +msgstr "Blinkadenn kaset da %s" #: lib/command.php:254 #, php-format @@ -4955,12 +4956,12 @@ msgstr "Anv klok : %s" #: lib/command.php:404 lib/mail.php:258 #, php-format msgid "Location: %s" -msgstr "" +msgstr "Lec'hiadur : %s" #: lib/command.php:407 lib/mail.php:260 #, php-format msgid "Homepage: %s" -msgstr "" +msgstr "Lec'hienn Web : %s" #: lib/command.php:410 #, php-format @@ -5013,7 +5014,7 @@ msgstr "" #: lib/command.php:545 #, php-format msgid "Reply to %s sent" -msgstr "" +msgstr "Respont kaset da %s" #: lib/command.php:547 msgid "Error saving notice." @@ -5150,19 +5151,19 @@ msgid "" "tracking - not yet implemented.\n" msgstr "" -#: lib/common.php:136 +#: lib/common.php:135 msgid "No configuration file found. " msgstr "" -#: lib/common.php:137 +#: lib/common.php:136 msgid "I looked for configuration files in the following places: " msgstr "" -#: lib/common.php:139 +#: lib/common.php:138 msgid "You may wish to run the installer to fix this." msgstr "" -#: lib/common.php:140 +#: lib/common.php:139 msgid "Go to the installer." msgstr "" @@ -5336,40 +5337,40 @@ msgstr "" msgid "This page is not available in a media type you accept" msgstr "" -#: lib/imagefile.php:74 +#: lib/imagefile.php:72 msgid "Unsupported image file format." msgstr "" -#: lib/imagefile.php:90 +#: lib/imagefile.php:88 #, php-format msgid "That file is too big. The maximum file size is %s." msgstr "" -#: lib/imagefile.php:95 +#: lib/imagefile.php:93 msgid "Partial upload." msgstr "" -#: lib/imagefile.php:103 lib/mediafile.php:170 +#: lib/imagefile.php:101 lib/mediafile.php:170 msgid "System error uploading file." msgstr "" -#: lib/imagefile.php:111 +#: lib/imagefile.php:109 msgid "Not an image or corrupt file." msgstr "" -#: lib/imagefile.php:124 +#: lib/imagefile.php:122 msgid "Lost our file." msgstr "" -#: lib/imagefile.php:168 lib/imagefile.php:233 +#: lib/imagefile.php:163 lib/imagefile.php:224 msgid "Unknown file type" msgstr "" -#: lib/imagefile.php:253 +#: lib/imagefile.php:244 msgid "MB" msgstr "Mo" -#: lib/imagefile.php:255 +#: lib/imagefile.php:246 msgid "kB" msgstr "Ko" @@ -5665,7 +5666,7 @@ msgstr "" #: lib/messageform.php:178 lib/noticeform.php:236 msgctxt "Send button for sending notice" msgid "Send" -msgstr "" +msgstr "Kas" #: lib/noticeform.php:160 msgid "Send a notice" @@ -5729,7 +5730,7 @@ msgstr "" #: lib/noticelist.php:604 msgid "Repeated by" -msgstr "" +msgstr "Adkemeret gant" #: lib/noticelist.php:631 msgid "Reply to this notice" @@ -5812,7 +5813,7 @@ msgstr "" msgid "Unknown" msgstr "Dianav" -#: lib/profileaction.php:109 lib/profileaction.php:194 lib/subgroupnav.php:82 +#: lib/profileaction.php:109 lib/profileaction.php:200 lib/subgroupnav.php:82 msgid "Subscriptions" msgstr "Koumanantoù" @@ -5820,7 +5821,7 @@ msgstr "Koumanantoù" msgid "All subscriptions" msgstr "" -#: lib/profileaction.php:142 lib/profileaction.php:203 lib/subgroupnav.php:90 +#: lib/profileaction.php:142 lib/profileaction.php:209 lib/subgroupnav.php:90 msgid "Subscribers" msgstr "Ar re koumanantet" @@ -5828,15 +5829,20 @@ msgstr "Ar re koumanantet" msgid "All subscribers" msgstr "An holl re koumanantet" -#: lib/profileaction.php:180 +#: lib/profileaction.php:186 msgid "User ID" msgstr "ID an implijer" -#: lib/profileaction.php:185 +#: lib/profileaction.php:191 msgid "Member since" msgstr "Ezel abaoe" -#: lib/profileaction.php:247 +#. TRANS: Average count of posts made per day since account registration +#: lib/profileaction.php:230 +msgid "Daily average" +msgstr "" + +#: lib/profileaction.php:259 msgid "All groups" msgstr "An holl strolladoù" @@ -6007,6 +6013,11 @@ msgstr "" msgid "Unsubscribe" msgstr "" +#: lib/usernoprofileexception.php:58 +#, fuzzy, php-format +msgid "User %s (%d) has no profile record." +msgstr "An implijer-mañ n'eus profil ebet dezhañ." + #: lib/userprofile.php:117 msgid "Edit Avatar" msgstr "Kemmañ an Avatar" @@ -6045,16 +6056,14 @@ msgid "User role" msgstr "Strolladoù implijerien" #: lib/userprofile.php:366 -#, fuzzy msgctxt "role" msgid "Administrator" -msgstr "Merourien" +msgstr "Merour" #: lib/userprofile.php:367 -#, fuzzy msgctxt "role" msgid "Moderator" -msgstr "Habaskaat" +msgstr "Habasker" #: lib/util.php:1046 msgid "a few seconds ago" @@ -6103,7 +6112,7 @@ msgstr "bloaz zo well-wazh" #: lib/webcolor.php:82 #, php-format msgid "%s is not a valid color!" -msgstr "" +msgstr "n'eo ket %s ul liv reizh !" #: lib/webcolor.php:123 #, php-format diff --git a/locale/ca/LC_MESSAGES/statusnet.po b/locale/ca/LC_MESSAGES/statusnet.po index 3ed2516c98..aaaa9f5572 100644 --- a/locale/ca/LC_MESSAGES/statusnet.po +++ b/locale/ca/LC_MESSAGES/statusnet.po @@ -10,12 +10,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-03-17 21:39+0000\n" -"PO-Revision-Date: 2010-03-17 21:40:17+0000\n" +"POT-Creation-Date: 2010-03-23 20:09+0000\n" +"PO-Revision-Date: 2010-03-23 20:09:21+0000\n" "Language-Team: Catalan\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r63880); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.17alpha (r64087); Translate extension (2010-01-16)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: ca\n" "X-Message-Group: out-statusnet\n" @@ -784,25 +784,30 @@ msgstr "Puja" msgid "Crop" msgstr "Retalla" -#: actions/avatarsettings.php:328 +#: actions/avatarsettings.php:305 +#, fuzzy +msgid "No file uploaded." +msgstr "No s'ha especificat perfil." + +#: actions/avatarsettings.php:332 msgid "Pick a square area of the image to be your avatar" msgstr "" "Selecciona un quadrat de l'àrea de la imatge que vols que sigui el teu " "avatar." -#: actions/avatarsettings.php:343 actions/grouplogo.php:380 +#: actions/avatarsettings.php:347 actions/grouplogo.php:380 msgid "Lost our file data." msgstr "S'ha perdut el nostre fitxer de dades." -#: actions/avatarsettings.php:366 +#: actions/avatarsettings.php:370 msgid "Avatar updated." msgstr "Avatar actualitzat." -#: actions/avatarsettings.php:369 +#: actions/avatarsettings.php:373 msgid "Failed updating avatar." msgstr "Error en actualitzar avatar." -#: actions/avatarsettings.php:393 +#: actions/avatarsettings.php:397 msgid "Avatar deleted." msgstr "S'ha suprimit l'avatar." @@ -939,7 +944,7 @@ msgid "Conversation" msgstr "Conversa" #: actions/conversation.php:154 lib/mailbox.php:116 lib/noticelist.php:87 -#: lib/profileaction.php:218 lib/searchgroupnav.php:82 +#: lib/profileaction.php:224 lib/searchgroupnav.php:82 msgid "Notices" msgstr "Avisos" @@ -1781,7 +1786,7 @@ msgstr "%s línia temporal" msgid "Updates from members of %1$s on %2$s!" msgstr "Actualitzacions dels membres de %1$s el %2$s!" -#: actions/groups.php:62 lib/profileaction.php:212 lib/profileaction.php:232 +#: actions/groups.php:62 lib/profileaction.php:218 lib/profileaction.php:244 #: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98 msgid "Groups" msgstr "Grups" @@ -3450,7 +3455,7 @@ msgid "Description" msgstr "Descripció" #: actions/showapplication.php:192 actions/showgroup.php:439 -#: lib/profileaction.php:176 +#: lib/profileaction.php:182 msgid "Statistics" msgstr "Estadístiques" @@ -3609,7 +3614,7 @@ msgid "Members" msgstr "Membres" #: actions/showgroup.php:396 lib/profileaction.php:117 -#: lib/profileaction.php:150 lib/profileaction.php:238 lib/section.php:95 +#: lib/profileaction.php:150 lib/profileaction.php:250 lib/section.php:95 #: lib/subscriptionlist.php:126 lib/tagcloudsection.php:71 msgid "(None)" msgstr "(Cap)" @@ -3777,7 +3782,7 @@ msgid "Unknown language \"%s\"." msgstr "Llengua desconeguda «%s»" #: actions/siteadminpanel.php:165 -msgid "Minimum text limit is 140 characters." +msgid "Minimum text limit is 0 (unlimited)." msgstr "" #: actions/siteadminpanel.php:171 @@ -4059,8 +4064,7 @@ msgstr "Desa els paràmetres del lloc" msgid "You are not subscribed to that profile." msgstr "No estàs subscrit a aquest perfil." -#: actions/subedit.php:83 classes/Subscription.php:89 -#: classes/Subscription.php:116 +#: actions/subedit.php:83 classes/Subscription.php:132 msgid "Could not save subscription." msgstr "No s'ha pogut guardar la subscripció." @@ -4637,38 +4641,38 @@ msgstr "Problema en guardar l'avís." msgid "RT @%1$s %2$s" msgstr "%1$s (%2$s)" -#: classes/Subscription.php:66 lib/oauthstore.php:465 +#: classes/Subscription.php:74 lib/oauthstore.php:465 msgid "You have been banned from subscribing." msgstr "Se us ha banejat la subscripció." -#: classes/Subscription.php:70 +#: classes/Subscription.php:78 msgid "Already subscribed!" msgstr "Ja hi esteu subscrit!" -#: classes/Subscription.php:74 +#: classes/Subscription.php:82 msgid "User has blocked you." msgstr "Un usuari t'ha bloquejat." -#: classes/Subscription.php:157 +#: classes/Subscription.php:167 #, fuzzy msgid "Not subscribed!" msgstr "No estàs subscrit!" -#: classes/Subscription.php:163 +#: classes/Subscription.php:173 #, fuzzy msgid "Couldn't delete self-subscription." msgstr "No s'ha pogut eliminar la subscripció." -#: classes/Subscription.php:190 +#: classes/Subscription.php:200 #, fuzzy msgid "Couldn't delete subscription OMB token." msgstr "No s'ha pogut eliminar la subscripció." -#: classes/Subscription.php:201 +#: classes/Subscription.php:211 msgid "Couldn't delete subscription." msgstr "No s'ha pogut eliminar la subscripció." -#: classes/User.php:378 +#: classes/User.php:363 #, php-format msgid "Welcome to %1$s, @%2$s!" msgstr "Us donem la benvinguda a %1$s, @%2$s!" @@ -4972,22 +4976,22 @@ msgstr "Posteriors" msgid "Before" msgstr "Anteriors" -#: lib/activity.php:453 +#: lib/activity.php:120 +msgid "Expecting a root feed element but got a whole XML document." +msgstr "" + +#: lib/activityutils.php:208 msgid "Can't handle remote content yet." msgstr "" -#: lib/activity.php:481 +#: lib/activityutils.php:236 msgid "Can't handle embedded XML content yet." msgstr "" -#: lib/activity.php:485 +#: lib/activityutils.php:240 msgid "Can't handle embedded Base64 content yet." msgstr "" -#: lib/activity.php:1089 -msgid "Expecting a root feed element but got a whole XML document." -msgstr "" - #. TRANS: Client error message #: lib/adminpanelaction.php:98 msgid "You cannot make changes to this site." @@ -5476,19 +5480,19 @@ msgid "" "tracking - not yet implemented.\n" msgstr "" -#: lib/common.php:136 +#: lib/common.php:135 msgid "No configuration file found. " msgstr "No s'ha trobat cap fitxer de configuració. " -#: lib/common.php:137 +#: lib/common.php:136 msgid "I looked for configuration files in the following places: " msgstr "" -#: lib/common.php:139 +#: lib/common.php:138 msgid "You may wish to run the installer to fix this." msgstr "Podeu voler executar l'instal·lador per a corregir-ho." -#: lib/common.php:140 +#: lib/common.php:139 msgid "Go to the installer." msgstr "Vés a l'instal·lador." @@ -5664,40 +5668,40 @@ msgstr "Etiquetes en les notificacions del grup %s" msgid "This page is not available in a media type you accept" msgstr "Aquesta pàgina no està disponible en un tipus de mèdia que acceptis." -#: lib/imagefile.php:74 +#: lib/imagefile.php:72 msgid "Unsupported image file format." msgstr "Format d'imatge no suportat." -#: lib/imagefile.php:90 +#: lib/imagefile.php:88 #, fuzzy, php-format msgid "That file is too big. The maximum file size is %s." msgstr "Pots pujar una imatge de logo per al grup." -#: lib/imagefile.php:95 +#: lib/imagefile.php:93 msgid "Partial upload." msgstr "Càrrega parcial." -#: lib/imagefile.php:103 lib/mediafile.php:170 +#: lib/imagefile.php:101 lib/mediafile.php:170 msgid "System error uploading file." msgstr "Error del sistema en pujar el fitxer." -#: lib/imagefile.php:111 +#: lib/imagefile.php:109 msgid "Not an image or corrupt file." msgstr "No és una imatge o és un fitxer corrupte." -#: lib/imagefile.php:124 +#: lib/imagefile.php:122 msgid "Lost our file." msgstr "Hem perdut el nostre arxiu." -#: lib/imagefile.php:168 lib/imagefile.php:233 +#: lib/imagefile.php:163 lib/imagefile.php:224 msgid "Unknown file type" msgstr "Tipus de fitxer desconegut" -#: lib/imagefile.php:253 +#: lib/imagefile.php:244 msgid "MB" msgstr "MB" -#: lib/imagefile.php:255 +#: lib/imagefile.php:246 msgid "kB" msgstr "kB" @@ -6164,7 +6168,7 @@ msgstr "Etiquetes en les notificacions de %s's" msgid "Unknown" msgstr "Acció desconeguda" -#: lib/profileaction.php:109 lib/profileaction.php:194 lib/subgroupnav.php:82 +#: lib/profileaction.php:109 lib/profileaction.php:200 lib/subgroupnav.php:82 msgid "Subscriptions" msgstr "Subscripcions" @@ -6172,7 +6176,7 @@ msgstr "Subscripcions" msgid "All subscriptions" msgstr "Totes les subscripcions" -#: lib/profileaction.php:142 lib/profileaction.php:203 lib/subgroupnav.php:90 +#: lib/profileaction.php:142 lib/profileaction.php:209 lib/subgroupnav.php:90 msgid "Subscribers" msgstr "Subscriptors" @@ -6180,15 +6184,20 @@ msgstr "Subscriptors" msgid "All subscribers" msgstr "Tots els subscriptors" -#: lib/profileaction.php:180 +#: lib/profileaction.php:186 msgid "User ID" msgstr "ID de l'usuari" -#: lib/profileaction.php:185 +#: lib/profileaction.php:191 msgid "Member since" msgstr "Membre des de" -#: lib/profileaction.php:247 +#. TRANS: Average count of posts made per day since account registration +#: lib/profileaction.php:230 +msgid "Daily average" +msgstr "" + +#: lib/profileaction.php:259 msgid "All groups" msgstr "Tots els grups" @@ -6364,6 +6373,11 @@ msgstr "Deixar d'estar subscrit des d'aquest usuari" msgid "Unsubscribe" msgstr "Cancel·lar subscripció" +#: lib/usernoprofileexception.php:58 +#, fuzzy, php-format +msgid "User %s (%d) has no profile record." +msgstr "L'usuari no té perfil." + #: lib/userprofile.php:117 msgid "Edit Avatar" msgstr "Edita l'avatar" diff --git a/locale/cs/LC_MESSAGES/statusnet.po b/locale/cs/LC_MESSAGES/statusnet.po index 4790caf6cb..d9669c2d61 100644 --- a/locale/cs/LC_MESSAGES/statusnet.po +++ b/locale/cs/LC_MESSAGES/statusnet.po @@ -9,12 +9,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-03-17 21:39+0000\n" -"PO-Revision-Date: 2010-03-17 21:40:20+0000\n" +"POT-Creation-Date: 2010-03-23 20:09+0000\n" +"PO-Revision-Date: 2010-03-23 20:09:24+0000\n" "Language-Team: Czech\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r63880); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.17alpha (r64087); Translate extension (2010-01-16)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: cs\n" "X-Message-Group: out-statusnet\n" @@ -782,23 +782,28 @@ msgstr "Upload" msgid "Crop" msgstr "" -#: actions/avatarsettings.php:328 +#: actions/avatarsettings.php:305 +#, fuzzy +msgid "No file uploaded." +msgstr "Částečné náhrání." + +#: actions/avatarsettings.php:332 msgid "Pick a square area of the image to be your avatar" msgstr "" -#: actions/avatarsettings.php:343 actions/grouplogo.php:380 +#: actions/avatarsettings.php:347 actions/grouplogo.php:380 msgid "Lost our file data." msgstr "" -#: actions/avatarsettings.php:366 +#: actions/avatarsettings.php:370 msgid "Avatar updated." msgstr "Obrázek nahrán" -#: actions/avatarsettings.php:369 +#: actions/avatarsettings.php:373 msgid "Failed updating avatar." msgstr "Nahrávání obrázku selhalo." -#: actions/avatarsettings.php:393 +#: actions/avatarsettings.php:397 msgid "Avatar deleted." msgstr "Avatar smazán." @@ -941,7 +946,7 @@ msgid "Conversation" msgstr "Umístění" #: actions/conversation.php:154 lib/mailbox.php:116 lib/noticelist.php:87 -#: lib/profileaction.php:218 lib/searchgroupnav.php:82 +#: lib/profileaction.php:224 lib/searchgroupnav.php:82 msgid "Notices" msgstr "Sdělení" @@ -1788,7 +1793,7 @@ msgstr "" msgid "Updates from members of %1$s on %2$s!" msgstr "Mikroblog od %s" -#: actions/groups.php:62 lib/profileaction.php:212 lib/profileaction.php:232 +#: actions/groups.php:62 lib/profileaction.php:218 lib/profileaction.php:244 #: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98 msgid "Groups" msgstr "Skupiny" @@ -3403,7 +3408,7 @@ msgid "Description" msgstr "Odběry" #: actions/showapplication.php:192 actions/showgroup.php:439 -#: lib/profileaction.php:176 +#: lib/profileaction.php:182 msgid "Statistics" msgstr "Statistiky" @@ -3562,7 +3567,7 @@ msgid "Members" msgstr "Členem od" #: actions/showgroup.php:396 lib/profileaction.php:117 -#: lib/profileaction.php:150 lib/profileaction.php:238 lib/section.php:95 +#: lib/profileaction.php:150 lib/profileaction.php:250 lib/section.php:95 #: lib/subscriptionlist.php:126 lib/tagcloudsection.php:71 msgid "(None)" msgstr "" @@ -3725,7 +3730,7 @@ msgid "Unknown language \"%s\"." msgstr "" #: actions/siteadminpanel.php:165 -msgid "Minimum text limit is 140 characters." +msgid "Minimum text limit is 0 (unlimited)." msgstr "" #: actions/siteadminpanel.php:171 @@ -4000,8 +4005,7 @@ msgstr "Nastavení" msgid "You are not subscribed to that profile." msgstr "Neodeslal jste nám profil" -#: actions/subedit.php:83 classes/Subscription.php:89 -#: classes/Subscription.php:116 +#: actions/subedit.php:83 classes/Subscription.php:132 #, fuzzy msgid "Could not save subscription." msgstr "Nelze vytvořit odebírat" @@ -4576,39 +4580,39 @@ msgstr "Problém při ukládání sdělení" msgid "RT @%1$s %2$s" msgstr "" -#: classes/Subscription.php:66 lib/oauthstore.php:465 +#: classes/Subscription.php:74 lib/oauthstore.php:465 msgid "You have been banned from subscribing." msgstr "" -#: classes/Subscription.php:70 +#: classes/Subscription.php:78 msgid "Already subscribed!" msgstr "" -#: classes/Subscription.php:74 +#: classes/Subscription.php:82 #, fuzzy msgid "User has blocked you." msgstr "Uživatel nemá profil." -#: classes/Subscription.php:157 +#: classes/Subscription.php:167 #, fuzzy msgid "Not subscribed!" msgstr "Nepřihlášen!" -#: classes/Subscription.php:163 +#: classes/Subscription.php:173 #, fuzzy msgid "Couldn't delete self-subscription." msgstr "Nelze smazat odebírání" -#: classes/Subscription.php:190 +#: classes/Subscription.php:200 #, fuzzy msgid "Couldn't delete subscription OMB token." msgstr "Nelze smazat odebírání" -#: classes/Subscription.php:201 +#: classes/Subscription.php:211 msgid "Couldn't delete subscription." msgstr "Nelze smazat odebírání" -#: classes/User.php:378 +#: classes/User.php:363 #, php-format msgid "Welcome to %1$s, @%2$s!" msgstr "" @@ -4916,22 +4920,22 @@ msgstr "« Novější" msgid "Before" msgstr "Starší »" -#: lib/activity.php:453 +#: lib/activity.php:120 +msgid "Expecting a root feed element but got a whole XML document." +msgstr "" + +#: lib/activityutils.php:208 msgid "Can't handle remote content yet." msgstr "" -#: lib/activity.php:481 +#: lib/activityutils.php:236 msgid "Can't handle embedded XML content yet." msgstr "" -#: lib/activity.php:485 +#: lib/activityutils.php:240 msgid "Can't handle embedded Base64 content yet." msgstr "" -#: lib/activity.php:1089 -msgid "Expecting a root feed element but got a whole XML document." -msgstr "" - #. TRANS: Client error message #: lib/adminpanelaction.php:98 msgid "You cannot make changes to this site." @@ -5426,20 +5430,20 @@ msgid "" "tracking - not yet implemented.\n" msgstr "" -#: lib/common.php:136 +#: lib/common.php:135 #, fuzzy msgid "No configuration file found. " msgstr "Žádný potvrzující kód." -#: lib/common.php:137 +#: lib/common.php:136 msgid "I looked for configuration files in the following places: " msgstr "" -#: lib/common.php:139 +#: lib/common.php:138 msgid "You may wish to run the installer to fix this." msgstr "" -#: lib/common.php:140 +#: lib/common.php:139 msgid "Go to the installer." msgstr "" @@ -5621,41 +5625,41 @@ msgstr "" msgid "This page is not available in a media type you accept" msgstr "Tato stránka není k dispozici v typu média která přijímáte." -#: lib/imagefile.php:74 +#: lib/imagefile.php:72 msgid "Unsupported image file format." msgstr "Nepodporovaný formát obrázku." -#: lib/imagefile.php:90 +#: lib/imagefile.php:88 #, fuzzy, php-format msgid "That file is too big. The maximum file size is %s." msgstr "Je to příliš dlouhé. Maximální sdělení délka je 140 znaků" -#: lib/imagefile.php:95 +#: lib/imagefile.php:93 msgid "Partial upload." msgstr "Částečné náhrání." -#: lib/imagefile.php:103 lib/mediafile.php:170 +#: lib/imagefile.php:101 lib/mediafile.php:170 msgid "System error uploading file." msgstr "Chyba systému při nahrávání souboru" -#: lib/imagefile.php:111 +#: lib/imagefile.php:109 msgid "Not an image or corrupt file." msgstr "Není obrázkem, nebo jde o poškozený soubor." -#: lib/imagefile.php:124 +#: lib/imagefile.php:122 #, fuzzy msgid "Lost our file." msgstr "Žádné takové oznámení." -#: lib/imagefile.php:168 lib/imagefile.php:233 +#: lib/imagefile.php:163 lib/imagefile.php:224 msgid "Unknown file type" msgstr "" -#: lib/imagefile.php:253 +#: lib/imagefile.php:244 msgid "MB" msgstr "" -#: lib/imagefile.php:255 +#: lib/imagefile.php:246 msgid "kB" msgstr "" @@ -6119,7 +6123,7 @@ msgstr "" msgid "Unknown" msgstr "" -#: lib/profileaction.php:109 lib/profileaction.php:194 lib/subgroupnav.php:82 +#: lib/profileaction.php:109 lib/profileaction.php:200 lib/subgroupnav.php:82 msgid "Subscriptions" msgstr "Odběry" @@ -6127,7 +6131,7 @@ msgstr "Odběry" msgid "All subscriptions" msgstr "Všechny odběry" -#: lib/profileaction.php:142 lib/profileaction.php:203 lib/subgroupnav.php:90 +#: lib/profileaction.php:142 lib/profileaction.php:209 lib/subgroupnav.php:90 msgid "Subscribers" msgstr "Odběratelé" @@ -6135,15 +6139,20 @@ msgstr "Odběratelé" msgid "All subscribers" msgstr "Všichni odběratelé" -#: lib/profileaction.php:180 +#: lib/profileaction.php:186 msgid "User ID" msgstr "" -#: lib/profileaction.php:185 +#: lib/profileaction.php:191 msgid "Member since" msgstr "Členem od" -#: lib/profileaction.php:247 +#. TRANS: Average count of posts made per day since account registration +#: lib/profileaction.php:230 +msgid "Daily average" +msgstr "" + +#: lib/profileaction.php:259 msgid "All groups" msgstr "" @@ -6325,6 +6334,11 @@ msgstr "" msgid "Unsubscribe" msgstr "Odhlásit" +#: lib/usernoprofileexception.php:58 +#, fuzzy, php-format +msgid "User %s (%d) has no profile record." +msgstr "Uživatel nemá profil." + #: lib/userprofile.php:117 msgid "Edit Avatar" msgstr "Upravit avatar" diff --git a/locale/de/LC_MESSAGES/statusnet.po b/locale/de/LC_MESSAGES/statusnet.po index 014c755655..60835cf962 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-03-17 21:39+0000\n" -"PO-Revision-Date: 2010-03-17 21:40:23+0000\n" +"POT-Creation-Date: 2010-03-23 20:09+0000\n" +"PO-Revision-Date: 2010-03-23 20:09:27+0000\n" "Language-Team: German\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r63880); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.17alpha (r64087); Translate extension (2010-01-16)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: de\n" "X-Message-Group: out-statusnet\n" @@ -781,24 +781,29 @@ msgstr "Hochladen" msgid "Crop" msgstr "Zuschneiden" -#: actions/avatarsettings.php:328 +#: actions/avatarsettings.php:305 +#, fuzzy +msgid "No file uploaded." +msgstr "Kein Profil angegeben." + +#: actions/avatarsettings.php:332 msgid "Pick a square area of the image to be your avatar" msgstr "" "Wähle eine quadratische Fläche aus dem Bild, um dein Avatar zu speichern" -#: actions/avatarsettings.php:343 actions/grouplogo.php:380 +#: actions/avatarsettings.php:347 actions/grouplogo.php:380 msgid "Lost our file data." msgstr "Daten verloren." -#: actions/avatarsettings.php:366 +#: actions/avatarsettings.php:370 msgid "Avatar updated." msgstr "Avatar aktualisiert." -#: actions/avatarsettings.php:369 +#: actions/avatarsettings.php:373 msgid "Failed updating avatar." msgstr "Aktualisierung des Avatars fehlgeschlagen." -#: actions/avatarsettings.php:393 +#: actions/avatarsettings.php:397 msgid "Avatar deleted." msgstr "Avatar gelöscht." @@ -936,7 +941,7 @@ msgid "Conversation" msgstr "Unterhaltung" #: actions/conversation.php:154 lib/mailbox.php:116 lib/noticelist.php:87 -#: lib/profileaction.php:218 lib/searchgroupnav.php:82 +#: lib/profileaction.php:224 lib/searchgroupnav.php:82 msgid "Notices" msgstr "Nachrichten" @@ -1763,7 +1768,7 @@ msgstr "%s Zeitleiste" msgid "Updates from members of %1$s on %2$s!" msgstr "Aktualisierungen von %1$s auf %2$s!" -#: actions/groups.php:62 lib/profileaction.php:212 lib/profileaction.php:232 +#: actions/groups.php:62 lib/profileaction.php:218 lib/profileaction.php:244 #: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98 msgid "Groups" msgstr "Gruppen" @@ -3439,7 +3444,7 @@ msgid "Description" msgstr "Beschreibung" #: actions/showapplication.php:192 actions/showgroup.php:439 -#: lib/profileaction.php:176 +#: lib/profileaction.php:182 msgid "Statistics" msgstr "Statistiken" @@ -3601,7 +3606,7 @@ msgid "Members" msgstr "Mitglieder" #: actions/showgroup.php:396 lib/profileaction.php:117 -#: lib/profileaction.php:150 lib/profileaction.php:238 lib/section.php:95 +#: lib/profileaction.php:150 lib/profileaction.php:250 lib/section.php:95 #: lib/subscriptionlist.php:126 lib/tagcloudsection.php:71 msgid "(None)" msgstr "(Kein)" @@ -3773,7 +3778,8 @@ msgid "Unknown language \"%s\"." msgstr "Unbekannte Sprache „%s“" #: actions/siteadminpanel.php:165 -msgid "Minimum text limit is 140 characters." +#, fuzzy +msgid "Minimum text limit is 0 (unlimited)." msgstr "Minimale Textlänge ist 140 Zeichen." #: actions/siteadminpanel.php:171 @@ -4050,8 +4056,7 @@ msgstr "Site-Einstellungen speichern" msgid "You are not subscribed to that profile." msgstr "Du hast dieses Profil nicht abonniert." -#: actions/subedit.php:83 classes/Subscription.php:89 -#: classes/Subscription.php:116 +#: actions/subedit.php:83 classes/Subscription.php:132 msgid "Could not save subscription." msgstr "Konnte Abonnement nicht erstellen." @@ -4628,36 +4633,36 @@ msgstr "Problem bei Speichern der Nachricht." msgid "RT @%1$s %2$s" msgstr "RT @%1$s %2$s" -#: classes/Subscription.php:66 lib/oauthstore.php:465 +#: classes/Subscription.php:74 lib/oauthstore.php:465 msgid "You have been banned from subscribing." msgstr "Dieser Benutzer erlaubt dir nicht ihn zu abonnieren." -#: classes/Subscription.php:70 +#: classes/Subscription.php:78 msgid "Already subscribed!" msgstr "Bereits abonniert!" -#: classes/Subscription.php:74 +#: classes/Subscription.php:82 msgid "User has blocked you." msgstr "Dieser Benutzer hat dich blockiert." -#: classes/Subscription.php:157 +#: classes/Subscription.php:167 #, fuzzy msgid "Not subscribed!" msgstr "Nicht abonniert!" -#: classes/Subscription.php:163 +#: classes/Subscription.php:173 msgid "Couldn't delete self-subscription." msgstr "Konnte Abonnement nicht löschen." -#: classes/Subscription.php:190 +#: classes/Subscription.php:200 msgid "Couldn't delete subscription OMB token." msgstr "Konnte OMB-Abonnement nicht löschen." -#: classes/Subscription.php:201 +#: classes/Subscription.php:211 msgid "Couldn't delete subscription." msgstr "Konnte Abonnement nicht löschen." -#: classes/User.php:378 +#: classes/User.php:363 #, php-format msgid "Welcome to %1$s, @%2$s!" msgstr "Herzlich willkommen bei %1$s, @%2$s!" @@ -4945,22 +4950,22 @@ msgstr "Später" msgid "Before" msgstr "Vorher" -#: lib/activity.php:453 +#: lib/activity.php:120 +msgid "Expecting a root feed element but got a whole XML document." +msgstr "" + +#: lib/activityutils.php:208 msgid "Can't handle remote content yet." msgstr "Fremdinhalt kann noch nicht eingebunden werden." -#: lib/activity.php:481 +#: lib/activityutils.php:236 msgid "Can't handle embedded XML content yet." msgstr "Kann eingebundenen XML Inhalt nicht verarbeiten." -#: lib/activity.php:485 +#: lib/activityutils.php:240 msgid "Can't handle embedded Base64 content yet." msgstr "Eingebundener Base64 Inhalt kann noch nicht verarbeitet werden." -#: lib/activity.php:1089 -msgid "Expecting a root feed element but got a whole XML document." -msgstr "" - #. TRANS: Client error message #: lib/adminpanelaction.php:98 msgid "You cannot make changes to this site." @@ -5470,19 +5475,19 @@ msgstr "" "tracks - not yet implemented.\n" "tracking - not yet implemented.\n" -#: lib/common.php:136 +#: lib/common.php:135 msgid "No configuration file found. " msgstr "Keine Konfigurationsdatei gefunden." -#: lib/common.php:137 +#: lib/common.php:136 msgid "I looked for configuration files in the following places: " msgstr "Ich habe an folgenden Stellen nach Konfigurationsdateien gesucht: " -#: lib/common.php:139 +#: lib/common.php:138 msgid "You may wish to run the installer to fix this." msgstr "Bitte die Installation erneut starten um das Problem zu beheben." -#: lib/common.php:140 +#: lib/common.php:139 msgid "Go to the installer." msgstr "Zur Installation gehen." @@ -5661,40 +5666,40 @@ msgstr "Stichworte in den Nachrichten der Gruppe %s" msgid "This page is not available in a media type you accept" msgstr "Dies Seite liegt in keinem von dir akzeptierten Mediatype vor." -#: lib/imagefile.php:74 +#: lib/imagefile.php:72 msgid "Unsupported image file format." msgstr "Bildformat wird nicht unterstützt." -#: lib/imagefile.php:90 +#: lib/imagefile.php:88 #, fuzzy, php-format msgid "That file is too big. The maximum file size is %s." msgstr "Du kannst ein Logo für Deine Gruppe hochladen." -#: lib/imagefile.php:95 +#: lib/imagefile.php:93 msgid "Partial upload." msgstr "Unvollständiges Hochladen." -#: lib/imagefile.php:103 lib/mediafile.php:170 +#: lib/imagefile.php:101 lib/mediafile.php:170 msgid "System error uploading file." msgstr "Systemfehler beim hochladen der Datei." -#: lib/imagefile.php:111 +#: lib/imagefile.php:109 msgid "Not an image or corrupt file." msgstr "Kein Bild oder defekte Datei." -#: lib/imagefile.php:124 +#: lib/imagefile.php:122 msgid "Lost our file." msgstr "Daten verloren." -#: lib/imagefile.php:168 lib/imagefile.php:233 +#: lib/imagefile.php:163 lib/imagefile.php:224 msgid "Unknown file type" msgstr "Unbekannter Dateityp" -#: lib/imagefile.php:253 +#: lib/imagefile.php:244 msgid "MB" msgstr "MB" -#: lib/imagefile.php:255 +#: lib/imagefile.php:246 msgid "kB" msgstr "kB" @@ -6216,7 +6221,7 @@ msgstr "Stichworte in %ss Nachrichten" msgid "Unknown" msgstr "Unbekannter Befehl" -#: lib/profileaction.php:109 lib/profileaction.php:194 lib/subgroupnav.php:82 +#: lib/profileaction.php:109 lib/profileaction.php:200 lib/subgroupnav.php:82 msgid "Subscriptions" msgstr "Abonnements" @@ -6224,7 +6229,7 @@ msgstr "Abonnements" msgid "All subscriptions" msgstr "Alle Abonnements" -#: lib/profileaction.php:142 lib/profileaction.php:203 lib/subgroupnav.php:90 +#: lib/profileaction.php:142 lib/profileaction.php:209 lib/subgroupnav.php:90 msgid "Subscribers" msgstr "Abonnenten" @@ -6232,15 +6237,20 @@ msgstr "Abonnenten" msgid "All subscribers" msgstr "Alle Abonnenten" -#: lib/profileaction.php:180 +#: lib/profileaction.php:186 msgid "User ID" msgstr "Nutzer ID" -#: lib/profileaction.php:185 +#: lib/profileaction.php:191 msgid "Member since" msgstr "Mitglied seit" -#: lib/profileaction.php:247 +#. TRANS: Average count of posts made per day since account registration +#: lib/profileaction.php:230 +msgid "Daily average" +msgstr "" + +#: lib/profileaction.php:259 msgid "All groups" msgstr "Alle Gruppen" @@ -6412,6 +6422,11 @@ msgstr "Lösche dein Abonnement von diesem Benutzer" msgid "Unsubscribe" msgstr "Abbestellen" +#: lib/usernoprofileexception.php:58 +#, fuzzy, php-format +msgid "User %s (%d) has no profile record." +msgstr "Benutzer hat kein Profil." + #: lib/userprofile.php:117 msgid "Edit Avatar" msgstr "Avatar bearbeiten" @@ -6422,7 +6437,7 @@ msgstr "Benutzeraktionen" #: lib/userprofile.php:237 msgid "User deletion in progress..." -msgstr "" +msgstr "Löschung des Nutzers in Arbeit..." #: lib/userprofile.php:263 msgid "Edit profile settings" diff --git a/locale/el/LC_MESSAGES/statusnet.po b/locale/el/LC_MESSAGES/statusnet.po index d2552a0882..b001bc7af5 100644 --- a/locale/el/LC_MESSAGES/statusnet.po +++ b/locale/el/LC_MESSAGES/statusnet.po @@ -10,12 +10,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-03-17 21:39+0000\n" -"PO-Revision-Date: 2010-03-17 21:40:26+0000\n" +"POT-Creation-Date: 2010-03-23 20:09+0000\n" +"PO-Revision-Date: 2010-03-23 20:09:30+0000\n" "Language-Team: Greek\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r63880); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.17alpha (r64087); Translate extension (2010-01-16)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: el\n" "X-Message-Group: out-statusnet\n" @@ -767,23 +767,27 @@ msgstr "" msgid "Crop" msgstr "" -#: actions/avatarsettings.php:328 +#: actions/avatarsettings.php:305 +msgid "No file uploaded." +msgstr "" + +#: actions/avatarsettings.php:332 msgid "Pick a square area of the image to be your avatar" msgstr "" -#: actions/avatarsettings.php:343 actions/grouplogo.php:380 +#: actions/avatarsettings.php:347 actions/grouplogo.php:380 msgid "Lost our file data." msgstr "" -#: actions/avatarsettings.php:366 +#: actions/avatarsettings.php:370 msgid "Avatar updated." msgstr "" -#: actions/avatarsettings.php:369 +#: actions/avatarsettings.php:373 msgid "Failed updating avatar." msgstr "" -#: actions/avatarsettings.php:393 +#: actions/avatarsettings.php:397 #, fuzzy msgid "Avatar deleted." msgstr "Ρυθμίσεις OpenID" @@ -923,7 +927,7 @@ msgid "Conversation" msgstr "Συζήτηση" #: actions/conversation.php:154 lib/mailbox.php:116 lib/noticelist.php:87 -#: lib/profileaction.php:218 lib/searchgroupnav.php:82 +#: lib/profileaction.php:224 lib/searchgroupnav.php:82 msgid "Notices" msgstr "" @@ -1759,7 +1763,7 @@ msgstr "χρονοδιάγραμμα του χρήστη %s" msgid "Updates from members of %1$s on %2$s!" msgstr "" -#: actions/groups.php:62 lib/profileaction.php:212 lib/profileaction.php:232 +#: actions/groups.php:62 lib/profileaction.php:218 lib/profileaction.php:244 #: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98 msgid "Groups" msgstr "" @@ -3358,7 +3362,7 @@ msgid "Description" msgstr "Περιγραφή" #: actions/showapplication.php:192 actions/showgroup.php:439 -#: lib/profileaction.php:176 +#: lib/profileaction.php:182 msgid "Statistics" msgstr "" @@ -3517,7 +3521,7 @@ msgid "Members" msgstr "Μέλη" #: actions/showgroup.php:396 lib/profileaction.php:117 -#: lib/profileaction.php:150 lib/profileaction.php:238 lib/section.php:95 +#: lib/profileaction.php:150 lib/profileaction.php:250 lib/section.php:95 #: lib/subscriptionlist.php:126 lib/tagcloudsection.php:71 msgid "(None)" msgstr "" @@ -3678,7 +3682,7 @@ msgid "Unknown language \"%s\"." msgstr "" #: actions/siteadminpanel.php:165 -msgid "Minimum text limit is 140 characters." +msgid "Minimum text limit is 0 (unlimited)." msgstr "" #: actions/siteadminpanel.php:171 @@ -3951,8 +3955,7 @@ msgstr "Ρυθμίσεις OpenID" msgid "You are not subscribed to that profile." msgstr "" -#: actions/subedit.php:83 classes/Subscription.php:89 -#: classes/Subscription.php:116 +#: actions/subedit.php:83 classes/Subscription.php:132 #, fuzzy msgid "Could not save subscription." msgstr "Αδύνατη η αποθήκευση των νέων πληροφοριών του προφίλ" @@ -4502,38 +4505,38 @@ msgstr "" msgid "RT @%1$s %2$s" msgstr "" -#: classes/Subscription.php:66 lib/oauthstore.php:465 +#: classes/Subscription.php:74 lib/oauthstore.php:465 msgid "You have been banned from subscribing." msgstr "" -#: classes/Subscription.php:70 +#: classes/Subscription.php:78 msgid "Already subscribed!" msgstr "" -#: classes/Subscription.php:74 +#: classes/Subscription.php:82 msgid "User has blocked you." msgstr "" -#: classes/Subscription.php:157 +#: classes/Subscription.php:167 #, fuzzy msgid "Not subscribed!" msgstr "Απέτυχε η συνδρομή." -#: classes/Subscription.php:163 +#: classes/Subscription.php:173 #, fuzzy msgid "Couldn't delete self-subscription." msgstr "Απέτυχε η διαγραφή συνδρομής." -#: classes/Subscription.php:190 +#: classes/Subscription.php:200 #, fuzzy msgid "Couldn't delete subscription OMB token." msgstr "Απέτυχε η διαγραφή συνδρομής." -#: classes/Subscription.php:201 +#: classes/Subscription.php:211 msgid "Couldn't delete subscription." msgstr "Απέτυχε η διαγραφή συνδρομής." -#: classes/User.php:378 +#: classes/User.php:363 #, php-format msgid "Welcome to %1$s, @%2$s!" msgstr "" @@ -4830,22 +4833,22 @@ msgstr "" msgid "Before" msgstr "" -#: lib/activity.php:453 +#: lib/activity.php:120 +msgid "Expecting a root feed element but got a whole XML document." +msgstr "" + +#: lib/activityutils.php:208 msgid "Can't handle remote content yet." msgstr "" -#: lib/activity.php:481 +#: lib/activityutils.php:236 msgid "Can't handle embedded XML content yet." msgstr "" -#: lib/activity.php:485 +#: lib/activityutils.php:240 msgid "Can't handle embedded Base64 content yet." msgstr "" -#: lib/activity.php:1089 -msgid "Expecting a root feed element but got a whole XML document." -msgstr "" - #. TRANS: Client error message #: lib/adminpanelaction.php:98 msgid "You cannot make changes to this site." @@ -5326,20 +5329,20 @@ msgid "" "tracking - not yet implemented.\n" msgstr "" -#: lib/common.php:136 +#: lib/common.php:135 #, fuzzy msgid "No configuration file found. " msgstr "Ο κωδικός επιβεβαίωσης δεν βρέθηκε." -#: lib/common.php:137 +#: lib/common.php:136 msgid "I looked for configuration files in the following places: " msgstr "" -#: lib/common.php:139 +#: lib/common.php:138 msgid "You may wish to run the installer to fix this." msgstr "" -#: lib/common.php:140 +#: lib/common.php:139 msgid "Go to the installer." msgstr "" @@ -5515,41 +5518,41 @@ msgstr "" msgid "This page is not available in a media type you accept" msgstr "" -#: lib/imagefile.php:74 +#: lib/imagefile.php:72 msgid "Unsupported image file format." msgstr "" -#: lib/imagefile.php:90 +#: lib/imagefile.php:88 #, php-format msgid "That file is too big. The maximum file size is %s." msgstr "" -#: lib/imagefile.php:95 +#: lib/imagefile.php:93 msgid "Partial upload." msgstr "" -#: lib/imagefile.php:103 lib/mediafile.php:170 +#: lib/imagefile.php:101 lib/mediafile.php:170 msgid "System error uploading file." msgstr "" -#: lib/imagefile.php:111 +#: lib/imagefile.php:109 msgid "Not an image or corrupt file." msgstr "" -#: lib/imagefile.php:124 +#: lib/imagefile.php:122 #, fuzzy msgid "Lost our file." msgstr "Αδύνατη η αποθήκευση του προφίλ." -#: lib/imagefile.php:168 lib/imagefile.php:233 +#: lib/imagefile.php:163 lib/imagefile.php:224 msgid "Unknown file type" msgstr "" -#: lib/imagefile.php:253 +#: lib/imagefile.php:244 msgid "MB" msgstr "" -#: lib/imagefile.php:255 +#: lib/imagefile.php:246 msgid "kB" msgstr "" @@ -5999,7 +6002,7 @@ msgstr "" msgid "Unknown" msgstr "" -#: lib/profileaction.php:109 lib/profileaction.php:194 lib/subgroupnav.php:82 +#: lib/profileaction.php:109 lib/profileaction.php:200 lib/subgroupnav.php:82 msgid "Subscriptions" msgstr "" @@ -6007,7 +6010,7 @@ msgstr "" msgid "All subscriptions" msgstr "Όλες οι συνδρομές" -#: lib/profileaction.php:142 lib/profileaction.php:203 lib/subgroupnav.php:90 +#: lib/profileaction.php:142 lib/profileaction.php:209 lib/subgroupnav.php:90 msgid "Subscribers" msgstr "" @@ -6015,15 +6018,20 @@ msgstr "" msgid "All subscribers" msgstr "" -#: lib/profileaction.php:180 +#: lib/profileaction.php:186 msgid "User ID" msgstr "" -#: lib/profileaction.php:185 +#: lib/profileaction.php:191 msgid "Member since" msgstr "Μέλος από" -#: lib/profileaction.php:247 +#. TRANS: Average count of posts made per day since account registration +#: lib/profileaction.php:230 +msgid "Daily average" +msgstr "" + +#: lib/profileaction.php:259 msgid "All groups" msgstr "" @@ -6200,6 +6208,11 @@ msgstr "" msgid "Unsubscribe" msgstr "" +#: lib/usernoprofileexception.php:58 +#, php-format +msgid "User %s (%d) has no profile record." +msgstr "" + #: lib/userprofile.php:117 msgid "Edit Avatar" msgstr "" diff --git a/locale/en_GB/LC_MESSAGES/statusnet.po b/locale/en_GB/LC_MESSAGES/statusnet.po index 361270cbbe..d1f9ea3f39 100644 --- a/locale/en_GB/LC_MESSAGES/statusnet.po +++ b/locale/en_GB/LC_MESSAGES/statusnet.po @@ -10,12 +10,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-03-17 21:39+0000\n" -"PO-Revision-Date: 2010-03-17 21:40:29+0000\n" +"POT-Creation-Date: 2010-03-23 20:09+0000\n" +"PO-Revision-Date: 2010-03-23 20:09:33+0000\n" "Language-Team: British English\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r63880); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.17alpha (r64087); Translate extension (2010-01-16)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: en-gb\n" "X-Message-Group: out-statusnet\n" @@ -768,23 +768,28 @@ msgstr "Upload" msgid "Crop" msgstr "Crop" -#: actions/avatarsettings.php:328 +#: actions/avatarsettings.php:305 +#, fuzzy +msgid "No file uploaded." +msgstr "No profile specified." + +#: actions/avatarsettings.php:332 msgid "Pick a square area of the image to be your avatar" msgstr "Pick a square area of the image to be your avatar" -#: actions/avatarsettings.php:343 actions/grouplogo.php:380 +#: actions/avatarsettings.php:347 actions/grouplogo.php:380 msgid "Lost our file data." msgstr "Lost our file data." -#: actions/avatarsettings.php:366 +#: actions/avatarsettings.php:370 msgid "Avatar updated." msgstr "Avatar updated." -#: actions/avatarsettings.php:369 +#: actions/avatarsettings.php:373 msgid "Failed updating avatar." msgstr "Failed updating avatar." -#: actions/avatarsettings.php:393 +#: actions/avatarsettings.php:397 msgid "Avatar deleted." msgstr "Avatar deleted." @@ -922,7 +927,7 @@ msgid "Conversation" msgstr "Conversation" #: actions/conversation.php:154 lib/mailbox.php:116 lib/noticelist.php:87 -#: lib/profileaction.php:218 lib/searchgroupnav.php:82 +#: lib/profileaction.php:224 lib/searchgroupnav.php:82 msgid "Notices" msgstr "Notices" @@ -1744,7 +1749,7 @@ msgstr "%s timeline" msgid "Updates from members of %1$s on %2$s!" msgstr "Updates from members of %1$s on %2$s!" -#: actions/groups.php:62 lib/profileaction.php:212 lib/profileaction.php:232 +#: actions/groups.php:62 lib/profileaction.php:218 lib/profileaction.php:244 #: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98 msgid "Groups" msgstr "Groups" @@ -3372,7 +3377,7 @@ msgid "Description" msgstr "Description" #: actions/showapplication.php:192 actions/showgroup.php:439 -#: lib/profileaction.php:176 +#: lib/profileaction.php:182 msgid "Statistics" msgstr "Statistics" @@ -3536,7 +3541,7 @@ msgid "Members" msgstr "Members" #: actions/showgroup.php:396 lib/profileaction.php:117 -#: lib/profileaction.php:150 lib/profileaction.php:238 lib/section.php:95 +#: lib/profileaction.php:150 lib/profileaction.php:250 lib/section.php:95 #: lib/subscriptionlist.php:126 lib/tagcloudsection.php:71 msgid "(None)" msgstr "(None)" @@ -3710,7 +3715,8 @@ msgid "Unknown language \"%s\"." msgstr "" #: actions/siteadminpanel.php:165 -msgid "Minimum text limit is 140 characters." +#, fuzzy +msgid "Minimum text limit is 0 (unlimited)." msgstr "Minimum text limit is 140 characters." #: actions/siteadminpanel.php:171 @@ -3986,8 +3992,7 @@ msgstr "Save site settings" msgid "You are not subscribed to that profile." msgstr "You are not subscribed to that profile." -#: actions/subedit.php:83 classes/Subscription.php:89 -#: classes/Subscription.php:116 +#: actions/subedit.php:83 classes/Subscription.php:132 msgid "Could not save subscription." msgstr "Could not save subscription." @@ -4552,37 +4557,37 @@ msgstr "Problem saving group inbox." msgid "RT @%1$s %2$s" msgstr "RT @%1$s %2$s" -#: classes/Subscription.php:66 lib/oauthstore.php:465 +#: classes/Subscription.php:74 lib/oauthstore.php:465 msgid "You have been banned from subscribing." msgstr "You have been banned from subscribing." -#: classes/Subscription.php:70 +#: classes/Subscription.php:78 msgid "Already subscribed!" msgstr "" -#: classes/Subscription.php:74 +#: classes/Subscription.php:82 msgid "User has blocked you." msgstr "User has blocked you." -#: classes/Subscription.php:157 +#: classes/Subscription.php:167 #, fuzzy msgid "Not subscribed!" msgstr "Not subscribed!" -#: classes/Subscription.php:163 +#: classes/Subscription.php:173 msgid "Couldn't delete self-subscription." msgstr "Couldn't delete self-subscription." -#: classes/Subscription.php:190 +#: classes/Subscription.php:200 #, fuzzy msgid "Couldn't delete subscription OMB token." msgstr "Couldn't delete subscription." -#: classes/Subscription.php:201 +#: classes/Subscription.php:211 msgid "Couldn't delete subscription." msgstr "Couldn't delete subscription." -#: classes/User.php:378 +#: classes/User.php:363 #, php-format msgid "Welcome to %1$s, @%2$s!" msgstr "Welcome to %1$s, @%2$s!" @@ -4883,22 +4888,22 @@ msgstr "After" msgid "Before" msgstr "Before" -#: lib/activity.php:453 +#: lib/activity.php:120 +msgid "Expecting a root feed element but got a whole XML document." +msgstr "" + +#: lib/activityutils.php:208 msgid "Can't handle remote content yet." msgstr "" -#: lib/activity.php:481 +#: lib/activityutils.php:236 msgid "Can't handle embedded XML content yet." msgstr "" -#: lib/activity.php:485 +#: lib/activityutils.php:240 msgid "Can't handle embedded Base64 content yet." msgstr "" -#: lib/activity.php:1089 -msgid "Expecting a root feed element but got a whole XML document." -msgstr "" - #. TRANS: Client error message #: lib/adminpanelaction.php:98 msgid "You cannot make changes to this site." @@ -5367,19 +5372,19 @@ msgid "" "tracking - not yet implemented.\n" msgstr "" -#: lib/common.php:136 +#: lib/common.php:135 msgid "No configuration file found. " msgstr "No configuration file found" -#: lib/common.php:137 +#: lib/common.php:136 msgid "I looked for configuration files in the following places: " msgstr "" -#: lib/common.php:139 +#: lib/common.php:138 msgid "You may wish to run the installer to fix this." msgstr "" -#: lib/common.php:140 +#: lib/common.php:139 msgid "Go to the installer." msgstr "Go to the installer." @@ -5555,40 +5560,40 @@ msgstr "Tags in %s group's notices" msgid "This page is not available in a media type you accept" msgstr "This page is not available in a media type you accept" -#: lib/imagefile.php:74 +#: lib/imagefile.php:72 msgid "Unsupported image file format." msgstr "Unsupported image file format." -#: lib/imagefile.php:90 +#: lib/imagefile.php:88 #, php-format msgid "That file is too big. The maximum file size is %s." msgstr "That file is too big. The maximum file size is %s." -#: lib/imagefile.php:95 +#: lib/imagefile.php:93 msgid "Partial upload." msgstr "Partial upload." -#: lib/imagefile.php:103 lib/mediafile.php:170 +#: lib/imagefile.php:101 lib/mediafile.php:170 msgid "System error uploading file." msgstr "System error uploading file." -#: lib/imagefile.php:111 +#: lib/imagefile.php:109 msgid "Not an image or corrupt file." msgstr "Not an image or corrupt file." -#: lib/imagefile.php:124 +#: lib/imagefile.php:122 msgid "Lost our file." msgstr "Lost our file." -#: lib/imagefile.php:168 lib/imagefile.php:233 +#: lib/imagefile.php:163 lib/imagefile.php:224 msgid "Unknown file type" msgstr "Unknown file type" -#: lib/imagefile.php:253 +#: lib/imagefile.php:244 msgid "MB" msgstr "" -#: lib/imagefile.php:255 +#: lib/imagefile.php:246 msgid "kB" msgstr "" @@ -6049,7 +6054,7 @@ msgstr "Tags in %s's notices" msgid "Unknown" msgstr "Unknown" -#: lib/profileaction.php:109 lib/profileaction.php:194 lib/subgroupnav.php:82 +#: lib/profileaction.php:109 lib/profileaction.php:200 lib/subgroupnav.php:82 msgid "Subscriptions" msgstr "Subscriptions" @@ -6057,7 +6062,7 @@ msgstr "Subscriptions" msgid "All subscriptions" msgstr "All subscriptions" -#: lib/profileaction.php:142 lib/profileaction.php:203 lib/subgroupnav.php:90 +#: lib/profileaction.php:142 lib/profileaction.php:209 lib/subgroupnav.php:90 msgid "Subscribers" msgstr "Subscribers" @@ -6065,15 +6070,20 @@ msgstr "Subscribers" msgid "All subscribers" msgstr "All subscribers" -#: lib/profileaction.php:180 +#: lib/profileaction.php:186 msgid "User ID" msgstr "User ID" -#: lib/profileaction.php:185 +#: lib/profileaction.php:191 msgid "Member since" msgstr "Member since" -#: lib/profileaction.php:247 +#. TRANS: Average count of posts made per day since account registration +#: lib/profileaction.php:230 +msgid "Daily average" +msgstr "" + +#: lib/profileaction.php:259 msgid "All groups" msgstr "All groups" @@ -6244,6 +6254,11 @@ msgstr "Unsubscribe from this user" msgid "Unsubscribe" msgstr "Unsubscribe" +#: lib/usernoprofileexception.php:58 +#, fuzzy, php-format +msgid "User %s (%d) has no profile record." +msgstr "User has no profile." + #: lib/userprofile.php:117 msgid "Edit Avatar" msgstr "Edit Avatar" diff --git a/locale/es/LC_MESSAGES/statusnet.po b/locale/es/LC_MESSAGES/statusnet.po index 9b21560f98..e3d3ac2e6c 100644 --- a/locale/es/LC_MESSAGES/statusnet.po +++ b/locale/es/LC_MESSAGES/statusnet.po @@ -13,12 +13,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-03-17 21:39+0000\n" -"PO-Revision-Date: 2010-03-17 21:40:32+0000\n" +"POT-Creation-Date: 2010-03-23 20:09+0000\n" +"PO-Revision-Date: 2010-03-23 20:09:37+0000\n" "Language-Team: Spanish\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r63880); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.17alpha (r64087); Translate extension (2010-01-16)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: es\n" "X-Message-Group: out-statusnet\n" @@ -775,23 +775,28 @@ msgstr "Cargar" msgid "Crop" msgstr "Cortar" -#: actions/avatarsettings.php:328 +#: actions/avatarsettings.php:305 +#, fuzzy +msgid "No file uploaded." +msgstr "No se especificó perfil." + +#: actions/avatarsettings.php:332 msgid "Pick a square area of the image to be your avatar" msgstr "Elige un área cuadrada de la imagen para que sea tu avatar" -#: actions/avatarsettings.php:343 actions/grouplogo.php:380 +#: actions/avatarsettings.php:347 actions/grouplogo.php:380 msgid "Lost our file data." msgstr "Se perdió nuestros datos de archivo." -#: actions/avatarsettings.php:366 +#: actions/avatarsettings.php:370 msgid "Avatar updated." msgstr "Avatar actualizado" -#: actions/avatarsettings.php:369 +#: actions/avatarsettings.php:373 msgid "Failed updating avatar." msgstr "Error al actualizar avatar." -#: actions/avatarsettings.php:393 +#: actions/avatarsettings.php:397 msgid "Avatar deleted." msgstr "Avatar borrado." @@ -930,7 +935,7 @@ msgid "Conversation" msgstr "Conversación" #: actions/conversation.php:154 lib/mailbox.php:116 lib/noticelist.php:87 -#: lib/profileaction.php:218 lib/searchgroupnav.php:82 +#: lib/profileaction.php:224 lib/searchgroupnav.php:82 msgid "Notices" msgstr "Avisos" @@ -1757,7 +1762,7 @@ msgstr "línea temporal de %s" msgid "Updates from members of %1$s on %2$s!" msgstr "¡Actualizaciones de miembros de %1$s en %2$s!" -#: actions/groups.php:62 lib/profileaction.php:212 lib/profileaction.php:232 +#: actions/groups.php:62 lib/profileaction.php:218 lib/profileaction.php:244 #: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98 msgid "Groups" msgstr "Grupos" @@ -3413,7 +3418,7 @@ msgid "Description" msgstr "Descripción" #: actions/showapplication.php:192 actions/showgroup.php:439 -#: lib/profileaction.php:176 +#: lib/profileaction.php:182 msgid "Statistics" msgstr "Estadísticas" @@ -3571,7 +3576,7 @@ msgid "Members" msgstr "Miembros" #: actions/showgroup.php:396 lib/profileaction.php:117 -#: lib/profileaction.php:150 lib/profileaction.php:238 lib/section.php:95 +#: lib/profileaction.php:150 lib/profileaction.php:250 lib/section.php:95 #: lib/subscriptionlist.php:126 lib/tagcloudsection.php:71 msgid "(None)" msgstr "(Ninguno)" @@ -3739,7 +3744,7 @@ msgid "Unknown language \"%s\"." msgstr "Idioma desconocido \"%s\"." #: actions/siteadminpanel.php:165 -msgid "Minimum text limit is 140 characters." +msgid "Minimum text limit is 0 (unlimited)." msgstr "" #: actions/siteadminpanel.php:171 @@ -4018,8 +4023,7 @@ msgstr "Guardar la configuración del sitio" msgid "You are not subscribed to that profile." msgstr "No te has suscrito a ese perfil." -#: actions/subedit.php:83 classes/Subscription.php:89 -#: classes/Subscription.php:116 +#: actions/subedit.php:83 classes/Subscription.php:132 msgid "Could not save subscription." msgstr "No se ha podido guardar la suscripción." @@ -4588,38 +4592,38 @@ msgstr "Hubo un problema al guardar el aviso." msgid "RT @%1$s %2$s" msgstr "RT @%1$s %2$s" -#: classes/Subscription.php:66 lib/oauthstore.php:465 +#: classes/Subscription.php:74 lib/oauthstore.php:465 msgid "You have been banned from subscribing." msgstr "Se te ha prohibido la suscripción." -#: classes/Subscription.php:70 +#: classes/Subscription.php:78 msgid "Already subscribed!" msgstr "" -#: classes/Subscription.php:74 +#: classes/Subscription.php:82 msgid "User has blocked you." msgstr "El usuario te ha bloqueado." -#: classes/Subscription.php:157 +#: classes/Subscription.php:167 #, fuzzy msgid "Not subscribed!" msgstr "¡No estás suscrito!" -#: classes/Subscription.php:163 +#: classes/Subscription.php:173 #, fuzzy msgid "Couldn't delete self-subscription." msgstr "No se pudo eliminar la suscripción." -#: classes/Subscription.php:190 +#: classes/Subscription.php:200 #, fuzzy msgid "Couldn't delete subscription OMB token." msgstr "No se pudo eliminar la suscripción." -#: classes/Subscription.php:201 +#: classes/Subscription.php:211 msgid "Couldn't delete subscription." msgstr "No se pudo eliminar la suscripción." -#: classes/User.php:378 +#: classes/User.php:363 #, php-format msgid "Welcome to %1$s, @%2$s!" msgstr "Bienvenido a %1$s, @%2$s!" @@ -4925,22 +4929,22 @@ msgstr "Después" msgid "Before" msgstr "Antes" -#: lib/activity.php:453 +#: lib/activity.php:120 +msgid "Expecting a root feed element but got a whole XML document." +msgstr "" + +#: lib/activityutils.php:208 msgid "Can't handle remote content yet." msgstr "" -#: lib/activity.php:481 +#: lib/activityutils.php:236 msgid "Can't handle embedded XML content yet." msgstr "" -#: lib/activity.php:485 +#: lib/activityutils.php:240 msgid "Can't handle embedded Base64 content yet." msgstr "" -#: lib/activity.php:1089 -msgid "Expecting a root feed element but got a whole XML document." -msgstr "" - #. TRANS: Client error message #: lib/adminpanelaction.php:98 msgid "You cannot make changes to this site." @@ -5423,19 +5427,19 @@ msgid "" "tracking - not yet implemented.\n" msgstr "" -#: lib/common.php:136 +#: lib/common.php:135 msgid "No configuration file found. " msgstr "Ningún archivo de configuración encontrado. " -#: lib/common.php:137 +#: lib/common.php:136 msgid "I looked for configuration files in the following places: " msgstr "" -#: lib/common.php:139 +#: lib/common.php:138 msgid "You may wish to run the installer to fix this." msgstr "" -#: lib/common.php:140 +#: lib/common.php:139 msgid "Go to the installer." msgstr "Ir al instalador." @@ -5615,40 +5619,40 @@ msgstr "Tags en avisos del grupo %s" msgid "This page is not available in a media type you accept" msgstr "Esta página no está disponible en el tipo de medio que aceptas." -#: lib/imagefile.php:74 +#: lib/imagefile.php:72 msgid "Unsupported image file format." msgstr "Formato de imagen no soportado." -#: lib/imagefile.php:90 +#: lib/imagefile.php:88 #, fuzzy, php-format msgid "That file is too big. The maximum file size is %s." msgstr "Puedes cargar una imagen de logo para tu grupo." -#: lib/imagefile.php:95 +#: lib/imagefile.php:93 msgid "Partial upload." msgstr "Carga parcial." -#: lib/imagefile.php:103 lib/mediafile.php:170 +#: lib/imagefile.php:101 lib/mediafile.php:170 msgid "System error uploading file." msgstr "Error del sistema al cargar el archivo." -#: lib/imagefile.php:111 +#: lib/imagefile.php:109 msgid "Not an image or corrupt file." msgstr "No es una imagen o es un fichero corrupto." -#: lib/imagefile.php:124 +#: lib/imagefile.php:122 msgid "Lost our file." msgstr "Se perdió nuestro archivo." -#: lib/imagefile.php:168 lib/imagefile.php:233 +#: lib/imagefile.php:163 lib/imagefile.php:224 msgid "Unknown file type" msgstr "Tipo de archivo desconocido" -#: lib/imagefile.php:253 +#: lib/imagefile.php:244 msgid "MB" msgstr "MB" -#: lib/imagefile.php:255 +#: lib/imagefile.php:246 msgid "kB" msgstr "kB" @@ -6116,7 +6120,7 @@ msgstr "Tags en avisos de %s" msgid "Unknown" msgstr "Acción desconocida" -#: lib/profileaction.php:109 lib/profileaction.php:194 lib/subgroupnav.php:82 +#: lib/profileaction.php:109 lib/profileaction.php:200 lib/subgroupnav.php:82 msgid "Subscriptions" msgstr "Suscripciones" @@ -6124,7 +6128,7 @@ msgstr "Suscripciones" msgid "All subscriptions" msgstr "Todas las suscripciones" -#: lib/profileaction.php:142 lib/profileaction.php:203 lib/subgroupnav.php:90 +#: lib/profileaction.php:142 lib/profileaction.php:209 lib/subgroupnav.php:90 msgid "Subscribers" msgstr "Suscriptores" @@ -6133,15 +6137,20 @@ msgstr "Suscriptores" msgid "All subscribers" msgstr "Todos los suscriptores" -#: lib/profileaction.php:180 +#: lib/profileaction.php:186 msgid "User ID" msgstr "ID de usuario" -#: lib/profileaction.php:185 +#: lib/profileaction.php:191 msgid "Member since" msgstr "Miembro desde" -#: lib/profileaction.php:247 +#. TRANS: Average count of posts made per day since account registration +#: lib/profileaction.php:230 +msgid "Daily average" +msgstr "" + +#: lib/profileaction.php:259 msgid "All groups" msgstr "Todos los grupos" @@ -6322,6 +6331,11 @@ msgstr "Desuscribirse de este usuario" msgid "Unsubscribe" msgstr "Cancelar suscripción" +#: lib/usernoprofileexception.php:58 +#, fuzzy, php-format +msgid "User %s (%d) has no profile record." +msgstr "El usuario no tiene un perfil." + #: lib/userprofile.php:117 msgid "Edit Avatar" msgstr "editar avatar" diff --git a/locale/fa/LC_MESSAGES/statusnet.po b/locale/fa/LC_MESSAGES/statusnet.po index 7d948015a2..23fa734dec 100644 --- a/locale/fa/LC_MESSAGES/statusnet.po +++ b/locale/fa/LC_MESSAGES/statusnet.po @@ -10,8 +10,8 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-03-17 21:39+0000\n" -"PO-Revision-Date: 2010-03-17 21:40:38+0000\n" +"POT-Creation-Date: 2010-03-23 20:09+0000\n" +"PO-Revision-Date: 2010-03-23 20:09:43+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 (r63880); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.17alpha (r64087); Translate extension (2010-01-16)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" #. TRANS: Page title @@ -770,23 +770,28 @@ msgstr "پایین‌گذاری" msgid "Crop" msgstr "برش" -#: actions/avatarsettings.php:328 +#: actions/avatarsettings.php:305 +#, fuzzy +msgid "No file uploaded." +msgstr "کاربری مشخص نشده است." + +#: actions/avatarsettings.php:332 msgid "Pick a square area of the image to be your avatar" msgstr "یک مربع از عکس خود را انتخاب کنید تا چهره‌ی شما باشد." -#: actions/avatarsettings.php:343 actions/grouplogo.php:380 +#: actions/avatarsettings.php:347 actions/grouplogo.php:380 msgid "Lost our file data." msgstr "فایل اطلاعات خود را گم کرده ایم." -#: actions/avatarsettings.php:366 +#: actions/avatarsettings.php:370 msgid "Avatar updated." msgstr "چهره به روز رسانی شد." -#: actions/avatarsettings.php:369 +#: actions/avatarsettings.php:373 msgid "Failed updating avatar." msgstr "به روز رسانی چهره موفقیت آمیر نبود." -#: actions/avatarsettings.php:393 +#: actions/avatarsettings.php:397 msgid "Avatar deleted." msgstr "چهره پاک شد." @@ -926,7 +931,7 @@ msgid "Conversation" msgstr "مکالمه" #: actions/conversation.php:154 lib/mailbox.php:116 lib/noticelist.php:87 -#: lib/profileaction.php:218 lib/searchgroupnav.php:82 +#: lib/profileaction.php:224 lib/searchgroupnav.php:82 msgid "Notices" msgstr "پیام‌ها" @@ -1759,7 +1764,7 @@ msgstr "خط زمانی %s" msgid "Updates from members of %1$s on %2$s!" msgstr "به روز رسانی کابران %1$s در %2$s" -#: actions/groups.php:62 lib/profileaction.php:212 lib/profileaction.php:232 +#: actions/groups.php:62 lib/profileaction.php:218 lib/profileaction.php:244 #: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98 msgid "Groups" msgstr "گروه‌ها" @@ -3359,7 +3364,7 @@ msgid "Description" msgstr "" #: actions/showapplication.php:192 actions/showgroup.php:439 -#: lib/profileaction.php:176 +#: lib/profileaction.php:182 msgid "Statistics" msgstr "آمار" @@ -3518,7 +3523,7 @@ msgid "Members" msgstr "اعضا" #: actions/showgroup.php:396 lib/profileaction.php:117 -#: lib/profileaction.php:150 lib/profileaction.php:238 lib/section.php:95 +#: lib/profileaction.php:150 lib/profileaction.php:250 lib/section.php:95 #: lib/subscriptionlist.php:126 lib/tagcloudsection.php:71 msgid "(None)" msgstr "هیچ" @@ -3683,7 +3688,7 @@ msgid "Unknown language \"%s\"." msgstr "" #: actions/siteadminpanel.php:165 -msgid "Minimum text limit is 140 characters." +msgid "Minimum text limit is 0 (unlimited)." msgstr "" #: actions/siteadminpanel.php:171 @@ -3958,8 +3963,7 @@ msgstr "تنظیمات چهره" msgid "You are not subscribed to that profile." msgstr "شما به این پروفيل متعهد نشدید" -#: actions/subedit.php:83 classes/Subscription.php:89 -#: classes/Subscription.php:116 +#: actions/subedit.php:83 classes/Subscription.php:132 msgid "Could not save subscription." msgstr "" @@ -4507,36 +4511,36 @@ msgstr "مشکل در ذخیره کردن آگهی." msgid "RT @%1$s %2$s" msgstr "" -#: classes/Subscription.php:66 lib/oauthstore.php:465 +#: classes/Subscription.php:74 lib/oauthstore.php:465 msgid "You have been banned from subscribing." msgstr "" -#: classes/Subscription.php:70 +#: classes/Subscription.php:78 msgid "Already subscribed!" msgstr "قبلا تایید شده !" -#: classes/Subscription.php:74 +#: classes/Subscription.php:82 msgid "User has blocked you." msgstr "" -#: classes/Subscription.php:157 +#: classes/Subscription.php:167 msgid "Not subscribed!" msgstr "تایید نشده!" -#: classes/Subscription.php:163 +#: classes/Subscription.php:173 msgid "Couldn't delete self-subscription." msgstr "" -#: classes/Subscription.php:190 +#: classes/Subscription.php:200 #, fuzzy msgid "Couldn't delete subscription OMB token." msgstr "نمی‌توان تصدیق پست الکترونیک را پاک کرد." -#: classes/Subscription.php:201 +#: classes/Subscription.php:211 msgid "Couldn't delete subscription." msgstr "" -#: classes/User.php:378 +#: classes/User.php:363 #, php-format msgid "Welcome to %1$s, @%2$s!" msgstr "خوش امدید به %1$s , @%2$s!" @@ -4833,22 +4837,22 @@ msgstr "بعد از" msgid "Before" msgstr "قبل از" -#: lib/activity.php:453 +#: lib/activity.php:120 +msgid "Expecting a root feed element but got a whole XML document." +msgstr "" + +#: lib/activityutils.php:208 msgid "Can't handle remote content yet." msgstr "" -#: lib/activity.php:481 +#: lib/activityutils.php:236 msgid "Can't handle embedded XML content yet." msgstr "" -#: lib/activity.php:485 +#: lib/activityutils.php:240 msgid "Can't handle embedded Base64 content yet." msgstr "" -#: lib/activity.php:1089 -msgid "Expecting a root feed element but got a whole XML document." -msgstr "" - #. TRANS: Client error message #: lib/adminpanelaction.php:98 msgid "You cannot make changes to this site." @@ -5329,19 +5333,19 @@ msgid "" "tracking - not yet implemented.\n" msgstr "" -#: lib/common.php:136 +#: lib/common.php:135 msgid "No configuration file found. " msgstr "" -#: lib/common.php:137 +#: lib/common.php:136 msgid "I looked for configuration files in the following places: " msgstr "" -#: lib/common.php:139 +#: lib/common.php:138 msgid "You may wish to run the installer to fix this." msgstr "شما ممکن است بخواهید نصاب را اجرا کنید تا این را تعمیر کند." -#: lib/common.php:140 +#: lib/common.php:139 msgid "Go to the installer." msgstr "برو به نصاب." @@ -5516,41 +5520,41 @@ msgstr "" msgid "This page is not available in a media type you accept" msgstr "" -#: lib/imagefile.php:74 +#: lib/imagefile.php:72 msgid "Unsupported image file format." msgstr "فرمت(فایل) عکس پشتیبانی نشده." -#: lib/imagefile.php:90 +#: lib/imagefile.php:88 #, php-format msgid "That file is too big. The maximum file size is %s." msgstr "" "است . این فایل بسیار یزرگ است %s بیشترین مقدار قابل قبول برای اندازه ی فایل." -#: lib/imagefile.php:95 +#: lib/imagefile.php:93 msgid "Partial upload." msgstr "" -#: lib/imagefile.php:103 lib/mediafile.php:170 +#: lib/imagefile.php:101 lib/mediafile.php:170 msgid "System error uploading file." msgstr "خطای سیستم ارسال فایل." -#: lib/imagefile.php:111 +#: lib/imagefile.php:109 msgid "Not an image or corrupt file." msgstr "تصویر یا فایل خرابی نیست" -#: lib/imagefile.php:124 +#: lib/imagefile.php:122 msgid "Lost our file." msgstr "فایلمان گم شده" -#: lib/imagefile.php:168 lib/imagefile.php:233 +#: lib/imagefile.php:163 lib/imagefile.php:224 msgid "Unknown file type" msgstr "نوع فایل پشتیبانی نشده" -#: lib/imagefile.php:253 +#: lib/imagefile.php:244 msgid "MB" msgstr "مگابایت" -#: lib/imagefile.php:255 +#: lib/imagefile.php:246 msgid "kB" msgstr "کیلوبایت" @@ -6004,7 +6008,7 @@ msgstr "" msgid "Unknown" msgstr "" -#: lib/profileaction.php:109 lib/profileaction.php:194 lib/subgroupnav.php:82 +#: lib/profileaction.php:109 lib/profileaction.php:200 lib/subgroupnav.php:82 msgid "Subscriptions" msgstr "اشتراک‌ها" @@ -6012,7 +6016,7 @@ msgstr "اشتراک‌ها" msgid "All subscriptions" msgstr "تمام اشتراک‌ها" -#: lib/profileaction.php:142 lib/profileaction.php:203 lib/subgroupnav.php:90 +#: lib/profileaction.php:142 lib/profileaction.php:209 lib/subgroupnav.php:90 msgid "Subscribers" msgstr "مشترک‌ها" @@ -6020,15 +6024,20 @@ msgstr "مشترک‌ها" msgid "All subscribers" msgstr "تمام مشترک‌ها" -#: lib/profileaction.php:180 +#: lib/profileaction.php:186 msgid "User ID" msgstr "شناسه کاربر" -#: lib/profileaction.php:185 +#: lib/profileaction.php:191 msgid "Member since" msgstr "عضو شده از" -#: lib/profileaction.php:247 +#. TRANS: Average count of posts made per day since account registration +#: lib/profileaction.php:230 +msgid "Daily average" +msgstr "" + +#: lib/profileaction.php:259 msgid "All groups" msgstr "تمام گروه‌ها" @@ -6200,6 +6209,11 @@ msgstr "" msgid "Unsubscribe" msgstr "" +#: lib/usernoprofileexception.php:58 +#, fuzzy, php-format +msgid "User %s (%d) has no profile record." +msgstr "کاربر هیچ شناس‌نامه‌ای ندارد." + #: lib/userprofile.php:117 msgid "Edit Avatar" msgstr "ویرایش اواتور" diff --git a/locale/fi/LC_MESSAGES/statusnet.po b/locale/fi/LC_MESSAGES/statusnet.po index 7892ef932f..035d698169 100644 --- a/locale/fi/LC_MESSAGES/statusnet.po +++ b/locale/fi/LC_MESSAGES/statusnet.po @@ -10,12 +10,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-03-17 21:39+0000\n" -"PO-Revision-Date: 2010-03-17 21:40:35+0000\n" +"POT-Creation-Date: 2010-03-23 20:09+0000\n" +"PO-Revision-Date: 2010-03-23 20:09:40+0000\n" "Language-Team: Finnish\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r63880); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.17alpha (r64087); Translate extension (2010-01-16)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: fi\n" "X-Message-Group: out-statusnet\n" @@ -787,23 +787,28 @@ msgstr "Lataa" msgid "Crop" msgstr "Rajaa" -#: actions/avatarsettings.php:328 +#: actions/avatarsettings.php:305 +#, fuzzy +msgid "No file uploaded." +msgstr "Profiilia ei ole määritelty." + +#: actions/avatarsettings.php:332 msgid "Pick a square area of the image to be your avatar" msgstr "Valitse neliön muotoinen alue kuvasta profiilikuvaksi" -#: actions/avatarsettings.php:343 actions/grouplogo.php:380 +#: actions/avatarsettings.php:347 actions/grouplogo.php:380 msgid "Lost our file data." msgstr "Tiedoston data hävisi." -#: actions/avatarsettings.php:366 +#: actions/avatarsettings.php:370 msgid "Avatar updated." msgstr "Kuva päivitetty." -#: actions/avatarsettings.php:369 +#: actions/avatarsettings.php:373 msgid "Failed updating avatar." msgstr "Profiilikuvan päivittäminen epäonnistui." -#: actions/avatarsettings.php:393 +#: actions/avatarsettings.php:397 msgid "Avatar deleted." msgstr "Kuva poistettu." @@ -941,7 +946,7 @@ msgid "Conversation" msgstr "Keskustelu" #: actions/conversation.php:154 lib/mailbox.php:116 lib/noticelist.php:87 -#: lib/profileaction.php:218 lib/searchgroupnav.php:82 +#: lib/profileaction.php:224 lib/searchgroupnav.php:82 msgid "Notices" msgstr "Päivitykset" @@ -1791,7 +1796,7 @@ msgstr "%s aikajana" msgid "Updates from members of %1$s on %2$s!" msgstr "Ryhmän %1$s käyttäjien päivitykset palvelussa %2$s!" -#: actions/groups.php:62 lib/profileaction.php:212 lib/profileaction.php:232 +#: actions/groups.php:62 lib/profileaction.php:218 lib/profileaction.php:244 #: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98 msgid "Groups" msgstr "Ryhmät" @@ -3485,7 +3490,7 @@ msgid "Description" msgstr "Kuvaus" #: actions/showapplication.php:192 actions/showgroup.php:439 -#: lib/profileaction.php:176 +#: lib/profileaction.php:182 msgid "Statistics" msgstr "Tilastot" @@ -3643,7 +3648,7 @@ msgid "Members" msgstr "Jäsenet" #: actions/showgroup.php:396 lib/profileaction.php:117 -#: lib/profileaction.php:150 lib/profileaction.php:238 lib/section.php:95 +#: lib/profileaction.php:150 lib/profileaction.php:250 lib/section.php:95 #: lib/subscriptionlist.php:126 lib/tagcloudsection.php:71 msgid "(None)" msgstr "(Tyhjä)" @@ -3814,7 +3819,7 @@ msgid "Unknown language \"%s\"." msgstr "" #: actions/siteadminpanel.php:165 -msgid "Minimum text limit is 140 characters." +msgid "Minimum text limit is 0 (unlimited)." msgstr "" #: actions/siteadminpanel.php:171 @@ -4096,8 +4101,7 @@ msgstr "Profiilikuva-asetukset" msgid "You are not subscribed to that profile." msgstr "Et ole tilannut tämän käyttäjän päivityksiä." -#: actions/subedit.php:83 classes/Subscription.php:89 -#: classes/Subscription.php:116 +#: actions/subedit.php:83 classes/Subscription.php:132 msgid "Could not save subscription." msgstr "Tilausta ei onnistuttu tallentamaan." @@ -4678,39 +4682,39 @@ msgstr "Ongelma päivityksen tallentamisessa." msgid "RT @%1$s %2$s" msgstr "%1$s (%2$s)" -#: classes/Subscription.php:66 lib/oauthstore.php:465 +#: classes/Subscription.php:74 lib/oauthstore.php:465 #, fuzzy msgid "You have been banned from subscribing." msgstr "Käyttäjä on estänyt sinua tilaamasta päivityksiä." -#: classes/Subscription.php:70 +#: classes/Subscription.php:78 msgid "Already subscribed!" msgstr "" -#: classes/Subscription.php:74 +#: classes/Subscription.php:82 msgid "User has blocked you." msgstr "Käyttäjä on asettanut eston sinulle." -#: classes/Subscription.php:157 +#: classes/Subscription.php:167 #, fuzzy msgid "Not subscribed!" msgstr "Ei ole tilattu!." -#: classes/Subscription.php:163 +#: classes/Subscription.php:173 #, fuzzy msgid "Couldn't delete self-subscription." msgstr "Ei voitu poistaa tilausta." -#: classes/Subscription.php:190 +#: classes/Subscription.php:200 #, fuzzy msgid "Couldn't delete subscription OMB token." msgstr "Ei voitu poistaa tilausta." -#: classes/Subscription.php:201 +#: classes/Subscription.php:211 msgid "Couldn't delete subscription." msgstr "Ei voitu poistaa tilausta." -#: classes/User.php:378 +#: classes/User.php:363 #, fuzzy, php-format msgid "Welcome to %1$s, @%2$s!" msgstr "Viesti käyttäjälle %1$s, %2$s" @@ -5016,22 +5020,22 @@ msgstr "Myöhemmin" msgid "Before" msgstr "Aiemmin" -#: lib/activity.php:453 +#: lib/activity.php:120 +msgid "Expecting a root feed element but got a whole XML document." +msgstr "" + +#: lib/activityutils.php:208 msgid "Can't handle remote content yet." msgstr "" -#: lib/activity.php:481 +#: lib/activityutils.php:236 msgid "Can't handle embedded XML content yet." msgstr "" -#: lib/activity.php:485 +#: lib/activityutils.php:240 msgid "Can't handle embedded Base64 content yet." msgstr "" -#: lib/activity.php:1089 -msgid "Expecting a root feed element but got a whole XML document." -msgstr "" - #. TRANS: Client error message #: lib/adminpanelaction.php:98 #, fuzzy @@ -5527,20 +5531,20 @@ msgid "" "tracking - not yet implemented.\n" msgstr "" -#: lib/common.php:136 +#: lib/common.php:135 #, fuzzy msgid "No configuration file found. " msgstr "Varmistuskoodia ei ole annettu." -#: lib/common.php:137 +#: lib/common.php:136 msgid "I looked for configuration files in the following places: " msgstr "" -#: lib/common.php:139 +#: lib/common.php:138 msgid "You may wish to run the installer to fix this." msgstr "" -#: lib/common.php:140 +#: lib/common.php:139 #, fuzzy msgid "Go to the installer." msgstr "Kirjaudu sisään palveluun" @@ -5723,40 +5727,40 @@ msgstr "Tagit ryhmän %s päivityksissä" msgid "This page is not available in a media type you accept" msgstr "Tämä sivu ei ole saatavilla sinulle sopivassa mediatyypissä." -#: lib/imagefile.php:74 +#: lib/imagefile.php:72 msgid "Unsupported image file format." msgstr "Kuvatiedoston formaattia ei ole tuettu." -#: lib/imagefile.php:90 +#: lib/imagefile.php:88 #, fuzzy, php-format msgid "That file is too big. The maximum file size is %s." msgstr "Voit ladata ryhmälle logon." -#: lib/imagefile.php:95 +#: lib/imagefile.php:93 msgid "Partial upload." msgstr "Osittain ladattu palvelimelle." -#: lib/imagefile.php:103 lib/mediafile.php:170 +#: lib/imagefile.php:101 lib/mediafile.php:170 msgid "System error uploading file." msgstr "Tiedoston lähetyksessä tapahtui järjestelmävirhe." -#: lib/imagefile.php:111 +#: lib/imagefile.php:109 msgid "Not an image or corrupt file." msgstr "Tuo ei ole kelvollinen kuva tai tiedosto on rikkoutunut." -#: lib/imagefile.php:124 +#: lib/imagefile.php:122 msgid "Lost our file." msgstr "Tiedosto hävisi." -#: lib/imagefile.php:168 lib/imagefile.php:233 +#: lib/imagefile.php:163 lib/imagefile.php:224 msgid "Unknown file type" msgstr "Tunnistamaton tiedoston tyyppi" -#: lib/imagefile.php:253 +#: lib/imagefile.php:244 msgid "MB" msgstr "" -#: lib/imagefile.php:255 +#: lib/imagefile.php:246 msgid "kB" msgstr "" @@ -6230,7 +6234,7 @@ msgstr "Tagit käyttäjän %s päivityksissä" msgid "Unknown" msgstr "Tuntematon toiminto" -#: lib/profileaction.php:109 lib/profileaction.php:194 lib/subgroupnav.php:82 +#: lib/profileaction.php:109 lib/profileaction.php:200 lib/subgroupnav.php:82 msgid "Subscriptions" msgstr "Tilaukset" @@ -6238,7 +6242,7 @@ msgstr "Tilaukset" msgid "All subscriptions" msgstr "Kaikki tilaukset" -#: lib/profileaction.php:142 lib/profileaction.php:203 lib/subgroupnav.php:90 +#: lib/profileaction.php:142 lib/profileaction.php:209 lib/subgroupnav.php:90 msgid "Subscribers" msgstr "Tilaajat" @@ -6246,16 +6250,21 @@ msgstr "Tilaajat" msgid "All subscribers" msgstr "Kaikki tilaajat" -#: lib/profileaction.php:180 +#: lib/profileaction.php:186 #, fuzzy msgid "User ID" msgstr "Käyttäjä" -#: lib/profileaction.php:185 +#: lib/profileaction.php:191 msgid "Member since" msgstr "Käyttäjänä alkaen" -#: lib/profileaction.php:247 +#. TRANS: Average count of posts made per day since account registration +#: lib/profileaction.php:230 +msgid "Daily average" +msgstr "" + +#: lib/profileaction.php:259 msgid "All groups" msgstr "Kaikki ryhmät" @@ -6437,6 +6446,11 @@ msgstr "Peruuta tämän käyttäjän tilaus" msgid "Unsubscribe" msgstr "Peruuta tilaus" +#: lib/usernoprofileexception.php:58 +#, fuzzy, php-format +msgid "User %s (%d) has no profile record." +msgstr "Käyttäjällä ei ole profiilia." + #: lib/userprofile.php:117 #, fuzzy msgid "Edit Avatar" diff --git a/locale/fr/LC_MESSAGES/statusnet.po b/locale/fr/LC_MESSAGES/statusnet.po index 70155e450f..76d83ea6c2 100644 --- a/locale/fr/LC_MESSAGES/statusnet.po +++ b/locale/fr/LC_MESSAGES/statusnet.po @@ -14,12 +14,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-03-17 21:39+0000\n" -"PO-Revision-Date: 2010-03-17 21:40:41+0000\n" +"POT-Creation-Date: 2010-03-23 20:09+0000\n" +"PO-Revision-Date: 2010-03-23 20:09:47+0000\n" "Language-Team: French\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r63880); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.17alpha (r64087); Translate extension (2010-01-16)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: fr\n" "X-Message-Group: out-statusnet\n" @@ -785,23 +785,28 @@ msgstr "Transfert" msgid "Crop" msgstr "Recadrer" -#: actions/avatarsettings.php:328 +#: actions/avatarsettings.php:305 +#, fuzzy +msgid "No file uploaded." +msgstr "Aucun profil n’a été spécifié." + +#: actions/avatarsettings.php:332 msgid "Pick a square area of the image to be your avatar" msgstr "Sélectionnez une zone de forme carrée pour définir votre avatar" -#: actions/avatarsettings.php:343 actions/grouplogo.php:380 +#: actions/avatarsettings.php:347 actions/grouplogo.php:380 msgid "Lost our file data." msgstr "Données perdues." -#: actions/avatarsettings.php:366 +#: actions/avatarsettings.php:370 msgid "Avatar updated." msgstr "Avatar mis à jour." -#: actions/avatarsettings.php:369 +#: actions/avatarsettings.php:373 msgid "Failed updating avatar." msgstr "La mise à jour de l’avatar a échoué." -#: actions/avatarsettings.php:393 +#: actions/avatarsettings.php:397 msgid "Avatar deleted." msgstr "Avatar supprimé." @@ -939,7 +944,7 @@ msgid "Conversation" msgstr "Conversation" #: actions/conversation.php:154 lib/mailbox.php:116 lib/noticelist.php:87 -#: lib/profileaction.php:218 lib/searchgroupnav.php:82 +#: lib/profileaction.php:224 lib/searchgroupnav.php:82 msgid "Notices" msgstr "Avis" @@ -1763,7 +1768,7 @@ msgstr "Activité de %s" msgid "Updates from members of %1$s on %2$s!" msgstr "Mises à jour des membres de %1$s dans %2$s !" -#: actions/groups.php:62 lib/profileaction.php:212 lib/profileaction.php:232 +#: actions/groups.php:62 lib/profileaction.php:218 lib/profileaction.php:244 #: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98 msgid "Groups" msgstr "Groupes" @@ -3449,7 +3454,7 @@ msgid "Description" msgstr "Description" #: actions/showapplication.php:192 actions/showgroup.php:439 -#: lib/profileaction.php:176 +#: lib/profileaction.php:182 msgid "Statistics" msgstr "Statistiques" @@ -3616,7 +3621,7 @@ msgid "Members" msgstr "Membres" #: actions/showgroup.php:396 lib/profileaction.php:117 -#: lib/profileaction.php:150 lib/profileaction.php:238 lib/section.php:95 +#: lib/profileaction.php:150 lib/profileaction.php:250 lib/section.php:95 #: lib/subscriptionlist.php:126 lib/tagcloudsection.php:71 msgid "(None)" msgstr "(aucun)" @@ -3800,7 +3805,8 @@ msgid "Unknown language \"%s\"." msgstr "Langue « %s » inconnue." #: actions/siteadminpanel.php:165 -msgid "Minimum text limit is 140 characters." +#, fuzzy +msgid "Minimum text limit is 0 (unlimited)." msgstr "La limite minimale de texte est de 140 caractères." #: actions/siteadminpanel.php:171 @@ -4077,8 +4083,7 @@ msgstr "Sauvegarder les paramètres des instantanés" msgid "You are not subscribed to that profile." msgstr "Vous n’êtes pas abonné(e) à ce profil." -#: actions/subedit.php:83 classes/Subscription.php:89 -#: classes/Subscription.php:116 +#: actions/subedit.php:83 classes/Subscription.php:132 msgid "Could not save subscription." msgstr "Impossible d’enregistrer l’abonnement." @@ -4667,35 +4672,35 @@ msgstr "Problème lors de l’enregistrement de la boîte de réception du group msgid "RT @%1$s %2$s" msgstr "RT @%1$s %2$s" -#: classes/Subscription.php:66 lib/oauthstore.php:465 +#: classes/Subscription.php:74 lib/oauthstore.php:465 msgid "You have been banned from subscribing." msgstr "Il vous avez été interdit de vous abonner." -#: classes/Subscription.php:70 +#: classes/Subscription.php:78 msgid "Already subscribed!" msgstr "Déjà abonné !" -#: classes/Subscription.php:74 +#: classes/Subscription.php:82 msgid "User has blocked you." msgstr "Cet utilisateur vous a bloqué." -#: classes/Subscription.php:157 +#: classes/Subscription.php:167 msgid "Not subscribed!" msgstr "Pas abonné !" -#: classes/Subscription.php:163 +#: classes/Subscription.php:173 msgid "Couldn't delete self-subscription." msgstr "Impossible de supprimer l’abonnement à soi-même." -#: classes/Subscription.php:190 +#: classes/Subscription.php:200 msgid "Couldn't delete subscription OMB token." msgstr "Impossible de supprimer le jeton OMB de l'abonnement ." -#: classes/Subscription.php:201 +#: classes/Subscription.php:211 msgid "Couldn't delete subscription." msgstr "Impossible de cesser l’abonnement" -#: classes/User.php:378 +#: classes/User.php:363 #, php-format msgid "Welcome to %1$s, @%2$s!" msgstr "Bienvenue à %1$s, @%2$s !" @@ -4983,22 +4988,22 @@ msgstr "Après" msgid "Before" msgstr "Avant" -#: lib/activity.php:453 +#: lib/activity.php:120 +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." + +#: lib/activityutils.php:208 msgid "Can't handle remote content yet." msgstr "Impossible de gérer le contenu distant pour le moment." -#: lib/activity.php:481 +#: lib/activityutils.php:236 msgid "Can't handle embedded XML content yet." msgstr "Impossible de gérer le contenu XML embarqué pour le moment." -#: lib/activity.php:485 +#: lib/activityutils.php:240 msgid "Can't handle embedded Base64 content yet." msgstr "Impossible de gérer le contenu en Base64 embarqué pour le moment." -#: lib/activity.php:1089 -msgid "Expecting a root feed element but got a whole XML document." -msgstr "" - #. TRANS: Client error message #: lib/adminpanelaction.php:98 msgid "You cannot make changes to this site." @@ -5518,20 +5523,20 @@ msgstr "" "tracks - pas encore implémenté.\n" "tracking - pas encore implémenté.\n" -#: lib/common.php:136 +#: lib/common.php:135 msgid "No configuration file found. " msgstr "Aucun fichier de configuration n’a été trouvé. " -#: lib/common.php:137 +#: lib/common.php:136 msgid "I looked for configuration files in the following places: " msgstr "" "J’ai cherché des fichiers de configuration dans les emplacements suivants : " -#: lib/common.php:139 +#: lib/common.php:138 msgid "You may wish to run the installer to fix this." msgstr "Vous pouvez essayer de lancer l’installeur pour régler ce problème." -#: lib/common.php:140 +#: lib/common.php:139 msgid "Go to the installer." msgstr "Aller au programme d’installation" @@ -5712,40 +5717,40 @@ msgid "This page is not available in a media type you accept" msgstr "" "Cette page n’est pas disponible dans un des formats que vous avez autorisés." -#: lib/imagefile.php:74 +#: lib/imagefile.php:72 msgid "Unsupported image file format." msgstr "Format de fichier d’image non supporté." -#: lib/imagefile.php:90 +#: lib/imagefile.php:88 #, php-format msgid "That file is too big. The maximum file size is %s." msgstr "Ce fichier est trop grand. La taille maximale est %s." -#: lib/imagefile.php:95 +#: lib/imagefile.php:93 msgid "Partial upload." msgstr "Transfert partiel." -#: lib/imagefile.php:103 lib/mediafile.php:170 +#: lib/imagefile.php:101 lib/mediafile.php:170 msgid "System error uploading file." msgstr "Erreur système lors du transfert du fichier." -#: lib/imagefile.php:111 +#: lib/imagefile.php:109 msgid "Not an image or corrupt file." msgstr "Ceci n’est pas une image, ou c’est un fichier corrompu." -#: lib/imagefile.php:124 +#: lib/imagefile.php:122 msgid "Lost our file." msgstr "Fichier perdu." -#: lib/imagefile.php:168 lib/imagefile.php:233 +#: lib/imagefile.php:163 lib/imagefile.php:224 msgid "Unknown file type" msgstr "Type de fichier inconnu" -#: lib/imagefile.php:253 +#: lib/imagefile.php:244 msgid "MB" msgstr "Mo" -#: lib/imagefile.php:255 +#: lib/imagefile.php:246 msgid "kB" msgstr "Ko" @@ -6280,7 +6285,7 @@ msgstr "Marques dans les avis de %s" msgid "Unknown" msgstr "Inconnu" -#: lib/profileaction.php:109 lib/profileaction.php:194 lib/subgroupnav.php:82 +#: lib/profileaction.php:109 lib/profileaction.php:200 lib/subgroupnav.php:82 msgid "Subscriptions" msgstr "Abonnements" @@ -6288,7 +6293,7 @@ msgstr "Abonnements" msgid "All subscriptions" msgstr "Tous les abonnements" -#: lib/profileaction.php:142 lib/profileaction.php:203 lib/subgroupnav.php:90 +#: lib/profileaction.php:142 lib/profileaction.php:209 lib/subgroupnav.php:90 msgid "Subscribers" msgstr "Abonnés" @@ -6296,15 +6301,20 @@ msgstr "Abonnés" msgid "All subscribers" msgstr "Tous les abonnés" -#: lib/profileaction.php:180 +#: lib/profileaction.php:186 msgid "User ID" msgstr "ID de l’utilisateur" -#: lib/profileaction.php:185 +#: lib/profileaction.php:191 msgid "Member since" msgstr "Membre depuis" -#: lib/profileaction.php:247 +#. TRANS: Average count of posts made per day since account registration +#: lib/profileaction.php:230 +msgid "Daily average" +msgstr "" + +#: lib/profileaction.php:259 msgid "All groups" msgstr "Tous les groupes" @@ -6475,6 +6485,11 @@ msgstr "Ne plus suivre cet utilisateur" msgid "Unsubscribe" msgstr "Désabonnement" +#: lib/usernoprofileexception.php:58 +#, fuzzy, php-format +msgid "User %s (%d) has no profile record." +msgstr "Aucun profil ne correspond à cet utilisateur." + #: lib/userprofile.php:117 msgid "Edit Avatar" msgstr "Modifier l’avatar" @@ -6485,7 +6500,7 @@ msgstr "Actions de l’utilisateur" #: lib/userprofile.php:237 msgid "User deletion in progress..." -msgstr "" +msgstr "Suppression de l'utilisateur en cours..." #: lib/userprofile.php:263 msgid "Edit profile settings" diff --git a/locale/ga/LC_MESSAGES/statusnet.po b/locale/ga/LC_MESSAGES/statusnet.po index 9d77755800..6e5d0d232d 100644 --- a/locale/ga/LC_MESSAGES/statusnet.po +++ b/locale/ga/LC_MESSAGES/statusnet.po @@ -8,12 +8,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-03-17 21:39+0000\n" -"PO-Revision-Date: 2010-03-17 21:40:44+0000\n" +"POT-Creation-Date: 2010-03-23 20:09+0000\n" +"PO-Revision-Date: 2010-03-23 20:09:50+0000\n" "Language-Team: Irish\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r63880); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.17alpha (r64087); Translate extension (2010-01-16)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: ga\n" "X-Message-Group: out-statusnet\n" @@ -788,23 +788,28 @@ msgstr "Subir" msgid "Crop" msgstr "" -#: actions/avatarsettings.php:328 +#: actions/avatarsettings.php:305 +#, fuzzy +msgid "No file uploaded." +msgstr "Non se especificou ningún perfil." + +#: actions/avatarsettings.php:332 msgid "Pick a square area of the image to be your avatar" msgstr "" -#: actions/avatarsettings.php:343 actions/grouplogo.php:380 +#: actions/avatarsettings.php:347 actions/grouplogo.php:380 msgid "Lost our file data." msgstr "" -#: actions/avatarsettings.php:366 +#: actions/avatarsettings.php:370 msgid "Avatar updated." msgstr "Avatar actualizado." -#: actions/avatarsettings.php:369 +#: actions/avatarsettings.php:373 msgid "Failed updating avatar." msgstr "Acounteceu un fallo ó actualizar o avatar." -#: actions/avatarsettings.php:393 +#: actions/avatarsettings.php:397 #, fuzzy msgid "Avatar deleted." msgstr "Avatar actualizado." @@ -952,7 +957,7 @@ msgid "Conversation" msgstr "Código de confirmación." #: actions/conversation.php:154 lib/mailbox.php:116 lib/noticelist.php:87 -#: lib/profileaction.php:218 lib/searchgroupnav.php:82 +#: lib/profileaction.php:224 lib/searchgroupnav.php:82 msgid "Notices" msgstr "Chíos" @@ -1825,7 +1830,7 @@ msgstr "Liña de tempo de %s" msgid "Updates from members of %1$s on %2$s!" msgstr "Actualizacións dende %1$s en %2$s!" -#: actions/groups.php:62 lib/profileaction.php:212 lib/profileaction.php:232 +#: actions/groups.php:62 lib/profileaction.php:218 lib/profileaction.php:244 #: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98 msgid "Groups" msgstr "" @@ -3521,7 +3526,7 @@ msgid "Description" msgstr "Subscricións" #: actions/showapplication.php:192 actions/showgroup.php:439 -#: lib/profileaction.php:176 +#: lib/profileaction.php:182 msgid "Statistics" msgstr "Estatísticas" @@ -3683,7 +3688,7 @@ msgid "Members" msgstr "Membro dende" #: actions/showgroup.php:396 lib/profileaction.php:117 -#: lib/profileaction.php:150 lib/profileaction.php:238 lib/section.php:95 +#: lib/profileaction.php:150 lib/profileaction.php:250 lib/section.php:95 #: lib/subscriptionlist.php:126 lib/tagcloudsection.php:71 #, fuzzy msgid "(None)" @@ -3864,7 +3869,7 @@ msgid "Unknown language \"%s\"." msgstr "" #: actions/siteadminpanel.php:165 -msgid "Minimum text limit is 140 characters." +msgid "Minimum text limit is 0 (unlimited)." msgstr "" #: actions/siteadminpanel.php:171 @@ -4147,8 +4152,7 @@ msgstr "Configuracións de Twitter" msgid "You are not subscribed to that profile." msgstr "Non estás suscrito a ese perfil" -#: actions/subedit.php:83 classes/Subscription.php:89 -#: classes/Subscription.php:116 +#: actions/subedit.php:83 classes/Subscription.php:132 msgid "Could not save subscription." msgstr "Non se pode gardar a subscrición." @@ -4734,39 +4738,39 @@ msgstr "Aconteceu un erro ó gardar o chío." msgid "RT @%1$s %2$s" msgstr "%1$s (%2$s)" -#: classes/Subscription.php:66 lib/oauthstore.php:465 +#: classes/Subscription.php:74 lib/oauthstore.php:465 #, fuzzy msgid "You have been banned from subscribing." msgstr "Este usuario non che permite suscribirte a el." -#: classes/Subscription.php:70 +#: classes/Subscription.php:78 msgid "Already subscribed!" msgstr "" -#: classes/Subscription.php:74 +#: classes/Subscription.php:82 msgid "User has blocked you." msgstr "O usuario bloqueoute." -#: classes/Subscription.php:157 +#: classes/Subscription.php:167 #, fuzzy msgid "Not subscribed!" msgstr "Non está suscrito!" -#: classes/Subscription.php:163 +#: classes/Subscription.php:173 #, fuzzy msgid "Couldn't delete self-subscription." msgstr "Non se pode eliminar a subscrición." -#: classes/Subscription.php:190 +#: classes/Subscription.php:200 #, fuzzy msgid "Couldn't delete subscription OMB token." msgstr "Non se pode eliminar a subscrición." -#: classes/Subscription.php:201 +#: classes/Subscription.php:211 msgid "Couldn't delete subscription." msgstr "Non se pode eliminar a subscrición." -#: classes/User.php:378 +#: classes/User.php:363 #, fuzzy, php-format msgid "Welcome to %1$s, @%2$s!" msgstr "Mensaxe de %1$s en %2$s" @@ -5077,22 +5081,22 @@ msgstr "« Despois" msgid "Before" msgstr "Antes »" -#: lib/activity.php:453 +#: lib/activity.php:120 +msgid "Expecting a root feed element but got a whole XML document." +msgstr "" + +#: lib/activityutils.php:208 msgid "Can't handle remote content yet." msgstr "" -#: lib/activity.php:481 +#: lib/activityutils.php:236 msgid "Can't handle embedded XML content yet." msgstr "" -#: lib/activity.php:485 +#: lib/activityutils.php:240 msgid "Can't handle embedded Base64 content yet." msgstr "" -#: lib/activity.php:1089 -msgid "Expecting a root feed element but got a whole XML document." -msgstr "" - #. TRANS: Client error message #: lib/adminpanelaction.php:98 #, fuzzy @@ -5628,20 +5632,20 @@ msgstr "" "tracks - non implementado por agora.\n" "tracking - non implementado por agora.\n" -#: lib/common.php:136 +#: lib/common.php:135 #, fuzzy msgid "No configuration file found. " msgstr "Sen código de confirmación." -#: lib/common.php:137 +#: lib/common.php:136 msgid "I looked for configuration files in the following places: " msgstr "" -#: lib/common.php:139 +#: lib/common.php:138 msgid "You may wish to run the installer to fix this." msgstr "" -#: lib/common.php:140 +#: lib/common.php:139 msgid "Go to the installer." msgstr "" @@ -5826,42 +5830,42 @@ msgstr "" msgid "This page is not available in a media type you accept" msgstr "Esta páxina non está dispoñíbel no tipo de medio que aceptas" -#: lib/imagefile.php:74 +#: lib/imagefile.php:72 msgid "Unsupported image file format." msgstr "Formato de ficheiro de imaxe non soportado." -#: lib/imagefile.php:90 +#: lib/imagefile.php:88 #, fuzzy, php-format msgid "That file is too big. The maximum file size is %s." msgstr "Podes actualizar a túa información do perfil persoal aquí" -#: lib/imagefile.php:95 +#: lib/imagefile.php:93 msgid "Partial upload." msgstr "Carga parcial." -#: lib/imagefile.php:103 lib/mediafile.php:170 +#: lib/imagefile.php:101 lib/mediafile.php:170 msgid "System error uploading file." msgstr "Aconteceu un erro no sistema namentras se estaba cargando o ficheiro." -#: lib/imagefile.php:111 +#: lib/imagefile.php:109 msgid "Not an image or corrupt file." msgstr "Non é unha imaxe ou está corrupta." -#: lib/imagefile.php:124 +#: lib/imagefile.php:122 #, fuzzy msgid "Lost our file." msgstr "Bloqueo de usuario fallido." -#: lib/imagefile.php:168 lib/imagefile.php:233 +#: lib/imagefile.php:163 lib/imagefile.php:224 #, fuzzy msgid "Unknown file type" msgstr "tipo de ficheiro non soportado" -#: lib/imagefile.php:253 +#: lib/imagefile.php:244 msgid "MB" msgstr "" -#: lib/imagefile.php:255 +#: lib/imagefile.php:246 msgid "kB" msgstr "" @@ -6389,7 +6393,7 @@ msgstr "O usuario non ten último chio." msgid "Unknown" msgstr "Acción descoñecida" -#: lib/profileaction.php:109 lib/profileaction.php:194 lib/subgroupnav.php:82 +#: lib/profileaction.php:109 lib/profileaction.php:200 lib/subgroupnav.php:82 msgid "Subscriptions" msgstr "Subscricións" @@ -6397,7 +6401,7 @@ msgstr "Subscricións" msgid "All subscriptions" msgstr "Tódalas subscricións" -#: lib/profileaction.php:142 lib/profileaction.php:203 lib/subgroupnav.php:90 +#: lib/profileaction.php:142 lib/profileaction.php:209 lib/subgroupnav.php:90 msgid "Subscribers" msgstr "Subscritores" @@ -6406,16 +6410,21 @@ msgstr "Subscritores" msgid "All subscribers" msgstr "Subscritores" -#: lib/profileaction.php:180 +#: lib/profileaction.php:186 #, fuzzy msgid "User ID" msgstr "Usuario" -#: lib/profileaction.php:185 +#: lib/profileaction.php:191 msgid "Member since" msgstr "Membro dende" -#: lib/profileaction.php:247 +#. TRANS: Average count of posts made per day since account registration +#: lib/profileaction.php:230 +msgid "Daily average" +msgstr "" + +#: lib/profileaction.php:259 #, fuzzy msgid "All groups" msgstr "Tódalas etiquetas" @@ -6604,6 +6613,11 @@ msgstr "Desuscribir de %s" msgid "Unsubscribe" msgstr "Eliminar subscrición" +#: lib/usernoprofileexception.php:58 +#, fuzzy, php-format +msgid "User %s (%d) has no profile record." +msgstr "O usuario non ten perfil." + #: lib/userprofile.php:117 #, fuzzy msgid "Edit Avatar" diff --git a/locale/he/LC_MESSAGES/statusnet.po b/locale/he/LC_MESSAGES/statusnet.po index 27c7af90f0..f1fd35346c 100644 --- a/locale/he/LC_MESSAGES/statusnet.po +++ b/locale/he/LC_MESSAGES/statusnet.po @@ -7,12 +7,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-03-17 21:39+0000\n" -"PO-Revision-Date: 2010-03-17 21:40:47+0000\n" +"POT-Creation-Date: 2010-03-23 20:09+0000\n" +"PO-Revision-Date: 2010-03-23 20:09:53+0000\n" "Language-Team: Hebrew\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r63880); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.17alpha (r64087); Translate extension (2010-01-16)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: he\n" "X-Message-Group: out-statusnet\n" @@ -780,23 +780,28 @@ msgstr "ההעלה" msgid "Crop" msgstr "" -#: actions/avatarsettings.php:328 +#: actions/avatarsettings.php:305 +#, fuzzy +msgid "No file uploaded." +msgstr "העלאה חלקית." + +#: actions/avatarsettings.php:332 msgid "Pick a square area of the image to be your avatar" msgstr "" -#: actions/avatarsettings.php:343 actions/grouplogo.php:380 +#: actions/avatarsettings.php:347 actions/grouplogo.php:380 msgid "Lost our file data." msgstr "" -#: actions/avatarsettings.php:366 +#: actions/avatarsettings.php:370 msgid "Avatar updated." msgstr "התמונה עודכנה." -#: actions/avatarsettings.php:369 +#: actions/avatarsettings.php:373 msgid "Failed updating avatar." msgstr "עדכון התמונה נכשל." -#: actions/avatarsettings.php:393 +#: actions/avatarsettings.php:397 #, fuzzy msgid "Avatar deleted." msgstr "התמונה עודכנה." @@ -941,7 +946,7 @@ msgid "Conversation" msgstr "מיקום" #: actions/conversation.php:154 lib/mailbox.php:116 lib/noticelist.php:87 -#: lib/profileaction.php:218 lib/searchgroupnav.php:82 +#: lib/profileaction.php:224 lib/searchgroupnav.php:82 msgid "Notices" msgstr "הודעות" @@ -1796,7 +1801,7 @@ msgstr "" msgid "Updates from members of %1$s on %2$s!" msgstr "מיקרובלוג מאת %s" -#: actions/groups.php:62 lib/profileaction.php:212 lib/profileaction.php:232 +#: actions/groups.php:62 lib/profileaction.php:218 lib/profileaction.php:244 #: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98 msgid "Groups" msgstr "קבוצות" @@ -3406,7 +3411,7 @@ msgid "Description" msgstr "הרשמות" #: actions/showapplication.php:192 actions/showgroup.php:439 -#: lib/profileaction.php:176 +#: lib/profileaction.php:182 msgid "Statistics" msgstr "סטטיסטיקה" @@ -3566,7 +3571,7 @@ msgid "Members" msgstr "חבר מאז" #: actions/showgroup.php:396 lib/profileaction.php:117 -#: lib/profileaction.php:150 lib/profileaction.php:238 lib/section.php:95 +#: lib/profileaction.php:150 lib/profileaction.php:250 lib/section.php:95 #: lib/subscriptionlist.php:126 lib/tagcloudsection.php:71 msgid "(None)" msgstr "" @@ -3728,7 +3733,7 @@ msgid "Unknown language \"%s\"." msgstr "" #: actions/siteadminpanel.php:165 -msgid "Minimum text limit is 140 characters." +msgid "Minimum text limit is 0 (unlimited)." msgstr "" #: actions/siteadminpanel.php:171 @@ -4002,8 +4007,7 @@ msgstr "הגדרות" msgid "You are not subscribed to that profile." msgstr "לא שלחנו אלינו את הפרופיל הזה" -#: actions/subedit.php:83 classes/Subscription.php:89 -#: classes/Subscription.php:116 +#: actions/subedit.php:83 classes/Subscription.php:132 #, fuzzy msgid "Could not save subscription." msgstr "יצירת המנוי נכשלה." @@ -4578,39 +4582,39 @@ msgstr "בעיה בשמירת ההודעה." msgid "RT @%1$s %2$s" msgstr "" -#: classes/Subscription.php:66 lib/oauthstore.php:465 +#: classes/Subscription.php:74 lib/oauthstore.php:465 msgid "You have been banned from subscribing." msgstr "" -#: classes/Subscription.php:70 +#: classes/Subscription.php:78 msgid "Already subscribed!" msgstr "" -#: classes/Subscription.php:74 +#: classes/Subscription.php:82 #, fuzzy msgid "User has blocked you." msgstr "למשתמש אין פרופיל." -#: classes/Subscription.php:157 +#: classes/Subscription.php:167 #, fuzzy msgid "Not subscribed!" msgstr "לא מנוי!" -#: classes/Subscription.php:163 +#: classes/Subscription.php:173 #, fuzzy msgid "Couldn't delete self-subscription." msgstr "מחיקת המנוי לא הצליחה." -#: classes/Subscription.php:190 +#: classes/Subscription.php:200 #, fuzzy msgid "Couldn't delete subscription OMB token." msgstr "מחיקת המנוי לא הצליחה." -#: classes/Subscription.php:201 +#: classes/Subscription.php:211 msgid "Couldn't delete subscription." msgstr "מחיקת המנוי לא הצליחה." -#: classes/User.php:378 +#: classes/User.php:363 #, php-format msgid "Welcome to %1$s, @%2$s!" msgstr "" @@ -4918,22 +4922,22 @@ msgstr "<< אחרי" msgid "Before" msgstr "לפני >>" -#: lib/activity.php:453 +#: lib/activity.php:120 +msgid "Expecting a root feed element but got a whole XML document." +msgstr "" + +#: lib/activityutils.php:208 msgid "Can't handle remote content yet." msgstr "" -#: lib/activity.php:481 +#: lib/activityutils.php:236 msgid "Can't handle embedded XML content yet." msgstr "" -#: lib/activity.php:485 +#: lib/activityutils.php:240 msgid "Can't handle embedded Base64 content yet." msgstr "" -#: lib/activity.php:1089 -msgid "Expecting a root feed element but got a whole XML document." -msgstr "" - #. TRANS: Client error message #: lib/adminpanelaction.php:98 msgid "You cannot make changes to this site." @@ -5425,20 +5429,20 @@ msgid "" "tracking - not yet implemented.\n" msgstr "" -#: lib/common.php:136 +#: lib/common.php:135 #, fuzzy msgid "No configuration file found. " msgstr "אין קוד אישור." -#: lib/common.php:137 +#: lib/common.php:136 msgid "I looked for configuration files in the following places: " msgstr "" -#: lib/common.php:139 +#: lib/common.php:138 msgid "You may wish to run the installer to fix this." msgstr "" -#: lib/common.php:140 +#: lib/common.php:139 msgid "Go to the installer." msgstr "" @@ -5621,41 +5625,41 @@ msgstr "" msgid "This page is not available in a media type you accept" msgstr "עמוד זה אינו זמין בסוג מדיה שאתה יכול לקבל" -#: lib/imagefile.php:74 +#: lib/imagefile.php:72 msgid "Unsupported image file format." msgstr "פורמט התמונה אינו נתמך." -#: lib/imagefile.php:90 +#: lib/imagefile.php:88 #, fuzzy, php-format msgid "That file is too big. The maximum file size is %s." msgstr "זה ארוך מידי. אורך מירבי להודעה הוא 140 אותיות." -#: lib/imagefile.php:95 +#: lib/imagefile.php:93 msgid "Partial upload." msgstr "העלאה חלקית." -#: lib/imagefile.php:103 lib/mediafile.php:170 +#: lib/imagefile.php:101 lib/mediafile.php:170 msgid "System error uploading file." msgstr "שגיאת מערכת בהעלאת הקובץ." -#: lib/imagefile.php:111 +#: lib/imagefile.php:109 msgid "Not an image or corrupt file." msgstr "זהו לא קובץ תמונה, או שחל בו שיבוש." -#: lib/imagefile.php:124 +#: lib/imagefile.php:122 #, fuzzy msgid "Lost our file." msgstr "אין הודעה כזו." -#: lib/imagefile.php:168 lib/imagefile.php:233 +#: lib/imagefile.php:163 lib/imagefile.php:224 msgid "Unknown file type" msgstr "" -#: lib/imagefile.php:253 +#: lib/imagefile.php:244 msgid "MB" msgstr "" -#: lib/imagefile.php:255 +#: lib/imagefile.php:246 msgid "kB" msgstr "" @@ -6119,7 +6123,7 @@ msgstr "" msgid "Unknown" msgstr "" -#: lib/profileaction.php:109 lib/profileaction.php:194 lib/subgroupnav.php:82 +#: lib/profileaction.php:109 lib/profileaction.php:200 lib/subgroupnav.php:82 msgid "Subscriptions" msgstr "הרשמות" @@ -6127,7 +6131,7 @@ msgstr "הרשמות" msgid "All subscriptions" msgstr "כל המנויים" -#: lib/profileaction.php:142 lib/profileaction.php:203 lib/subgroupnav.php:90 +#: lib/profileaction.php:142 lib/profileaction.php:209 lib/subgroupnav.php:90 msgid "Subscribers" msgstr "מנויים" @@ -6136,16 +6140,21 @@ msgstr "מנויים" msgid "All subscribers" msgstr "מנויים" -#: lib/profileaction.php:180 +#: lib/profileaction.php:186 #, fuzzy msgid "User ID" msgstr "מתשמש" -#: lib/profileaction.php:185 +#: lib/profileaction.php:191 msgid "Member since" msgstr "חבר מאז" -#: lib/profileaction.php:247 +#. TRANS: Average count of posts made per day since account registration +#: lib/profileaction.php:230 +msgid "Daily average" +msgstr "" + +#: lib/profileaction.php:259 msgid "All groups" msgstr "" @@ -6328,6 +6337,11 @@ msgstr "" msgid "Unsubscribe" msgstr "בטל מנוי" +#: lib/usernoprofileexception.php:58 +#, fuzzy, php-format +msgid "User %s (%d) has no profile record." +msgstr "למשתמש אין פרופיל." + #: lib/userprofile.php:117 #, fuzzy msgid "Edit Avatar" diff --git a/locale/hsb/LC_MESSAGES/statusnet.po b/locale/hsb/LC_MESSAGES/statusnet.po index f61fb0a82b..1411d983f9 100644 --- a/locale/hsb/LC_MESSAGES/statusnet.po +++ b/locale/hsb/LC_MESSAGES/statusnet.po @@ -9,12 +9,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-03-17 21:39+0000\n" -"PO-Revision-Date: 2010-03-17 21:40:50+0000\n" +"POT-Creation-Date: 2010-03-23 20:09+0000\n" +"PO-Revision-Date: 2010-03-23 20:09:56+0000\n" "Language-Team: Dutch\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r63880); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.17alpha (r64087); Translate extension (2010-01-16)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: hsb\n" "X-Message-Group: out-statusnet\n" @@ -749,23 +749,28 @@ msgstr "Nahrać" msgid "Crop" msgstr "" -#: actions/avatarsettings.php:328 +#: actions/avatarsettings.php:305 +#, fuzzy +msgid "No file uploaded." +msgstr "Žadyn profil podaty." + +#: actions/avatarsettings.php:332 msgid "Pick a square area of the image to be your avatar" msgstr "" -#: actions/avatarsettings.php:343 actions/grouplogo.php:380 +#: actions/avatarsettings.php:347 actions/grouplogo.php:380 msgid "Lost our file data." msgstr "" -#: actions/avatarsettings.php:366 +#: actions/avatarsettings.php:370 msgid "Avatar updated." msgstr "Awatar zaktualizowany." -#: actions/avatarsettings.php:369 +#: actions/avatarsettings.php:373 msgid "Failed updating avatar." msgstr "" -#: actions/avatarsettings.php:393 +#: actions/avatarsettings.php:397 msgid "Avatar deleted." msgstr "Awatar zničeny." @@ -900,7 +905,7 @@ msgid "Conversation" msgstr "Konwersacija" #: actions/conversation.php:154 lib/mailbox.php:116 lib/noticelist.php:87 -#: lib/profileaction.php:218 lib/searchgroupnav.php:82 +#: lib/profileaction.php:224 lib/searchgroupnav.php:82 msgid "Notices" msgstr "Zdźělenki" @@ -1698,7 +1703,7 @@ msgstr "" msgid "Updates from members of %1$s on %2$s!" msgstr "" -#: actions/groups.php:62 lib/profileaction.php:212 lib/profileaction.php:232 +#: actions/groups.php:62 lib/profileaction.php:218 lib/profileaction.php:244 #: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98 msgid "Groups" msgstr "Skupiny" @@ -3227,7 +3232,7 @@ msgid "Description" msgstr "Wopisanje" #: actions/showapplication.php:192 actions/showgroup.php:439 -#: lib/profileaction.php:176 +#: lib/profileaction.php:182 msgid "Statistics" msgstr "Statistika" @@ -3384,7 +3389,7 @@ msgid "Members" msgstr "Čłonojo" #: actions/showgroup.php:396 lib/profileaction.php:117 -#: lib/profileaction.php:150 lib/profileaction.php:238 lib/section.php:95 +#: lib/profileaction.php:150 lib/profileaction.php:250 lib/section.php:95 #: lib/subscriptionlist.php:126 lib/tagcloudsection.php:71 msgid "(None)" msgstr "(Žadyn)" @@ -3543,7 +3548,7 @@ msgid "Unknown language \"%s\"." msgstr "Njeznata rěč \"%s\"." #: actions/siteadminpanel.php:165 -msgid "Minimum text limit is 140 characters." +msgid "Minimum text limit is 0 (unlimited)." msgstr "" #: actions/siteadminpanel.php:171 @@ -3804,8 +3809,7 @@ msgstr "Nastajenja wobrazowkoweho fota składować" msgid "You are not subscribed to that profile." msgstr "Njejsy tón profil abonował." -#: actions/subedit.php:83 classes/Subscription.php:89 -#: classes/Subscription.php:116 +#: actions/subedit.php:83 classes/Subscription.php:132 msgid "Could not save subscription." msgstr "" @@ -4341,35 +4345,35 @@ msgstr "" msgid "RT @%1$s %2$s" msgstr "" -#: classes/Subscription.php:66 lib/oauthstore.php:465 +#: classes/Subscription.php:74 lib/oauthstore.php:465 msgid "You have been banned from subscribing." msgstr "" -#: classes/Subscription.php:70 +#: classes/Subscription.php:78 msgid "Already subscribed!" msgstr "Hižo abonowany!" -#: classes/Subscription.php:74 +#: classes/Subscription.php:82 msgid "User has blocked you." msgstr "Wužiwar je će zablokował." -#: classes/Subscription.php:157 +#: classes/Subscription.php:167 msgid "Not subscribed!" msgstr "Njeje abonowany!" -#: classes/Subscription.php:163 +#: classes/Subscription.php:173 msgid "Couldn't delete self-subscription." msgstr "Sebjeabonement njeje so dał zničić." -#: classes/Subscription.php:190 +#: classes/Subscription.php:200 msgid "Couldn't delete subscription OMB token." msgstr "Znamjo OMB-abonementa njeda so zhašeć." -#: classes/Subscription.php:201 +#: classes/Subscription.php:211 msgid "Couldn't delete subscription." msgstr "Abonoment njeje so dał zničić." -#: classes/User.php:378 +#: classes/User.php:363 #, php-format msgid "Welcome to %1$s, @%2$s!" msgstr "" @@ -4648,22 +4652,22 @@ msgstr "" msgid "Before" msgstr "" -#: lib/activity.php:453 +#: lib/activity.php:120 +msgid "Expecting a root feed element but got a whole XML document." +msgstr "" + +#: lib/activityutils.php:208 msgid "Can't handle remote content yet." msgstr "" -#: lib/activity.php:481 +#: lib/activityutils.php:236 msgid "Can't handle embedded XML content yet." msgstr "" -#: lib/activity.php:485 +#: lib/activityutils.php:240 msgid "Can't handle embedded Base64 content yet." msgstr "" -#: lib/activity.php:1089 -msgid "Expecting a root feed element but got a whole XML document." -msgstr "" - #. TRANS: Client error message #: lib/adminpanelaction.php:98 msgid "You cannot make changes to this site." @@ -5133,19 +5137,19 @@ msgid "" "tracking - not yet implemented.\n" msgstr "" -#: lib/common.php:136 +#: lib/common.php:135 msgid "No configuration file found. " msgstr "Žana konfiguraciska dataja namakana. " -#: lib/common.php:137 +#: lib/common.php:136 msgid "I looked for configuration files in the following places: " msgstr "" -#: lib/common.php:139 +#: lib/common.php:138 msgid "You may wish to run the installer to fix this." msgstr "" -#: lib/common.php:140 +#: lib/common.php:139 msgid "Go to the installer." msgstr "" @@ -5319,40 +5323,40 @@ msgstr "" msgid "This page is not available in a media type you accept" msgstr "" -#: lib/imagefile.php:74 +#: lib/imagefile.php:72 msgid "Unsupported image file format." msgstr "" -#: lib/imagefile.php:90 +#: lib/imagefile.php:88 #, php-format msgid "That file is too big. The maximum file size is %s." msgstr "" -#: lib/imagefile.php:95 +#: lib/imagefile.php:93 msgid "Partial upload." msgstr "Dźělne nahraće." -#: lib/imagefile.php:103 lib/mediafile.php:170 +#: lib/imagefile.php:101 lib/mediafile.php:170 msgid "System error uploading file." msgstr "" -#: lib/imagefile.php:111 +#: lib/imagefile.php:109 msgid "Not an image or corrupt file." msgstr "" -#: lib/imagefile.php:124 +#: lib/imagefile.php:122 msgid "Lost our file." msgstr "Naša dataja je so zhubiła." -#: lib/imagefile.php:168 lib/imagefile.php:233 +#: lib/imagefile.php:163 lib/imagefile.php:224 msgid "Unknown file type" msgstr "Njeznaty datajowy typ" -#: lib/imagefile.php:253 +#: lib/imagefile.php:244 msgid "MB" msgstr "MB" -#: lib/imagefile.php:255 +#: lib/imagefile.php:246 msgid "kB" msgstr "KB" @@ -5795,7 +5799,7 @@ msgstr "" msgid "Unknown" msgstr "Njeznaty" -#: lib/profileaction.php:109 lib/profileaction.php:194 lib/subgroupnav.php:82 +#: lib/profileaction.php:109 lib/profileaction.php:200 lib/subgroupnav.php:82 msgid "Subscriptions" msgstr "Abonementy" @@ -5803,7 +5807,7 @@ msgstr "Abonementy" msgid "All subscriptions" msgstr "Wšě abonementy" -#: lib/profileaction.php:142 lib/profileaction.php:203 lib/subgroupnav.php:90 +#: lib/profileaction.php:142 lib/profileaction.php:209 lib/subgroupnav.php:90 msgid "Subscribers" msgstr "Abonenća" @@ -5811,15 +5815,20 @@ msgstr "Abonenća" msgid "All subscribers" msgstr "Wšitcy abonenća" -#: lib/profileaction.php:180 +#: lib/profileaction.php:186 msgid "User ID" msgstr "Wužiwarski ID" -#: lib/profileaction.php:185 +#: lib/profileaction.php:191 msgid "Member since" msgstr "Čłon wot" -#: lib/profileaction.php:247 +#. TRANS: Average count of posts made per day since account registration +#: lib/profileaction.php:230 +msgid "Daily average" +msgstr "" + +#: lib/profileaction.php:259 msgid "All groups" msgstr "Wšě skupiny" @@ -5990,6 +5999,11 @@ msgstr "Tutoho wužiwarja wotskazać" msgid "Unsubscribe" msgstr "Wotskazać" +#: lib/usernoprofileexception.php:58 +#, fuzzy, php-format +msgid "User %s (%d) has no profile record." +msgstr "Wužiwar nima profil." + #: lib/userprofile.php:117 msgid "Edit Avatar" msgstr "Awatar wobdźěłać" diff --git a/locale/ia/LC_MESSAGES/statusnet.po b/locale/ia/LC_MESSAGES/statusnet.po index b31fc0d2db..c8aa5e6166 100644 --- a/locale/ia/LC_MESSAGES/statusnet.po +++ b/locale/ia/LC_MESSAGES/statusnet.po @@ -8,12 +8,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-03-17 21:39+0000\n" -"PO-Revision-Date: 2010-03-17 21:40:53+0000\n" +"POT-Creation-Date: 2010-03-23 20:09+0000\n" +"PO-Revision-Date: 2010-03-23 20:09:59+0000\n" "Language-Team: Interlingua\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r63880); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.17alpha (r64087); Translate extension (2010-01-16)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: ia\n" "X-Message-Group: out-statusnet\n" @@ -771,23 +771,28 @@ msgstr "Incargar" msgid "Crop" msgstr "Taliar" -#: actions/avatarsettings.php:328 +#: actions/avatarsettings.php:305 +#, fuzzy +msgid "No file uploaded." +msgstr "Nulle profilo specificate." + +#: actions/avatarsettings.php:332 msgid "Pick a square area of the image to be your avatar" msgstr "Selige un area quadrate del imagine pro facer lo tu avatar" -#: actions/avatarsettings.php:343 actions/grouplogo.php:380 +#: actions/avatarsettings.php:347 actions/grouplogo.php:380 msgid "Lost our file data." msgstr "Datos del file perdite." -#: actions/avatarsettings.php:366 +#: actions/avatarsettings.php:370 msgid "Avatar updated." msgstr "Avatar actualisate." -#: actions/avatarsettings.php:369 +#: actions/avatarsettings.php:373 msgid "Failed updating avatar." msgstr "Actualisation del avatar fallite." -#: actions/avatarsettings.php:393 +#: actions/avatarsettings.php:397 msgid "Avatar deleted." msgstr "Avatar delite." @@ -925,7 +930,7 @@ msgid "Conversation" msgstr "Conversation" #: actions/conversation.php:154 lib/mailbox.php:116 lib/noticelist.php:87 -#: lib/profileaction.php:218 lib/searchgroupnav.php:82 +#: lib/profileaction.php:224 lib/searchgroupnav.php:82 msgid "Notices" msgstr "Notas" @@ -1747,7 +1752,7 @@ msgstr "Chronologia de %s" msgid "Updates from members of %1$s on %2$s!" msgstr "Actualisationes de membros de %1$s in %2$s!" -#: actions/groups.php:62 lib/profileaction.php:212 lib/profileaction.php:232 +#: actions/groups.php:62 lib/profileaction.php:218 lib/profileaction.php:244 #: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98 msgid "Groups" msgstr "Gruppos" @@ -3408,7 +3413,7 @@ msgid "Description" msgstr "Description" #: actions/showapplication.php:192 actions/showgroup.php:439 -#: lib/profileaction.php:176 +#: lib/profileaction.php:182 msgid "Statistics" msgstr "Statisticas" @@ -3575,7 +3580,7 @@ msgid "Members" msgstr "Membros" #: actions/showgroup.php:396 lib/profileaction.php:117 -#: lib/profileaction.php:150 lib/profileaction.php:238 lib/section.php:95 +#: lib/profileaction.php:150 lib/profileaction.php:250 lib/section.php:95 #: lib/subscriptionlist.php:126 lib/tagcloudsection.php:71 msgid "(None)" msgstr "(Nulle)" @@ -3756,7 +3761,8 @@ msgid "Unknown language \"%s\"." msgstr "Lingua \"%s\" incognite." #: actions/siteadminpanel.php:165 -msgid "Minimum text limit is 140 characters." +#, fuzzy +msgid "Minimum text limit is 0 (unlimited)." msgstr "Le limite minimal del texto es 140 characteres." #: actions/siteadminpanel.php:171 @@ -4029,8 +4035,7 @@ msgstr "Salveguardar configuration de instantaneos" msgid "You are not subscribed to that profile." msgstr "Tu non es subscribite a iste profilo." -#: actions/subedit.php:83 classes/Subscription.php:89 -#: classes/Subscription.php:116 +#: actions/subedit.php:83 classes/Subscription.php:132 msgid "Could not save subscription." msgstr "Non poteva salveguardar le subscription." @@ -4612,35 +4617,35 @@ msgstr "Problema salveguardar le cassa de entrata del gruppo." msgid "RT @%1$s %2$s" msgstr "RT @%1$s %2$s" -#: classes/Subscription.php:66 lib/oauthstore.php:465 +#: classes/Subscription.php:74 lib/oauthstore.php:465 msgid "You have been banned from subscribing." msgstr "Tu ha essite blocate del subscription." -#: classes/Subscription.php:70 +#: classes/Subscription.php:78 msgid "Already subscribed!" msgstr "Ja subscribite!" -#: classes/Subscription.php:74 +#: classes/Subscription.php:82 msgid "User has blocked you." msgstr "Le usator te ha blocate." -#: classes/Subscription.php:157 +#: classes/Subscription.php:167 msgid "Not subscribed!" msgstr "Non subscribite!" -#: classes/Subscription.php:163 +#: classes/Subscription.php:173 msgid "Couldn't delete self-subscription." msgstr "Non poteva deler auto-subscription." -#: classes/Subscription.php:190 +#: classes/Subscription.php:200 msgid "Couldn't delete subscription OMB token." msgstr "Non poteva deler le indicio OMB del subscription." -#: classes/Subscription.php:201 +#: classes/Subscription.php:211 msgid "Couldn't delete subscription." msgstr "Non poteva deler subscription." -#: classes/User.php:378 +#: classes/User.php:363 #, php-format msgid "Welcome to %1$s, @%2$s!" msgstr "Benvenite a %1$s, @%2$s!" @@ -4925,22 +4930,22 @@ msgstr "Post" msgid "Before" msgstr "Ante" -#: lib/activity.php:453 +#: lib/activity.php:120 +msgid "Expecting a root feed element but got a whole XML document." +msgstr "" + +#: lib/activityutils.php:208 msgid "Can't handle remote content yet." msgstr "Non pote ancora tractar contento remote." -#: lib/activity.php:481 +#: lib/activityutils.php:236 msgid "Can't handle embedded XML content yet." msgstr "Non pote ancora tractar contento XML incastrate." -#: lib/activity.php:485 +#: lib/activityutils.php:240 msgid "Can't handle embedded Base64 content yet." msgstr "Non pote ancora tractar contento Base64 incastrate." -#: lib/activity.php:1089 -msgid "Expecting a root feed element but got a whole XML document." -msgstr "" - #. TRANS: Client error message #: lib/adminpanelaction.php:98 msgid "You cannot make changes to this site." @@ -5455,19 +5460,19 @@ msgstr "" "tracks - non ancora implementate.\n" "tracking - non ancora implementate.\n" -#: lib/common.php:136 +#: lib/common.php:135 msgid "No configuration file found. " msgstr "Nulle file de configuration trovate. " -#: lib/common.php:137 +#: lib/common.php:136 msgid "I looked for configuration files in the following places: " msgstr "Io cercava files de configuration in le sequente locos: " -#: lib/common.php:139 +#: lib/common.php:138 msgid "You may wish to run the installer to fix this." msgstr "Considera executar le installator pro reparar isto." -#: lib/common.php:140 +#: lib/common.php:139 msgid "Go to the installer." msgstr "Ir al installator." @@ -5645,40 +5650,40 @@ msgstr "Etiquettas in le notas del gruppo %s" msgid "This page is not available in a media type you accept" msgstr "Iste pagina non es disponibile in un formato que tu accepta" -#: lib/imagefile.php:74 +#: lib/imagefile.php:72 msgid "Unsupported image file format." msgstr "Formato de file de imagine non supportate." -#: lib/imagefile.php:90 +#: lib/imagefile.php:88 #, php-format msgid "That file is too big. The maximum file size is %s." msgstr "Iste file es troppo grande. Le dimension maximal es %s." -#: lib/imagefile.php:95 +#: lib/imagefile.php:93 msgid "Partial upload." msgstr "Incargamento partial." -#: lib/imagefile.php:103 lib/mediafile.php:170 +#: lib/imagefile.php:101 lib/mediafile.php:170 msgid "System error uploading file." msgstr "Error de systema durante le incargamento del file." -#: lib/imagefile.php:111 +#: lib/imagefile.php:109 msgid "Not an image or corrupt file." msgstr "Le file non es un imagine o es defectuose." -#: lib/imagefile.php:124 +#: lib/imagefile.php:122 msgid "Lost our file." msgstr "File perdite." -#: lib/imagefile.php:168 lib/imagefile.php:233 +#: lib/imagefile.php:163 lib/imagefile.php:224 msgid "Unknown file type" msgstr "Typo de file incognite" -#: lib/imagefile.php:253 +#: lib/imagefile.php:244 msgid "MB" msgstr "MB" -#: lib/imagefile.php:255 +#: lib/imagefile.php:246 msgid "kB" msgstr "KB" @@ -6213,7 +6218,7 @@ msgstr "Etiquettas in le notas de %s" msgid "Unknown" msgstr "Incognite" -#: lib/profileaction.php:109 lib/profileaction.php:194 lib/subgroupnav.php:82 +#: lib/profileaction.php:109 lib/profileaction.php:200 lib/subgroupnav.php:82 msgid "Subscriptions" msgstr "Subscriptiones" @@ -6221,7 +6226,7 @@ msgstr "Subscriptiones" msgid "All subscriptions" msgstr "Tote le subscriptiones" -#: lib/profileaction.php:142 lib/profileaction.php:203 lib/subgroupnav.php:90 +#: lib/profileaction.php:142 lib/profileaction.php:209 lib/subgroupnav.php:90 msgid "Subscribers" msgstr "Subscriptores" @@ -6229,15 +6234,20 @@ msgstr "Subscriptores" msgid "All subscribers" msgstr "Tote le subscriptores" -#: lib/profileaction.php:180 +#: lib/profileaction.php:186 msgid "User ID" msgstr "ID del usator" -#: lib/profileaction.php:185 +#: lib/profileaction.php:191 msgid "Member since" msgstr "Membro depost" -#: lib/profileaction.php:247 +#. TRANS: Average count of posts made per day since account registration +#: lib/profileaction.php:230 +msgid "Daily average" +msgstr "" + +#: lib/profileaction.php:259 msgid "All groups" msgstr "Tote le gruppos" @@ -6408,6 +6418,11 @@ msgstr "Cancellar subscription a iste usator" msgid "Unsubscribe" msgstr "Cancellar subscription" +#: lib/usernoprofileexception.php:58 +#, fuzzy, php-format +msgid "User %s (%d) has no profile record." +msgstr "Le usator non ha un profilo." + #: lib/userprofile.php:117 msgid "Edit Avatar" msgstr "Modificar avatar" diff --git a/locale/is/LC_MESSAGES/statusnet.po b/locale/is/LC_MESSAGES/statusnet.po index 595431e9a9..ca72d54a3f 100644 --- a/locale/is/LC_MESSAGES/statusnet.po +++ b/locale/is/LC_MESSAGES/statusnet.po @@ -8,12 +8,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-03-17 21:39+0000\n" -"PO-Revision-Date: 2010-03-17 21:40:56+0000\n" +"POT-Creation-Date: 2010-03-23 20:09+0000\n" +"PO-Revision-Date: 2010-03-23 20:10:10+0000\n" "Language-Team: Icelandic\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r63880); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.17alpha (r64087); Translate extension (2010-01-16)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: is\n" "X-Message-Group: out-statusnet\n" @@ -777,24 +777,29 @@ msgstr "Hlaða upp" msgid "Crop" msgstr "Skera af" -#: actions/avatarsettings.php:328 +#: actions/avatarsettings.php:305 +#, fuzzy +msgid "No file uploaded." +msgstr "Engin persónuleg síða tilgreind" + +#: actions/avatarsettings.php:332 msgid "Pick a square area of the image to be your avatar" msgstr "" "Veldu ferningslaga svæði á upphaflegu myndinni sem einkennismyndina þína" -#: actions/avatarsettings.php:343 actions/grouplogo.php:380 +#: actions/avatarsettings.php:347 actions/grouplogo.php:380 msgid "Lost our file data." msgstr "Týndum skráargögnunum okkar" -#: actions/avatarsettings.php:366 +#: actions/avatarsettings.php:370 msgid "Avatar updated." msgstr "Mynd hefur verið uppfærð." -#: actions/avatarsettings.php:369 +#: actions/avatarsettings.php:373 msgid "Failed updating avatar." msgstr "Mistókst að uppfæra mynd" -#: actions/avatarsettings.php:393 +#: actions/avatarsettings.php:397 msgid "Avatar deleted." msgstr "" @@ -934,7 +939,7 @@ msgid "Conversation" msgstr "" #: actions/conversation.php:154 lib/mailbox.php:116 lib/noticelist.php:87 -#: lib/profileaction.php:218 lib/searchgroupnav.php:82 +#: lib/profileaction.php:224 lib/searchgroupnav.php:82 msgid "Notices" msgstr "Babl" @@ -1778,7 +1783,7 @@ msgstr "Rás %s" msgid "Updates from members of %1$s on %2$s!" msgstr "Færslur frá %1$s á %2$s!" -#: actions/groups.php:62 lib/profileaction.php:212 lib/profileaction.php:232 +#: actions/groups.php:62 lib/profileaction.php:218 lib/profileaction.php:244 #: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98 msgid "Groups" msgstr "Hópar" @@ -3450,7 +3455,7 @@ msgid "Description" msgstr "Lýsing" #: actions/showapplication.php:192 actions/showgroup.php:439 -#: lib/profileaction.php:176 +#: lib/profileaction.php:182 msgid "Statistics" msgstr "Tölfræði" @@ -3608,7 +3613,7 @@ msgid "Members" msgstr "Meðlimir" #: actions/showgroup.php:396 lib/profileaction.php:117 -#: lib/profileaction.php:150 lib/profileaction.php:238 lib/section.php:95 +#: lib/profileaction.php:150 lib/profileaction.php:250 lib/section.php:95 #: lib/subscriptionlist.php:126 lib/tagcloudsection.php:71 msgid "(None)" msgstr "(Ekkert)" @@ -3770,7 +3775,7 @@ msgid "Unknown language \"%s\"." msgstr "" #: actions/siteadminpanel.php:165 -msgid "Minimum text limit is 140 characters." +msgid "Minimum text limit is 0 (unlimited)." msgstr "" #: actions/siteadminpanel.php:171 @@ -4050,8 +4055,7 @@ msgstr "Stillingar fyrir mynd" msgid "You are not subscribed to that profile." msgstr "Þú ert ekki áskrifandi." -#: actions/subedit.php:83 classes/Subscription.php:89 -#: classes/Subscription.php:116 +#: actions/subedit.php:83 classes/Subscription.php:132 msgid "Could not save subscription." msgstr "Gat ekki vistað áskrift." @@ -4627,39 +4631,39 @@ msgstr "Vandamál komu upp við að vista babl." msgid "RT @%1$s %2$s" msgstr "%1$s (%2$s)" -#: classes/Subscription.php:66 lib/oauthstore.php:465 +#: classes/Subscription.php:74 lib/oauthstore.php:465 #, fuzzy msgid "You have been banned from subscribing." msgstr "Þessi notandi hefur bannað þér að gerast áskrifandi" -#: classes/Subscription.php:70 +#: classes/Subscription.php:78 msgid "Already subscribed!" msgstr "" -#: classes/Subscription.php:74 +#: classes/Subscription.php:82 msgid "User has blocked you." msgstr "Notandinn hefur lokað á þig." -#: classes/Subscription.php:157 +#: classes/Subscription.php:167 #, fuzzy msgid "Not subscribed!" msgstr "Ekki í áskrift!" -#: classes/Subscription.php:163 +#: classes/Subscription.php:173 #, fuzzy msgid "Couldn't delete self-subscription." msgstr "Gat ekki eytt áskrift." -#: classes/Subscription.php:190 +#: classes/Subscription.php:200 #, fuzzy msgid "Couldn't delete subscription OMB token." msgstr "Gat ekki eytt áskrift." -#: classes/Subscription.php:201 +#: classes/Subscription.php:211 msgid "Couldn't delete subscription." msgstr "Gat ekki eytt áskrift." -#: classes/User.php:378 +#: classes/User.php:363 #, php-format msgid "Welcome to %1$s, @%2$s!" msgstr "" @@ -4965,22 +4969,22 @@ msgstr "Eftir" msgid "Before" msgstr "Áður" -#: lib/activity.php:453 +#: lib/activity.php:120 +msgid "Expecting a root feed element but got a whole XML document." +msgstr "" + +#: lib/activityutils.php:208 msgid "Can't handle remote content yet." msgstr "" -#: lib/activity.php:481 +#: lib/activityutils.php:236 msgid "Can't handle embedded XML content yet." msgstr "" -#: lib/activity.php:485 +#: lib/activityutils.php:240 msgid "Can't handle embedded Base64 content yet." msgstr "" -#: lib/activity.php:1089 -msgid "Expecting a root feed element but got a whole XML document." -msgstr "" - #. TRANS: Client error message #: lib/adminpanelaction.php:98 #, fuzzy @@ -5474,20 +5478,20 @@ msgid "" "tracking - not yet implemented.\n" msgstr "" -#: lib/common.php:136 +#: lib/common.php:135 #, fuzzy msgid "No configuration file found. " msgstr "Enginn staðfestingarlykill." -#: lib/common.php:137 +#: lib/common.php:136 msgid "I looked for configuration files in the following places: " msgstr "" -#: lib/common.php:139 +#: lib/common.php:138 msgid "You may wish to run the installer to fix this." msgstr "" -#: lib/common.php:140 +#: lib/common.php:139 #, fuzzy msgid "Go to the installer." msgstr "Skrá þig inn á síðuna" @@ -5667,40 +5671,40 @@ msgid "This page is not available in a media type you accept" msgstr "" "Þessi síða er ekki aðgengileg í margmiðlunargerðinni sem þú tekur á móti" -#: lib/imagefile.php:74 +#: lib/imagefile.php:72 msgid "Unsupported image file format." msgstr "Skráarsnið myndar ekki stutt." -#: lib/imagefile.php:90 +#: lib/imagefile.php:88 #, fuzzy, php-format msgid "That file is too big. The maximum file size is %s." msgstr "Þetta er of langt. Hámarkslengd babls er 140 tákn." -#: lib/imagefile.php:95 +#: lib/imagefile.php:93 msgid "Partial upload." msgstr "Upphal að hluta til." -#: lib/imagefile.php:103 lib/mediafile.php:170 +#: lib/imagefile.php:101 lib/mediafile.php:170 msgid "System error uploading file." msgstr "Kerfisvilla kom upp við upphal skráar." -#: lib/imagefile.php:111 +#: lib/imagefile.php:109 msgid "Not an image or corrupt file." msgstr "Annaðhvort ekki mynd eða þá að skráin er gölluð." -#: lib/imagefile.php:124 +#: lib/imagefile.php:122 msgid "Lost our file." msgstr "Týndum skránni okkar" -#: lib/imagefile.php:168 lib/imagefile.php:233 +#: lib/imagefile.php:163 lib/imagefile.php:224 msgid "Unknown file type" msgstr "Óþekkt skráargerð" -#: lib/imagefile.php:253 +#: lib/imagefile.php:244 msgid "MB" msgstr "" -#: lib/imagefile.php:255 +#: lib/imagefile.php:246 msgid "kB" msgstr "" @@ -6163,7 +6167,7 @@ msgstr "Merki í babli %s" msgid "Unknown" msgstr "Óþekkt aðgerð" -#: lib/profileaction.php:109 lib/profileaction.php:194 lib/subgroupnav.php:82 +#: lib/profileaction.php:109 lib/profileaction.php:200 lib/subgroupnav.php:82 msgid "Subscriptions" msgstr "Áskriftir" @@ -6171,7 +6175,7 @@ msgstr "Áskriftir" msgid "All subscriptions" msgstr "Allar áskriftir" -#: lib/profileaction.php:142 lib/profileaction.php:203 lib/subgroupnav.php:90 +#: lib/profileaction.php:142 lib/profileaction.php:209 lib/subgroupnav.php:90 msgid "Subscribers" msgstr "Áskrifendur" @@ -6179,15 +6183,20 @@ msgstr "Áskrifendur" msgid "All subscribers" msgstr "Allir áskrifendur" -#: lib/profileaction.php:180 +#: lib/profileaction.php:186 msgid "User ID" msgstr "" -#: lib/profileaction.php:185 +#: lib/profileaction.php:191 msgid "Member since" msgstr "Meðlimur síðan" -#: lib/profileaction.php:247 +#. TRANS: Average count of posts made per day since account registration +#: lib/profileaction.php:230 +msgid "Daily average" +msgstr "" + +#: lib/profileaction.php:259 msgid "All groups" msgstr "Allir hópar" @@ -6367,6 +6376,11 @@ msgstr "Hætta sem áskrifandi að þessum notanda" msgid "Unsubscribe" msgstr "Fara úr áskrift" +#: lib/usernoprofileexception.php:58 +#, fuzzy, php-format +msgid "User %s (%d) has no profile record." +msgstr "Notandi hefur enga persónulega síðu." + #: lib/userprofile.php:117 msgid "Edit Avatar" msgstr "" diff --git a/locale/it/LC_MESSAGES/statusnet.po b/locale/it/LC_MESSAGES/statusnet.po index d4d6fc3ef2..681f60f0af 100644 --- a/locale/it/LC_MESSAGES/statusnet.po +++ b/locale/it/LC_MESSAGES/statusnet.po @@ -9,12 +9,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-03-17 21:39+0000\n" -"PO-Revision-Date: 2010-03-17 21:40:59+0000\n" +"POT-Creation-Date: 2010-03-23 20:09+0000\n" +"PO-Revision-Date: 2010-03-23 20:10:13+0000\n" "Language-Team: Italian\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r63880); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.17alpha (r64087); Translate extension (2010-01-16)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: it\n" "X-Message-Group: out-statusnet\n" @@ -772,23 +772,28 @@ msgstr "Carica" msgid "Crop" msgstr "Ritaglia" -#: actions/avatarsettings.php:328 +#: actions/avatarsettings.php:305 +#, fuzzy +msgid "No file uploaded." +msgstr "Nessun profilo specificato." + +#: actions/avatarsettings.php:332 msgid "Pick a square area of the image to be your avatar" msgstr "Scegli un'area quadrata per la tua immagine personale" -#: actions/avatarsettings.php:343 actions/grouplogo.php:380 +#: actions/avatarsettings.php:347 actions/grouplogo.php:380 msgid "Lost our file data." msgstr "Perso il nostro file di dati." -#: actions/avatarsettings.php:366 +#: actions/avatarsettings.php:370 msgid "Avatar updated." msgstr "Immagine aggiornata." -#: actions/avatarsettings.php:369 +#: actions/avatarsettings.php:373 msgid "Failed updating avatar." msgstr "Aggiornamento dell'immagine non riuscito." -#: actions/avatarsettings.php:393 +#: actions/avatarsettings.php:397 msgid "Avatar deleted." msgstr "Immagine eliminata." @@ -926,7 +931,7 @@ msgid "Conversation" msgstr "Conversazione" #: actions/conversation.php:154 lib/mailbox.php:116 lib/noticelist.php:87 -#: lib/profileaction.php:218 lib/searchgroupnav.php:82 +#: lib/profileaction.php:224 lib/searchgroupnav.php:82 msgid "Notices" msgstr "Messaggi" @@ -1751,7 +1756,7 @@ msgstr "Attività di %s" msgid "Updates from members of %1$s on %2$s!" msgstr "Messaggi dai membri di %1$s su %2$s!" -#: actions/groups.php:62 lib/profileaction.php:212 lib/profileaction.php:232 +#: actions/groups.php:62 lib/profileaction.php:218 lib/profileaction.php:244 #: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98 msgid "Groups" msgstr "Gruppi" @@ -3408,7 +3413,7 @@ msgid "Description" msgstr "Descrizione" #: actions/showapplication.php:192 actions/showgroup.php:439 -#: lib/profileaction.php:176 +#: lib/profileaction.php:182 msgid "Statistics" msgstr "Statistiche" @@ -3574,7 +3579,7 @@ msgid "Members" msgstr "Membri" #: actions/showgroup.php:396 lib/profileaction.php:117 -#: lib/profileaction.php:150 lib/profileaction.php:238 lib/section.php:95 +#: lib/profileaction.php:150 lib/profileaction.php:250 lib/section.php:95 #: lib/subscriptionlist.php:126 lib/tagcloudsection.php:71 msgid "(None)" msgstr "(nessuno)" @@ -3754,7 +3759,8 @@ msgid "Unknown language \"%s\"." msgstr "Lingua \"%s\" sconosciuta." #: actions/siteadminpanel.php:165 -msgid "Minimum text limit is 140 characters." +#, fuzzy +msgid "Minimum text limit is 0 (unlimited)." msgstr "Il limite minimo del testo è di 140 caratteri." #: actions/siteadminpanel.php:171 @@ -4026,8 +4032,7 @@ msgstr "Salva impostazioni snapshot" msgid "You are not subscribed to that profile." msgstr "Non hai una abbonamento a quel profilo." -#: actions/subedit.php:83 classes/Subscription.php:89 -#: classes/Subscription.php:116 +#: actions/subedit.php:83 classes/Subscription.php:132 msgid "Could not save subscription." msgstr "Impossibile salvare l'abbonamento." @@ -4612,35 +4617,35 @@ msgstr "Problema nel salvare la casella della posta del gruppo." msgid "RT @%1$s %2$s" msgstr "RT @%1$s %2$s" -#: classes/Subscription.php:66 lib/oauthstore.php:465 +#: classes/Subscription.php:74 lib/oauthstore.php:465 msgid "You have been banned from subscribing." msgstr "Non ti è possibile abbonarti." -#: classes/Subscription.php:70 +#: classes/Subscription.php:78 msgid "Already subscribed!" msgstr "Hai già l'abbonamento!" -#: classes/Subscription.php:74 +#: classes/Subscription.php:82 msgid "User has blocked you." msgstr "L'utente non ti consente di seguirlo." -#: classes/Subscription.php:157 +#: classes/Subscription.php:167 msgid "Not subscribed!" msgstr "Non hai l'abbonamento!" -#: classes/Subscription.php:163 +#: classes/Subscription.php:173 msgid "Couldn't delete self-subscription." msgstr "Impossibile eliminare l'auto-abbonamento." -#: classes/Subscription.php:190 +#: classes/Subscription.php:200 msgid "Couldn't delete subscription OMB token." msgstr "Impossibile eliminare il token di abbonamento OMB." -#: classes/Subscription.php:201 +#: classes/Subscription.php:211 msgid "Couldn't delete subscription." msgstr "Impossibile eliminare l'abbonamento." -#: classes/User.php:378 +#: classes/User.php:363 #, php-format msgid "Welcome to %1$s, @%2$s!" msgstr "Benvenuti su %1$s, @%2$s!" @@ -4927,22 +4932,22 @@ msgstr "Successivi" msgid "Before" msgstr "Precedenti" -#: lib/activity.php:453 +#: lib/activity.php:120 +msgid "Expecting a root feed element but got a whole XML document." +msgstr "" + +#: lib/activityutils.php:208 msgid "Can't handle remote content yet." msgstr "Impossibile gestire contenuti remoti." -#: lib/activity.php:481 +#: lib/activityutils.php:236 msgid "Can't handle embedded XML content yet." msgstr "Impossibile gestire contenuti XML incorporati." -#: lib/activity.php:485 +#: lib/activityutils.php:240 msgid "Can't handle embedded Base64 content yet." msgstr "Impossibile gestire contenuti Base64." -#: lib/activity.php:1089 -msgid "Expecting a root feed element but got a whole XML document." -msgstr "" - #. TRANS: Client error message #: lib/adminpanelaction.php:98 msgid "You cannot make changes to this site." @@ -5458,21 +5463,21 @@ msgstr "" "tracks - non ancora implementato\n" "tracking - non ancora implementato\n" -#: lib/common.php:136 +#: lib/common.php:135 msgid "No configuration file found. " msgstr "Non è stato trovato alcun file di configurazione. " -#: lib/common.php:137 +#: lib/common.php:136 msgid "I looked for configuration files in the following places: " msgstr "I file di configurazione sono stati cercati in questi posti: " -#: lib/common.php:139 +#: lib/common.php:138 msgid "You may wish to run the installer to fix this." msgstr "" "Potrebbe essere necessario lanciare il programma d'installazione per " "correggere il problema." -#: lib/common.php:140 +#: lib/common.php:139 msgid "Go to the installer." msgstr "Vai al programma d'installazione." @@ -5649,40 +5654,40 @@ msgstr "Etichette nei messaggi del gruppo %s" msgid "This page is not available in a media type you accept" msgstr "Questa pagina non è disponibile in un tipo di supporto che tu accetti" -#: lib/imagefile.php:74 +#: lib/imagefile.php:72 msgid "Unsupported image file format." msgstr "Formato file immagine non supportato." -#: lib/imagefile.php:90 +#: lib/imagefile.php:88 #, php-format msgid "That file is too big. The maximum file size is %s." msgstr "Quel file è troppo grande. La dimensione massima è %s." -#: lib/imagefile.php:95 +#: lib/imagefile.php:93 msgid "Partial upload." msgstr "Caricamento parziale." -#: lib/imagefile.php:103 lib/mediafile.php:170 +#: lib/imagefile.php:101 lib/mediafile.php:170 msgid "System error uploading file." msgstr "Errore di sistema nel caricare il file." -#: lib/imagefile.php:111 +#: lib/imagefile.php:109 msgid "Not an image or corrupt file." msgstr "Non è un'immagine o il file è danneggiato." -#: lib/imagefile.php:124 +#: lib/imagefile.php:122 msgid "Lost our file." msgstr "Perso il nostro file." -#: lib/imagefile.php:168 lib/imagefile.php:233 +#: lib/imagefile.php:163 lib/imagefile.php:224 msgid "Unknown file type" msgstr "Tipo di file sconosciuto" -#: lib/imagefile.php:253 +#: lib/imagefile.php:244 msgid "MB" msgstr "MB" -#: lib/imagefile.php:255 +#: lib/imagefile.php:246 msgid "kB" msgstr "kB" @@ -6216,7 +6221,7 @@ msgstr "Etichette nei messaggi di %s" msgid "Unknown" msgstr "Sconosciuto" -#: lib/profileaction.php:109 lib/profileaction.php:194 lib/subgroupnav.php:82 +#: lib/profileaction.php:109 lib/profileaction.php:200 lib/subgroupnav.php:82 msgid "Subscriptions" msgstr "Abbonamenti" @@ -6224,7 +6229,7 @@ msgstr "Abbonamenti" msgid "All subscriptions" msgstr "Tutti gli abbonamenti" -#: lib/profileaction.php:142 lib/profileaction.php:203 lib/subgroupnav.php:90 +#: lib/profileaction.php:142 lib/profileaction.php:209 lib/subgroupnav.php:90 msgid "Subscribers" msgstr "Abbonati" @@ -6232,15 +6237,20 @@ msgstr "Abbonati" msgid "All subscribers" msgstr "Tutti gli abbonati" -#: lib/profileaction.php:180 +#: lib/profileaction.php:186 msgid "User ID" msgstr "ID utente" -#: lib/profileaction.php:185 +#: lib/profileaction.php:191 msgid "Member since" msgstr "Membro dal" -#: lib/profileaction.php:247 +#. TRANS: Average count of posts made per day since account registration +#: lib/profileaction.php:230 +msgid "Daily average" +msgstr "" + +#: lib/profileaction.php:259 msgid "All groups" msgstr "Tutti i gruppi" @@ -6411,6 +6421,11 @@ msgstr "Annulla l'abbonamento da questo utente" msgid "Unsubscribe" msgstr "Disabbonati" +#: lib/usernoprofileexception.php:58 +#, fuzzy, php-format +msgid "User %s (%d) has no profile record." +msgstr "L'utente non ha un profilo." + #: lib/userprofile.php:117 msgid "Edit Avatar" msgstr "Modifica immagine" diff --git a/locale/ja/LC_MESSAGES/statusnet.po b/locale/ja/LC_MESSAGES/statusnet.po index 85b83bfe98..a50da36c4a 100644 --- a/locale/ja/LC_MESSAGES/statusnet.po +++ b/locale/ja/LC_MESSAGES/statusnet.po @@ -11,12 +11,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-03-17 21:39+0000\n" -"PO-Revision-Date: 2010-03-17 21:41:02+0000\n" +"POT-Creation-Date: 2010-03-23 20:09+0000\n" +"PO-Revision-Date: 2010-03-23 20:10:29+0000\n" "Language-Team: Japanese\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r63880); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.17alpha (r64087); Translate extension (2010-01-16)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: ja\n" "X-Message-Group: out-statusnet\n" @@ -766,23 +766,28 @@ msgstr "アップロード" msgid "Crop" msgstr "切り取り" -#: actions/avatarsettings.php:328 +#: actions/avatarsettings.php:305 +#, fuzzy +msgid "No file uploaded." +msgstr "プロファイル記述がありません。" + +#: actions/avatarsettings.php:332 msgid "Pick a square area of the image to be your avatar" msgstr "あなたのアバターとなるイメージを正方形で指定" -#: actions/avatarsettings.php:343 actions/grouplogo.php:380 +#: actions/avatarsettings.php:347 actions/grouplogo.php:380 msgid "Lost our file data." msgstr "ファイルデータを紛失しました。" -#: actions/avatarsettings.php:366 +#: actions/avatarsettings.php:370 msgid "Avatar updated." msgstr "アバターが更新されました。" -#: actions/avatarsettings.php:369 +#: actions/avatarsettings.php:373 msgid "Failed updating avatar." msgstr "アバターの更新に失敗しました。" -#: actions/avatarsettings.php:393 +#: actions/avatarsettings.php:397 msgid "Avatar deleted." msgstr "アバターが削除されました。" @@ -921,7 +926,7 @@ msgid "Conversation" msgstr "会話" #: actions/conversation.php:154 lib/mailbox.php:116 lib/noticelist.php:87 -#: lib/profileaction.php:218 lib/searchgroupnav.php:82 +#: lib/profileaction.php:224 lib/searchgroupnav.php:82 msgid "Notices" msgstr "つぶやき" @@ -1749,7 +1754,7 @@ msgstr "%s のタイムライン" msgid "Updates from members of %1$s on %2$s!" msgstr "%2$s 上の %1$s のメンバーから更新する" -#: actions/groups.php:62 lib/profileaction.php:212 lib/profileaction.php:232 +#: actions/groups.php:62 lib/profileaction.php:218 lib/profileaction.php:244 #: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98 msgid "Groups" msgstr "グループ" @@ -3404,7 +3409,7 @@ msgid "Description" msgstr "概要" #: actions/showapplication.php:192 actions/showgroup.php:439 -#: lib/profileaction.php:176 +#: lib/profileaction.php:182 msgid "Statistics" msgstr "統計データ" @@ -3572,7 +3577,7 @@ msgid "Members" msgstr "メンバー" #: actions/showgroup.php:396 lib/profileaction.php:117 -#: lib/profileaction.php:150 lib/profileaction.php:238 lib/section.php:95 +#: lib/profileaction.php:150 lib/profileaction.php:250 lib/section.php:95 #: lib/subscriptionlist.php:126 lib/tagcloudsection.php:71 msgid "(None)" msgstr "(なし)" @@ -3753,7 +3758,8 @@ msgid "Unknown language \"%s\"." msgstr "不明な言語 \"%s\"" #: actions/siteadminpanel.php:165 -msgid "Minimum text limit is 140 characters." +#, fuzzy +msgid "Minimum text limit is 0 (unlimited)." msgstr "最小のテキスト制限は140字です。" #: actions/siteadminpanel.php:171 @@ -4035,8 +4041,7 @@ msgstr "サイト設定の保存" msgid "You are not subscribed to that profile." msgstr "あなたはそのプロファイルにフォローされていません。" -#: actions/subedit.php:83 classes/Subscription.php:89 -#: classes/Subscription.php:116 +#: actions/subedit.php:83 classes/Subscription.php:132 msgid "Could not save subscription." msgstr "フォローを保存できません。" @@ -4612,36 +4617,36 @@ msgstr "グループ受信箱を保存する際に問題が発生しました。 msgid "RT @%1$s %2$s" msgstr "" -#: classes/Subscription.php:66 lib/oauthstore.php:465 +#: classes/Subscription.php:74 lib/oauthstore.php:465 msgid "You have been banned from subscribing." msgstr "あなたはフォローが禁止されました。" -#: classes/Subscription.php:70 +#: classes/Subscription.php:78 msgid "Already subscribed!" msgstr "すでにフォローしています!" -#: classes/Subscription.php:74 +#: classes/Subscription.php:82 msgid "User has blocked you." msgstr "ユーザはあなたをブロックしました。" -#: classes/Subscription.php:157 +#: classes/Subscription.php:167 msgid "Not subscribed!" msgstr "フォローしていません！" -#: classes/Subscription.php:163 +#: classes/Subscription.php:173 msgid "Couldn't delete self-subscription." msgstr "自己フォローを削除できません。" -#: classes/Subscription.php:190 +#: classes/Subscription.php:200 #, fuzzy msgid "Couldn't delete subscription OMB token." msgstr "フォローを削除できません" -#: classes/Subscription.php:201 +#: classes/Subscription.php:211 msgid "Couldn't delete subscription." msgstr "フォローを削除できません" -#: classes/User.php:378 +#: classes/User.php:363 #, php-format msgid "Welcome to %1$s, @%2$s!" msgstr "ようこそ %1$s、@%2$s!" @@ -4944,22 +4949,22 @@ msgstr "<<後" msgid "Before" msgstr "前>>" -#: lib/activity.php:453 +#: lib/activity.php:120 +msgid "Expecting a root feed element but got a whole XML document." +msgstr "" + +#: lib/activityutils.php:208 msgid "Can't handle remote content yet." msgstr "" -#: lib/activity.php:481 +#: lib/activityutils.php:236 msgid "Can't handle embedded XML content yet." msgstr "" -#: lib/activity.php:485 +#: lib/activityutils.php:240 msgid "Can't handle embedded Base64 content yet." msgstr "" -#: lib/activity.php:1089 -msgid "Expecting a root feed element but got a whole XML document." -msgstr "" - #. TRANS: Client error message #: lib/adminpanelaction.php:98 msgid "You cannot make changes to this site." @@ -5432,21 +5437,21 @@ msgid "" "tracking - not yet implemented.\n" msgstr "" -#: lib/common.php:136 +#: lib/common.php:135 msgid "No configuration file found. " msgstr "コンフィギュレーションファイルがありません。 " -#: lib/common.php:137 +#: lib/common.php:136 msgid "I looked for configuration files in the following places: " msgstr "私は以下の場所でコンフィギュレーションファイルを探しました: " -#: lib/common.php:139 +#: lib/common.php:138 msgid "You may wish to run the installer to fix this." msgstr "" "あなたは、これを修理するためにインストーラを動かしたがっているかもしれませ" "ん。" -#: lib/common.php:140 +#: lib/common.php:139 msgid "Go to the installer." msgstr "インストーラへ。" @@ -5622,40 +5627,40 @@ msgstr "%s グループのつぶやきにあるタグ" msgid "This page is not available in a media type you accept" msgstr "このページはあなたが承認したメディアタイプでは利用できません。" -#: lib/imagefile.php:74 +#: lib/imagefile.php:72 msgid "Unsupported image file format." msgstr "サポート外の画像形式です。" -#: lib/imagefile.php:90 +#: lib/imagefile.php:88 #, php-format msgid "That file is too big. The maximum file size is %s." msgstr "ファイルが大きすぎます。最大ファイルサイズは %s 。" -#: lib/imagefile.php:95 +#: lib/imagefile.php:93 msgid "Partial upload." msgstr "不完全なアップロード。" -#: lib/imagefile.php:103 lib/mediafile.php:170 +#: lib/imagefile.php:101 lib/mediafile.php:170 msgid "System error uploading file." msgstr "ファイルのアップロードでシステムエラー" -#: lib/imagefile.php:111 +#: lib/imagefile.php:109 msgid "Not an image or corrupt file." msgstr "画像ではないかファイルが破損しています。" -#: lib/imagefile.php:124 +#: lib/imagefile.php:122 msgid "Lost our file." msgstr "ファイルを紛失。" -#: lib/imagefile.php:168 lib/imagefile.php:233 +#: lib/imagefile.php:163 lib/imagefile.php:224 msgid "Unknown file type" msgstr "不明なファイルタイプ" -#: lib/imagefile.php:253 +#: lib/imagefile.php:244 msgid "MB" msgstr "MB" -#: lib/imagefile.php:255 +#: lib/imagefile.php:246 msgid "kB" msgstr "kB" @@ -6196,7 +6201,7 @@ msgstr "%s のつぶやきのタグ" msgid "Unknown" msgstr "不明" -#: lib/profileaction.php:109 lib/profileaction.php:194 lib/subgroupnav.php:82 +#: lib/profileaction.php:109 lib/profileaction.php:200 lib/subgroupnav.php:82 msgid "Subscriptions" msgstr "フォロー" @@ -6204,7 +6209,7 @@ msgstr "フォロー" msgid "All subscriptions" msgstr "すべてのフォロー" -#: lib/profileaction.php:142 lib/profileaction.php:203 lib/subgroupnav.php:90 +#: lib/profileaction.php:142 lib/profileaction.php:209 lib/subgroupnav.php:90 msgid "Subscribers" msgstr "フォローされている" @@ -6212,15 +6217,20 @@ msgstr "フォローされている" msgid "All subscribers" msgstr "すべてのフォローされている" -#: lib/profileaction.php:180 +#: lib/profileaction.php:186 msgid "User ID" msgstr "ユーザＩＤ" -#: lib/profileaction.php:185 +#: lib/profileaction.php:191 msgid "Member since" msgstr "利用開始日" -#: lib/profileaction.php:247 +#. TRANS: Average count of posts made per day since account registration +#: lib/profileaction.php:230 +msgid "Daily average" +msgstr "" + +#: lib/profileaction.php:259 msgid "All groups" msgstr "全てのグループ" @@ -6391,6 +6401,11 @@ msgstr "この利用者からのフォローを解除する" msgid "Unsubscribe" msgstr "フォロー解除" +#: lib/usernoprofileexception.php:58 +#, fuzzy, php-format +msgid "User %s (%d) has no profile record." +msgstr "ユーザはプロフィールをもっていません。" + #: lib/userprofile.php:117 msgid "Edit Avatar" msgstr "アバターを編集する" diff --git a/locale/ko/LC_MESSAGES/statusnet.po b/locale/ko/LC_MESSAGES/statusnet.po index 41533a4265..d62e6ac5b6 100644 --- a/locale/ko/LC_MESSAGES/statusnet.po +++ b/locale/ko/LC_MESSAGES/statusnet.po @@ -7,12 +7,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-03-17 21:39+0000\n" -"PO-Revision-Date: 2010-03-17 21:41:05+0000\n" +"POT-Creation-Date: 2010-03-23 20:09+0000\n" +"PO-Revision-Date: 2010-03-23 20:10:33+0000\n" "Language-Team: Korean\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r63880); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.17alpha (r64087); Translate extension (2010-01-16)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: ko\n" "X-Message-Group: out-statusnet\n" @@ -782,23 +782,28 @@ msgstr "올리기" msgid "Crop" msgstr "자르기" -#: actions/avatarsettings.php:328 +#: actions/avatarsettings.php:305 +#, fuzzy +msgid "No file uploaded." +msgstr "프로필을 지정하지 않았습니다." + +#: actions/avatarsettings.php:332 msgid "Pick a square area of the image to be your avatar" msgstr "당신의 아바타가 될 이미지영역을 지정하세요." -#: actions/avatarsettings.php:343 actions/grouplogo.php:380 +#: actions/avatarsettings.php:347 actions/grouplogo.php:380 msgid "Lost our file data." msgstr "파일 데이터를 잃어버렸습니다." -#: actions/avatarsettings.php:366 +#: actions/avatarsettings.php:370 msgid "Avatar updated." msgstr "아바타가 업데이트 되었습니다." -#: actions/avatarsettings.php:369 +#: actions/avatarsettings.php:373 msgid "Failed updating avatar." msgstr "아바타 업데이트 실패" -#: actions/avatarsettings.php:393 +#: actions/avatarsettings.php:397 #, fuzzy msgid "Avatar deleted." msgstr "아바타가 업데이트 되었습니다." @@ -941,7 +946,7 @@ msgid "Conversation" msgstr "인증 코드" #: actions/conversation.php:154 lib/mailbox.php:116 lib/noticelist.php:87 -#: lib/profileaction.php:218 lib/searchgroupnav.php:82 +#: lib/profileaction.php:224 lib/searchgroupnav.php:82 msgid "Notices" msgstr "통지" @@ -1807,7 +1812,7 @@ msgstr "%s 타임라인" msgid "Updates from members of %1$s on %2$s!" msgstr "%2$s에 있는 %1$s의 업데이트!" -#: actions/groups.php:62 lib/profileaction.php:212 lib/profileaction.php:232 +#: actions/groups.php:62 lib/profileaction.php:218 lib/profileaction.php:244 #: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98 msgid "Groups" msgstr "그룹" @@ -3466,7 +3471,7 @@ msgid "Description" msgstr "설명" #: actions/showapplication.php:192 actions/showgroup.php:439 -#: lib/profileaction.php:176 +#: lib/profileaction.php:182 msgid "Statistics" msgstr "통계" @@ -3624,7 +3629,7 @@ msgid "Members" msgstr "회원" #: actions/showgroup.php:396 lib/profileaction.php:117 -#: lib/profileaction.php:150 lib/profileaction.php:238 lib/section.php:95 +#: lib/profileaction.php:150 lib/profileaction.php:250 lib/section.php:95 #: lib/subscriptionlist.php:126 lib/tagcloudsection.php:71 msgid "(None)" msgstr "(없습니다.)" @@ -3793,7 +3798,7 @@ msgid "Unknown language \"%s\"." msgstr "" #: actions/siteadminpanel.php:165 -msgid "Minimum text limit is 140 characters." +msgid "Minimum text limit is 0 (unlimited)." msgstr "" #: actions/siteadminpanel.php:171 @@ -4074,8 +4079,7 @@ msgstr "아바타 설정" msgid "You are not subscribed to that profile." msgstr "당신은 이 프로필에 구독되지 않고있습니다." -#: actions/subedit.php:83 classes/Subscription.php:89 -#: classes/Subscription.php:116 +#: actions/subedit.php:83 classes/Subscription.php:132 msgid "Could not save subscription." msgstr "구독을 저장할 수 없습니다." @@ -4652,39 +4656,39 @@ msgstr "통지를 저장하는데 문제가 발생했습니다." msgid "RT @%1$s %2$s" msgstr "%1$s (%2$s)" -#: classes/Subscription.php:66 lib/oauthstore.php:465 +#: classes/Subscription.php:74 lib/oauthstore.php:465 #, fuzzy msgid "You have been banned from subscribing." msgstr "이 회원은 구독으로부터 당신을 차단해왔다." -#: classes/Subscription.php:70 +#: classes/Subscription.php:78 msgid "Already subscribed!" msgstr "" -#: classes/Subscription.php:74 +#: classes/Subscription.php:82 msgid "User has blocked you." msgstr "회원이 당신을 차단해왔습니다." -#: classes/Subscription.php:157 +#: classes/Subscription.php:167 #, fuzzy msgid "Not subscribed!" msgstr "구독하고 있지 않습니다!" -#: classes/Subscription.php:163 +#: classes/Subscription.php:173 #, fuzzy msgid "Couldn't delete self-subscription." msgstr "예약 구독을 삭제 할 수 없습니다." -#: classes/Subscription.php:190 +#: classes/Subscription.php:200 #, fuzzy msgid "Couldn't delete subscription OMB token." msgstr "예약 구독을 삭제 할 수 없습니다." -#: classes/Subscription.php:201 +#: classes/Subscription.php:211 msgid "Couldn't delete subscription." msgstr "예약 구독을 삭제 할 수 없습니다." -#: classes/User.php:378 +#: classes/User.php:363 #, fuzzy, php-format msgid "Welcome to %1$s, @%2$s!" msgstr "%2$s에서 %1$s까지 메시지" @@ -4990,22 +4994,22 @@ msgstr "뒷 페이지" msgid "Before" msgstr "앞 페이지" -#: lib/activity.php:453 +#: lib/activity.php:120 +msgid "Expecting a root feed element but got a whole XML document." +msgstr "" + +#: lib/activityutils.php:208 msgid "Can't handle remote content yet." msgstr "" -#: lib/activity.php:481 +#: lib/activityutils.php:236 msgid "Can't handle embedded XML content yet." msgstr "" -#: lib/activity.php:485 +#: lib/activityutils.php:240 msgid "Can't handle embedded Base64 content yet." msgstr "" -#: lib/activity.php:1089 -msgid "Expecting a root feed element but got a whole XML document." -msgstr "" - #. TRANS: Client error message #: lib/adminpanelaction.php:98 #, fuzzy @@ -5498,20 +5502,20 @@ msgid "" "tracking - not yet implemented.\n" msgstr "" -#: lib/common.php:136 +#: lib/common.php:135 #, fuzzy msgid "No configuration file found. " msgstr "확인 코드가 없습니다." -#: lib/common.php:137 +#: lib/common.php:136 msgid "I looked for configuration files in the following places: " msgstr "" -#: lib/common.php:139 +#: lib/common.php:138 msgid "You may wish to run the installer to fix this." msgstr "" -#: lib/common.php:140 +#: lib/common.php:139 #, fuzzy msgid "Go to the installer." msgstr "이 사이트 로그인" @@ -5692,40 +5696,40 @@ msgstr "%s 그룹 게시글의 태그" msgid "This page is not available in a media type you accept" msgstr "이 페이지는 귀하가 승인한 미디어 타입에서는 이용할 수 없습니다." -#: lib/imagefile.php:74 +#: lib/imagefile.php:72 msgid "Unsupported image file format." msgstr "지원하지 않는 그림 파일 형식입니다." -#: lib/imagefile.php:90 +#: lib/imagefile.php:88 #, fuzzy, php-format msgid "That file is too big. The maximum file size is %s." msgstr "당신그룹의 로고 이미지를 업로드할 수 있습니다." -#: lib/imagefile.php:95 +#: lib/imagefile.php:93 msgid "Partial upload." msgstr "불완전한 업로드." -#: lib/imagefile.php:103 lib/mediafile.php:170 +#: lib/imagefile.php:101 lib/mediafile.php:170 msgid "System error uploading file." msgstr "파일을 올리는데 시스템 오류 발생" -#: lib/imagefile.php:111 +#: lib/imagefile.php:109 msgid "Not an image or corrupt file." msgstr "그림 파일이 아니거나 손상된 파일 입니다." -#: lib/imagefile.php:124 +#: lib/imagefile.php:122 msgid "Lost our file." msgstr "파일을 잃어버렸습니다." -#: lib/imagefile.php:168 lib/imagefile.php:233 +#: lib/imagefile.php:163 lib/imagefile.php:224 msgid "Unknown file type" msgstr "알 수 없는 종류의 파일입니다" -#: lib/imagefile.php:253 +#: lib/imagefile.php:244 msgid "MB" msgstr "" -#: lib/imagefile.php:255 +#: lib/imagefile.php:246 msgid "kB" msgstr "" @@ -6187,7 +6191,7 @@ msgstr "%s의 게시글의 태그" msgid "Unknown" msgstr "알려지지 않은 행동" -#: lib/profileaction.php:109 lib/profileaction.php:194 lib/subgroupnav.php:82 +#: lib/profileaction.php:109 lib/profileaction.php:200 lib/subgroupnav.php:82 msgid "Subscriptions" msgstr "구독" @@ -6195,7 +6199,7 @@ msgstr "구독" msgid "All subscriptions" msgstr "모든 예약 구독" -#: lib/profileaction.php:142 lib/profileaction.php:203 lib/subgroupnav.php:90 +#: lib/profileaction.php:142 lib/profileaction.php:209 lib/subgroupnav.php:90 msgid "Subscribers" msgstr "구독자" @@ -6203,16 +6207,21 @@ msgstr "구독자" msgid "All subscribers" msgstr "모든 구독자" -#: lib/profileaction.php:180 +#: lib/profileaction.php:186 #, fuzzy msgid "User ID" msgstr "이용자" -#: lib/profileaction.php:185 +#: lib/profileaction.php:191 msgid "Member since" msgstr "가입한 때" -#: lib/profileaction.php:247 +#. TRANS: Average count of posts made per day since account registration +#: lib/profileaction.php:230 +msgid "Daily average" +msgstr "" + +#: lib/profileaction.php:259 msgid "All groups" msgstr "모든 그룹" @@ -6394,6 +6403,11 @@ msgstr "이 사용자로부터 구독취소합니다." msgid "Unsubscribe" msgstr "구독 해제" +#: lib/usernoprofileexception.php:58 +#, fuzzy, php-format +msgid "User %s (%d) has no profile record." +msgstr "이용자가 프로필을 가지고 있지 않습니다." + #: lib/userprofile.php:117 #, fuzzy msgid "Edit Avatar" diff --git a/locale/mk/LC_MESSAGES/statusnet.po b/locale/mk/LC_MESSAGES/statusnet.po index 764a91b159..1be3168591 100644 --- a/locale/mk/LC_MESSAGES/statusnet.po +++ b/locale/mk/LC_MESSAGES/statusnet.po @@ -9,12 +9,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-03-17 21:39+0000\n" -"PO-Revision-Date: 2010-03-17 21:41:08+0000\n" +"POT-Creation-Date: 2010-03-23 20:09+0000\n" +"PO-Revision-Date: 2010-03-23 20:10:37+0000\n" "Language-Team: Macedonian\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r63880); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.17alpha (r64087); Translate extension (2010-01-16)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: mk\n" "X-Message-Group: out-statusnet\n" @@ -774,23 +774,28 @@ msgstr "Подигни" msgid "Crop" msgstr "Отсечи" -#: actions/avatarsettings.php:328 +#: actions/avatarsettings.php:305 +#, fuzzy +msgid "No file uploaded." +msgstr "Нема назначено профил." + +#: actions/avatarsettings.php:332 msgid "Pick a square area of the image to be your avatar" msgstr "Одберете квадратна површина од сликата за аватар" -#: actions/avatarsettings.php:343 actions/grouplogo.php:380 +#: actions/avatarsettings.php:347 actions/grouplogo.php:380 msgid "Lost our file data." msgstr "Податоците за податотеката се изгубени." -#: actions/avatarsettings.php:366 +#: actions/avatarsettings.php:370 msgid "Avatar updated." msgstr "Аватарот е подновен." -#: actions/avatarsettings.php:369 +#: actions/avatarsettings.php:373 msgid "Failed updating avatar." msgstr "Подновата на аватарот не успеа." -#: actions/avatarsettings.php:393 +#: actions/avatarsettings.php:397 msgid "Avatar deleted." msgstr "Аватарот е избришан." @@ -929,7 +934,7 @@ msgid "Conversation" msgstr "Разговор" #: actions/conversation.php:154 lib/mailbox.php:116 lib/noticelist.php:87 -#: lib/profileaction.php:218 lib/searchgroupnav.php:82 +#: lib/profileaction.php:224 lib/searchgroupnav.php:82 msgid "Notices" msgstr "Забелешки" @@ -1756,7 +1761,7 @@ msgstr "Историја на %s" msgid "Updates from members of %1$s on %2$s!" msgstr "Подновувања од членови на %1$s на %2$s!" -#: actions/groups.php:62 lib/profileaction.php:212 lib/profileaction.php:232 +#: actions/groups.php:62 lib/profileaction.php:218 lib/profileaction.php:244 #: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98 msgid "Groups" msgstr "Групи" @@ -3423,7 +3428,7 @@ msgid "Description" msgstr "Опис" #: actions/showapplication.php:192 actions/showgroup.php:439 -#: lib/profileaction.php:176 +#: lib/profileaction.php:182 msgid "Statistics" msgstr "Статистики" @@ -3592,7 +3597,7 @@ msgid "Members" msgstr "Членови" #: actions/showgroup.php:396 lib/profileaction.php:117 -#: lib/profileaction.php:150 lib/profileaction.php:238 lib/section.php:95 +#: lib/profileaction.php:150 lib/profileaction.php:250 lib/section.php:95 #: lib/subscriptionlist.php:126 lib/tagcloudsection.php:71 msgid "(None)" msgstr "(Нема)" @@ -3773,7 +3778,8 @@ msgid "Unknown language \"%s\"." msgstr "Непознат јазик „%s“" #: actions/siteadminpanel.php:165 -msgid "Minimum text limit is 140 characters." +#, fuzzy +msgid "Minimum text limit is 0 (unlimited)." msgstr "Минималното ограничување на текстот изнесува 140 знаци." #: actions/siteadminpanel.php:171 @@ -4049,8 +4055,7 @@ msgstr "Зачувај поставки за снимки" msgid "You are not subscribed to that profile." msgstr "Не сте претплатени на тој профил." -#: actions/subedit.php:83 classes/Subscription.php:89 -#: classes/Subscription.php:116 +#: actions/subedit.php:83 classes/Subscription.php:132 msgid "Could not save subscription." msgstr "Не можев да ја зачувам претплатата." @@ -4634,36 +4639,36 @@ msgstr "Проблем при зачувувањето на групното п msgid "RT @%1$s %2$s" msgstr "RT @%1$s %2$s" -#: classes/Subscription.php:66 lib/oauthstore.php:465 +#: classes/Subscription.php:74 lib/oauthstore.php:465 msgid "You have been banned from subscribing." msgstr "Блокирани сте од претплаќање." -#: classes/Subscription.php:70 +#: classes/Subscription.php:78 msgid "Already subscribed!" msgstr "Веќе претплатено!" -#: classes/Subscription.php:74 +#: classes/Subscription.php:82 msgid "User has blocked you." msgstr "Корисникот Ве има блокирано." -#: classes/Subscription.php:157 +#: classes/Subscription.php:167 #, fuzzy msgid "Not subscribed!" msgstr "Не сте претплатени!" -#: classes/Subscription.php:163 +#: classes/Subscription.php:173 msgid "Couldn't delete self-subscription." msgstr "Не можам да ја избришам самопретплатата." -#: classes/Subscription.php:190 +#: classes/Subscription.php:200 msgid "Couldn't delete subscription OMB token." msgstr "Не можете да го избришете OMB-жетонот за претплата." -#: classes/Subscription.php:201 +#: classes/Subscription.php:211 msgid "Couldn't delete subscription." msgstr "Претплата не може да се избрише." -#: classes/User.php:378 +#: classes/User.php:363 #, php-format msgid "Welcome to %1$s, @%2$s!" msgstr "Добредојдовте на %1$s, @%2$s!" @@ -4951,22 +4956,22 @@ msgstr "По" msgid "Before" msgstr "Пред" -#: lib/activity.php:453 +#: lib/activity.php:120 +msgid "Expecting a root feed element but got a whole XML document." +msgstr "Се очекува коренски каналски елемент, но добив цел XML документ." + +#: lib/activityutils.php:208 msgid "Can't handle remote content yet." msgstr "Сè уште не е поддржана обработката на далечинска содржина." -#: lib/activity.php:481 +#: lib/activityutils.php:236 msgid "Can't handle embedded XML content yet." msgstr "Сè уште не е поддржана обработката на XML содржина." -#: lib/activity.php:485 +#: lib/activityutils.php:240 msgid "Can't handle embedded Base64 content yet." msgstr "Сè уште не е достапна обработката на вметната Base64 содржина." -#: lib/activity.php:1089 -msgid "Expecting a root feed element but got a whole XML document." -msgstr "" - #. TRANS: Client error message #: lib/adminpanelaction.php:98 msgid "You cannot make changes to this site." @@ -5478,19 +5483,19 @@ msgstr "" "tracks - сè уште не е имплементирано.\n" "tracking - сè уште не е имплементирано.\n" -#: lib/common.php:136 +#: lib/common.php:135 msgid "No configuration file found. " msgstr "Нема пронајдено конфигурациска податотека. " -#: lib/common.php:137 +#: lib/common.php:136 msgid "I looked for configuration files in the following places: " msgstr "Побарав конфигурациони податотеки на следниве места: " -#: lib/common.php:139 +#: lib/common.php:138 msgid "You may wish to run the installer to fix this." msgstr "Препорачуваме да го пуштите инсталатерот за да го поправите ова." -#: lib/common.php:140 +#: lib/common.php:139 msgid "Go to the installer." msgstr "Оди на инсталаторот." @@ -5668,40 +5673,40 @@ msgstr "Ознаки во забелешките на групата %s" msgid "This page is not available in a media type you accept" msgstr "Оваа страница не е достапна во форматот кој Вие го прифаќате." -#: lib/imagefile.php:74 +#: lib/imagefile.php:72 msgid "Unsupported image file format." msgstr "Неподдржан фомрат на слики." -#: lib/imagefile.php:90 +#: lib/imagefile.php:88 #, fuzzy, php-format msgid "That file is too big. The maximum file size is %s." msgstr "Ова е предолго. Максималната должина е 140 знаци." -#: lib/imagefile.php:95 +#: lib/imagefile.php:93 msgid "Partial upload." msgstr "Делумно подигање." -#: lib/imagefile.php:103 lib/mediafile.php:170 +#: lib/imagefile.php:101 lib/mediafile.php:170 msgid "System error uploading file." msgstr "Системска грешка при подигањето на податотеката." -#: lib/imagefile.php:111 +#: lib/imagefile.php:109 msgid "Not an image or corrupt file." msgstr "Не е слика или податотеката е пореметена." -#: lib/imagefile.php:124 +#: lib/imagefile.php:122 msgid "Lost our file." msgstr "Податотеката е изгубена." -#: lib/imagefile.php:168 lib/imagefile.php:233 +#: lib/imagefile.php:163 lib/imagefile.php:224 msgid "Unknown file type" msgstr "Непознат тип на податотека" -#: lib/imagefile.php:253 +#: lib/imagefile.php:244 msgid "MB" msgstr "МБ" -#: lib/imagefile.php:255 +#: lib/imagefile.php:246 msgid "kB" msgstr "кб" @@ -6240,7 +6245,7 @@ msgstr "Ознаки во забелешките на %s" msgid "Unknown" msgstr "Непознато" -#: lib/profileaction.php:109 lib/profileaction.php:194 lib/subgroupnav.php:82 +#: lib/profileaction.php:109 lib/profileaction.php:200 lib/subgroupnav.php:82 msgid "Subscriptions" msgstr "Претплати" @@ -6248,7 +6253,7 @@ msgstr "Претплати" msgid "All subscriptions" msgstr "Сите претплати" -#: lib/profileaction.php:142 lib/profileaction.php:203 lib/subgroupnav.php:90 +#: lib/profileaction.php:142 lib/profileaction.php:209 lib/subgroupnav.php:90 msgid "Subscribers" msgstr "Претплатници" @@ -6256,15 +6261,20 @@ msgstr "Претплатници" msgid "All subscribers" msgstr "Сите претплатници" -#: lib/profileaction.php:180 +#: lib/profileaction.php:186 msgid "User ID" msgstr "Кориснички ID" -#: lib/profileaction.php:185 +#: lib/profileaction.php:191 msgid "Member since" msgstr "Член од" -#: lib/profileaction.php:247 +#. TRANS: Average count of posts made per day since account registration +#: lib/profileaction.php:230 +msgid "Daily average" +msgstr "" + +#: lib/profileaction.php:259 msgid "All groups" msgstr "Сите групи" @@ -6435,6 +6445,11 @@ msgstr "Откажи претплата од овој корсиник" msgid "Unsubscribe" msgstr "Откажи ја претплатата" +#: lib/usernoprofileexception.php:58 +#, fuzzy, php-format +msgid "User %s (%d) has no profile record." +msgstr "Корисникот нема профил." + #: lib/userprofile.php:117 msgid "Edit Avatar" msgstr "Уреди аватар" @@ -6445,7 +6460,7 @@ msgstr "Кориснички дејства" #: lib/userprofile.php:237 msgid "User deletion in progress..." -msgstr "" +msgstr "Бришењето на корисникот е во тек..." #: lib/userprofile.php:263 msgid "Edit profile settings" diff --git a/locale/nb/LC_MESSAGES/statusnet.po b/locale/nb/LC_MESSAGES/statusnet.po index 617280c33b..63e45a2736 100644 --- a/locale/nb/LC_MESSAGES/statusnet.po +++ b/locale/nb/LC_MESSAGES/statusnet.po @@ -9,12 +9,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-03-17 21:39+0000\n" -"PO-Revision-Date: 2010-03-17 21:41:11+0000\n" +"POT-Creation-Date: 2010-03-23 20:09+0000\n" +"PO-Revision-Date: 2010-03-23 20:10:40+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 (r63880); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.17alpha (r64087); Translate extension (2010-01-16)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: no\n" "X-Message-Group: out-statusnet\n" @@ -763,23 +763,28 @@ msgstr "Last opp" msgid "Crop" msgstr "Beskjær" -#: actions/avatarsettings.php:328 +#: actions/avatarsettings.php:305 +#, fuzzy +msgid "No file uploaded." +msgstr "Ingen profil oppgitt." + +#: actions/avatarsettings.php:332 msgid "Pick a square area of the image to be your avatar" msgstr "Velg et kvadratisk utsnitt av bildet som din avatar." -#: actions/avatarsettings.php:343 actions/grouplogo.php:380 +#: actions/avatarsettings.php:347 actions/grouplogo.php:380 msgid "Lost our file data." msgstr "Mistet våre fildata." -#: actions/avatarsettings.php:366 +#: actions/avatarsettings.php:370 msgid "Avatar updated." msgstr "Brukerbildet har blitt oppdatert." -#: actions/avatarsettings.php:369 +#: actions/avatarsettings.php:373 msgid "Failed updating avatar." msgstr "Oppdatering av avatar mislyktes." -#: actions/avatarsettings.php:393 +#: actions/avatarsettings.php:397 msgid "Avatar deleted." msgstr "Avatar slettet." @@ -917,7 +922,7 @@ msgid "Conversation" msgstr "Samtale" #: actions/conversation.php:154 lib/mailbox.php:116 lib/noticelist.php:87 -#: lib/profileaction.php:218 lib/searchgroupnav.php:82 +#: lib/profileaction.php:224 lib/searchgroupnav.php:82 msgid "Notices" msgstr "Notiser" @@ -1727,7 +1732,7 @@ msgstr "%s tidslinje" msgid "Updates from members of %1$s on %2$s!" msgstr "Oppdateringer fra medlemmer av %1$s på %2$s!" -#: actions/groups.php:62 lib/profileaction.php:212 lib/profileaction.php:232 +#: actions/groups.php:62 lib/profileaction.php:218 lib/profileaction.php:244 #: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98 msgid "Groups" msgstr "Grupper" @@ -3326,7 +3331,7 @@ msgid "Description" msgstr "Beskrivelse" #: actions/showapplication.php:192 actions/showgroup.php:439 -#: lib/profileaction.php:176 +#: lib/profileaction.php:182 msgid "Statistics" msgstr "Statistikk" @@ -3484,7 +3489,7 @@ msgid "Members" msgstr "Medlemmer" #: actions/showgroup.php:396 lib/profileaction.php:117 -#: lib/profileaction.php:150 lib/profileaction.php:238 lib/section.php:95 +#: lib/profileaction.php:150 lib/profileaction.php:250 lib/section.php:95 #: lib/subscriptionlist.php:126 lib/tagcloudsection.php:71 msgid "(None)" msgstr "(Ingen)" @@ -3665,7 +3670,7 @@ msgid "Unknown language \"%s\"." msgstr "Ukjent språk «%s»." #: actions/siteadminpanel.php:165 -msgid "Minimum text limit is 140 characters." +msgid "Minimum text limit is 0 (unlimited)." msgstr "" #: actions/siteadminpanel.php:171 @@ -3936,8 +3941,7 @@ msgstr "Innstillinger for IM" msgid "You are not subscribed to that profile." msgstr "" -#: actions/subedit.php:83 classes/Subscription.php:89 -#: classes/Subscription.php:116 +#: actions/subedit.php:83 classes/Subscription.php:132 #, fuzzy msgid "Could not save subscription." msgstr "Klarte ikke å lagre avatar-informasjonen" @@ -4486,38 +4490,38 @@ msgstr "" msgid "RT @%1$s %2$s" msgstr "RT @%1$s %2$s" -#: classes/Subscription.php:66 lib/oauthstore.php:465 +#: classes/Subscription.php:74 lib/oauthstore.php:465 msgid "You have been banned from subscribing." msgstr "" -#: classes/Subscription.php:70 +#: classes/Subscription.php:78 msgid "Already subscribed!" msgstr "" -#: classes/Subscription.php:74 +#: classes/Subscription.php:82 msgid "User has blocked you." msgstr "Bruker har blokkert deg." -#: classes/Subscription.php:157 +#: classes/Subscription.php:167 #, fuzzy msgid "Not subscribed!" msgstr "Alle abonnementer" -#: classes/Subscription.php:163 +#: classes/Subscription.php:173 #, fuzzy msgid "Couldn't delete self-subscription." msgstr "Klarte ikke å lagre avatar-informasjonen" -#: classes/Subscription.php:190 +#: classes/Subscription.php:200 #, fuzzy msgid "Couldn't delete subscription OMB token." msgstr "Klarte ikke å lagre avatar-informasjonen" -#: classes/Subscription.php:201 +#: classes/Subscription.php:211 msgid "Couldn't delete subscription." msgstr "" -#: classes/User.php:378 +#: classes/User.php:363 #, php-format msgid "Welcome to %1$s, @%2$s!" msgstr "Velkommen til %1$s, @%2$s." @@ -4800,22 +4804,22 @@ msgstr "Etter" msgid "Before" msgstr "Før" -#: lib/activity.php:453 +#: lib/activity.php:120 +msgid "Expecting a root feed element but got a whole XML document." +msgstr "" + +#: lib/activityutils.php:208 msgid "Can't handle remote content yet." msgstr "" -#: lib/activity.php:481 +#: lib/activityutils.php:236 msgid "Can't handle embedded XML content yet." msgstr "" -#: lib/activity.php:485 +#: lib/activityutils.php:240 msgid "Can't handle embedded Base64 content yet." msgstr "" -#: lib/activity.php:1089 -msgid "Expecting a root feed element but got a whole XML document." -msgstr "" - #. TRANS: Client error message #: lib/adminpanelaction.php:98 msgid "You cannot make changes to this site." @@ -5290,20 +5294,20 @@ msgid "" "tracking - not yet implemented.\n" msgstr "" -#: lib/common.php:136 +#: lib/common.php:135 #, fuzzy msgid "No configuration file found. " msgstr "Fant ikke bekreftelseskode." -#: lib/common.php:137 +#: lib/common.php:136 msgid "I looked for configuration files in the following places: " msgstr "" -#: lib/common.php:139 +#: lib/common.php:138 msgid "You may wish to run the installer to fix this." msgstr "" -#: lib/common.php:140 +#: lib/common.php:139 msgid "Go to the installer." msgstr "" @@ -5483,40 +5487,40 @@ msgstr "" msgid "This page is not available in a media type you accept" msgstr "Denne siden er ikke tilgjengelig i en mediatype du aksepterer" -#: lib/imagefile.php:74 +#: lib/imagefile.php:72 msgid "Unsupported image file format." msgstr "Bildefilformatet støttes ikke." -#: lib/imagefile.php:90 +#: lib/imagefile.php:88 #, php-format msgid "That file is too big. The maximum file size is %s." msgstr "Filen er for stor. Maks filstørrelse er %s." -#: lib/imagefile.php:95 +#: lib/imagefile.php:93 msgid "Partial upload." msgstr "Delvis opplasting." -#: lib/imagefile.php:103 lib/mediafile.php:170 +#: lib/imagefile.php:101 lib/mediafile.php:170 msgid "System error uploading file." msgstr "Systemfeil ved opplasting av fil." -#: lib/imagefile.php:111 +#: lib/imagefile.php:109 msgid "Not an image or corrupt file." msgstr "Ikke et bilde eller en korrupt fil." -#: lib/imagefile.php:124 +#: lib/imagefile.php:122 msgid "Lost our file." msgstr "Mistet filen vår." -#: lib/imagefile.php:168 lib/imagefile.php:233 +#: lib/imagefile.php:163 lib/imagefile.php:224 msgid "Unknown file type" msgstr "Ukjent filtype" -#: lib/imagefile.php:253 +#: lib/imagefile.php:244 msgid "MB" msgstr "MB" -#: lib/imagefile.php:255 +#: lib/imagefile.php:246 msgid "kB" msgstr "kB" @@ -6046,7 +6050,7 @@ msgstr "" msgid "Unknown" msgstr "Ukjent" -#: lib/profileaction.php:109 lib/profileaction.php:194 lib/subgroupnav.php:82 +#: lib/profileaction.php:109 lib/profileaction.php:200 lib/subgroupnav.php:82 msgid "Subscriptions" msgstr "Abonnement" @@ -6054,7 +6058,7 @@ msgstr "Abonnement" msgid "All subscriptions" msgstr "Alle abonnementer" -#: lib/profileaction.php:142 lib/profileaction.php:203 lib/subgroupnav.php:90 +#: lib/profileaction.php:142 lib/profileaction.php:209 lib/subgroupnav.php:90 msgid "Subscribers" msgstr "Abonnenter" @@ -6062,15 +6066,20 @@ msgstr "Abonnenter" msgid "All subscribers" msgstr "Alle abonnenter" -#: lib/profileaction.php:180 +#: lib/profileaction.php:186 msgid "User ID" msgstr "Bruker-ID" -#: lib/profileaction.php:185 +#: lib/profileaction.php:191 msgid "Member since" msgstr "Medlem siden" -#: lib/profileaction.php:247 +#. TRANS: Average count of posts made per day since account registration +#: lib/profileaction.php:230 +msgid "Daily average" +msgstr "" + +#: lib/profileaction.php:259 msgid "All groups" msgstr "Alle grupper" @@ -6246,6 +6255,11 @@ msgstr "" msgid "Unsubscribe" msgstr "" +#: lib/usernoprofileexception.php:58 +#, fuzzy, php-format +msgid "User %s (%d) has no profile record." +msgstr "Brukeren har ingen profil." + #: lib/userprofile.php:117 #, fuzzy msgid "Edit Avatar" diff --git a/locale/nl/LC_MESSAGES/statusnet.po b/locale/nl/LC_MESSAGES/statusnet.po index 745e666c20..6d3148c18a 100644 --- a/locale/nl/LC_MESSAGES/statusnet.po +++ b/locale/nl/LC_MESSAGES/statusnet.po @@ -10,12 +10,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-03-17 21:39+0000\n" -"PO-Revision-Date: 2010-03-17 21:41:17+0000\n" +"POT-Creation-Date: 2010-03-23 20:09+0000\n" +"PO-Revision-Date: 2010-03-23 20:10:46+0000\n" "Language-Team: Dutch\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r63880); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.17alpha (r64087); Translate extension (2010-01-16)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: nl\n" "X-Message-Group: out-statusnet\n" @@ -783,24 +783,29 @@ msgstr "Uploaden" msgid "Crop" msgstr "Uitsnijden" -#: actions/avatarsettings.php:328 +#: actions/avatarsettings.php:305 +#, fuzzy +msgid "No file uploaded." +msgstr "Er is geen profiel opgegeven." + +#: actions/avatarsettings.php:332 msgid "Pick a square area of the image to be your avatar" msgstr "" "Selecteer een vierkant in de afbeelding om deze als uw avatar in te stellen" -#: actions/avatarsettings.php:343 actions/grouplogo.php:380 +#: actions/avatarsettings.php:347 actions/grouplogo.php:380 msgid "Lost our file data." msgstr "Ons bestand is verloren gegaan." -#: actions/avatarsettings.php:366 +#: actions/avatarsettings.php:370 msgid "Avatar updated." msgstr "De avatar is bijgewerkt." -#: actions/avatarsettings.php:369 +#: actions/avatarsettings.php:373 msgid "Failed updating avatar." msgstr "Het bijwerken van de avatar is mislukt." -#: actions/avatarsettings.php:393 +#: actions/avatarsettings.php:397 msgid "Avatar deleted." msgstr "De avatar is verwijderd." @@ -938,7 +943,7 @@ msgid "Conversation" msgstr "Dialoog" #: actions/conversation.php:154 lib/mailbox.php:116 lib/noticelist.php:87 -#: lib/profileaction.php:218 lib/searchgroupnav.php:82 +#: lib/profileaction.php:224 lib/searchgroupnav.php:82 msgid "Notices" msgstr "Mededelingen" @@ -1770,7 +1775,7 @@ msgstr "%s tijdlijn" msgid "Updates from members of %1$s on %2$s!" msgstr "Updates voor leden van %1$s op %2$s." -#: actions/groups.php:62 lib/profileaction.php:212 lib/profileaction.php:232 +#: actions/groups.php:62 lib/profileaction.php:218 lib/profileaction.php:244 #: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98 msgid "Groups" msgstr "Groepen" @@ -3444,7 +3449,7 @@ msgid "Description" msgstr "Beschrijving" #: actions/showapplication.php:192 actions/showgroup.php:439 -#: lib/profileaction.php:176 +#: lib/profileaction.php:182 msgid "Statistics" msgstr "Statistieken" @@ -3613,7 +3618,7 @@ msgid "Members" msgstr "Leden" #: actions/showgroup.php:396 lib/profileaction.php:117 -#: lib/profileaction.php:150 lib/profileaction.php:238 lib/section.php:95 +#: lib/profileaction.php:150 lib/profileaction.php:250 lib/section.php:95 #: lib/subscriptionlist.php:126 lib/tagcloudsection.php:71 msgid "(None)" msgstr "(geen)" @@ -3796,7 +3801,8 @@ msgid "Unknown language \"%s\"." msgstr "De taal \"%s\" is niet bekend." #: actions/siteadminpanel.php:165 -msgid "Minimum text limit is 140 characters." +#, fuzzy +msgid "Minimum text limit is 0 (unlimited)." msgstr "De minimale tekstlimiet is 140 tekens." #: actions/siteadminpanel.php:171 @@ -4075,8 +4081,7 @@ msgstr "Snapshotinstellingen opslaan" msgid "You are not subscribed to that profile." msgstr "U bent niet geabonneerd op dat profiel." -#: actions/subedit.php:83 classes/Subscription.php:89 -#: classes/Subscription.php:116 +#: actions/subedit.php:83 classes/Subscription.php:132 msgid "Could not save subscription." msgstr "Het was niet mogelijk het abonnement op te slaan." @@ -4672,36 +4677,36 @@ msgstr "" msgid "RT @%1$s %2$s" msgstr "RT @%1$s %2$s" -#: classes/Subscription.php:66 lib/oauthstore.php:465 +#: classes/Subscription.php:74 lib/oauthstore.php:465 msgid "You have been banned from subscribing." msgstr "U mag zich niet abonneren." -#: classes/Subscription.php:70 +#: classes/Subscription.php:78 msgid "Already subscribed!" msgstr "U bent al gebonneerd!" -#: classes/Subscription.php:74 +#: classes/Subscription.php:82 msgid "User has blocked you." msgstr "Deze gebruiker negeert u." -#: classes/Subscription.php:157 +#: classes/Subscription.php:167 msgid "Not subscribed!" msgstr "Niet geabonneerd!" -#: classes/Subscription.php:163 +#: classes/Subscription.php:173 msgid "Couldn't delete self-subscription." msgstr "Het was niet mogelijk het abonnement op uzelf te verwijderen." -#: classes/Subscription.php:190 +#: classes/Subscription.php:200 msgid "Couldn't delete subscription OMB token." msgstr "" "Het was niet mogelijk om het OMB-token voor het abonnement te verwijderen." -#: classes/Subscription.php:201 +#: classes/Subscription.php:211 msgid "Couldn't delete subscription." msgstr "Kon abonnement niet verwijderen." -#: classes/User.php:378 +#: classes/User.php:363 #, php-format msgid "Welcome to %1$s, @%2$s!" msgstr "Welkom bij %1$s, @%2$s!" @@ -4989,22 +4994,22 @@ msgstr "Later" msgid "Before" msgstr "Eerder" -#: lib/activity.php:453 +#: lib/activity.php:120 +msgid "Expecting a root feed element but got a whole XML document." +msgstr "Verwachtte een root-feed element maar kreeg een heel XML-document." + +#: lib/activityutils.php:208 msgid "Can't handle remote content yet." msgstr "Het is nog niet mogelijk inhoud uit andere omgevingen te verwerken." -#: lib/activity.php:481 +#: lib/activityutils.php:236 msgid "Can't handle embedded XML content yet." msgstr "Het is nog niet mogelijk ingebedde XML-inhoud te verwerken" -#: lib/activity.php:485 +#: lib/activityutils.php:240 msgid "Can't handle embedded Base64 content yet." msgstr "Het is nog niet mogelijk ingebedde Base64-inhoud te verwerken" -#: lib/activity.php:1089 -msgid "Expecting a root feed element but got a whole XML document." -msgstr "" - #. TRANS: Client error message #: lib/adminpanelaction.php:98 msgid "You cannot make changes to this site." @@ -5524,20 +5529,20 @@ msgstr "" "tracks - nog niet beschikbaar\n" "tracking - nog niet beschikbaar\n" -#: lib/common.php:136 +#: lib/common.php:135 msgid "No configuration file found. " msgstr "Er is geen instellingenbestand aangetroffen. " -#: lib/common.php:137 +#: lib/common.php:136 msgid "I looked for configuration files in the following places: " msgstr "Er is gezocht naar instellingenbestanden op de volgende plaatsen: " -#: lib/common.php:139 +#: lib/common.php:138 msgid "You may wish to run the installer to fix this." msgstr "" "U kunt proberen de installer uit te voeren om dit probleem op te lossen." -#: lib/common.php:140 +#: lib/common.php:139 msgid "Go to the installer." msgstr "Naar het installatieprogramma gaan." @@ -5715,40 +5720,40 @@ msgstr "Labels in de groepsmededelingen van %s" msgid "This page is not available in a media type you accept" msgstr "Deze pagina is niet beschikbaar in een mediatype dat u accepteert" -#: lib/imagefile.php:74 +#: lib/imagefile.php:72 msgid "Unsupported image file format." msgstr "Niet ondersteund beeldbestandsformaat." -#: lib/imagefile.php:90 +#: lib/imagefile.php:88 #, php-format msgid "That file is too big. The maximum file size is %s." msgstr "Dat bestand is te groot. De maximale bestandsgrootte is %s." -#: lib/imagefile.php:95 +#: lib/imagefile.php:93 msgid "Partial upload." msgstr "Gedeeltelijke upload." -#: lib/imagefile.php:103 lib/mediafile.php:170 +#: lib/imagefile.php:101 lib/mediafile.php:170 msgid "System error uploading file." msgstr "Er is een systeemfout opgetreden tijdens het uploaden van het bestand." -#: lib/imagefile.php:111 +#: lib/imagefile.php:109 msgid "Not an image or corrupt file." msgstr "Het bestand is geen afbeelding of het bestand is beschadigd." -#: lib/imagefile.php:124 +#: lib/imagefile.php:122 msgid "Lost our file." msgstr "Het bestand is zoekgeraakt." -#: lib/imagefile.php:168 lib/imagefile.php:233 +#: lib/imagefile.php:163 lib/imagefile.php:224 msgid "Unknown file type" msgstr "Onbekend bestandstype" -#: lib/imagefile.php:253 +#: lib/imagefile.php:244 msgid "MB" msgstr "MB" -#: lib/imagefile.php:255 +#: lib/imagefile.php:246 msgid "kB" msgstr "kB" @@ -6287,7 +6292,7 @@ msgstr "Labels in de mededelingen van %s" msgid "Unknown" msgstr "Onbekend" -#: lib/profileaction.php:109 lib/profileaction.php:194 lib/subgroupnav.php:82 +#: lib/profileaction.php:109 lib/profileaction.php:200 lib/subgroupnav.php:82 msgid "Subscriptions" msgstr "Abonnementen" @@ -6295,7 +6300,7 @@ msgstr "Abonnementen" msgid "All subscriptions" msgstr "Alle abonnementen" -#: lib/profileaction.php:142 lib/profileaction.php:203 lib/subgroupnav.php:90 +#: lib/profileaction.php:142 lib/profileaction.php:209 lib/subgroupnav.php:90 msgid "Subscribers" msgstr "Abonnees" @@ -6303,15 +6308,20 @@ msgstr "Abonnees" msgid "All subscribers" msgstr "Alle abonnees" -#: lib/profileaction.php:180 +#: lib/profileaction.php:186 msgid "User ID" msgstr "Gebruikers-ID" -#: lib/profileaction.php:185 +#: lib/profileaction.php:191 msgid "Member since" msgstr "Lid sinds" -#: lib/profileaction.php:247 +#. TRANS: Average count of posts made per day since account registration +#: lib/profileaction.php:230 +msgid "Daily average" +msgstr "" + +#: lib/profileaction.php:259 msgid "All groups" msgstr "Alle groepen" @@ -6482,6 +6492,11 @@ msgstr "Uitschrijven van deze gebruiker" msgid "Unsubscribe" msgstr "Abonnement opheffen" +#: lib/usernoprofileexception.php:58 +#, fuzzy, php-format +msgid "User %s (%d) has no profile record." +msgstr "Deze gebruiker heeft geen profiel." + #: lib/userprofile.php:117 msgid "Edit Avatar" msgstr "Avatar bewerken" @@ -6492,7 +6507,7 @@ msgstr "Gebruikershandelingen" #: lib/userprofile.php:237 msgid "User deletion in progress..." -msgstr "" +msgstr "Bezig met het verwijderen van de gebruiker..." #: lib/userprofile.php:263 msgid "Edit profile settings" diff --git a/locale/nn/LC_MESSAGES/statusnet.po b/locale/nn/LC_MESSAGES/statusnet.po index 4b1110eae2..30f1adc0ff 100644 --- a/locale/nn/LC_MESSAGES/statusnet.po +++ b/locale/nn/LC_MESSAGES/statusnet.po @@ -7,12 +7,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-03-17 21:39+0000\n" -"PO-Revision-Date: 2010-03-17 21:41:14+0000\n" +"POT-Creation-Date: 2010-03-23 20:09+0000\n" +"PO-Revision-Date: 2010-03-23 20:10:43+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 (r63880); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.17alpha (r64087); Translate extension (2010-01-16)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: nn\n" "X-Message-Group: out-statusnet\n" @@ -780,23 +780,28 @@ msgstr "Last opp" msgid "Crop" msgstr "Skaler" -#: actions/avatarsettings.php:328 +#: actions/avatarsettings.php:305 +#, fuzzy +msgid "No file uploaded." +msgstr "Ingen vald profil." + +#: actions/avatarsettings.php:332 msgid "Pick a square area of the image to be your avatar" msgstr "Velg eit utvalg av bildet som vil blir din avatar." -#: actions/avatarsettings.php:343 actions/grouplogo.php:380 +#: actions/avatarsettings.php:347 actions/grouplogo.php:380 msgid "Lost our file data." msgstr "Fant ikkje igjen fil data." -#: actions/avatarsettings.php:366 +#: actions/avatarsettings.php:370 msgid "Avatar updated." msgstr "Lasta opp brukarbilete." -#: actions/avatarsettings.php:369 +#: actions/avatarsettings.php:373 msgid "Failed updating avatar." msgstr "Feil ved oppdatering av brukarbilete." -#: actions/avatarsettings.php:393 +#: actions/avatarsettings.php:397 #, fuzzy msgid "Avatar deleted." msgstr "Lasta opp brukarbilete." @@ -939,7 +944,7 @@ msgid "Conversation" msgstr "Stadfestingskode" #: actions/conversation.php:154 lib/mailbox.php:116 lib/noticelist.php:87 -#: lib/profileaction.php:218 lib/searchgroupnav.php:82 +#: lib/profileaction.php:224 lib/searchgroupnav.php:82 msgid "Notices" msgstr "Notisar" @@ -1807,7 +1812,7 @@ msgstr "%s tidsline" msgid "Updates from members of %1$s on %2$s!" msgstr "Oppdateringar frå %1$s på %2$s!" -#: actions/groups.php:62 lib/profileaction.php:212 lib/profileaction.php:232 +#: actions/groups.php:62 lib/profileaction.php:218 lib/profileaction.php:244 #: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98 msgid "Groups" msgstr "Grupper" @@ -3479,7 +3484,7 @@ msgid "Description" msgstr "Beskriving" #: actions/showapplication.php:192 actions/showgroup.php:439 -#: lib/profileaction.php:176 +#: lib/profileaction.php:182 msgid "Statistics" msgstr "Statistikk" @@ -3637,7 +3642,7 @@ msgid "Members" msgstr "Medlemmar" #: actions/showgroup.php:396 lib/profileaction.php:117 -#: lib/profileaction.php:150 lib/profileaction.php:238 lib/section.php:95 +#: lib/profileaction.php:150 lib/profileaction.php:250 lib/section.php:95 #: lib/subscriptionlist.php:126 lib/tagcloudsection.php:71 msgid "(None)" msgstr "(Ingen)" @@ -3806,7 +3811,7 @@ msgid "Unknown language \"%s\"." msgstr "" #: actions/siteadminpanel.php:165 -msgid "Minimum text limit is 140 characters." +msgid "Minimum text limit is 0 (unlimited)." msgstr "" #: actions/siteadminpanel.php:171 @@ -4088,8 +4093,7 @@ msgstr "Avatar-innstillingar" msgid "You are not subscribed to that profile." msgstr "Du tingar ikkje oppdateringar til den profilen." -#: actions/subedit.php:83 classes/Subscription.php:89 -#: classes/Subscription.php:116 +#: actions/subedit.php:83 classes/Subscription.php:132 msgid "Could not save subscription." msgstr "Kunne ikkje lagra abonnement." @@ -4669,39 +4673,39 @@ msgstr "Eit problem oppstod ved lagring av notis." msgid "RT @%1$s %2$s" msgstr "%1$s (%2$s)" -#: classes/Subscription.php:66 lib/oauthstore.php:465 +#: classes/Subscription.php:74 lib/oauthstore.php:465 #, fuzzy msgid "You have been banned from subscribing." msgstr "Brukaren tillet deg ikkje å tinga meldingane sine." -#: classes/Subscription.php:70 +#: classes/Subscription.php:78 msgid "Already subscribed!" msgstr "" -#: classes/Subscription.php:74 +#: classes/Subscription.php:82 msgid "User has blocked you." msgstr "Brukar har blokkert deg." -#: classes/Subscription.php:157 +#: classes/Subscription.php:167 #, fuzzy msgid "Not subscribed!" msgstr "Ikkje tinga." -#: classes/Subscription.php:163 +#: classes/Subscription.php:173 #, fuzzy msgid "Couldn't delete self-subscription." msgstr "Kan ikkje sletta tinging." -#: classes/Subscription.php:190 +#: classes/Subscription.php:200 #, fuzzy msgid "Couldn't delete subscription OMB token." msgstr "Kan ikkje sletta tinging." -#: classes/Subscription.php:201 +#: classes/Subscription.php:211 msgid "Couldn't delete subscription." msgstr "Kan ikkje sletta tinging." -#: classes/User.php:378 +#: classes/User.php:363 #, fuzzy, php-format msgid "Welcome to %1$s, @%2$s!" msgstr "Melding til %1$s på %2$s" @@ -5007,22 +5011,22 @@ msgstr "« Etter" msgid "Before" msgstr "Før »" -#: lib/activity.php:453 +#: lib/activity.php:120 +msgid "Expecting a root feed element but got a whole XML document." +msgstr "" + +#: lib/activityutils.php:208 msgid "Can't handle remote content yet." msgstr "" -#: lib/activity.php:481 +#: lib/activityutils.php:236 msgid "Can't handle embedded XML content yet." msgstr "" -#: lib/activity.php:485 +#: lib/activityutils.php:240 msgid "Can't handle embedded Base64 content yet." msgstr "" -#: lib/activity.php:1089 -msgid "Expecting a root feed element but got a whole XML document." -msgstr "" - #. TRANS: Client error message #: lib/adminpanelaction.php:98 #, fuzzy @@ -5518,20 +5522,20 @@ msgid "" "tracking - not yet implemented.\n" msgstr "" -#: lib/common.php:136 +#: lib/common.php:135 #, fuzzy msgid "No configuration file found. " msgstr "Ingen stadfestingskode." -#: lib/common.php:137 +#: lib/common.php:136 msgid "I looked for configuration files in the following places: " msgstr "" -#: lib/common.php:139 +#: lib/common.php:138 msgid "You may wish to run the installer to fix this." msgstr "" -#: lib/common.php:140 +#: lib/common.php:139 #, fuzzy msgid "Go to the installer." msgstr "Logg inn or sida" @@ -5712,40 +5716,40 @@ msgstr "Merkelappar i %s gruppa sine notisar" msgid "This page is not available in a media type you accept" msgstr "Denne sida er ikkje tilgjengeleg i nokon mediatype du aksepterer." -#: lib/imagefile.php:74 +#: lib/imagefile.php:72 msgid "Unsupported image file format." msgstr "Støttar ikkje bileteformatet." -#: lib/imagefile.php:90 +#: lib/imagefile.php:88 #, fuzzy, php-format msgid "That file is too big. The maximum file size is %s." msgstr "Du kan lasta opp ein logo for gruppa." -#: lib/imagefile.php:95 +#: lib/imagefile.php:93 msgid "Partial upload." msgstr "Hallvegs opplasta." -#: lib/imagefile.php:103 lib/mediafile.php:170 +#: lib/imagefile.php:101 lib/mediafile.php:170 msgid "System error uploading file." msgstr "Systemfeil ved opplasting av fil." -#: lib/imagefile.php:111 +#: lib/imagefile.php:109 msgid "Not an image or corrupt file." msgstr "Korrupt bilete." -#: lib/imagefile.php:124 +#: lib/imagefile.php:122 msgid "Lost our file." msgstr "Mista fila vår." -#: lib/imagefile.php:168 lib/imagefile.php:233 +#: lib/imagefile.php:163 lib/imagefile.php:224 msgid "Unknown file type" msgstr "Ukjend fil type" -#: lib/imagefile.php:253 +#: lib/imagefile.php:244 msgid "MB" msgstr "" -#: lib/imagefile.php:255 +#: lib/imagefile.php:246 msgid "kB" msgstr "" @@ -6214,7 +6218,7 @@ msgstr "Merkelappar i %s sine notisar" msgid "Unknown" msgstr "Uventa handling." -#: lib/profileaction.php:109 lib/profileaction.php:194 lib/subgroupnav.php:82 +#: lib/profileaction.php:109 lib/profileaction.php:200 lib/subgroupnav.php:82 msgid "Subscriptions" msgstr "Tingingar" @@ -6222,7 +6226,7 @@ msgstr "Tingingar" msgid "All subscriptions" msgstr "Alle tingingar" -#: lib/profileaction.php:142 lib/profileaction.php:203 lib/subgroupnav.php:90 +#: lib/profileaction.php:142 lib/profileaction.php:209 lib/subgroupnav.php:90 msgid "Subscribers" msgstr "Tingarar" @@ -6230,16 +6234,21 @@ msgstr "Tingarar" msgid "All subscribers" msgstr "Tingarar" -#: lib/profileaction.php:180 +#: lib/profileaction.php:186 #, fuzzy msgid "User ID" msgstr "Brukar" -#: lib/profileaction.php:185 +#: lib/profileaction.php:191 msgid "Member since" msgstr "Medlem sidan" -#: lib/profileaction.php:247 +#. TRANS: Average count of posts made per day since account registration +#: lib/profileaction.php:230 +msgid "Daily average" +msgstr "" + +#: lib/profileaction.php:259 msgid "All groups" msgstr "Alle gruppar" @@ -6421,6 +6430,11 @@ msgstr "Fjern tinging fra denne brukaren" msgid "Unsubscribe" msgstr "Fjern tinging" +#: lib/usernoprofileexception.php:58 +#, fuzzy, php-format +msgid "User %s (%d) has no profile record." +msgstr "Brukaren har inga profil." + #: lib/userprofile.php:117 #, fuzzy msgid "Edit Avatar" diff --git a/locale/pl/LC_MESSAGES/statusnet.po b/locale/pl/LC_MESSAGES/statusnet.po index 816eb6e850..e2656b0033 100644 --- a/locale/pl/LC_MESSAGES/statusnet.po +++ b/locale/pl/LC_MESSAGES/statusnet.po @@ -10,8 +10,8 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-03-17 21:39+0000\n" -"PO-Revision-Date: 2010-03-17 21:41:20+0000\n" +"POT-Creation-Date: 2010-03-23 20:09+0000\n" +"PO-Revision-Date: 2010-03-23 20:10:49+0000\n" "Last-Translator: Piotr Drąg \n" "Language-Team: Polish \n" "MIME-Version: 1.0\n" @@ -19,7 +19,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 (r63880); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.17alpha (r64087); Translate extension (2010-01-16)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: pl\n" "X-Message-Group: out-statusnet\n" @@ -770,23 +770,28 @@ msgstr "Wyślij" msgid "Crop" msgstr "Przytnij" -#: actions/avatarsettings.php:328 +#: actions/avatarsettings.php:305 +#, fuzzy +msgid "No file uploaded." +msgstr "Nie podano profilu." + +#: actions/avatarsettings.php:332 msgid "Pick a square area of the image to be your avatar" msgstr "Wybierz kwadratowy obszar obrazu do awatara" -#: actions/avatarsettings.php:343 actions/grouplogo.php:380 +#: actions/avatarsettings.php:347 actions/grouplogo.php:380 msgid "Lost our file data." msgstr "Utracono dane pliku." -#: actions/avatarsettings.php:366 +#: actions/avatarsettings.php:370 msgid "Avatar updated." msgstr "Zaktualizowano awatar." -#: actions/avatarsettings.php:369 +#: actions/avatarsettings.php:373 msgid "Failed updating avatar." msgstr "Zaktualizowanie awatara nie powiodło się." -#: actions/avatarsettings.php:393 +#: actions/avatarsettings.php:397 msgid "Avatar deleted." msgstr "Usunięto awatar." @@ -924,7 +929,7 @@ msgid "Conversation" msgstr "Rozmowa" #: actions/conversation.php:154 lib/mailbox.php:116 lib/noticelist.php:87 -#: lib/profileaction.php:218 lib/searchgroupnav.php:82 +#: lib/profileaction.php:224 lib/searchgroupnav.php:82 msgid "Notices" msgstr "Wpisy" @@ -1740,7 +1745,7 @@ msgstr "Oś czasu użytkownika %s" msgid "Updates from members of %1$s on %2$s!" msgstr "Aktualizacje od członków %1$s na %2$s." -#: actions/groups.php:62 lib/profileaction.php:212 lib/profileaction.php:232 +#: actions/groups.php:62 lib/profileaction.php:218 lib/profileaction.php:244 #: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98 msgid "Groups" msgstr "Grupy" @@ -3396,7 +3401,7 @@ msgid "Description" msgstr "Opis" #: actions/showapplication.php:192 actions/showgroup.php:439 -#: lib/profileaction.php:176 +#: lib/profileaction.php:182 msgid "Statistics" msgstr "Statystyki" @@ -3563,7 +3568,7 @@ msgid "Members" msgstr "Członkowie" #: actions/showgroup.php:396 lib/profileaction.php:117 -#: lib/profileaction.php:150 lib/profileaction.php:238 lib/section.php:95 +#: lib/profileaction.php:150 lib/profileaction.php:250 lib/section.php:95 #: lib/subscriptionlist.php:126 lib/tagcloudsection.php:71 msgid "(None)" msgstr "(Brak)" @@ -3745,7 +3750,8 @@ msgid "Unknown language \"%s\"." msgstr "Nieznany język \"%s\"." #: actions/siteadminpanel.php:165 -msgid "Minimum text limit is 140 characters." +#, fuzzy +msgid "Minimum text limit is 0 (unlimited)." msgstr "Maksymalne ograniczenie tekstu to 14 znaków." #: actions/siteadminpanel.php:171 @@ -4018,8 +4024,7 @@ msgstr "Zapisz ustawienia migawki" msgid "You are not subscribed to that profile." msgstr "Nie jesteś subskrybowany do tego profilu." -#: actions/subedit.php:83 classes/Subscription.php:89 -#: classes/Subscription.php:116 +#: actions/subedit.php:83 classes/Subscription.php:132 msgid "Could not save subscription." msgstr "Nie można zapisać subskrypcji." @@ -4605,35 +4610,35 @@ msgstr "Problem podczas zapisywania skrzynki odbiorczej grupy." msgid "RT @%1$s %2$s" msgstr "RT @%1$s %2$s" -#: classes/Subscription.php:66 lib/oauthstore.php:465 +#: classes/Subscription.php:74 lib/oauthstore.php:465 msgid "You have been banned from subscribing." msgstr "Zablokowano subskrybowanie." -#: classes/Subscription.php:70 +#: classes/Subscription.php:78 msgid "Already subscribed!" msgstr "Już subskrybowane." -#: classes/Subscription.php:74 +#: classes/Subscription.php:82 msgid "User has blocked you." msgstr "Użytkownik zablokował cię." -#: classes/Subscription.php:157 +#: classes/Subscription.php:167 msgid "Not subscribed!" msgstr "Niesubskrybowane." -#: classes/Subscription.php:163 +#: classes/Subscription.php:173 msgid "Couldn't delete self-subscription." msgstr "Nie można usunąć autosubskrypcji." -#: classes/Subscription.php:190 +#: classes/Subscription.php:200 msgid "Couldn't delete subscription OMB token." msgstr "Nie można usunąć tokenu subskrypcji OMB." -#: classes/Subscription.php:201 +#: classes/Subscription.php:211 msgid "Couldn't delete subscription." msgstr "Nie można usunąć subskrypcji." -#: classes/User.php:378 +#: classes/User.php:363 #, php-format msgid "Welcome to %1$s, @%2$s!" msgstr "Witaj w %1$s, @%2$s." @@ -4921,22 +4926,22 @@ msgstr "Później" msgid "Before" msgstr "Wcześniej" -#: lib/activity.php:453 +#: lib/activity.php:120 +msgid "Expecting a root feed element but got a whole XML document." +msgstr "Oczekiwano elementu kanału roota, ale otrzymano cały dokument XML." + +#: lib/activityutils.php:208 msgid "Can't handle remote content yet." msgstr "Nie można jeszcze obsługiwać zdalnej treści." -#: lib/activity.php:481 +#: lib/activityutils.php:236 msgid "Can't handle embedded XML content yet." msgstr "Nie można jeszcze obsługiwać zagnieżdżonej treści XML." -#: lib/activity.php:485 +#: lib/activityutils.php:240 msgid "Can't handle embedded Base64 content yet." msgstr "Nie można jeszcze obsługiwać zagnieżdżonej treści Base64." -#: lib/activity.php:1089 -msgid "Expecting a root feed element but got a whole XML document." -msgstr "" - #. TRANS: Client error message #: lib/adminpanelaction.php:98 msgid "You cannot make changes to this site." @@ -5455,19 +5460,19 @@ msgstr "" "tracks - jeszcze nie zaimplementowano\n" "tracking - jeszcze nie zaimplementowano\n" -#: lib/common.php:136 +#: lib/common.php:135 msgid "No configuration file found. " msgstr "Nie odnaleziono pliku konfiguracji." -#: lib/common.php:137 +#: lib/common.php:136 msgid "I looked for configuration files in the following places: " msgstr "Szukano plików konfiguracji w następujących miejscach: " -#: lib/common.php:139 +#: lib/common.php:138 msgid "You may wish to run the installer to fix this." msgstr "Należy uruchomić instalator, aby to naprawić." -#: lib/common.php:140 +#: lib/common.php:139 msgid "Go to the installer." msgstr "Przejdź do instalatora." @@ -5645,40 +5650,40 @@ msgstr "Znaczniki we wpisach grupy %s" msgid "This page is not available in a media type you accept" msgstr "Ta strona jest niedostępna dla akceptowanego typu medium" -#: lib/imagefile.php:74 +#: lib/imagefile.php:72 msgid "Unsupported image file format." msgstr "Nieobsługiwany format pliku obrazu." -#: lib/imagefile.php:90 +#: lib/imagefile.php:88 #, php-format msgid "That file is too big. The maximum file size is %s." msgstr "Ten plik jest za duży. Maksymalny rozmiar pliku to %s." -#: lib/imagefile.php:95 +#: lib/imagefile.php:93 msgid "Partial upload." msgstr "Częściowo wysłano." -#: lib/imagefile.php:103 lib/mediafile.php:170 +#: lib/imagefile.php:101 lib/mediafile.php:170 msgid "System error uploading file." msgstr "Błąd systemu podczas wysyłania pliku." -#: lib/imagefile.php:111 +#: lib/imagefile.php:109 msgid "Not an image or corrupt file." msgstr "To nie jest obraz lub lub plik jest uszkodzony." -#: lib/imagefile.php:124 +#: lib/imagefile.php:122 msgid "Lost our file." msgstr "Utracono plik." -#: lib/imagefile.php:168 lib/imagefile.php:233 +#: lib/imagefile.php:163 lib/imagefile.php:224 msgid "Unknown file type" msgstr "Nieznany typ pliku" -#: lib/imagefile.php:253 +#: lib/imagefile.php:244 msgid "MB" msgstr "MB" -#: lib/imagefile.php:255 +#: lib/imagefile.php:246 msgid "kB" msgstr "KB" @@ -6211,7 +6216,7 @@ msgstr "Znaczniki we wpisach użytkownika %s" msgid "Unknown" msgstr "Nieznane" -#: lib/profileaction.php:109 lib/profileaction.php:194 lib/subgroupnav.php:82 +#: lib/profileaction.php:109 lib/profileaction.php:200 lib/subgroupnav.php:82 msgid "Subscriptions" msgstr "Subskrypcje" @@ -6219,7 +6224,7 @@ msgstr "Subskrypcje" msgid "All subscriptions" msgstr "Wszystkie subskrypcje" -#: lib/profileaction.php:142 lib/profileaction.php:203 lib/subgroupnav.php:90 +#: lib/profileaction.php:142 lib/profileaction.php:209 lib/subgroupnav.php:90 msgid "Subscribers" msgstr "Subskrybenci" @@ -6227,15 +6232,20 @@ msgstr "Subskrybenci" msgid "All subscribers" msgstr "Wszyscy subskrybenci" -#: lib/profileaction.php:180 +#: lib/profileaction.php:186 msgid "User ID" msgstr "Identyfikator użytkownika" -#: lib/profileaction.php:185 +#: lib/profileaction.php:191 msgid "Member since" msgstr "Członek od" -#: lib/profileaction.php:247 +#. TRANS: Average count of posts made per day since account registration +#: lib/profileaction.php:230 +msgid "Daily average" +msgstr "" + +#: lib/profileaction.php:259 msgid "All groups" msgstr "Wszystkie grupy" @@ -6407,6 +6417,11 @@ msgstr "Zrezygnuj z subskrypcji tego użytkownika" msgid "Unsubscribe" msgstr "Zrezygnuj z subskrypcji" +#: lib/usernoprofileexception.php:58 +#, fuzzy, php-format +msgid "User %s (%d) has no profile record." +msgstr "Użytkownik nie posiada profilu." + #: lib/userprofile.php:117 msgid "Edit Avatar" msgstr "Zmodyfikuj awatar" @@ -6417,7 +6432,7 @@ msgstr "Czynności użytkownika" #: lib/userprofile.php:237 msgid "User deletion in progress..." -msgstr "" +msgstr "Trwa usuwanie użytkownika..." #: lib/userprofile.php:263 msgid "Edit profile settings" diff --git a/locale/pt/LC_MESSAGES/statusnet.po b/locale/pt/LC_MESSAGES/statusnet.po index 4d94d95b0a..4d1a30ea4d 100644 --- a/locale/pt/LC_MESSAGES/statusnet.po +++ b/locale/pt/LC_MESSAGES/statusnet.po @@ -9,12 +9,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-03-17 21:39+0000\n" -"PO-Revision-Date: 2010-03-17 21:41:23+0000\n" +"POT-Creation-Date: 2010-03-23 20:09+0000\n" +"PO-Revision-Date: 2010-03-23 20:10:52+0000\n" "Language-Team: Portuguese\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r63880); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.17alpha (r64087); Translate extension (2010-01-16)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: pt\n" "X-Message-Group: out-statusnet\n" @@ -770,23 +770,28 @@ msgstr "Carregar" msgid "Crop" msgstr "Cortar" -#: actions/avatarsettings.php:328 +#: actions/avatarsettings.php:305 +#, fuzzy +msgid "No file uploaded." +msgstr "Não foi especificado um perfil." + +#: actions/avatarsettings.php:332 msgid "Pick a square area of the image to be your avatar" msgstr "Escolha uma área quadrada da imagem para ser o seu avatar" -#: actions/avatarsettings.php:343 actions/grouplogo.php:380 +#: actions/avatarsettings.php:347 actions/grouplogo.php:380 msgid "Lost our file data." msgstr "Perdi os dados do nosso ficheiro." -#: actions/avatarsettings.php:366 +#: actions/avatarsettings.php:370 msgid "Avatar updated." msgstr "Avatar actualizado." -#: actions/avatarsettings.php:369 +#: actions/avatarsettings.php:373 msgid "Failed updating avatar." msgstr "Falha ao actualizar avatar." -#: actions/avatarsettings.php:393 +#: actions/avatarsettings.php:397 msgid "Avatar deleted." msgstr "Avatar apagado." @@ -925,7 +930,7 @@ msgid "Conversation" msgstr "Conversação" #: actions/conversation.php:154 lib/mailbox.php:116 lib/noticelist.php:87 -#: lib/profileaction.php:218 lib/searchgroupnav.php:82 +#: lib/profileaction.php:224 lib/searchgroupnav.php:82 msgid "Notices" msgstr "Notas" @@ -1772,7 +1777,7 @@ msgstr "Notas de %s" msgid "Updates from members of %1$s on %2$s!" msgstr "Actualizações dos membros de %1$s em %2$s!" -#: actions/groups.php:62 lib/profileaction.php:212 lib/profileaction.php:232 +#: actions/groups.php:62 lib/profileaction.php:218 lib/profileaction.php:244 #: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98 msgid "Groups" msgstr "Grupos" @@ -3450,7 +3455,7 @@ msgid "Description" msgstr "Descrição" #: actions/showapplication.php:192 actions/showgroup.php:439 -#: lib/profileaction.php:176 +#: lib/profileaction.php:182 msgid "Statistics" msgstr "Estatísticas" @@ -3617,7 +3622,7 @@ msgid "Members" msgstr "Membros" #: actions/showgroup.php:396 lib/profileaction.php:117 -#: lib/profileaction.php:150 lib/profileaction.php:238 lib/section.php:95 +#: lib/profileaction.php:150 lib/profileaction.php:250 lib/section.php:95 #: lib/subscriptionlist.php:126 lib/tagcloudsection.php:71 msgid "(None)" msgstr "(Nenhum)" @@ -3799,7 +3804,8 @@ msgid "Unknown language \"%s\"." msgstr "Língua desconhecida \"%s\"." #: actions/siteadminpanel.php:165 -msgid "Minimum text limit is 140 characters." +#, fuzzy +msgid "Minimum text limit is 0 (unlimited)." msgstr "O valor mínimo de limite para o texto é 140 caracteres." #: actions/siteadminpanel.php:171 @@ -4078,8 +4084,7 @@ msgstr "Gravar configurações do site" msgid "You are not subscribed to that profile." msgstr "Não subscreveu esse perfil." -#: actions/subedit.php:83 classes/Subscription.php:89 -#: classes/Subscription.php:116 +#: actions/subedit.php:83 classes/Subscription.php:132 msgid "Could not save subscription." msgstr "Não foi possível gravar a subscrição." @@ -4668,36 +4673,36 @@ msgstr "Problema na gravação da nota." msgid "RT @%1$s %2$s" msgstr "RT @%1$s %2$s" -#: classes/Subscription.php:66 lib/oauthstore.php:465 +#: classes/Subscription.php:74 lib/oauthstore.php:465 msgid "You have been banned from subscribing." msgstr "Foi bloqueado de fazer subscrições" -#: classes/Subscription.php:70 +#: classes/Subscription.php:78 msgid "Already subscribed!" msgstr "Já subscrito!" -#: classes/Subscription.php:74 +#: classes/Subscription.php:82 msgid "User has blocked you." msgstr "O utilizador bloqueou-o." -#: classes/Subscription.php:157 +#: classes/Subscription.php:167 msgid "Not subscribed!" msgstr "Não subscrito!" -#: classes/Subscription.php:163 +#: classes/Subscription.php:173 msgid "Couldn't delete self-subscription." msgstr "Não foi possível apagar a auto-subscrição." -#: classes/Subscription.php:190 +#: classes/Subscription.php:200 #, fuzzy msgid "Couldn't delete subscription OMB token." msgstr "Não foi possível apagar a subscrição." -#: classes/Subscription.php:201 +#: classes/Subscription.php:211 msgid "Couldn't delete subscription." msgstr "Não foi possível apagar a subscrição." -#: classes/User.php:378 +#: classes/User.php:363 #, php-format msgid "Welcome to %1$s, @%2$s!" msgstr "%1$s dá-lhe as boas-vindas, @%2$s!" @@ -5000,22 +5005,22 @@ msgstr "Posteriores" msgid "Before" msgstr "Anteriores" -#: lib/activity.php:453 +#: lib/activity.php:120 +msgid "Expecting a root feed element but got a whole XML document." +msgstr "" + +#: lib/activityutils.php:208 msgid "Can't handle remote content yet." msgstr "" -#: lib/activity.php:481 +#: lib/activityutils.php:236 msgid "Can't handle embedded XML content yet." msgstr "" -#: lib/activity.php:485 +#: lib/activityutils.php:240 msgid "Can't handle embedded Base64 content yet." msgstr "" -#: lib/activity.php:1089 -msgid "Expecting a root feed element but got a whole XML document." -msgstr "" - #. TRANS: Client error message #: lib/adminpanelaction.php:98 msgid "You cannot make changes to this site." @@ -5535,19 +5540,19 @@ msgstr "" "tracks - ainda não implementado.\n" "tracking - ainda não implementado.\n" -#: lib/common.php:136 +#: lib/common.php:135 msgid "No configuration file found. " msgstr "Ficheiro de configuração não encontrado. " -#: lib/common.php:137 +#: lib/common.php:136 msgid "I looked for configuration files in the following places: " msgstr "Procurei ficheiros de configuração nos seguintes sítios: " -#: lib/common.php:139 +#: lib/common.php:138 msgid "You may wish to run the installer to fix this." msgstr "Talvez queira correr o instalador para resolver esta questão." -#: lib/common.php:140 +#: lib/common.php:139 msgid "Go to the installer." msgstr "Ir para o instalador." @@ -5725,40 +5730,40 @@ msgstr "Categorias nas notas do grupo %s" msgid "This page is not available in a media type you accept" msgstr "Esta página não está disponível num formato que você aceite" -#: lib/imagefile.php:74 +#: lib/imagefile.php:72 msgid "Unsupported image file format." msgstr "Formato do ficheiro da imagem não é suportado." -#: lib/imagefile.php:90 +#: lib/imagefile.php:88 #, php-format msgid "That file is too big. The maximum file size is %s." msgstr "Esse ficheiro é demasiado grande. O tamanho máximo de ficheiro é %s." -#: lib/imagefile.php:95 +#: lib/imagefile.php:93 msgid "Partial upload." msgstr "Transferência parcial." -#: lib/imagefile.php:103 lib/mediafile.php:170 +#: lib/imagefile.php:101 lib/mediafile.php:170 msgid "System error uploading file." msgstr "Ocorreu um erro de sistema ao transferir o ficheiro." -#: lib/imagefile.php:111 +#: lib/imagefile.php:109 msgid "Not an image or corrupt file." msgstr "Ficheiro não é uma imagem ou está corrompido." -#: lib/imagefile.php:124 +#: lib/imagefile.php:122 msgid "Lost our file." msgstr "Perdi o nosso ficheiro." -#: lib/imagefile.php:168 lib/imagefile.php:233 +#: lib/imagefile.php:163 lib/imagefile.php:224 msgid "Unknown file type" msgstr "Tipo do ficheiro é desconhecido" -#: lib/imagefile.php:253 +#: lib/imagefile.php:244 msgid "MB" msgstr "MB" -#: lib/imagefile.php:255 +#: lib/imagefile.php:246 msgid "kB" msgstr "kB" @@ -6293,7 +6298,7 @@ msgstr "Categorias nas notas de %s" msgid "Unknown" msgstr "Desconhecida" -#: lib/profileaction.php:109 lib/profileaction.php:194 lib/subgroupnav.php:82 +#: lib/profileaction.php:109 lib/profileaction.php:200 lib/subgroupnav.php:82 msgid "Subscriptions" msgstr "Subscrições" @@ -6301,7 +6306,7 @@ msgstr "Subscrições" msgid "All subscriptions" msgstr "Todas as subscrições" -#: lib/profileaction.php:142 lib/profileaction.php:203 lib/subgroupnav.php:90 +#: lib/profileaction.php:142 lib/profileaction.php:209 lib/subgroupnav.php:90 msgid "Subscribers" msgstr "Subscritores" @@ -6309,15 +6314,20 @@ msgstr "Subscritores" msgid "All subscribers" msgstr "Todos os subscritores" -#: lib/profileaction.php:180 +#: lib/profileaction.php:186 msgid "User ID" msgstr "ID do utilizador" -#: lib/profileaction.php:185 +#: lib/profileaction.php:191 msgid "Member since" msgstr "Membro desde" -#: lib/profileaction.php:247 +#. TRANS: Average count of posts made per day since account registration +#: lib/profileaction.php:230 +msgid "Daily average" +msgstr "" + +#: lib/profileaction.php:259 msgid "All groups" msgstr "Todos os grupos" @@ -6488,6 +6498,11 @@ msgstr "Deixar de subscrever este utilizador" msgid "Unsubscribe" msgstr "Abandonar" +#: lib/usernoprofileexception.php:58 +#, fuzzy, php-format +msgid "User %s (%d) has no profile record." +msgstr "Utilizador não tem perfil." + #: lib/userprofile.php:117 msgid "Edit Avatar" msgstr "Editar Avatar" diff --git a/locale/pt_BR/LC_MESSAGES/statusnet.po b/locale/pt_BR/LC_MESSAGES/statusnet.po index a431c99b8f..78c07d4b85 100644 --- a/locale/pt_BR/LC_MESSAGES/statusnet.po +++ b/locale/pt_BR/LC_MESSAGES/statusnet.po @@ -12,12 +12,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-03-17 21:39+0000\n" -"PO-Revision-Date: 2010-03-17 21:41:27+0000\n" +"POT-Creation-Date: 2010-03-23 20:09+0000\n" +"PO-Revision-Date: 2010-03-23 20:10:55+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 (r63880); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.17alpha (r64087); Translate extension (2010-01-16)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: pt-br\n" "X-Message-Group: out-statusnet\n" @@ -46,10 +46,9 @@ msgstr "Impedir usuários anônimos (não autenticados) de visualizar o site?" #. TRANS: Checkbox label for prohibiting anonymous users from viewing site. #: actions/accessadminpanel.php:167 -#, fuzzy msgctxt "LABEL" msgid "Private" -msgstr "Particular" +msgstr "Privado" #. TRANS: Checkbox instructions for admin setting "Invite only" #: actions/accessadminpanel.php:174 @@ -627,7 +626,7 @@ msgstr "Essa mensagem não existe." #: actions/apistatusesretweet.php:83 msgid "Cannot repeat your own notice." -msgstr "Você não pode repetria sua própria mensagem." +msgstr "Você não pode repetir a sua própria mensagem." #: actions/apistatusesretweet.php:91 msgid "Already repeated that notice." @@ -778,23 +777,28 @@ msgstr "Enviar" msgid "Crop" msgstr "Cortar" -#: actions/avatarsettings.php:328 +#: actions/avatarsettings.php:305 +#, fuzzy +msgid "No file uploaded." +msgstr "Não foi especificado nenhum perfil." + +#: actions/avatarsettings.php:332 msgid "Pick a square area of the image to be your avatar" msgstr "Selecione uma área quadrada da imagem para ser seu avatar" -#: actions/avatarsettings.php:343 actions/grouplogo.php:380 +#: actions/avatarsettings.php:347 actions/grouplogo.php:380 msgid "Lost our file data." msgstr "Os dados do nosso arquivo foram perdidos." -#: actions/avatarsettings.php:366 +#: actions/avatarsettings.php:370 msgid "Avatar updated." msgstr "O avatar foi atualizado." -#: actions/avatarsettings.php:369 +#: actions/avatarsettings.php:373 msgid "Failed updating avatar." msgstr "Não foi possível atualizar o avatar." -#: actions/avatarsettings.php:393 +#: actions/avatarsettings.php:397 msgid "Avatar deleted." msgstr "O avatar foi excluído." @@ -933,7 +937,7 @@ msgid "Conversation" msgstr "Conversa" #: actions/conversation.php:154 lib/mailbox.php:116 lib/noticelist.php:87 -#: lib/profileaction.php:218 lib/searchgroupnav.php:82 +#: lib/profileaction.php:224 lib/searchgroupnav.php:82 msgid "Notices" msgstr "Mensagens" @@ -1587,23 +1591,20 @@ msgid "Cannot read file." msgstr "Não foi possível ler o arquivo." #: actions/grantrole.php:62 actions/revokerole.php:62 -#, fuzzy msgid "Invalid role." -msgstr "Token inválido." +msgstr "Papel inválido." #: actions/grantrole.php:66 actions/revokerole.php:66 msgid "This role is reserved and cannot be set." -msgstr "" +msgstr "Este papel está reservado e não pode ser definido." #: actions/grantrole.php:75 -#, fuzzy msgid "You cannot grant user roles on this site." -msgstr "Você não pode colocar usuários deste site em isolamento." +msgstr "Você não pode definir papéis para os usuários neste site." #: actions/grantrole.php:82 -#, fuzzy msgid "User already has this role." -msgstr "O usuário já está silenciado." +msgstr "O usuário já possui este papel." #: actions/groupblock.php:71 actions/groupunblock.php:71 #: actions/makeadmin.php:71 actions/subedit.php:46 @@ -1764,7 +1765,7 @@ msgstr "Mensagens de %s" msgid "Updates from members of %1$s on %2$s!" msgstr "Atualizações dos membros de %1$s no %2$s!" -#: actions/groups.php:62 lib/profileaction.php:212 lib/profileaction.php:232 +#: actions/groups.php:62 lib/profileaction.php:218 lib/profileaction.php:244 #: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98 msgid "Groups" msgstr "Grupos" @@ -2098,9 +2099,8 @@ msgid "You must be logged in to join a group." msgstr "Você deve estar autenticado para se associar a um grupo." #: actions/joingroup.php:88 actions/leavegroup.php:88 -#, fuzzy msgid "No nickname or ID." -msgstr "Nenhuma identificação." +msgstr "Nenhum apelido ou identificação." #: actions/joingroup.php:141 #, php-format @@ -3358,14 +3358,12 @@ msgid "Replies to %1$s on %2$s!" msgstr "Respostas para %1$s no %2$s" #: actions/revokerole.php:75 -#, fuzzy msgid "You cannot revoke user roles on this site." -msgstr "Você não pode silenciar os usuários neste site." +msgstr "Não é possível revogar os papéis dos usuários neste site." #: actions/revokerole.php:82 -#, fuzzy msgid "User doesn't have this role." -msgstr "Usuário sem um perfil correspondente" +msgstr "O usuário não possui este papel." #: actions/rsd.php:146 actions/version.php:157 msgid "StatusNet" @@ -3395,7 +3393,7 @@ msgstr "Gerenciar sessões" #: actions/sessionsadminpanel.php:177 msgid "Whether to handle sessions ourselves." -msgstr "Define se nós cuidamos do gerenciamento das sessões." +msgstr "Define se as sessões terão gerenciamento próprio." #: actions/sessionsadminpanel.php:181 msgid "Session debugging" @@ -3437,7 +3435,7 @@ msgid "Description" msgstr "Descrição" #: actions/showapplication.php:192 actions/showgroup.php:439 -#: lib/profileaction.php:176 +#: lib/profileaction.php:182 msgid "Statistics" msgstr "Estatísticas" @@ -3604,7 +3602,7 @@ msgid "Members" msgstr "Membros" #: actions/showgroup.php:396 lib/profileaction.php:117 -#: lib/profileaction.php:150 lib/profileaction.php:238 lib/section.php:95 +#: lib/profileaction.php:150 lib/profileaction.php:250 lib/section.php:95 #: lib/subscriptionlist.php:126 lib/tagcloudsection.php:71 msgid "(None)" msgstr "(Nenhum)" @@ -3770,7 +3768,6 @@ msgid "User is already silenced." msgstr "O usuário já está silenciado." #: actions/siteadminpanel.php:69 -#, fuzzy msgid "Basic settings for this StatusNet site" msgstr "Configurações básicas para esta instância do StatusNet." @@ -3788,7 +3785,8 @@ msgid "Unknown language \"%s\"." msgstr "Idioma \"%s\" desconhecido." #: actions/siteadminpanel.php:165 -msgid "Minimum text limit is 140 characters." +#, fuzzy +msgid "Minimum text limit is 0 (unlimited)." msgstr "O comprimento máximo do texto é de 140 caracteres." #: actions/siteadminpanel.php:171 @@ -3846,6 +3844,8 @@ msgstr "Idioma padrão" #: actions/siteadminpanel.php:263 msgid "Site language when autodetection from browser settings is not available" msgstr "" +"Idioma do site quando as configurações de autodetecção a partir do navegador " +"não estiverem disponíveis" #: actions/siteadminpanel.php:271 msgid "Limits" @@ -3870,37 +3870,32 @@ msgstr "" "coisa novamente." #: actions/sitenoticeadminpanel.php:56 -#, fuzzy msgid "Site Notice" -msgstr "Mensagem do site" +msgstr "Avisos do site" #: actions/sitenoticeadminpanel.php:67 -#, fuzzy msgid "Edit site-wide message" -msgstr "Nova mensagem" +msgstr "Editar os avisos do site (exibidos em todas as páginas)" #: actions/sitenoticeadminpanel.php:103 -#, fuzzy msgid "Unable to save site notice." -msgstr "Não foi possível salvar suas configurações de aparência." +msgstr "Não foi possível salvar os avisos do site." #: actions/sitenoticeadminpanel.php:113 msgid "Max length for the site-wide notice is 255 chars" -msgstr "" +msgstr "O tamanho máximo para os avisos é de 255 caracteres." #: actions/sitenoticeadminpanel.php:176 -#, fuzzy msgid "Site notice text" -msgstr "Mensagem do site" +msgstr "Texto dos avisos" #: actions/sitenoticeadminpanel.php:178 msgid "Site-wide notice text (255 chars max; HTML okay)" -msgstr "" +msgstr "Texto dos avisos do site (no máximo 255 caracteres; pode usar HTML)" #: actions/sitenoticeadminpanel.php:198 -#, fuzzy msgid "Save site notice" -msgstr "Mensagem do site" +msgstr "Salvar os avisos do site" #: actions/smssettings.php:58 msgid "SMS settings" @@ -4007,9 +4002,8 @@ msgid "Snapshots" msgstr "Estatísticas" #: actions/snapshotadminpanel.php:65 -#, fuzzy msgid "Manage snapshot configuration" -msgstr "Mude as configurações do site" +msgstr "Gerenciar as configurações das estatísticas" #: actions/snapshotadminpanel.php:127 msgid "Invalid snapshot run value." @@ -4056,32 +4050,28 @@ msgid "Snapshots will be sent to this URL" msgstr "As estatísticas serão enviadas para esta URL" #: actions/snapshotadminpanel.php:248 -#, fuzzy msgid "Save snapshot settings" -msgstr "Salvar as configurações do site" +msgstr "Salvar as configurações de estatísticas" #: actions/subedit.php:70 msgid "You are not subscribed to that profile." msgstr "Você não está assinando esse perfil." -#: actions/subedit.php:83 classes/Subscription.php:89 -#: classes/Subscription.php:116 +#: actions/subedit.php:83 classes/Subscription.php:132 msgid "Could not save subscription." msgstr "Não foi possível salvar a assinatura." #: actions/subscribe.php:77 msgid "This action only accepts POST requests." -msgstr "" +msgstr "Esta ação aceita somente requisições POST." #: actions/subscribe.php:107 -#, fuzzy msgid "No such profile." -msgstr "Esse arquivo não existe." +msgstr "Este perfil não existe." #: actions/subscribe.php:117 -#, fuzzy msgid "You cannot subscribe to an OMB 0.1 remote profile with this action." -msgstr "Você não está assinando esse perfil." +msgstr "Não é possível assinar um perfil OMB 0.1 remoto com essa ação." #: actions/subscribe.php:145 msgid "Subscribed" @@ -4586,9 +4576,8 @@ msgid "Group leave failed." msgstr "Não foi possível deixar o grupo." #: classes/Local_group.php:41 -#, fuzzy msgid "Could not update local group." -msgstr "Não foi possível atualizar o grupo." +msgstr "Não foi possível atualizar o grupo local." #: classes/Login_token.php:76 #, php-format @@ -4652,36 +4641,35 @@ msgstr "Problema no salvamento das mensagens recebidas do grupo." msgid "RT @%1$s %2$s" msgstr "RT @%1$s %2$s" -#: classes/Subscription.php:66 lib/oauthstore.php:465 +#: classes/Subscription.php:74 lib/oauthstore.php:465 msgid "You have been banned from subscribing." msgstr "Você está proibido de assinar." -#: classes/Subscription.php:70 +#: classes/Subscription.php:78 msgid "Already subscribed!" msgstr "Já assinado!" -#: classes/Subscription.php:74 +#: classes/Subscription.php:82 msgid "User has blocked you." msgstr "O usuário bloqueou você." -#: classes/Subscription.php:157 +#: classes/Subscription.php:167 msgid "Not subscribed!" msgstr "Não assinado!" -#: classes/Subscription.php:163 +#: classes/Subscription.php:173 msgid "Couldn't delete self-subscription." msgstr "Não foi possível excluir a auto-assinatura." -#: classes/Subscription.php:190 -#, fuzzy +#: classes/Subscription.php:200 msgid "Couldn't delete subscription OMB token." -msgstr "Não foi possível excluir a assinatura." +msgstr "Não foi possível excluir o token de assinatura OMB." -#: classes/Subscription.php:201 +#: classes/Subscription.php:211 msgid "Couldn't delete subscription." msgstr "Não foi possível excluir a assinatura." -#: classes/User.php:378 +#: classes/User.php:363 #, php-format msgid "Welcome to %1$s, @%2$s!" msgstr "Bem vindo(a) a %1$s, @%2$s!" @@ -4691,18 +4679,16 @@ msgid "Could not create group." msgstr "Não foi possível criar o grupo." #: classes/User_group.php:489 -#, fuzzy msgid "Could not set group URI." -msgstr "Não foi possível configurar a associação ao grupo." +msgstr "Não foi possível definir a URI do grupo." #: classes/User_group.php:510 msgid "Could not set group membership." msgstr "Não foi possível configurar a associação ao grupo." #: classes/User_group.php:524 -#, fuzzy msgid "Could not save local group info." -msgstr "Não foi possível salvar a assinatura." +msgstr "Não foi possível salvar a informação do grupo local." #: lib/accountsettingsaction.php:108 msgid "Change your profile settings" @@ -4747,27 +4733,23 @@ msgstr "Navegação primária no site" #. TRANS: Tooltip for main menu option "Personal" #: lib/action.php:430 -#, fuzzy msgctxt "TOOLTIP" msgid "Personal profile and friends timeline" msgstr "Perfil pessoal e fluxo de mensagens dos amigos" #: lib/action.php:433 -#, fuzzy msgctxt "MENU" msgid "Personal" msgstr "Pessoal" #. TRANS: Tooltip for main menu option "Account" #: lib/action.php:435 -#, fuzzy msgctxt "TOOLTIP" msgid "Change your email, avatar, password, profile" -msgstr "Mude seu e-mail, avatar, senha, perfil" +msgstr "Altere seu e-mail, avatar, senha, perfil" #. TRANS: Tooltip for main menu option "Services" #: lib/action.php:440 -#, fuzzy msgctxt "TOOLTIP" msgid "Connect to services" msgstr "Conecte-se a outros serviços" @@ -4778,16 +4760,14 @@ msgstr "Conectar" #. TRANS: Tooltip for menu option "Admin" #: lib/action.php:446 -#, fuzzy msgctxt "TOOLTIP" msgid "Change site configuration" -msgstr "Mude as configurações do site" +msgstr "Altere as configurações do site" #: lib/action.php:449 -#, fuzzy msgctxt "MENU" msgid "Admin" -msgstr "Admin" +msgstr "Administrar" #. TRANS: Tooltip for main menu option "Invite" #: lib/action.php:453 @@ -4979,22 +4959,22 @@ msgstr "Próximo" msgid "Before" msgstr "Anterior" -#: lib/activity.php:453 +#: lib/activity.php:120 +msgid "Expecting a root feed element but got a whole XML document." +msgstr "" + +#: lib/activityutils.php:208 msgid "Can't handle remote content yet." msgstr "" -#: lib/activity.php:481 +#: lib/activityutils.php:236 msgid "Can't handle embedded XML content yet." msgstr "" -#: lib/activity.php:485 +#: lib/activityutils.php:240 msgid "Can't handle embedded Base64 content yet." msgstr "" -#: lib/activity.php:1089 -msgid "Expecting a root feed element but got a whole XML document." -msgstr "" - #. TRANS: Client error message #: lib/adminpanelaction.php:98 msgid "You cannot make changes to this site." @@ -5214,9 +5194,9 @@ msgid "Could not find a user with nickname %s" msgstr "Não foi possível encontrar um usuário com a identificação %s" #: lib/command.php:143 -#, fuzzy, php-format +#, php-format msgid "Could not find a local user with nickname %s" -msgstr "Não foi possível encontrar um usuário com a identificação %s" +msgstr "Não foi possível encontrar um usuário local com a identificação %s" #: lib/command.php:176 msgid "Sorry, this command is not yet implemented." @@ -5296,6 +5276,8 @@ msgid "" "%s is a remote profile; you can only send direct messages to users on the " "same server." msgstr "" +"%s é um perfil remoto; você pode só pode enviar mensagens diretas para " +"usuários do mesmo servidor." #: lib/command.php:450 #, php-format @@ -5349,9 +5331,8 @@ msgid "Specify the name of the user to subscribe to" msgstr "Especifique o nome do usuário que será assinado" #: lib/command.php:602 -#, fuzzy msgid "Can't subscribe to OMB profiles by command." -msgstr "Você não está assinando esse perfil." +msgstr "Não é possível assinar perfis OMB com comandos." #: lib/command.php:608 #, php-format @@ -5399,7 +5380,7 @@ msgstr "" "s" #: lib/command.php:735 -#, fuzzy, php-format +#, php-format msgid "Unsubscribed %s" msgstr "Cancelada a assinatura de %s" @@ -5434,7 +5415,6 @@ msgstr[0] "Você é membro deste grupo:" msgstr[1] "Você é membro destes grupos:" #: lib/command.php:812 -#, fuzzy msgid "" "Commands:\n" "on - turn on notifications\n" @@ -5485,8 +5465,9 @@ msgstr "" "subscribers - lista as pessoas que seguem você\n" "leave - deixa de assinar o usuário\n" "d - mensagem direta para o usuário\n" -"get - obtém a última mensagem do usuário\n" -"whois - obtém as informações do perfil do usuário\n" +"get - obtém a última mensagem do usuário\n" +"whois - obtém as informações do perfil do usuário\n" +"lose - obriga o usuário a deixar de segui-lo\n" "fav - adiciona a último mensagem do usuário como uma " "'favorita'\n" "fav # - adiciona a mensagem identificada como 'favorita'\n" @@ -5514,19 +5495,19 @@ msgstr "" "tracks - não implementado ainda\n" "tracking - não implementado ainda\n" -#: lib/common.php:136 +#: lib/common.php:135 msgid "No configuration file found. " msgstr "Não foi encontrado nenhum arquivo de configuração. " -#: lib/common.php:137 +#: lib/common.php:136 msgid "I looked for configuration files in the following places: " msgstr "Eu procurei pelos arquivos de configuração nos seguintes lugares: " -#: lib/common.php:139 +#: lib/common.php:138 msgid "You may wish to run the installer to fix this." msgstr "Você pode querer executar o instalador para corrigir isto." -#: lib/common.php:140 +#: lib/common.php:139 msgid "Go to the installer." msgstr "Ir para o instalador." @@ -5627,7 +5608,7 @@ msgstr "Ir" #: lib/grantroleform.php:91 #, php-format msgid "Grant this user the \"%s\" role" -msgstr "" +msgstr "Associa o papel \"%s\" a este usuário" #: lib/groupeditform.php:163 msgid "URL of the homepage or blog of the group or topic" @@ -5704,40 +5685,40 @@ msgstr "Etiquetas nas mensagens do grupo %s" msgid "This page is not available in a media type you accept" msgstr "Esta página não está disponível em um tipo de mídia que você aceita" -#: lib/imagefile.php:74 +#: lib/imagefile.php:72 msgid "Unsupported image file format." msgstr "Formato de imagem não suportado." -#: lib/imagefile.php:90 +#: lib/imagefile.php:88 #, php-format msgid "That file is too big. The maximum file size is %s." msgstr "O arquivo é muito grande. O tamanho máximo é de %s." -#: lib/imagefile.php:95 +#: lib/imagefile.php:93 msgid "Partial upload." msgstr "Envio parcial." -#: lib/imagefile.php:103 lib/mediafile.php:170 +#: lib/imagefile.php:101 lib/mediafile.php:170 msgid "System error uploading file." msgstr "Erro no sistema durante o envio do arquivo." -#: lib/imagefile.php:111 +#: lib/imagefile.php:109 msgid "Not an image or corrupt file." msgstr "Imagem inválida ou arquivo corrompido." -#: lib/imagefile.php:124 +#: lib/imagefile.php:122 msgid "Lost our file." msgstr "Nosso arquivo foi perdido." -#: lib/imagefile.php:168 lib/imagefile.php:233 +#: lib/imagefile.php:163 lib/imagefile.php:224 msgid "Unknown file type" msgstr "Tipo de arquivo desconhecido" -#: lib/imagefile.php:253 +#: lib/imagefile.php:244 msgid "MB" msgstr "Mb" -#: lib/imagefile.php:255 +#: lib/imagefile.php:246 msgid "kB" msgstr "Kb" @@ -6273,7 +6254,7 @@ msgstr "Etiquetas nas mensagens de %s" msgid "Unknown" msgstr "Desconhecido" -#: lib/profileaction.php:109 lib/profileaction.php:194 lib/subgroupnav.php:82 +#: lib/profileaction.php:109 lib/profileaction.php:200 lib/subgroupnav.php:82 msgid "Subscriptions" msgstr "Assinaturas" @@ -6281,7 +6262,7 @@ msgstr "Assinaturas" msgid "All subscriptions" msgstr "Todas as assinaturas" -#: lib/profileaction.php:142 lib/profileaction.php:203 lib/subgroupnav.php:90 +#: lib/profileaction.php:142 lib/profileaction.php:209 lib/subgroupnav.php:90 msgid "Subscribers" msgstr "Assinantes" @@ -6289,15 +6270,20 @@ msgstr "Assinantes" msgid "All subscribers" msgstr "Todos os assinantes" -#: lib/profileaction.php:180 +#: lib/profileaction.php:186 msgid "User ID" msgstr "ID do usuário" -#: lib/profileaction.php:185 +#: lib/profileaction.php:191 msgid "Member since" msgstr "Membro desde" -#: lib/profileaction.php:247 +#. TRANS: Average count of posts made per day since account registration +#: lib/profileaction.php:230 +msgid "Daily average" +msgstr "" + +#: lib/profileaction.php:259 msgid "All groups" msgstr "Todos os grupos" @@ -6338,9 +6324,9 @@ msgid "Repeat this notice" msgstr "Repetir esta mensagem" #: lib/revokeroleform.php:91 -#, fuzzy, php-format +#, php-format msgid "Revoke the \"%s\" role from this user" -msgstr "Bloquear este usuário neste grupo" +msgstr "Revoga o papel \"%s\" deste usuário" #: lib/router.php:677 msgid "No single user defined for single-user mode." @@ -6468,6 +6454,11 @@ msgstr "Cancelar a assinatura deste usuário" msgid "Unsubscribe" msgstr "Cancelar" +#: lib/usernoprofileexception.php:58 +#, fuzzy, php-format +msgid "User %s (%d) has no profile record." +msgstr "O usuário não tem perfil." + #: lib/userprofile.php:117 msgid "Edit Avatar" msgstr "Editar o avatar" @@ -6478,7 +6469,7 @@ msgstr "Ações do usuário" #: lib/userprofile.php:237 msgid "User deletion in progress..." -msgstr "" +msgstr "Exclusão do usuário em andamento..." #: lib/userprofile.php:263 msgid "Edit profile settings" @@ -6501,9 +6492,8 @@ msgid "Moderate" msgstr "Moderar" #: lib/userprofile.php:364 -#, fuzzy msgid "User role" -msgstr "Perfil do usuário" +msgstr "Papel do usuário" #: lib/userprofile.php:366 msgctxt "role" @@ -6511,10 +6501,9 @@ msgid "Administrator" msgstr "Administrador" #: lib/userprofile.php:367 -#, fuzzy msgctxt "role" msgid "Moderator" -msgstr "Moderar" +msgstr "Moderador" #: lib/util.php:1046 msgid "a few seconds ago" diff --git a/locale/ru/LC_MESSAGES/statusnet.po b/locale/ru/LC_MESSAGES/statusnet.po index b436d9f1e3..472b3cbbea 100644 --- a/locale/ru/LC_MESSAGES/statusnet.po +++ b/locale/ru/LC_MESSAGES/statusnet.po @@ -12,12 +12,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-03-17 21:39+0000\n" -"PO-Revision-Date: 2010-03-17 21:41:30+0000\n" +"POT-Creation-Date: 2010-03-23 20:09+0000\n" +"PO-Revision-Date: 2010-03-23 20:10: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 (r63880); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.17alpha (r64087); Translate extension (2010-01-16)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: ru\n" "X-Message-Group: out-statusnet\n" @@ -774,23 +774,28 @@ msgstr "Загрузить" msgid "Crop" msgstr "Обрезать" -#: actions/avatarsettings.php:328 +#: actions/avatarsettings.php:305 +#, fuzzy +msgid "No file uploaded." +msgstr "Профиль не определен." + +#: actions/avatarsettings.php:332 msgid "Pick a square area of the image to be your avatar" msgstr "Подберите нужный квадратный участок для вашей аватары" -#: actions/avatarsettings.php:343 actions/grouplogo.php:380 +#: actions/avatarsettings.php:347 actions/grouplogo.php:380 msgid "Lost our file data." msgstr "Потеряна информация о файле." -#: actions/avatarsettings.php:366 +#: actions/avatarsettings.php:370 msgid "Avatar updated." msgstr "Аватара обновлена." -#: actions/avatarsettings.php:369 +#: actions/avatarsettings.php:373 msgid "Failed updating avatar." msgstr "Неудача при обновлении аватары." -#: actions/avatarsettings.php:393 +#: actions/avatarsettings.php:397 msgid "Avatar deleted." msgstr "Аватара удалена." @@ -928,7 +933,7 @@ msgid "Conversation" msgstr "Дискуссия" #: actions/conversation.php:154 lib/mailbox.php:116 lib/noticelist.php:87 -#: lib/profileaction.php:218 lib/searchgroupnav.php:82 +#: lib/profileaction.php:224 lib/searchgroupnav.php:82 msgid "Notices" msgstr "Записи" @@ -1760,7 +1765,7 @@ msgstr "Лента %s" msgid "Updates from members of %1$s on %2$s!" msgstr "Обновления участников %1$s на %2$s!" -#: actions/groups.php:62 lib/profileaction.php:212 lib/profileaction.php:232 +#: actions/groups.php:62 lib/profileaction.php:218 lib/profileaction.php:244 #: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98 msgid "Groups" msgstr "Группы" @@ -3414,7 +3419,7 @@ msgid "Description" msgstr "Описание" #: actions/showapplication.php:192 actions/showgroup.php:439 -#: lib/profileaction.php:176 +#: lib/profileaction.php:182 msgid "Statistics" msgstr "Статистика" @@ -3581,7 +3586,7 @@ msgid "Members" msgstr "Участники" #: actions/showgroup.php:396 lib/profileaction.php:117 -#: lib/profileaction.php:150 lib/profileaction.php:238 lib/section.php:95 +#: lib/profileaction.php:150 lib/profileaction.php:250 lib/section.php:95 #: lib/subscriptionlist.php:126 lib/tagcloudsection.php:71 msgid "(None)" msgstr "(пока ничего нет)" @@ -3765,7 +3770,8 @@ msgid "Unknown language \"%s\"." msgstr "Неизвестный язык «%s»." #: actions/siteadminpanel.php:165 -msgid "Minimum text limit is 140 characters." +#, fuzzy +msgid "Minimum text limit is 0 (unlimited)." msgstr "Минимальное ограничение текста составляет 140 символов." #: actions/siteadminpanel.php:171 @@ -4039,8 +4045,7 @@ msgstr "Сохранить настройки снимка" msgid "You are not subscribed to that profile." msgstr "Вы не подписаны на этот профиль." -#: actions/subedit.php:83 classes/Subscription.php:89 -#: classes/Subscription.php:116 +#: actions/subedit.php:83 classes/Subscription.php:132 msgid "Could not save subscription." msgstr "Не удаётся сохранить подписку." @@ -4623,35 +4628,35 @@ msgstr "Проблемы с сохранением входящих сообще msgid "RT @%1$s %2$s" msgstr "RT @%1$s %2$s" -#: classes/Subscription.php:66 lib/oauthstore.php:465 +#: classes/Subscription.php:74 lib/oauthstore.php:465 msgid "You have been banned from subscribing." msgstr "Вы заблокированы от подписки." -#: classes/Subscription.php:70 +#: classes/Subscription.php:78 msgid "Already subscribed!" msgstr "Уже подписаны!" -#: classes/Subscription.php:74 +#: classes/Subscription.php:82 msgid "User has blocked you." msgstr "Пользователь заблокировал Вас." -#: classes/Subscription.php:157 +#: classes/Subscription.php:167 msgid "Not subscribed!" msgstr "Не подписаны!" -#: classes/Subscription.php:163 +#: classes/Subscription.php:173 msgid "Couldn't delete self-subscription." msgstr "Невозможно удалить самоподписку." -#: classes/Subscription.php:190 +#: classes/Subscription.php:200 msgid "Couldn't delete subscription OMB token." msgstr "Не удаётся удалить подписочный жетон OMB." -#: classes/Subscription.php:201 +#: classes/Subscription.php:211 msgid "Couldn't delete subscription." msgstr "Не удаётся удалить подписку." -#: classes/User.php:378 +#: classes/User.php:363 #, php-format msgid "Welcome to %1$s, @%2$s!" msgstr "Добро пожаловать на %1$s, @%2$s!" @@ -4939,22 +4944,22 @@ msgstr "Сюда" msgid "Before" msgstr "Туда" -#: lib/activity.php:453 +#: lib/activity.php:120 +msgid "Expecting a root feed element but got a whole XML document." +msgstr "Ожидался корневой элемент потока, а получен XML-документ целиком." + +#: lib/activityutils.php:208 msgid "Can't handle remote content yet." msgstr "Пока ещё нельзя обрабатывать удалённое содержимое." -#: lib/activity.php:481 +#: lib/activityutils.php:236 msgid "Can't handle embedded XML content yet." msgstr "Пока ещё нельзя обрабатывать встроенный XML." -#: lib/activity.php:485 +#: lib/activityutils.php:240 msgid "Can't handle embedded Base64 content yet." msgstr "Пока ещё нельзя обрабатывать встроенное содержание Base64." -#: lib/activity.php:1089 -msgid "Expecting a root feed element but got a whole XML document." -msgstr "" - #. TRANS: Client error message #: lib/adminpanelaction.php:98 msgid "You cannot make changes to this site." @@ -5469,19 +5474,19 @@ msgstr "" "tracks — пока не реализовано.\n" "tracking — пока не реализовано.\n" -#: lib/common.php:136 +#: lib/common.php:135 msgid "No configuration file found. " msgstr "Конфигурационный файл не найден. " -#: lib/common.php:137 +#: lib/common.php:136 msgid "I looked for configuration files in the following places: " msgstr "Конфигурационные файлы искались в следующих местах: " -#: lib/common.php:139 +#: lib/common.php:138 msgid "You may wish to run the installer to fix this." msgstr "Возможно, вы решите запустить установщик для исправления этого." -#: lib/common.php:140 +#: lib/common.php:139 msgid "Go to the installer." msgstr "Перейти к установщику" @@ -5659,40 +5664,40 @@ msgstr "Теги записей группы %s" msgid "This page is not available in a media type you accept" msgstr "Страница недоступна для того типа, который Вы задействовали." -#: lib/imagefile.php:74 +#: lib/imagefile.php:72 msgid "Unsupported image file format." msgstr "Неподдерживаемый формат файла изображения." -#: lib/imagefile.php:90 +#: lib/imagefile.php:88 #, php-format msgid "That file is too big. The maximum file size is %s." msgstr "Этот файл слишком большой. Максимальный размер файла составляет %s." -#: lib/imagefile.php:95 +#: lib/imagefile.php:93 msgid "Partial upload." msgstr "Частичная загрузка." -#: lib/imagefile.php:103 lib/mediafile.php:170 +#: lib/imagefile.php:101 lib/mediafile.php:170 msgid "System error uploading file." msgstr "Системная ошибка при загрузке файла." -#: lib/imagefile.php:111 +#: lib/imagefile.php:109 msgid "Not an image or corrupt file." msgstr "Не является изображением или повреждённый файл." -#: lib/imagefile.php:124 +#: lib/imagefile.php:122 msgid "Lost our file." msgstr "Потерян файл." -#: lib/imagefile.php:168 lib/imagefile.php:233 +#: lib/imagefile.php:163 lib/imagefile.php:224 msgid "Unknown file type" msgstr "Неподдерживаемый тип файла" -#: lib/imagefile.php:253 +#: lib/imagefile.php:244 msgid "MB" msgstr "МБ" -#: lib/imagefile.php:255 +#: lib/imagefile.php:246 msgid "kB" msgstr "КБ" @@ -6226,7 +6231,7 @@ msgstr "Теги записей пользователя %s" msgid "Unknown" msgstr "Неизвестно" -#: lib/profileaction.php:109 lib/profileaction.php:194 lib/subgroupnav.php:82 +#: lib/profileaction.php:109 lib/profileaction.php:200 lib/subgroupnav.php:82 msgid "Subscriptions" msgstr "Подписки" @@ -6234,7 +6239,7 @@ msgstr "Подписки" msgid "All subscriptions" msgstr "Все подписки." -#: lib/profileaction.php:142 lib/profileaction.php:203 lib/subgroupnav.php:90 +#: lib/profileaction.php:142 lib/profileaction.php:209 lib/subgroupnav.php:90 msgid "Subscribers" msgstr "Подписчики" @@ -6242,15 +6247,20 @@ msgstr "Подписчики" msgid "All subscribers" msgstr "Все подписчики" -#: lib/profileaction.php:180 +#: lib/profileaction.php:186 msgid "User ID" msgstr "ID пользователя" -#: lib/profileaction.php:185 +#: lib/profileaction.php:191 msgid "Member since" msgstr "Регистрация" -#: lib/profileaction.php:247 +#. TRANS: Average count of posts made per day since account registration +#: lib/profileaction.php:230 +msgid "Daily average" +msgstr "" + +#: lib/profileaction.php:259 msgid "All groups" msgstr "Все группы" @@ -6421,6 +6431,11 @@ msgstr "Отписаться от этого пользователя" msgid "Unsubscribe" msgstr "Отписаться" +#: lib/usernoprofileexception.php:58 +#, fuzzy, php-format +msgid "User %s (%d) has no profile record." +msgstr "У пользователя нет профиля." + #: lib/userprofile.php:117 msgid "Edit Avatar" msgstr "Изменить аватару" @@ -6431,7 +6446,7 @@ msgstr "Действия пользователя" #: lib/userprofile.php:237 msgid "User deletion in progress..." -msgstr "" +msgstr "Идёт удаление пользователя…" #: lib/userprofile.php:263 msgid "Edit profile settings" diff --git a/locale/statusnet.po b/locale/statusnet.po index eccc291e20..f8d6ea29cb 100644 --- a/locale/statusnet.po +++ b/locale/statusnet.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-03-17 21:39+0000\n" +"POT-Creation-Date: 2010-03-23 20:09+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -744,23 +744,27 @@ msgstr "" msgid "Crop" msgstr "" -#: actions/avatarsettings.php:328 +#: actions/avatarsettings.php:305 +msgid "No file uploaded." +msgstr "" + +#: actions/avatarsettings.php:332 msgid "Pick a square area of the image to be your avatar" msgstr "" -#: actions/avatarsettings.php:343 actions/grouplogo.php:380 +#: actions/avatarsettings.php:347 actions/grouplogo.php:380 msgid "Lost our file data." msgstr "" -#: actions/avatarsettings.php:366 +#: actions/avatarsettings.php:370 msgid "Avatar updated." msgstr "" -#: actions/avatarsettings.php:369 +#: actions/avatarsettings.php:373 msgid "Failed updating avatar." msgstr "" -#: actions/avatarsettings.php:393 +#: actions/avatarsettings.php:397 msgid "Avatar deleted." msgstr "" @@ -895,7 +899,7 @@ msgid "Conversation" msgstr "" #: actions/conversation.php:154 lib/mailbox.php:116 lib/noticelist.php:87 -#: lib/profileaction.php:218 lib/searchgroupnav.php:82 +#: lib/profileaction.php:224 lib/searchgroupnav.php:82 msgid "Notices" msgstr "" @@ -1690,7 +1694,7 @@ msgstr "" msgid "Updates from members of %1$s on %2$s!" msgstr "" -#: actions/groups.php:62 lib/profileaction.php:212 lib/profileaction.php:232 +#: actions/groups.php:62 lib/profileaction.php:218 lib/profileaction.php:244 #: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98 msgid "Groups" msgstr "" @@ -3216,7 +3220,7 @@ msgid "Description" msgstr "" #: actions/showapplication.php:192 actions/showgroup.php:439 -#: lib/profileaction.php:176 +#: lib/profileaction.php:182 msgid "Statistics" msgstr "" @@ -3373,7 +3377,7 @@ msgid "Members" msgstr "" #: actions/showgroup.php:396 lib/profileaction.php:117 -#: lib/profileaction.php:150 lib/profileaction.php:238 lib/section.php:95 +#: lib/profileaction.php:150 lib/profileaction.php:250 lib/section.php:95 #: lib/subscriptionlist.php:126 lib/tagcloudsection.php:71 msgid "(None)" msgstr "" @@ -3532,7 +3536,7 @@ msgid "Unknown language \"%s\"." msgstr "" #: actions/siteadminpanel.php:165 -msgid "Minimum text limit is 140 characters." +msgid "Minimum text limit is 0 (unlimited)." msgstr "" #: actions/siteadminpanel.php:171 @@ -3793,8 +3797,7 @@ msgstr "" msgid "You are not subscribed to that profile." msgstr "" -#: actions/subedit.php:83 classes/Subscription.php:89 -#: classes/Subscription.php:116 +#: actions/subedit.php:83 classes/Subscription.php:132 msgid "Could not save subscription." msgstr "" @@ -4330,35 +4333,35 @@ msgstr "" msgid "RT @%1$s %2$s" msgstr "" -#: classes/Subscription.php:66 lib/oauthstore.php:465 +#: classes/Subscription.php:74 lib/oauthstore.php:465 msgid "You have been banned from subscribing." msgstr "" -#: classes/Subscription.php:70 +#: classes/Subscription.php:78 msgid "Already subscribed!" msgstr "" -#: classes/Subscription.php:74 +#: classes/Subscription.php:82 msgid "User has blocked you." msgstr "" -#: classes/Subscription.php:157 +#: classes/Subscription.php:167 msgid "Not subscribed!" msgstr "" -#: classes/Subscription.php:163 +#: classes/Subscription.php:173 msgid "Couldn't delete self-subscription." msgstr "" -#: classes/Subscription.php:190 +#: classes/Subscription.php:200 msgid "Couldn't delete subscription OMB token." msgstr "" -#: classes/Subscription.php:201 +#: classes/Subscription.php:211 msgid "Couldn't delete subscription." msgstr "" -#: classes/User.php:378 +#: classes/User.php:363 #, php-format msgid "Welcome to %1$s, @%2$s!" msgstr "" @@ -4637,22 +4640,22 @@ msgstr "" msgid "Before" msgstr "" -#: lib/activity.php:453 +#: lib/activity.php:120 +msgid "Expecting a root feed element but got a whole XML document." +msgstr "" + +#: lib/activityutils.php:208 msgid "Can't handle remote content yet." msgstr "" -#: lib/activity.php:481 +#: lib/activityutils.php:236 msgid "Can't handle embedded XML content yet." msgstr "" -#: lib/activity.php:485 +#: lib/activityutils.php:240 msgid "Can't handle embedded Base64 content yet." msgstr "" -#: lib/activity.php:1089 -msgid "Expecting a root feed element but got a whole XML document." -msgstr "" - #. TRANS: Client error message #: lib/adminpanelaction.php:98 msgid "You cannot make changes to this site." @@ -5116,19 +5119,19 @@ msgid "" "tracking - not yet implemented.\n" msgstr "" -#: lib/common.php:136 +#: lib/common.php:135 msgid "No configuration file found. " msgstr "" -#: lib/common.php:137 +#: lib/common.php:136 msgid "I looked for configuration files in the following places: " msgstr "" -#: lib/common.php:139 +#: lib/common.php:138 msgid "You may wish to run the installer to fix this." msgstr "" -#: lib/common.php:140 +#: lib/common.php:139 msgid "Go to the installer." msgstr "" @@ -5302,40 +5305,40 @@ msgstr "" msgid "This page is not available in a media type you accept" msgstr "" -#: lib/imagefile.php:74 +#: lib/imagefile.php:72 msgid "Unsupported image file format." msgstr "" -#: lib/imagefile.php:90 +#: lib/imagefile.php:88 #, php-format msgid "That file is too big. The maximum file size is %s." msgstr "" -#: lib/imagefile.php:95 +#: lib/imagefile.php:93 msgid "Partial upload." msgstr "" -#: lib/imagefile.php:103 lib/mediafile.php:170 +#: lib/imagefile.php:101 lib/mediafile.php:170 msgid "System error uploading file." msgstr "" -#: lib/imagefile.php:111 +#: lib/imagefile.php:109 msgid "Not an image or corrupt file." msgstr "" -#: lib/imagefile.php:124 +#: lib/imagefile.php:122 msgid "Lost our file." msgstr "" -#: lib/imagefile.php:168 lib/imagefile.php:233 +#: lib/imagefile.php:163 lib/imagefile.php:224 msgid "Unknown file type" msgstr "" -#: lib/imagefile.php:253 +#: lib/imagefile.php:244 msgid "MB" msgstr "" -#: lib/imagefile.php:255 +#: lib/imagefile.php:246 msgid "kB" msgstr "" @@ -5778,7 +5781,7 @@ msgstr "" msgid "Unknown" msgstr "" -#: lib/profileaction.php:109 lib/profileaction.php:194 lib/subgroupnav.php:82 +#: lib/profileaction.php:109 lib/profileaction.php:200 lib/subgroupnav.php:82 msgid "Subscriptions" msgstr "" @@ -5786,7 +5789,7 @@ msgstr "" msgid "All subscriptions" msgstr "" -#: lib/profileaction.php:142 lib/profileaction.php:203 lib/subgroupnav.php:90 +#: lib/profileaction.php:142 lib/profileaction.php:209 lib/subgroupnav.php:90 msgid "Subscribers" msgstr "" @@ -5794,15 +5797,20 @@ msgstr "" msgid "All subscribers" msgstr "" -#: lib/profileaction.php:180 +#: lib/profileaction.php:186 msgid "User ID" msgstr "" -#: lib/profileaction.php:185 +#: lib/profileaction.php:191 msgid "Member since" msgstr "" -#: lib/profileaction.php:247 +#. TRANS: Average count of posts made per day since account registration +#: lib/profileaction.php:230 +msgid "Daily average" +msgstr "" + +#: lib/profileaction.php:259 msgid "All groups" msgstr "" @@ -5973,6 +5981,11 @@ msgstr "" msgid "Unsubscribe" msgstr "" +#: lib/usernoprofileexception.php:58 +#, php-format +msgid "User %s (%d) has no profile record." +msgstr "" + #: lib/userprofile.php:117 msgid "Edit Avatar" msgstr "" diff --git a/locale/sv/LC_MESSAGES/statusnet.po b/locale/sv/LC_MESSAGES/statusnet.po index eee7b6d722..681dfedce4 100644 --- a/locale/sv/LC_MESSAGES/statusnet.po +++ b/locale/sv/LC_MESSAGES/statusnet.po @@ -9,12 +9,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-03-17 21:39+0000\n" -"PO-Revision-Date: 2010-03-17 21:41:33+0000\n" +"POT-Creation-Date: 2010-03-23 20:09+0000\n" +"PO-Revision-Date: 2010-03-23 20:11: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 (r63880); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.17alpha (r64087); Translate extension (2010-01-16)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: sv\n" "X-Message-Group: out-statusnet\n" @@ -762,23 +762,28 @@ msgstr "Ladda upp" msgid "Crop" msgstr "Beskär" -#: actions/avatarsettings.php:328 +#: actions/avatarsettings.php:305 +#, fuzzy +msgid "No file uploaded." +msgstr "Ingen profil angiven." + +#: actions/avatarsettings.php:332 msgid "Pick a square area of the image to be your avatar" msgstr "Välj ett kvadratiskt område i bilden som din avatar" -#: actions/avatarsettings.php:343 actions/grouplogo.php:380 +#: actions/avatarsettings.php:347 actions/grouplogo.php:380 msgid "Lost our file data." msgstr "Förlorade vår fildata." -#: actions/avatarsettings.php:366 +#: actions/avatarsettings.php:370 msgid "Avatar updated." msgstr "Avatar uppdaterad." -#: actions/avatarsettings.php:369 +#: actions/avatarsettings.php:373 msgid "Failed updating avatar." msgstr "Misslyckades uppdatera avatar." -#: actions/avatarsettings.php:393 +#: actions/avatarsettings.php:397 msgid "Avatar deleted." msgstr "Avatar borttagen." @@ -917,7 +922,7 @@ msgid "Conversation" msgstr "Konversationer" #: actions/conversation.php:154 lib/mailbox.php:116 lib/noticelist.php:87 -#: lib/profileaction.php:218 lib/searchgroupnav.php:82 +#: lib/profileaction.php:224 lib/searchgroupnav.php:82 msgid "Notices" msgstr "Notiser" @@ -1739,7 +1744,7 @@ msgstr "%s tidslinje" msgid "Updates from members of %1$s on %2$s!" msgstr "Uppdateringar från medlemmar i %1$s på %2$s!" -#: actions/groups.php:62 lib/profileaction.php:212 lib/profileaction.php:232 +#: actions/groups.php:62 lib/profileaction.php:218 lib/profileaction.php:244 #: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98 msgid "Groups" msgstr "Grupper" @@ -3398,7 +3403,7 @@ msgid "Description" msgstr "Beskrivning" #: actions/showapplication.php:192 actions/showgroup.php:439 -#: lib/profileaction.php:176 +#: lib/profileaction.php:182 msgid "Statistics" msgstr "Statistik" @@ -3566,7 +3571,7 @@ msgid "Members" msgstr "Medlemmar" #: actions/showgroup.php:396 lib/profileaction.php:117 -#: lib/profileaction.php:150 lib/profileaction.php:238 lib/section.php:95 +#: lib/profileaction.php:150 lib/profileaction.php:250 lib/section.php:95 #: lib/subscriptionlist.php:126 lib/tagcloudsection.php:71 msgid "(None)" msgstr "(Ingen)" @@ -3745,7 +3750,8 @@ msgid "Unknown language \"%s\"." msgstr "Okänt språk \"%s\"." #: actions/siteadminpanel.php:165 -msgid "Minimum text limit is 140 characters." +#, fuzzy +msgid "Minimum text limit is 0 (unlimited)." msgstr "Minsta textbegränsning är 140 tecken." #: actions/siteadminpanel.php:171 @@ -4016,8 +4022,7 @@ msgstr "Spara inställningar för ögonblicksbild" msgid "You are not subscribed to that profile." msgstr "Du är inte prenumerat hos den profilen." -#: actions/subedit.php:83 classes/Subscription.php:89 -#: classes/Subscription.php:116 +#: actions/subedit.php:83 classes/Subscription.php:132 msgid "Could not save subscription." msgstr "Kunde inte spara prenumeration." @@ -4601,35 +4606,35 @@ msgstr "Problem med att spara gruppinkorg." msgid "RT @%1$s %2$s" msgstr "RT @%1$s %2$s" -#: classes/Subscription.php:66 lib/oauthstore.php:465 +#: classes/Subscription.php:74 lib/oauthstore.php:465 msgid "You have been banned from subscribing." msgstr "Du har blivit utestängd från att prenumerera." -#: classes/Subscription.php:70 +#: classes/Subscription.php:78 msgid "Already subscribed!" msgstr "Redan prenumerant!" -#: classes/Subscription.php:74 +#: classes/Subscription.php:82 msgid "User has blocked you." msgstr "Användaren har blockerat dig." -#: classes/Subscription.php:157 +#: classes/Subscription.php:167 msgid "Not subscribed!" msgstr "Inte prenumerant!" -#: classes/Subscription.php:163 +#: classes/Subscription.php:173 msgid "Couldn't delete self-subscription." msgstr "Kunde inte ta bort själv-prenumeration." -#: classes/Subscription.php:190 +#: classes/Subscription.php:200 msgid "Couldn't delete subscription OMB token." msgstr "Kunde inte radera OMB prenumerations-token." -#: classes/Subscription.php:201 +#: classes/Subscription.php:211 msgid "Couldn't delete subscription." msgstr "Kunde inte ta bort prenumeration." -#: classes/User.php:378 +#: classes/User.php:363 #, php-format msgid "Welcome to %1$s, @%2$s!" msgstr "Välkommen till %1$s, @%2$s!" @@ -4914,22 +4919,22 @@ msgstr "Senare" msgid "Before" msgstr "Tidigare" -#: lib/activity.php:453 +#: lib/activity.php:120 +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." + +#: lib/activityutils.php:208 msgid "Can't handle remote content yet." msgstr "Kan inte hantera fjärrinnehåll ännu." -#: lib/activity.php:481 +#: lib/activityutils.php:236 msgid "Can't handle embedded XML content yet." msgstr "Kan inte hantera inbäddat XML-innehåll ännu." -#: lib/activity.php:485 +#: lib/activityutils.php:240 msgid "Can't handle embedded Base64 content yet." msgstr "Kan inte hantera inbäddat Base64-innehåll ännu." -#: lib/activity.php:1089 -msgid "Expecting a root feed element but got a whole XML document." -msgstr "" - #. TRANS: Client error message #: lib/adminpanelaction.php:98 msgid "You cannot make changes to this site." @@ -5441,19 +5446,19 @@ msgstr "" "tracks - inte implementerat än.\n" "tracking - inte implementerat än.\n" -#: lib/common.php:136 +#: lib/common.php:135 msgid "No configuration file found. " msgstr "Ingen konfigurationsfil hittades. " -#: lib/common.php:137 +#: lib/common.php:136 msgid "I looked for configuration files in the following places: " msgstr "Jag letade efter konfigurationsfiler på följande platser: " -#: lib/common.php:139 +#: lib/common.php:138 msgid "You may wish to run the installer to fix this." msgstr "Du kanske vill köra installeraren för att åtgärda detta." -#: lib/common.php:140 +#: lib/common.php:139 msgid "Go to the installer." msgstr "Gå till installeraren." @@ -5629,40 +5634,40 @@ msgstr "Taggar i %s grupps notiser" msgid "This page is not available in a media type you accept" msgstr "Denna sida är inte tillgänglig i den mediatyp du accepterat" -#: lib/imagefile.php:74 +#: lib/imagefile.php:72 msgid "Unsupported image file format." msgstr "Bildfilens format stödjs inte." -#: lib/imagefile.php:90 +#: lib/imagefile.php:88 #, php-format msgid "That file is too big. The maximum file size is %s." msgstr "Denna fil är för stor. Den maximala filstorleken är %s." -#: lib/imagefile.php:95 +#: lib/imagefile.php:93 msgid "Partial upload." msgstr "Bitvis uppladdad." -#: lib/imagefile.php:103 lib/mediafile.php:170 +#: lib/imagefile.php:101 lib/mediafile.php:170 msgid "System error uploading file." msgstr "Systemfel vid uppladdning av fil." -#: lib/imagefile.php:111 +#: lib/imagefile.php:109 msgid "Not an image or corrupt file." msgstr "Inte en bildfil eller så är filen korrupt." -#: lib/imagefile.php:124 +#: lib/imagefile.php:122 msgid "Lost our file." msgstr "Förlorade vår fil." -#: lib/imagefile.php:168 lib/imagefile.php:233 +#: lib/imagefile.php:163 lib/imagefile.php:224 msgid "Unknown file type" msgstr "Okänd filtyp" -#: lib/imagefile.php:253 +#: lib/imagefile.php:244 msgid "MB" msgstr "MB" -#: lib/imagefile.php:255 +#: lib/imagefile.php:246 msgid "kB" msgstr "kB" @@ -6196,7 +6201,7 @@ msgstr "Taggar i %ss notiser" msgid "Unknown" msgstr "Okänd" -#: lib/profileaction.php:109 lib/profileaction.php:194 lib/subgroupnav.php:82 +#: lib/profileaction.php:109 lib/profileaction.php:200 lib/subgroupnav.php:82 msgid "Subscriptions" msgstr "Prenumerationer" @@ -6204,7 +6209,7 @@ msgstr "Prenumerationer" msgid "All subscriptions" msgstr "Alla prenumerationer" -#: lib/profileaction.php:142 lib/profileaction.php:203 lib/subgroupnav.php:90 +#: lib/profileaction.php:142 lib/profileaction.php:209 lib/subgroupnav.php:90 msgid "Subscribers" msgstr "Prenumeranter" @@ -6212,15 +6217,20 @@ msgstr "Prenumeranter" msgid "All subscribers" msgstr "Alla prenumeranter" -#: lib/profileaction.php:180 +#: lib/profileaction.php:186 msgid "User ID" msgstr "Användar-ID" -#: lib/profileaction.php:185 +#: lib/profileaction.php:191 msgid "Member since" msgstr "Medlem sedan" -#: lib/profileaction.php:247 +#. TRANS: Average count of posts made per day since account registration +#: lib/profileaction.php:230 +msgid "Daily average" +msgstr "" + +#: lib/profileaction.php:259 msgid "All groups" msgstr "Alla grupper" @@ -6391,6 +6401,11 @@ msgstr "Avsluta prenumerationen på denna användare" msgid "Unsubscribe" msgstr "Avsluta pren." +#: lib/usernoprofileexception.php:58 +#, fuzzy, php-format +msgid "User %s (%d) has no profile record." +msgstr "Användaren har ingen profil." + #: lib/userprofile.php:117 msgid "Edit Avatar" msgstr "Redigera avatar" @@ -6401,7 +6416,7 @@ msgstr "Åtgärder för användare" #: lib/userprofile.php:237 msgid "User deletion in progress..." -msgstr "" +msgstr "Borttagning av användare pågår..." #: lib/userprofile.php:263 msgid "Edit profile settings" diff --git a/locale/te/LC_MESSAGES/statusnet.po b/locale/te/LC_MESSAGES/statusnet.po index 091dd8fda0..270bf68850 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-03-17 21:39+0000\n" -"PO-Revision-Date: 2010-03-17 21:41:36+0000\n" +"POT-Creation-Date: 2010-03-23 20:09+0000\n" +"PO-Revision-Date: 2010-03-23 20:11: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 (r63880); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.17alpha (r64087); Translate extension (2010-01-16)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: te\n" "X-Message-Group: out-statusnet\n" @@ -758,23 +758,28 @@ msgstr "ఎగుమతించు" msgid "Crop" msgstr "కత్తిరించు" -#: actions/avatarsettings.php:328 +#: actions/avatarsettings.php:305 +#, fuzzy +msgid "No file uploaded." +msgstr "పాక్షిక ఎగుమతి." + +#: actions/avatarsettings.php:332 msgid "Pick a square area of the image to be your avatar" msgstr "మీ అవతారానికి గానూ ఈ చిత్రం నుండి ఒక చతురస్రపు ప్రదేశాన్ని ఎంచుకోండి" -#: actions/avatarsettings.php:343 actions/grouplogo.php:380 +#: actions/avatarsettings.php:347 actions/grouplogo.php:380 msgid "Lost our file data." msgstr "" -#: actions/avatarsettings.php:366 +#: actions/avatarsettings.php:370 msgid "Avatar updated." msgstr "అవతారాన్ని తాజాకరించాం." -#: actions/avatarsettings.php:369 +#: actions/avatarsettings.php:373 msgid "Failed updating avatar." msgstr "అవతారపు తాజాకరణ విఫలమైంది." -#: actions/avatarsettings.php:393 +#: actions/avatarsettings.php:397 msgid "Avatar deleted." msgstr "అవతారాన్ని తొలగించాం." @@ -913,7 +918,7 @@ msgid "Conversation" msgstr "సంభాషణ" #: actions/conversation.php:154 lib/mailbox.php:116 lib/noticelist.php:87 -#: lib/profileaction.php:218 lib/searchgroupnav.php:82 +#: lib/profileaction.php:224 lib/searchgroupnav.php:82 msgid "Notices" msgstr "సందేశాలు" @@ -1722,7 +1727,7 @@ msgstr "%s కాలరేఖ" msgid "Updates from members of %1$s on %2$s!" msgstr "%s యొక్క మైక్రోబ్లాగు" -#: actions/groups.php:62 lib/profileaction.php:212 lib/profileaction.php:232 +#: actions/groups.php:62 lib/profileaction.php:218 lib/profileaction.php:244 #: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98 msgid "Groups" msgstr "గుంపులు" @@ -3316,7 +3321,7 @@ msgid "Description" msgstr "వివరణ" #: actions/showapplication.php:192 actions/showgroup.php:439 -#: lib/profileaction.php:176 +#: lib/profileaction.php:182 msgid "Statistics" msgstr "గణాంకాలు" @@ -3475,7 +3480,7 @@ msgid "Members" msgstr "సభ్యులు" #: actions/showgroup.php:396 lib/profileaction.php:117 -#: lib/profileaction.php:150 lib/profileaction.php:238 lib/section.php:95 +#: lib/profileaction.php:150 lib/profileaction.php:250 lib/section.php:95 #: lib/subscriptionlist.php:126 lib/tagcloudsection.php:71 msgid "(None)" msgstr "(ఏమీలేదు)" @@ -3637,7 +3642,8 @@ msgid "Unknown language \"%s\"." msgstr "గుర్తు తెలియని భాష \"%s\"." #: actions/siteadminpanel.php:165 -msgid "Minimum text limit is 140 characters." +#, fuzzy +msgid "Minimum text limit is 0 (unlimited)." msgstr "కనిష్ఠ పాఠ్య పరిమితి 140 అక్షరాలు." #: actions/siteadminpanel.php:171 @@ -3908,8 +3914,7 @@ msgstr "సైటు అమరికలను భద్రపరచు" msgid "You are not subscribed to that profile." msgstr "" -#: actions/subedit.php:83 classes/Subscription.php:89 -#: classes/Subscription.php:116 +#: actions/subedit.php:83 classes/Subscription.php:132 #, fuzzy msgid "Could not save subscription." msgstr "చందాని సృష్టించలేకపోయాం." @@ -4457,38 +4462,38 @@ msgstr "సందేశాన్ని భద్రపరచడంలో పొ msgid "RT @%1$s %2$s" msgstr "%1$s (%2$s)" -#: classes/Subscription.php:66 lib/oauthstore.php:465 +#: classes/Subscription.php:74 lib/oauthstore.php:465 msgid "You have been banned from subscribing." msgstr "చందాచేరడం నుండి మిమ్మల్ని నిషేధించారు." -#: classes/Subscription.php:70 +#: classes/Subscription.php:78 msgid "Already subscribed!" msgstr "ఇప్పటికే చందాచేరారు!" -#: classes/Subscription.php:74 +#: classes/Subscription.php:82 msgid "User has blocked you." msgstr "వాడుకరి మిమ్మల్ని నిరోధించారు." -#: classes/Subscription.php:157 +#: classes/Subscription.php:167 #, fuzzy msgid "Not subscribed!" msgstr "చందాదార్లు" -#: classes/Subscription.php:163 +#: classes/Subscription.php:173 #, fuzzy msgid "Couldn't delete self-subscription." msgstr "చందాని తొలగించలేకపోయాం." -#: classes/Subscription.php:190 +#: classes/Subscription.php:200 #, fuzzy msgid "Couldn't delete subscription OMB token." msgstr "చందాని తొలగించలేకపోయాం." -#: classes/Subscription.php:201 +#: classes/Subscription.php:211 msgid "Couldn't delete subscription." msgstr "చందాని తొలగించలేకపోయాం." -#: classes/User.php:378 +#: classes/User.php:363 #, php-format msgid "Welcome to %1$s, @%2$s!" msgstr "@%2$s, %1$sకి స్వాగతం!" @@ -4779,22 +4784,22 @@ msgstr "తర్వాత" msgid "Before" msgstr "ఇంతక్రితం" -#: lib/activity.php:453 +#: lib/activity.php:120 +msgid "Expecting a root feed element but got a whole XML document." +msgstr "" + +#: lib/activityutils.php:208 msgid "Can't handle remote content yet." msgstr "" -#: lib/activity.php:481 +#: lib/activityutils.php:236 msgid "Can't handle embedded XML content yet." msgstr "" -#: lib/activity.php:485 +#: lib/activityutils.php:240 msgid "Can't handle embedded Base64 content yet." msgstr "" -#: lib/activity.php:1089 -msgid "Expecting a root feed element but got a whole XML document." -msgstr "" - #. TRANS: Client error message #: lib/adminpanelaction.php:98 msgid "You cannot make changes to this site." @@ -5276,20 +5281,20 @@ msgid "" "tracking - not yet implemented.\n" msgstr "" -#: lib/common.php:136 +#: lib/common.php:135 #, fuzzy msgid "No configuration file found. " msgstr "నిర్ధారణ సంకేతం లేదు." -#: lib/common.php:137 +#: lib/common.php:136 msgid "I looked for configuration files in the following places: " msgstr "" -#: lib/common.php:139 +#: lib/common.php:138 msgid "You may wish to run the installer to fix this." msgstr "" -#: lib/common.php:140 +#: lib/common.php:139 msgid "Go to the installer." msgstr "" @@ -5467,41 +5472,41 @@ msgstr "" msgid "This page is not available in a media type you accept" msgstr "" -#: lib/imagefile.php:74 +#: lib/imagefile.php:72 msgid "Unsupported image file format." msgstr "" -#: lib/imagefile.php:90 +#: lib/imagefile.php:88 #, fuzzy, php-format msgid "That file is too big. The maximum file size is %s." msgstr "ఇది చాలా పొడవుంది. గరిష్ఠ సందేశ పరిమాణం 140 అక్షరాలు." -#: lib/imagefile.php:95 +#: lib/imagefile.php:93 msgid "Partial upload." msgstr "పాక్షిక ఎగుమతి." -#: lib/imagefile.php:103 lib/mediafile.php:170 +#: lib/imagefile.php:101 lib/mediafile.php:170 msgid "System error uploading file." msgstr "" -#: lib/imagefile.php:111 +#: lib/imagefile.php:109 msgid "Not an image or corrupt file." msgstr "బొమ్మ కాదు లేదా పాడైపోయిన ఫైలు." -#: lib/imagefile.php:124 +#: lib/imagefile.php:122 #, fuzzy msgid "Lost our file." msgstr "అటువంటి సందేశమేమీ లేదు." -#: lib/imagefile.php:168 lib/imagefile.php:233 +#: lib/imagefile.php:163 lib/imagefile.php:224 msgid "Unknown file type" msgstr "తెలియని ఫైలు రకం" -#: lib/imagefile.php:253 +#: lib/imagefile.php:244 msgid "MB" msgstr "మెబై" -#: lib/imagefile.php:255 +#: lib/imagefile.php:246 msgid "kB" msgstr "కిబై" @@ -5989,7 +5994,7 @@ msgstr "" msgid "Unknown" msgstr "" -#: lib/profileaction.php:109 lib/profileaction.php:194 lib/subgroupnav.php:82 +#: lib/profileaction.php:109 lib/profileaction.php:200 lib/subgroupnav.php:82 msgid "Subscriptions" msgstr "చందాలు" @@ -5997,7 +6002,7 @@ msgstr "చందాలు" msgid "All subscriptions" msgstr "అన్ని చందాలు" -#: lib/profileaction.php:142 lib/profileaction.php:203 lib/subgroupnav.php:90 +#: lib/profileaction.php:142 lib/profileaction.php:209 lib/subgroupnav.php:90 msgid "Subscribers" msgstr "చందాదార్లు" @@ -6005,15 +6010,20 @@ msgstr "చందాదార్లు" msgid "All subscribers" msgstr "అందరు చందాదార్లు" -#: lib/profileaction.php:180 +#: lib/profileaction.php:186 msgid "User ID" msgstr "వాడుకరి ID" -#: lib/profileaction.php:185 +#: lib/profileaction.php:191 msgid "Member since" msgstr "సభ్యులైన తేదీ" -#: lib/profileaction.php:247 +#. TRANS: Average count of posts made per day since account registration +#: lib/profileaction.php:230 +msgid "Daily average" +msgstr "" + +#: lib/profileaction.php:259 msgid "All groups" msgstr "అన్ని గుంపులు" @@ -6190,6 +6200,11 @@ msgstr "ఈ వాడుకరి నుండి చందామాను" msgid "Unsubscribe" msgstr "చందామాను" +#: lib/usernoprofileexception.php:58 +#, fuzzy, php-format +msgid "User %s (%d) has no profile record." +msgstr "వాడుకరికి ప్రొఫైలు లేదు." + #: lib/userprofile.php:117 msgid "Edit Avatar" msgstr "అవతారాన్ని మార్చు" diff --git a/locale/tr/LC_MESSAGES/statusnet.po b/locale/tr/LC_MESSAGES/statusnet.po index b6668adcde..051abd9835 100644 --- a/locale/tr/LC_MESSAGES/statusnet.po +++ b/locale/tr/LC_MESSAGES/statusnet.po @@ -9,12 +9,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-03-17 21:39+0000\n" -"PO-Revision-Date: 2010-03-17 21:41:39+0000\n" +"POT-Creation-Date: 2010-03-23 20:09+0000\n" +"PO-Revision-Date: 2010-03-23 20:11:09+0000\n" "Language-Team: Turkish\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r63880); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.17alpha (r64087); Translate extension (2010-01-16)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: tr\n" "X-Message-Group: out-statusnet\n" @@ -785,23 +785,28 @@ msgstr "Yükle" msgid "Crop" msgstr "" -#: actions/avatarsettings.php:328 +#: actions/avatarsettings.php:305 +#, fuzzy +msgid "No file uploaded." +msgstr "Kısmi yükleme." + +#: actions/avatarsettings.php:332 msgid "Pick a square area of the image to be your avatar" msgstr "" -#: actions/avatarsettings.php:343 actions/grouplogo.php:380 +#: actions/avatarsettings.php:347 actions/grouplogo.php:380 msgid "Lost our file data." msgstr "" -#: actions/avatarsettings.php:366 +#: actions/avatarsettings.php:370 msgid "Avatar updated." msgstr "Avatar güncellendi." -#: actions/avatarsettings.php:369 +#: actions/avatarsettings.php:373 msgid "Failed updating avatar." msgstr "Avatar güncellemede hata." -#: actions/avatarsettings.php:393 +#: actions/avatarsettings.php:397 #, fuzzy msgid "Avatar deleted." msgstr "Avatar güncellendi." @@ -946,7 +951,7 @@ msgid "Conversation" msgstr "Yer" #: actions/conversation.php:154 lib/mailbox.php:116 lib/noticelist.php:87 -#: lib/profileaction.php:218 lib/searchgroupnav.php:82 +#: lib/profileaction.php:224 lib/searchgroupnav.php:82 msgid "Notices" msgstr "Durum mesajları" @@ -1797,7 +1802,7 @@ msgstr "" msgid "Updates from members of %1$s on %2$s!" msgstr "%s adli kullanicinin durum mesajlari" -#: actions/groups.php:62 lib/profileaction.php:212 lib/profileaction.php:232 +#: actions/groups.php:62 lib/profileaction.php:218 lib/profileaction.php:244 #: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98 msgid "Groups" msgstr "" @@ -3418,7 +3423,7 @@ msgid "Description" msgstr "Abonelikler" #: actions/showapplication.php:192 actions/showgroup.php:439 -#: lib/profileaction.php:176 +#: lib/profileaction.php:182 msgid "Statistics" msgstr "İstatistikler" @@ -3578,7 +3583,7 @@ msgid "Members" msgstr "Üyelik başlangıcı" #: actions/showgroup.php:396 lib/profileaction.php:117 -#: lib/profileaction.php:150 lib/profileaction.php:238 lib/section.php:95 +#: lib/profileaction.php:150 lib/profileaction.php:250 lib/section.php:95 #: lib/subscriptionlist.php:126 lib/tagcloudsection.php:71 msgid "(None)" msgstr "" @@ -3741,7 +3746,7 @@ msgid "Unknown language \"%s\"." msgstr "" #: actions/siteadminpanel.php:165 -msgid "Minimum text limit is 140 characters." +msgid "Minimum text limit is 0 (unlimited)." msgstr "" #: actions/siteadminpanel.php:171 @@ -4015,8 +4020,7 @@ msgstr "Ayarlar" msgid "You are not subscribed to that profile." msgstr "Bize o profili yollamadınız" -#: actions/subedit.php:83 classes/Subscription.php:89 -#: classes/Subscription.php:116 +#: actions/subedit.php:83 classes/Subscription.php:132 #, fuzzy msgid "Could not save subscription." msgstr "Abonelik oluşturulamadı." @@ -4584,39 +4588,39 @@ msgstr "Durum mesajını kaydederken hata oluştu." msgid "RT @%1$s %2$s" msgstr "" -#: classes/Subscription.php:66 lib/oauthstore.php:465 +#: classes/Subscription.php:74 lib/oauthstore.php:465 msgid "You have been banned from subscribing." msgstr "" -#: classes/Subscription.php:70 +#: classes/Subscription.php:78 msgid "Already subscribed!" msgstr "" -#: classes/Subscription.php:74 +#: classes/Subscription.php:82 #, fuzzy msgid "User has blocked you." msgstr "Kullanıcının profili yok." -#: classes/Subscription.php:157 +#: classes/Subscription.php:167 #, fuzzy msgid "Not subscribed!" msgstr "Bu kullanıcıyı zaten takip etmiyorsunuz!" -#: classes/Subscription.php:163 +#: classes/Subscription.php:173 #, fuzzy msgid "Couldn't delete self-subscription." msgstr "Abonelik silinemedi." -#: classes/Subscription.php:190 +#: classes/Subscription.php:200 #, fuzzy msgid "Couldn't delete subscription OMB token." msgstr "Abonelik silinemedi." -#: classes/Subscription.php:201 +#: classes/Subscription.php:211 msgid "Couldn't delete subscription." msgstr "Abonelik silinemedi." -#: classes/User.php:378 +#: classes/User.php:363 #, php-format msgid "Welcome to %1$s, @%2$s!" msgstr "" @@ -4924,22 +4928,22 @@ msgstr "« Sonra" msgid "Before" msgstr "Önce »" -#: lib/activity.php:453 +#: lib/activity.php:120 +msgid "Expecting a root feed element but got a whole XML document." +msgstr "" + +#: lib/activityutils.php:208 msgid "Can't handle remote content yet." msgstr "" -#: lib/activity.php:481 +#: lib/activityutils.php:236 msgid "Can't handle embedded XML content yet." msgstr "" -#: lib/activity.php:485 +#: lib/activityutils.php:240 msgid "Can't handle embedded Base64 content yet." msgstr "" -#: lib/activity.php:1089 -msgid "Expecting a root feed element but got a whole XML document." -msgstr "" - #. TRANS: Client error message #: lib/adminpanelaction.php:98 msgid "You cannot make changes to this site." @@ -5430,20 +5434,20 @@ msgid "" "tracking - not yet implemented.\n" msgstr "" -#: lib/common.php:136 +#: lib/common.php:135 #, fuzzy msgid "No configuration file found. " msgstr "Onay kodu yok." -#: lib/common.php:137 +#: lib/common.php:136 msgid "I looked for configuration files in the following places: " msgstr "" -#: lib/common.php:139 +#: lib/common.php:138 msgid "You may wish to run the installer to fix this." msgstr "" -#: lib/common.php:140 +#: lib/common.php:139 msgid "Go to the installer." msgstr "" @@ -5628,42 +5632,42 @@ msgstr "" msgid "This page is not available in a media type you accept" msgstr "Bu sayfa kabul ettiğiniz ortam türünde kullanılabilir değil" -#: lib/imagefile.php:74 +#: lib/imagefile.php:72 msgid "Unsupported image file format." msgstr "Desteklenmeyen görüntü dosyası biçemi." -#: lib/imagefile.php:90 +#: lib/imagefile.php:88 #, fuzzy, php-format msgid "That file is too big. The maximum file size is %s." msgstr "" "Ah, durumunuz biraz uzun kaçtı. Azami 180 karaktere sığdırmaya ne dersiniz?" -#: lib/imagefile.php:95 +#: lib/imagefile.php:93 msgid "Partial upload." msgstr "Kısmi yükleme." -#: lib/imagefile.php:103 lib/mediafile.php:170 +#: lib/imagefile.php:101 lib/mediafile.php:170 msgid "System error uploading file." msgstr "Dosya yüklemede sistem hatası." -#: lib/imagefile.php:111 +#: lib/imagefile.php:109 msgid "Not an image or corrupt file." msgstr "Bu bir resim dosyası değil ya da dosyada hata var" -#: lib/imagefile.php:124 +#: lib/imagefile.php:122 #, fuzzy msgid "Lost our file." msgstr "Böyle bir durum mesajı yok." -#: lib/imagefile.php:168 lib/imagefile.php:233 +#: lib/imagefile.php:163 lib/imagefile.php:224 msgid "Unknown file type" msgstr "" -#: lib/imagefile.php:253 +#: lib/imagefile.php:244 msgid "MB" msgstr "" -#: lib/imagefile.php:255 +#: lib/imagefile.php:246 msgid "kB" msgstr "" @@ -6127,7 +6131,7 @@ msgstr "" msgid "Unknown" msgstr "" -#: lib/profileaction.php:109 lib/profileaction.php:194 lib/subgroupnav.php:82 +#: lib/profileaction.php:109 lib/profileaction.php:200 lib/subgroupnav.php:82 msgid "Subscriptions" msgstr "Abonelikler" @@ -6135,7 +6139,7 @@ msgstr "Abonelikler" msgid "All subscriptions" msgstr "Bütün abonelikler" -#: lib/profileaction.php:142 lib/profileaction.php:203 lib/subgroupnav.php:90 +#: lib/profileaction.php:142 lib/profileaction.php:209 lib/subgroupnav.php:90 msgid "Subscribers" msgstr "Abone olanlar" @@ -6144,15 +6148,20 @@ msgstr "Abone olanlar" msgid "All subscribers" msgstr "Abone olanlar" -#: lib/profileaction.php:180 +#: lib/profileaction.php:186 msgid "User ID" msgstr "" -#: lib/profileaction.php:185 +#: lib/profileaction.php:191 msgid "Member since" msgstr "Üyelik başlangıcı" -#: lib/profileaction.php:247 +#. TRANS: Average count of posts made per day since account registration +#: lib/profileaction.php:230 +msgid "Daily average" +msgstr "" + +#: lib/profileaction.php:259 msgid "All groups" msgstr "" @@ -6334,6 +6343,11 @@ msgstr "" msgid "Unsubscribe" msgstr "Aboneliği sonlandır" +#: lib/usernoprofileexception.php:58 +#, fuzzy, php-format +msgid "User %s (%d) has no profile record." +msgstr "Kullanıcının profili yok." + #: lib/userprofile.php:117 #, fuzzy msgid "Edit Avatar" diff --git a/locale/uk/LC_MESSAGES/statusnet.po b/locale/uk/LC_MESSAGES/statusnet.po index 39b7d186b5..8121f20683 100644 --- a/locale/uk/LC_MESSAGES/statusnet.po +++ b/locale/uk/LC_MESSAGES/statusnet.po @@ -10,12 +10,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-03-17 21:39+0000\n" -"PO-Revision-Date: 2010-03-17 21:41:42+0000\n" +"POT-Creation-Date: 2010-03-23 20:09+0000\n" +"PO-Revision-Date: 2010-03-23 20:11:12+0000\n" "Language-Team: Ukrainian\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r63880); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.17alpha (r64087); Translate extension (2010-01-16)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: uk\n" "X-Message-Group: out-statusnet\n" @@ -772,23 +772,28 @@ msgstr "Завантажити" msgid "Crop" msgstr "Втяти" -#: actions/avatarsettings.php:328 +#: actions/avatarsettings.php:305 +#, fuzzy +msgid "No file uploaded." +msgstr "Не визначено жодного профілю." + +#: actions/avatarsettings.php:332 msgid "Pick a square area of the image to be your avatar" msgstr "Оберіть квадратну ділянку зображення, яка й буде Вашою автарою." -#: actions/avatarsettings.php:343 actions/grouplogo.php:380 +#: actions/avatarsettings.php:347 actions/grouplogo.php:380 msgid "Lost our file data." msgstr "Дані Вашого файлу десь загубились." -#: actions/avatarsettings.php:366 +#: actions/avatarsettings.php:370 msgid "Avatar updated." msgstr "Аватару оновлено." -#: actions/avatarsettings.php:369 +#: actions/avatarsettings.php:373 msgid "Failed updating avatar." msgstr "Оновлення аватари невдале." -#: actions/avatarsettings.php:393 +#: actions/avatarsettings.php:397 msgid "Avatar deleted." msgstr "Аватару видалено." @@ -926,7 +931,7 @@ msgid "Conversation" msgstr "Розмова" #: actions/conversation.php:154 lib/mailbox.php:116 lib/noticelist.php:87 -#: lib/profileaction.php:218 lib/searchgroupnav.php:82 +#: lib/profileaction.php:224 lib/searchgroupnav.php:82 msgid "Notices" msgstr "Дописи" @@ -1744,7 +1749,7 @@ msgstr "%s стрічка" msgid "Updates from members of %1$s on %2$s!" msgstr "Оновлення членів %1$s на %2$s!" -#: actions/groups.php:62 lib/profileaction.php:212 lib/profileaction.php:232 +#: actions/groups.php:62 lib/profileaction.php:218 lib/profileaction.php:244 #: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98 msgid "Groups" msgstr "Групи" @@ -3405,7 +3410,7 @@ msgid "Description" msgstr "Опис" #: actions/showapplication.php:192 actions/showgroup.php:439 -#: lib/profileaction.php:176 +#: lib/profileaction.php:182 msgid "Statistics" msgstr "Статистика" @@ -3572,7 +3577,7 @@ msgid "Members" msgstr "Учасники" #: actions/showgroup.php:396 lib/profileaction.php:117 -#: lib/profileaction.php:150 lib/profileaction.php:238 lib/section.php:95 +#: lib/profileaction.php:150 lib/profileaction.php:250 lib/section.php:95 #: lib/subscriptionlist.php:126 lib/tagcloudsection.php:71 msgid "(None)" msgstr "(Пусто)" @@ -3752,7 +3757,8 @@ msgid "Unknown language \"%s\"." msgstr "Невідома мова «%s»." #: actions/siteadminpanel.php:165 -msgid "Minimum text limit is 140 characters." +#, fuzzy +msgid "Minimum text limit is 0 (unlimited)." msgstr "Ліміт текстових повідомлень становить 140 знаків." #: actions/siteadminpanel.php:171 @@ -4026,8 +4032,7 @@ msgstr "Зберегти налаштування знімку" msgid "You are not subscribed to that profile." msgstr "Ви не підписані до цього профілю." -#: actions/subedit.php:83 classes/Subscription.php:89 -#: classes/Subscription.php:116 +#: actions/subedit.php:83 classes/Subscription.php:132 msgid "Could not save subscription." msgstr "Не вдалося зберегти підписку." @@ -4608,35 +4613,35 @@ msgstr "Проблема при збереженні вхідних дописі msgid "RT @%1$s %2$s" msgstr "RT @%1$s %2$s" -#: classes/Subscription.php:66 lib/oauthstore.php:465 +#: classes/Subscription.php:74 lib/oauthstore.php:465 msgid "You have been banned from subscribing." msgstr "Вас позбавлено можливості підписатись." -#: classes/Subscription.php:70 +#: classes/Subscription.php:78 msgid "Already subscribed!" msgstr "Вже підписаний!" -#: classes/Subscription.php:74 +#: classes/Subscription.php:82 msgid "User has blocked you." msgstr "Користувач заблокував Вас." -#: classes/Subscription.php:157 +#: classes/Subscription.php:167 msgid "Not subscribed!" msgstr "Не підписано!" -#: classes/Subscription.php:163 +#: classes/Subscription.php:173 msgid "Couldn't delete self-subscription." msgstr "Не можу видалити самопідписку." -#: classes/Subscription.php:190 +#: classes/Subscription.php:200 msgid "Couldn't delete subscription OMB token." msgstr "Не вдається видалити токен підписки OMB." -#: classes/Subscription.php:201 +#: classes/Subscription.php:211 msgid "Couldn't delete subscription." msgstr "Не вдалося видалити підписку." -#: classes/User.php:378 +#: classes/User.php:363 #, php-format msgid "Welcome to %1$s, @%2$s!" msgstr "Вітаємо на %1$s, @%2$s!" @@ -4921,22 +4926,23 @@ msgstr "Вперед" msgid "Before" msgstr "Назад" -#: lib/activity.php:453 +#: lib/activity.php:120 +msgid "Expecting a root feed element but got a whole XML document." +msgstr "" +"В очікуванні кореневого елементу веб-стрічки, отримали цілий документ XML." + +#: lib/activityutils.php:208 msgid "Can't handle remote content yet." msgstr "Поки що не можу обробити віддалений контент." -#: lib/activity.php:481 +#: lib/activityutils.php:236 msgid "Can't handle embedded XML content yet." msgstr "Поки що не можу обробити вбудований XML контент." -#: lib/activity.php:485 +#: lib/activityutils.php:240 msgid "Can't handle embedded Base64 content yet." msgstr "Поки що не можу обробити вбудований контент Base64." -#: lib/activity.php:1089 -msgid "Expecting a root feed element but got a whole XML document." -msgstr "" - #. TRANS: Client error message #: lib/adminpanelaction.php:98 msgid "You cannot make changes to this site." @@ -5448,19 +5454,19 @@ msgstr "" "tracks — наразі не виконується\n" "tracking — наразі не виконується\n" -#: lib/common.php:136 +#: lib/common.php:135 msgid "No configuration file found. " msgstr "Файлу конфігурації не знайдено. " -#: lib/common.php:137 +#: lib/common.php:136 msgid "I looked for configuration files in the following places: " msgstr "Шукав файли конфігурації в цих місцях: " -#: lib/common.php:139 +#: lib/common.php:138 msgid "You may wish to run the installer to fix this." msgstr "Запустіть файл інсталяції, аби полагодити це." -#: lib/common.php:140 +#: lib/common.php:139 msgid "Go to the installer." msgstr "Іти до файлу інсталяції." @@ -5637,40 +5643,40 @@ msgstr "Теґи у дописах групи %s" msgid "This page is not available in a media type you accept" msgstr "Ця сторінка не доступна для того типу медіа, з яким ви погодились" -#: lib/imagefile.php:74 +#: lib/imagefile.php:72 msgid "Unsupported image file format." msgstr "Формат зображення не підтримується." -#: lib/imagefile.php:90 +#: lib/imagefile.php:88 #, php-format msgid "That file is too big. The maximum file size is %s." msgstr "Цей файл завеликий. Максимальний розмір %s." -#: lib/imagefile.php:95 +#: lib/imagefile.php:93 msgid "Partial upload." msgstr "Часткове завантаження." -#: lib/imagefile.php:103 lib/mediafile.php:170 +#: lib/imagefile.php:101 lib/mediafile.php:170 msgid "System error uploading file." msgstr "Система відповіла помилкою при завантаженні цього файла." -#: lib/imagefile.php:111 +#: lib/imagefile.php:109 msgid "Not an image or corrupt file." msgstr "Це не зображення, або файл зіпсовано." -#: lib/imagefile.php:124 +#: lib/imagefile.php:122 msgid "Lost our file." msgstr "Файл втрачено." -#: lib/imagefile.php:168 lib/imagefile.php:233 +#: lib/imagefile.php:163 lib/imagefile.php:224 msgid "Unknown file type" msgstr "Тип файлу не підтримується" -#: lib/imagefile.php:253 +#: lib/imagefile.php:244 msgid "MB" msgstr "Мб" -#: lib/imagefile.php:255 +#: lib/imagefile.php:246 msgid "kB" msgstr "кб" @@ -6204,7 +6210,7 @@ msgstr "Теґи у дописах %s" msgid "Unknown" msgstr "Невідомо" -#: lib/profileaction.php:109 lib/profileaction.php:194 lib/subgroupnav.php:82 +#: lib/profileaction.php:109 lib/profileaction.php:200 lib/subgroupnav.php:82 msgid "Subscriptions" msgstr "Підписки" @@ -6212,7 +6218,7 @@ msgstr "Підписки" msgid "All subscriptions" msgstr "Всі підписки" -#: lib/profileaction.php:142 lib/profileaction.php:203 lib/subgroupnav.php:90 +#: lib/profileaction.php:142 lib/profileaction.php:209 lib/subgroupnav.php:90 msgid "Subscribers" msgstr "Підписчики" @@ -6220,15 +6226,20 @@ msgstr "Підписчики" msgid "All subscribers" msgstr "Всі підписчики" -#: lib/profileaction.php:180 +#: lib/profileaction.php:186 msgid "User ID" msgstr "ІД" -#: lib/profileaction.php:185 +#: lib/profileaction.php:191 msgid "Member since" msgstr "З нами від" -#: lib/profileaction.php:247 +#. TRANS: Average count of posts made per day since account registration +#: lib/profileaction.php:230 +msgid "Daily average" +msgstr "" + +#: lib/profileaction.php:259 msgid "All groups" msgstr "Всі групи" @@ -6399,6 +6410,11 @@ msgstr "Відписатись від цього користувача" msgid "Unsubscribe" msgstr "Відписатись" +#: lib/usernoprofileexception.php:58 +#, fuzzy, php-format +msgid "User %s (%d) has no profile record." +msgstr "Користувач не має профілю." + #: lib/userprofile.php:117 msgid "Edit Avatar" msgstr "Аватара" @@ -6409,7 +6425,7 @@ msgstr "Діяльність користувача" #: lib/userprofile.php:237 msgid "User deletion in progress..." -msgstr "" +msgstr "Видалення користувача у процесі..." #: lib/userprofile.php:263 msgid "Edit profile settings" diff --git a/locale/vi/LC_MESSAGES/statusnet.po b/locale/vi/LC_MESSAGES/statusnet.po index 0f560f41d7..c934fa28d0 100644 --- a/locale/vi/LC_MESSAGES/statusnet.po +++ b/locale/vi/LC_MESSAGES/statusnet.po @@ -7,12 +7,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-03-17 21:39+0000\n" -"PO-Revision-Date: 2010-03-17 21:41:45+0000\n" +"POT-Creation-Date: 2010-03-23 20:09+0000\n" +"PO-Revision-Date: 2010-03-23 20:11:15+0000\n" "Language-Team: Vietnamese\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r63880); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.17alpha (r64087); Translate extension (2010-01-16)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: vi\n" "X-Message-Group: out-statusnet\n" @@ -790,23 +790,28 @@ msgstr "Tải file" msgid "Crop" msgstr "Nhóm" -#: actions/avatarsettings.php:328 +#: actions/avatarsettings.php:305 +#, fuzzy +msgid "No file uploaded." +msgstr "Upload từng phần." + +#: actions/avatarsettings.php:332 msgid "Pick a square area of the image to be your avatar" msgstr "" -#: actions/avatarsettings.php:343 actions/grouplogo.php:380 +#: actions/avatarsettings.php:347 actions/grouplogo.php:380 msgid "Lost our file data." msgstr "" -#: actions/avatarsettings.php:366 +#: actions/avatarsettings.php:370 msgid "Avatar updated." msgstr "Hình đại diện đã được cập nhật." -#: actions/avatarsettings.php:369 +#: actions/avatarsettings.php:373 msgid "Failed updating avatar." msgstr "Cập nhật hình đại diện không thành công." -#: actions/avatarsettings.php:393 +#: actions/avatarsettings.php:397 #, fuzzy msgid "Avatar deleted." msgstr "Hình đại diện đã được cập nhật." @@ -950,7 +955,7 @@ msgid "Conversation" msgstr "Không có mã số xác nhận." #: actions/conversation.php:154 lib/mailbox.php:116 lib/noticelist.php:87 -#: lib/profileaction.php:218 lib/searchgroupnav.php:82 +#: lib/profileaction.php:224 lib/searchgroupnav.php:82 msgid "Notices" msgstr "Tin nhắn" @@ -1842,7 +1847,7 @@ msgstr "Dòng tin nhắn của %s" msgid "Updates from members of %1$s on %2$s!" msgstr "Dòng tin nhắn cho %s" -#: actions/groups.php:62 lib/profileaction.php:212 lib/profileaction.php:232 +#: actions/groups.php:62 lib/profileaction.php:218 lib/profileaction.php:244 #: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98 #, fuzzy msgid "Groups" @@ -3537,7 +3542,7 @@ msgid "Description" msgstr "Mô tả" #: actions/showapplication.php:192 actions/showgroup.php:439 -#: lib/profileaction.php:176 +#: lib/profileaction.php:182 msgid "Statistics" msgstr "Số liệu thống kê" @@ -3698,7 +3703,7 @@ msgid "Members" msgstr "Thành viên" #: actions/showgroup.php:396 lib/profileaction.php:117 -#: lib/profileaction.php:150 lib/profileaction.php:238 lib/section.php:95 +#: lib/profileaction.php:150 lib/profileaction.php:250 lib/section.php:95 #: lib/subscriptionlist.php:126 lib/tagcloudsection.php:71 msgid "(None)" msgstr "" @@ -3864,7 +3869,7 @@ msgid "Unknown language \"%s\"." msgstr "" #: actions/siteadminpanel.php:165 -msgid "Minimum text limit is 140 characters." +msgid "Minimum text limit is 0 (unlimited)." msgstr "" #: actions/siteadminpanel.php:171 @@ -4155,8 +4160,7 @@ msgstr "Thay đổi hình đại diện" msgid "You are not subscribed to that profile." msgstr "Bạn chưa cập nhật thông tin riêng" -#: actions/subedit.php:83 classes/Subscription.php:89 -#: classes/Subscription.php:116 +#: actions/subedit.php:83 classes/Subscription.php:132 #, fuzzy msgid "Could not save subscription." msgstr "Không thể tạo đăng nhận." @@ -4737,39 +4741,39 @@ msgstr "Có lỗi xảy ra khi lưu tin nhắn." msgid "RT @%1$s %2$s" msgstr "%s (%s)" -#: classes/Subscription.php:66 lib/oauthstore.php:465 +#: classes/Subscription.php:74 lib/oauthstore.php:465 msgid "You have been banned from subscribing." msgstr "" -#: classes/Subscription.php:70 +#: classes/Subscription.php:78 msgid "Already subscribed!" msgstr "" -#: classes/Subscription.php:74 +#: classes/Subscription.php:82 #, fuzzy msgid "User has blocked you." msgstr "Người dùng không có thông tin." -#: classes/Subscription.php:157 +#: classes/Subscription.php:167 #, fuzzy msgid "Not subscribed!" msgstr "Chưa đăng nhận!" -#: classes/Subscription.php:163 +#: classes/Subscription.php:173 #, fuzzy msgid "Couldn't delete self-subscription." msgstr "Không thể xóa đăng nhận." -#: classes/Subscription.php:190 +#: classes/Subscription.php:200 #, fuzzy msgid "Couldn't delete subscription OMB token." msgstr "Không thể xóa đăng nhận." -#: classes/Subscription.php:201 +#: classes/Subscription.php:211 msgid "Couldn't delete subscription." msgstr "Không thể xóa đăng nhận." -#: classes/User.php:378 +#: classes/User.php:363 #, fuzzy, php-format msgid "Welcome to %1$s, @%2$s!" msgstr "%s chào mừng bạn " @@ -5081,22 +5085,22 @@ msgstr "Sau" msgid "Before" msgstr "Trước" -#: lib/activity.php:453 +#: lib/activity.php:120 +msgid "Expecting a root feed element but got a whole XML document." +msgstr "" + +#: lib/activityutils.php:208 msgid "Can't handle remote content yet." msgstr "" -#: lib/activity.php:481 +#: lib/activityutils.php:236 msgid "Can't handle embedded XML content yet." msgstr "" -#: lib/activity.php:485 +#: lib/activityutils.php:240 msgid "Can't handle embedded Base64 content yet." msgstr "" -#: lib/activity.php:1089 -msgid "Expecting a root feed element but got a whole XML document." -msgstr "" - #. TRANS: Client error message #: lib/adminpanelaction.php:98 #, fuzzy @@ -5595,20 +5599,20 @@ msgid "" "tracking - not yet implemented.\n" msgstr "" -#: lib/common.php:136 +#: lib/common.php:135 #, fuzzy msgid "No configuration file found. " msgstr "Không có mã số xác nhận." -#: lib/common.php:137 +#: lib/common.php:136 msgid "I looked for configuration files in the following places: " msgstr "" -#: lib/common.php:139 +#: lib/common.php:138 msgid "You may wish to run the installer to fix this." msgstr "" -#: lib/common.php:140 +#: lib/common.php:139 msgid "Go to the installer." msgstr "" @@ -5798,44 +5802,44 @@ msgstr "" msgid "This page is not available in a media type you accept" msgstr "Trang này không phải là phương tiện truyền thông mà bạn chấp nhận." -#: lib/imagefile.php:74 +#: lib/imagefile.php:72 msgid "Unsupported image file format." msgstr "Không hỗ trợ kiểu file ảnh này." -#: lib/imagefile.php:90 +#: lib/imagefile.php:88 #, fuzzy, php-format msgid "That file is too big. The maximum file size is %s." msgstr "" "Bạn có thể cập nhật hồ sơ cá nhân tại đây để mọi người có thể biết thông tin " "về bạn." -#: lib/imagefile.php:95 +#: lib/imagefile.php:93 msgid "Partial upload." msgstr "Upload từng phần." -#: lib/imagefile.php:103 lib/mediafile.php:170 +#: lib/imagefile.php:101 lib/mediafile.php:170 msgid "System error uploading file." msgstr "Hệ thống xảy ra lỗi trong khi tải file." -#: lib/imagefile.php:111 +#: lib/imagefile.php:109 msgid "Not an image or corrupt file." msgstr "File hỏng hoặc không phải là file ảnh." -#: lib/imagefile.php:124 +#: lib/imagefile.php:122 #, fuzzy msgid "Lost our file." msgstr "Không có tin nhắn nào." -#: lib/imagefile.php:168 lib/imagefile.php:233 +#: lib/imagefile.php:163 lib/imagefile.php:224 #, fuzzy msgid "Unknown file type" msgstr "Không hỗ trợ kiểu file ảnh này." -#: lib/imagefile.php:253 +#: lib/imagefile.php:244 msgid "MB" msgstr "" -#: lib/imagefile.php:255 +#: lib/imagefile.php:246 msgid "kB" msgstr "" @@ -6357,7 +6361,7 @@ msgstr "cảnh báo tin nhắn" msgid "Unknown" msgstr "Không tìm thấy action" -#: lib/profileaction.php:109 lib/profileaction.php:194 lib/subgroupnav.php:82 +#: lib/profileaction.php:109 lib/profileaction.php:200 lib/subgroupnav.php:82 msgid "Subscriptions" msgstr "Tôi theo bạn này" @@ -6365,7 +6369,7 @@ msgstr "Tôi theo bạn này" msgid "All subscriptions" msgstr "Tất cả đăng nhận" -#: lib/profileaction.php:142 lib/profileaction.php:203 lib/subgroupnav.php:90 +#: lib/profileaction.php:142 lib/profileaction.php:209 lib/subgroupnav.php:90 msgid "Subscribers" msgstr "Bạn này theo tôi" @@ -6374,15 +6378,20 @@ msgstr "Bạn này theo tôi" msgid "All subscribers" msgstr "Bạn này theo tôi" -#: lib/profileaction.php:180 +#: lib/profileaction.php:186 msgid "User ID" msgstr "" -#: lib/profileaction.php:185 +#: lib/profileaction.php:191 msgid "Member since" msgstr "Gia nhập từ" -#: lib/profileaction.php:247 +#. TRANS: Average count of posts made per day since account registration +#: lib/profileaction.php:230 +msgid "Daily average" +msgstr "" + +#: lib/profileaction.php:259 #, fuzzy msgid "All groups" msgstr "Nhóm" @@ -6573,6 +6582,11 @@ msgstr "Ngừng đăng ký từ người dùng này" msgid "Unsubscribe" msgstr "Hết theo" +#: lib/usernoprofileexception.php:58 +#, fuzzy, php-format +msgid "User %s (%d) has no profile record." +msgstr "Người dùng không có thông tin." + #: lib/userprofile.php:117 #, fuzzy msgid "Edit Avatar" diff --git a/locale/zh_CN/LC_MESSAGES/statusnet.po b/locale/zh_CN/LC_MESSAGES/statusnet.po index a5cef8add8..f67435d918 100644 --- a/locale/zh_CN/LC_MESSAGES/statusnet.po +++ b/locale/zh_CN/LC_MESSAGES/statusnet.po @@ -10,12 +10,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-03-17 21:39+0000\n" -"PO-Revision-Date: 2010-03-17 21:41:49+0000\n" +"POT-Creation-Date: 2010-03-23 20:09+0000\n" +"PO-Revision-Date: 2010-03-23 20:11:18+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 (r63880); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.17alpha (r64087); Translate extension (2010-01-16)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: zh-hans\n" "X-Message-Group: out-statusnet\n" @@ -784,23 +784,28 @@ msgstr "上传" msgid "Crop" msgstr "剪裁" -#: actions/avatarsettings.php:328 +#: actions/avatarsettings.php:305 +#, fuzzy +msgid "No file uploaded." +msgstr "没有收件人。" + +#: actions/avatarsettings.php:332 msgid "Pick a square area of the image to be your avatar" msgstr "请选择一块方形区域作为你的头像" -#: actions/avatarsettings.php:343 actions/grouplogo.php:380 +#: actions/avatarsettings.php:347 actions/grouplogo.php:380 msgid "Lost our file data." msgstr "文件数据丢失" -#: actions/avatarsettings.php:366 +#: actions/avatarsettings.php:370 msgid "Avatar updated." msgstr "头像已更新。" -#: actions/avatarsettings.php:369 +#: actions/avatarsettings.php:373 msgid "Failed updating avatar." msgstr "更新头像失败。" -#: actions/avatarsettings.php:393 +#: actions/avatarsettings.php:397 #, fuzzy msgid "Avatar deleted." msgstr "头像已更新。" @@ -946,7 +951,7 @@ msgid "Conversation" msgstr "确认码" #: actions/conversation.php:154 lib/mailbox.php:116 lib/noticelist.php:87 -#: lib/profileaction.php:218 lib/searchgroupnav.php:82 +#: lib/profileaction.php:224 lib/searchgroupnav.php:82 msgid "Notices" msgstr "通告" @@ -1819,7 +1824,7 @@ msgstr "%s 时间表" msgid "Updates from members of %1$s on %2$s!" msgstr "%2$s 上 %1$s 的更新！" -#: actions/groups.php:62 lib/profileaction.php:212 lib/profileaction.php:232 +#: actions/groups.php:62 lib/profileaction.php:218 lib/profileaction.php:244 #: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98 msgid "Groups" msgstr "组" @@ -3472,7 +3477,7 @@ msgid "Description" msgstr "描述" #: actions/showapplication.php:192 actions/showgroup.php:439 -#: lib/profileaction.php:176 +#: lib/profileaction.php:182 msgid "Statistics" msgstr "统计" @@ -3633,7 +3638,7 @@ msgid "Members" msgstr "注册于" #: actions/showgroup.php:396 lib/profileaction.php:117 -#: lib/profileaction.php:150 lib/profileaction.php:238 lib/section.php:95 +#: lib/profileaction.php:150 lib/profileaction.php:250 lib/section.php:95 #: lib/subscriptionlist.php:126 lib/tagcloudsection.php:71 msgid "(None)" msgstr "（没有）" @@ -3802,7 +3807,7 @@ msgid "Unknown language \"%s\"." msgstr "" #: actions/siteadminpanel.php:165 -msgid "Minimum text limit is 140 characters." +msgid "Minimum text limit is 0 (unlimited)." msgstr "" #: actions/siteadminpanel.php:171 @@ -4084,8 +4089,7 @@ msgstr "头像设置" msgid "You are not subscribed to that profile." msgstr "您未告知此个人信息" -#: actions/subedit.php:83 classes/Subscription.php:89 -#: classes/Subscription.php:116 +#: actions/subedit.php:83 classes/Subscription.php:132 #, fuzzy msgid "Could not save subscription." msgstr "无法删除订阅。" @@ -4664,40 +4668,40 @@ msgstr "保存通告时出错。" msgid "RT @%1$s %2$s" msgstr "%1$s (%2$s)" -#: classes/Subscription.php:66 lib/oauthstore.php:465 +#: classes/Subscription.php:74 lib/oauthstore.php:465 #, fuzzy msgid "You have been banned from subscribing." msgstr "那个用户阻止了你的订阅。" -#: classes/Subscription.php:70 +#: classes/Subscription.php:78 msgid "Already subscribed!" msgstr "" -#: classes/Subscription.php:74 +#: classes/Subscription.php:82 #, fuzzy msgid "User has blocked you." msgstr "用户没有个人信息。" -#: classes/Subscription.php:157 +#: classes/Subscription.php:167 #, fuzzy msgid "Not subscribed!" msgstr "未订阅！" -#: classes/Subscription.php:163 +#: classes/Subscription.php:173 #, fuzzy msgid "Couldn't delete self-subscription." msgstr "无法删除订阅。" -#: classes/Subscription.php:190 +#: classes/Subscription.php:200 #, fuzzy msgid "Couldn't delete subscription OMB token." msgstr "无法删除订阅。" -#: classes/Subscription.php:201 +#: classes/Subscription.php:211 msgid "Couldn't delete subscription." msgstr "无法删除订阅。" -#: classes/User.php:378 +#: classes/User.php:363 #, fuzzy, php-format msgid "Welcome to %1$s, @%2$s!" msgstr "发送给 %1$s 的 %2$s 消息" @@ -5009,22 +5013,22 @@ msgstr "« 之后" msgid "Before" msgstr "之前 »" -#: lib/activity.php:453 +#: lib/activity.php:120 +msgid "Expecting a root feed element but got a whole XML document." +msgstr "" + +#: lib/activityutils.php:208 msgid "Can't handle remote content yet." msgstr "" -#: lib/activity.php:481 +#: lib/activityutils.php:236 msgid "Can't handle embedded XML content yet." msgstr "" -#: lib/activity.php:485 +#: lib/activityutils.php:240 msgid "Can't handle embedded Base64 content yet." msgstr "" -#: lib/activity.php:1089 -msgid "Expecting a root feed element but got a whole XML document." -msgstr "" - #. TRANS: Client error message #: lib/adminpanelaction.php:98 #, fuzzy @@ -5517,20 +5521,20 @@ msgid "" "tracking - not yet implemented.\n" msgstr "" -#: lib/common.php:136 +#: lib/common.php:135 #, fuzzy msgid "No configuration file found. " msgstr "没有验证码" -#: lib/common.php:137 +#: lib/common.php:136 msgid "I looked for configuration files in the following places: " msgstr "" -#: lib/common.php:139 +#: lib/common.php:138 msgid "You may wish to run the installer to fix this." msgstr "" -#: lib/common.php:140 +#: lib/common.php:139 #, fuzzy msgid "Go to the installer." msgstr "登入本站" @@ -5718,41 +5722,41 @@ msgstr "这个组所发布的消息的标签" msgid "This page is not available in a media type you accept" msgstr "这个页面不提供您想要的媒体类型" -#: lib/imagefile.php:74 +#: lib/imagefile.php:72 msgid "Unsupported image file format." msgstr "不支持这种图像格式。" -#: lib/imagefile.php:90 +#: lib/imagefile.php:88 #, fuzzy, php-format msgid "That file is too big. The maximum file size is %s." msgstr "你可以给你的组上载一个logo图。" -#: lib/imagefile.php:95 +#: lib/imagefile.php:93 msgid "Partial upload." msgstr "部分上传。" -#: lib/imagefile.php:103 lib/mediafile.php:170 +#: lib/imagefile.php:101 lib/mediafile.php:170 msgid "System error uploading file." msgstr "上传文件时出错。" -#: lib/imagefile.php:111 +#: lib/imagefile.php:109 msgid "Not an image or corrupt file." msgstr "不是图片文件或文件已损坏。" -#: lib/imagefile.php:124 +#: lib/imagefile.php:122 #, fuzzy msgid "Lost our file." msgstr "没有这份通告。" -#: lib/imagefile.php:168 lib/imagefile.php:233 +#: lib/imagefile.php:163 lib/imagefile.php:224 msgid "Unknown file type" msgstr "未知文件类型" -#: lib/imagefile.php:253 +#: lib/imagefile.php:244 msgid "MB" msgstr "" -#: lib/imagefile.php:255 +#: lib/imagefile.php:246 msgid "kB" msgstr "" @@ -6230,7 +6234,7 @@ msgstr "%s's 的消息的标签" msgid "Unknown" msgstr "未知动作" -#: lib/profileaction.php:109 lib/profileaction.php:194 lib/subgroupnav.php:82 +#: lib/profileaction.php:109 lib/profileaction.php:200 lib/subgroupnav.php:82 msgid "Subscriptions" msgstr "订阅" @@ -6238,7 +6242,7 @@ msgstr "订阅" msgid "All subscriptions" msgstr "所有订阅" -#: lib/profileaction.php:142 lib/profileaction.php:203 lib/subgroupnav.php:90 +#: lib/profileaction.php:142 lib/profileaction.php:209 lib/subgroupnav.php:90 msgid "Subscribers" msgstr "订阅者" @@ -6247,16 +6251,21 @@ msgstr "订阅者" msgid "All subscribers" msgstr "订阅者" -#: lib/profileaction.php:180 +#: lib/profileaction.php:186 #, fuzzy msgid "User ID" msgstr "用户" -#: lib/profileaction.php:185 +#: lib/profileaction.php:191 msgid "Member since" msgstr "用户始于" -#: lib/profileaction.php:247 +#. TRANS: Average count of posts made per day since account registration +#: lib/profileaction.php:230 +msgid "Daily average" +msgstr "" + +#: lib/profileaction.php:259 msgid "All groups" msgstr "所有组" @@ -6444,6 +6453,11 @@ msgstr "取消订阅 %s" msgid "Unsubscribe" msgstr "退订" +#: lib/usernoprofileexception.php:58 +#, fuzzy, php-format +msgid "User %s (%d) has no profile record." +msgstr "用户没有个人信息。" + #: lib/userprofile.php:117 #, fuzzy msgid "Edit Avatar" diff --git a/locale/zh_TW/LC_MESSAGES/statusnet.po b/locale/zh_TW/LC_MESSAGES/statusnet.po index a7b777d9d6..6b5c237b5b 100644 --- a/locale/zh_TW/LC_MESSAGES/statusnet.po +++ b/locale/zh_TW/LC_MESSAGES/statusnet.po @@ -7,12 +7,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-03-17 21:39+0000\n" -"PO-Revision-Date: 2010-03-17 21:41:53+0000\n" +"POT-Creation-Date: 2010-03-23 20:09+0000\n" +"PO-Revision-Date: 2010-03-23 20:11:21+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 (r63880); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.17alpha (r64087); Translate extension (2010-01-16)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: zh-hant\n" "X-Message-Group: out-statusnet\n" @@ -774,23 +774,27 @@ msgstr "" msgid "Crop" msgstr "" -#: actions/avatarsettings.php:328 +#: actions/avatarsettings.php:305 +msgid "No file uploaded." +msgstr "" + +#: actions/avatarsettings.php:332 msgid "Pick a square area of the image to be your avatar" msgstr "" -#: actions/avatarsettings.php:343 actions/grouplogo.php:380 +#: actions/avatarsettings.php:347 actions/grouplogo.php:380 msgid "Lost our file data." msgstr "" -#: actions/avatarsettings.php:366 +#: actions/avatarsettings.php:370 msgid "Avatar updated." msgstr "更新個人圖像" -#: actions/avatarsettings.php:369 +#: actions/avatarsettings.php:373 msgid "Failed updating avatar." msgstr "無法上傳個人圖像" -#: actions/avatarsettings.php:393 +#: actions/avatarsettings.php:397 #, fuzzy msgid "Avatar deleted." msgstr "更新個人圖像" @@ -935,7 +939,7 @@ msgid "Conversation" msgstr "地點" #: actions/conversation.php:154 lib/mailbox.php:116 lib/noticelist.php:87 -#: lib/profileaction.php:218 lib/searchgroupnav.php:82 +#: lib/profileaction.php:224 lib/searchgroupnav.php:82 msgid "Notices" msgstr "" @@ -1777,7 +1781,7 @@ msgstr "" msgid "Updates from members of %1$s on %2$s!" msgstr "&s的微型部落格" -#: actions/groups.php:62 lib/profileaction.php:212 lib/profileaction.php:232 +#: actions/groups.php:62 lib/profileaction.php:218 lib/profileaction.php:244 #: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98 msgid "Groups" msgstr "" @@ -3348,7 +3352,7 @@ msgid "Description" msgstr "所有訂閱" #: actions/showapplication.php:192 actions/showgroup.php:439 -#: lib/profileaction.php:176 +#: lib/profileaction.php:182 msgid "Statistics" msgstr "" @@ -3507,7 +3511,7 @@ msgid "Members" msgstr "何時加入會員的呢？" #: actions/showgroup.php:396 lib/profileaction.php:117 -#: lib/profileaction.php:150 lib/profileaction.php:238 lib/section.php:95 +#: lib/profileaction.php:150 lib/profileaction.php:250 lib/section.php:95 #: lib/subscriptionlist.php:126 lib/tagcloudsection.php:71 msgid "(None)" msgstr "" @@ -3669,7 +3673,7 @@ msgid "Unknown language \"%s\"." msgstr "" #: actions/siteadminpanel.php:165 -msgid "Minimum text limit is 140 characters." +msgid "Minimum text limit is 0 (unlimited)." msgstr "" #: actions/siteadminpanel.php:171 @@ -3942,8 +3946,7 @@ msgstr "線上即時通設定" msgid "You are not subscribed to that profile." msgstr "" -#: actions/subedit.php:83 classes/Subscription.php:89 -#: classes/Subscription.php:116 +#: actions/subedit.php:83 classes/Subscription.php:132 #, fuzzy msgid "Could not save subscription." msgstr "註冊失敗" @@ -4501,38 +4504,38 @@ msgstr "儲存使用者發生錯誤" msgid "RT @%1$s %2$s" msgstr "" -#: classes/Subscription.php:66 lib/oauthstore.php:465 +#: classes/Subscription.php:74 lib/oauthstore.php:465 msgid "You have been banned from subscribing." msgstr "" -#: classes/Subscription.php:70 +#: classes/Subscription.php:78 msgid "Already subscribed!" msgstr "" -#: classes/Subscription.php:74 +#: classes/Subscription.php:82 msgid "User has blocked you." msgstr "" -#: classes/Subscription.php:157 +#: classes/Subscription.php:167 #, fuzzy msgid "Not subscribed!" msgstr "此帳號已註冊" -#: classes/Subscription.php:163 +#: classes/Subscription.php:173 #, fuzzy msgid "Couldn't delete self-subscription." msgstr "無法刪除帳號" -#: classes/Subscription.php:190 +#: classes/Subscription.php:200 #, fuzzy msgid "Couldn't delete subscription OMB token." msgstr "無法刪除帳號" -#: classes/Subscription.php:201 +#: classes/Subscription.php:211 msgid "Couldn't delete subscription." msgstr "無法刪除帳號" -#: classes/User.php:378 +#: classes/User.php:363 #, php-format msgid "Welcome to %1$s, @%2$s!" msgstr "" @@ -4834,22 +4837,22 @@ msgstr "" msgid "Before" msgstr "之前的內容»" -#: lib/activity.php:453 +#: lib/activity.php:120 +msgid "Expecting a root feed element but got a whole XML document." +msgstr "" + +#: lib/activityutils.php:208 msgid "Can't handle remote content yet." msgstr "" -#: lib/activity.php:481 +#: lib/activityutils.php:236 msgid "Can't handle embedded XML content yet." msgstr "" -#: lib/activity.php:485 +#: lib/activityutils.php:240 msgid "Can't handle embedded Base64 content yet." msgstr "" -#: lib/activity.php:1089 -msgid "Expecting a root feed element but got a whole XML document." -msgstr "" - #. TRANS: Client error message #: lib/adminpanelaction.php:98 msgid "You cannot make changes to this site." @@ -5329,20 +5332,20 @@ msgid "" "tracking - not yet implemented.\n" msgstr "" -#: lib/common.php:136 +#: lib/common.php:135 #, fuzzy msgid "No configuration file found. " msgstr "無確認碼" -#: lib/common.php:137 +#: lib/common.php:136 msgid "I looked for configuration files in the following places: " msgstr "" -#: lib/common.php:139 +#: lib/common.php:138 msgid "You may wish to run the installer to fix this." msgstr "" -#: lib/common.php:140 +#: lib/common.php:139 msgid "Go to the installer." msgstr "" @@ -5522,41 +5525,41 @@ msgstr "" msgid "This page is not available in a media type you accept" msgstr "" -#: lib/imagefile.php:74 +#: lib/imagefile.php:72 msgid "Unsupported image file format." msgstr "" -#: lib/imagefile.php:90 +#: lib/imagefile.php:88 #, php-format msgid "That file is too big. The maximum file size is %s." msgstr "" -#: lib/imagefile.php:95 +#: lib/imagefile.php:93 msgid "Partial upload." msgstr "" -#: lib/imagefile.php:103 lib/mediafile.php:170 +#: lib/imagefile.php:101 lib/mediafile.php:170 msgid "System error uploading file." msgstr "" -#: lib/imagefile.php:111 +#: lib/imagefile.php:109 msgid "Not an image or corrupt file." msgstr "" -#: lib/imagefile.php:124 +#: lib/imagefile.php:122 #, fuzzy msgid "Lost our file." msgstr "無此通知" -#: lib/imagefile.php:168 lib/imagefile.php:233 +#: lib/imagefile.php:163 lib/imagefile.php:224 msgid "Unknown file type" msgstr "" -#: lib/imagefile.php:253 +#: lib/imagefile.php:244 msgid "MB" msgstr "" -#: lib/imagefile.php:255 +#: lib/imagefile.php:246 msgid "kB" msgstr "" @@ -6018,7 +6021,7 @@ msgstr "" msgid "Unknown" msgstr "" -#: lib/profileaction.php:109 lib/profileaction.php:194 lib/subgroupnav.php:82 +#: lib/profileaction.php:109 lib/profileaction.php:200 lib/subgroupnav.php:82 msgid "Subscriptions" msgstr "" @@ -6026,7 +6029,7 @@ msgstr "" msgid "All subscriptions" msgstr "所有訂閱" -#: lib/profileaction.php:142 lib/profileaction.php:203 lib/subgroupnav.php:90 +#: lib/profileaction.php:142 lib/profileaction.php:209 lib/subgroupnav.php:90 msgid "Subscribers" msgstr "" @@ -6035,15 +6038,20 @@ msgstr "" msgid "All subscribers" msgstr "所有訂閱" -#: lib/profileaction.php:180 +#: lib/profileaction.php:186 msgid "User ID" msgstr "" -#: lib/profileaction.php:185 +#: lib/profileaction.php:191 msgid "Member since" msgstr "何時加入會員的呢？" -#: lib/profileaction.php:247 +#. TRANS: Average count of posts made per day since account registration +#: lib/profileaction.php:230 +msgid "Daily average" +msgstr "" + +#: lib/profileaction.php:259 msgid "All groups" msgstr "" @@ -6222,6 +6230,11 @@ msgstr "" msgid "Unsubscribe" msgstr "" +#: lib/usernoprofileexception.php:58 +#, php-format +msgid "User %s (%d) has no profile record." +msgstr "" + #: lib/userprofile.php:117 #, fuzzy msgid "Edit Avatar" From 5f32cf32cd7d4a5df7ba64d4f1e7d9edee8d418c Mon Sep 17 00:00:00 2001 From: Brion Vibber Date: Tue, 23 Mar 2010 14:18:45 -0700 Subject: [PATCH 14/34] Don't spew XML parse warnings to output when checking a remote XRD page --- plugins/OStatus/lib/xrd.php | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/plugins/OStatus/lib/xrd.php b/plugins/OStatus/lib/xrd.php index aa13ef0242..34b28790b7 100644 --- a/plugins/OStatus/lib/xrd.php +++ b/plugins/OStatus/lib/xrd.php @@ -53,7 +53,14 @@ class XRD $xrd = new XRD(); $dom = new DOMDocument(); - if (!$dom->loadXML($xml)) { + + // Don't spew XML warnings to output + $old = error_reporting(); + error_reporting($old & ~E_WARNING); + $ok = $dom->loadXML($xml); + error_reporting($old); + + if (!$ok) { throw new Exception("Invalid XML"); } $xrd_element = $dom->getElementsByTagName('XRD')->item(0); From df8c9090c0deabe20b804e0fd0766d6b86b7968f Mon Sep 17 00:00:00 2001 From: Brion Vibber Date: Tue, 23 Mar 2010 14:19:12 -0700 Subject: [PATCH 15/34] Add basic subscribe/unsubscribe test to OStatus test cases --- plugins/OStatus/tests/remote-tests.php | 176 ++++++++++++++++++++++--- 1 file changed, 157 insertions(+), 19 deletions(-) diff --git a/plugins/OStatus/tests/remote-tests.php b/plugins/OStatus/tests/remote-tests.php index 103ca066c0..b064114911 100644 --- a/plugins/OStatus/tests/remote-tests.php +++ b/plugins/OStatus/tests/remote-tests.php @@ -40,6 +40,20 @@ class TestBase } return true; } + + function assertTrue($a) + { + if (!$a) { + throw new Exception("Failed to assert true: got false"); + } + } + + function assertFalse($a) + { + if ($a) { + throw new Exception("Failed to assert false: got true"); + } + } } class OStatusTester extends TestBase @@ -60,8 +74,12 @@ class OStatusTester extends TestBase function run() { $this->setup(); + $this->testLocalPost(); $this->testMentionUrl(); + $this->testSubscribe(); + $this->testUnsubscribe(); + $this->log("DONE!"); } @@ -98,6 +116,25 @@ class OStatusTester extends TestBase $post = $this->pub->post("@$base/$name should have this in home and replies"); $this->sub->assertReceived($post); } + + function testSubscribe() + { + $this->assertFalse($this->sub->hasSubscription($this->pub->getProfileUri())); + $this->assertFalse($this->pub->hasSubscriber($this->sub->getProfileUri())); + $this->sub->subscribe($this->pub->getProfileLink()); + $this->assertTrue($this->sub->hasSubscription($this->pub->getProfileUri())); + $this->assertTrue($this->pub->hasSubscriber($this->sub->getProfileUri())); + } + + function testUnsubscribe() + { + $this->assertTrue($this->sub->hasSubscription($this->pub->getProfileUri())); + $this->assertTrue($this->pub->hasSubscriber($this->sub->getProfileUri())); + $this->sub->unsubscribe($this->pub->getProfileLink()); + $this->assertFalse($this->sub->hasSubscription($this->pub->getProfileUri())); + $this->assertFalse($this->pub->hasSubscriber($this->sub->getProfileUri())); + } + } class SNTestClient extends TestBase @@ -202,6 +239,43 @@ class SNTestClient extends TestBase return $dom; } + protected function parseXml($path, $body) + { + $dom = new DOMDocument(); + if ($dom->loadXML($body)) { + return $dom; + } else { + throw new Exception("Bogus XML data from $path:\n$body"); + } + } + + /** + * Make a hit to a REST-y XML page on the site, without authentication. + * @param string $path URL fragment for something relative to base + * @param array $params POST parameters to send + * @return DOMDocument + * @throws Exception on low-level error conditions + */ + protected function xml($path, $params=array()) + { + $response = $this->hit($path, $params, true); + $body = $response->getBody(); + return $this->parseXml($path, $body); + } + + protected function parseJson($path, $body) + { + $data = json_decode($body, true); + if ($data !== null) { + if (!empty($data['error'])) { + throw new Exception("JSON API returned error: " . $data['error']); + } + return $data; + } else { + throw new Exception("Bogus JSON data from $path:\n$body"); + } + } + /** * Make an API hit to this site, with authentication. * @param string $path URL fragment for something under 'api' folder @@ -215,22 +289,9 @@ class SNTestClient extends TestBase $response = $this->hit("api/$path.$style", $params, true); $body = $response->getBody(); if ($style == 'json') { - $data = json_decode($body, true); - if ($data !== null) { - if (!empty($data['error'])) { - throw new Exception("JSON API returned error: " . $data['error']); - } - return $data; - } else { - throw new Exception("Bogus JSON data from $path:\n$body"); - } + return $this->parseJson($path, $body); } else if ($style == 'xml' || $style == 'atom') { - $dom = new DOMDocument(); - if ($dom->loadXML($body)) { - return $dom; - } else { - throw new Exception("Bogus XML data from $path:\n$body"); - } + return $this->parseXml($path, $body); } else { throw new Exception("API needs to be JSON, XML, or Atom"); } @@ -257,6 +318,24 @@ class SNTestClient extends TestBase 'submit' => 'Register')); } + /** + * @return string canonical URI/URL to profile page + */ + function getProfileUri() + { + $data = $this->api('account/verify_credentials', 'json'); + $id = $data['id']; + return $this->basepath . '/user/' . $id; + } + + /** + * @return string human-friendly URL to profile page + */ + function getProfileLink() + { + return $this->basepath . '/' . $this->username; + } + /** * Check that the account has been registered and can be used. * On failure, throws a test failure exception. @@ -349,22 +428,81 @@ class SNTestClient extends TestBase return false; } + /** + * @param string $profile user page link or webfinger + */ + function subscribe($profile) + { + // This uses the command interface, since there's not currently + // a friendly Twit-API way to do a fresh remote subscription and + // the web form's a pain to use. + $this->post('follow ' . $profile); + } + + /** + * @param string $profile user page link or webfinger + */ + function unsubscribe($profile) + { + // This uses the command interface, since there's not currently + // a friendly Twit-API way to do a fresh remote subscription and + // the web form's a pain to use. + $this->post('leave ' . $profile); + } + /** * Check that this account is subscribed to the given profile. * @param string $profile_uri URI for the profile to check for + * @return boolean */ - function assertHasSubscription($profile_uri) + function hasSubscription($profile_uri) { - throw new Exception('tbi'); + $this->log("Checking if $this->username has a subscription to $profile_uri"); + + $me = $this->getProfileUri(); + return $this->checkSubscription($me, $profile_uri); } /** * Check that this account is subscribed to by the given profile. * @param string $profile_uri URI for the profile to check for + * @return boolean */ - function assertHasSubscriber($profile_uri) + function hasSubscriber($profile_uri) { - throw new Exception('tbi'); + $this->log("Checking if $this->username is subscribed to by $profile_uri"); + + $me = $this->getProfileUri(); + return $this->checkSubscription($profile_uri, $me); + } + + protected function checkSubscription($subscriber, $subscribed) + { + // Using FOAF as the API methods for checking the social graph + // currently are unfriendly to remote profiles + $ns_foaf = 'http://xmlns.com/foaf/0.1/'; + $ns_sioc = 'http://rdfs.org/sioc/ns#'; + $ns_rdf = 'http://www.w3.org/1999/02/22-rdf-syntax-ns#'; + + $dom = $this->xml($this->username . '/foaf'); + $agents = $dom->getElementsByTagNameNS($ns_foaf, 'Agent'); + foreach ($agents as $agent) { + $agent_uri = $agent->getAttributeNS($ns_rdf, 'about'); + if ($agent_uri == $subscriber) { + $follows = $agent->getElementsByTagNameNS($ns_sioc, 'follows'); + foreach ($follows as $follow) { + $target = $follow->getAttributeNS($ns_rdf, 'resource'); + if ($target == ($subscribed . '#acct')) { + $this->log("Confirmed $subscriber subscribed to $subscribed"); + return true; + } + } + $this->log("We found $subscriber but they don't follow $subscribed"); + return false; + } + } + $this->log("Can't find $subscriber in {$this->username}'s social graph."); + return false; } } From 13d59e0c76b887a2bfd2e5cfcc2e0fedf728bc07 Mon Sep 17 00:00:00 2001 From: Brion Vibber Date: Tue, 23 Mar 2010 17:24:01 -0700 Subject: [PATCH 16/34] fixup_deletions.php script to look for notices posted by now-deleted profiles and remove them. --- classes/Notice.php | 4 +- scripts/fixup_deletions.php | 166 ++++++++++++++++++++++++++++++++++++ 2 files changed, 169 insertions(+), 1 deletion(-) create mode 100755 scripts/fixup_deletions.php diff --git a/classes/Notice.php b/classes/Notice.php index f7194e3394..be3e9ca2a6 100644 --- a/classes/Notice.php +++ b/classes/Notice.php @@ -421,7 +421,9 @@ class Notice extends Memcached_DataObject } $profile = Profile::staticGet($this->profile_id); - $profile->blowNoticeCount(); + if (!empty($profile)) { + $profile->blowNoticeCount(); + } } /** diff --git a/scripts/fixup_deletions.php b/scripts/fixup_deletions.php new file mode 100755 index 0000000000..07ada7f9d9 --- /dev/null +++ b/scripts/fixup_deletions.php @@ -0,0 +1,166 @@ +#!/usr/bin/env php +. + */ + +define('INSTALLDIR', realpath(dirname(__FILE__) . '/..')); + +$longoptions = array('dry-run', 'start=', 'end='); + +$helptext = <<query($query); + + if ($profile->fetch()) { + return intval($profile->id); + } else { + die("Something went awry; could not look up max used profile_id."); + } +} + +/** + * Check for profiles in the given id range that are missing, presumed deleted. + * + * @param int $start beginning profile.id, inclusive + * @param int $end final profile.id, inclusive + * @return array of integer profile.ids + * @access private + */ +function get_missing_profiles($start, $end) +{ + $query = sprintf("SELECT id FROM profile WHERE id BETWEEN %d AND %d", + $start, $end); + + $profile = new Profile(); + $profile->query($query); + + $all = range($start, $end); + $known = array(); + while ($row = $profile->fetch()) { + $known[] = intval($profile->id); + } + unset($profile); + + $missing = array_diff($all, $known); + return $missing; +} + +/** + * Look for stray notices from this profile and, if present, kill them. + * + * @param int $profile_id + * @param bool $dry if true, we won't delete anything + */ +function cleanup_missing_profile($profile_id, $dry) +{ + $notice = new Notice(); + $notice->profile_id = $profile_id; + $notice->find(); + if ($notice->N == 0) { + return; + } + + $s = ($notice->N == 1) ? '' : 's'; + print "Deleted profile $profile_id has $notice->N stray notice$s:\n"; + + while ($notice->fetch()) { + print " notice $notice->id"; + if ($dry) { + print " (skipped; dry run)\n"; + } else { + $victim = clone($notice); + try { + $victim->delete(); + print " (deleted)\n"; + } catch (Exception $e) { + print " FAILED: "; + print $e->getMessage(); + print "\n"; + } + } + } +} + +$dry = have_option('dry-run'); + +$max_profile_id = get_max_profile_id(); +$chunk = 1000; + +if (have_option('start')) { + $begin = intval(get_option_value('start')); +} else { + $begin = 1; +} +if (have_option('end')) { + $final = min($max_profile_id, intval(get_option_value('end'))); +} else { + $final = $max_profile_id; +} + +if ($begin < 1) { + die("Silly human, you can't begin before profile number 1!\n"); +} +if ($final < $begin) { + die("Silly human, you can't end at $final if it's before $begin!\n"); +} + +// Identify missing profiles... +for ($start = $begin; $start <= $final; $start += $chunk) { + $end = min($start + $chunk - 1, $final); + + print "Checking for missing profiles between id $start and $end"; + if ($dry) { + print " (dry run)"; + } + print "...\n"; + $missing = get_missing_profiles($start, $end); + + foreach ($missing as $profile_id) { + cleanup_missing_profile($profile_id, $dry); + } +} + +echo "done.\n"; + From d9dcdf5b4966fc244fa9b6fa8415c2aeae6cbb47 Mon Sep 17 00:00:00 2001 From: Nick Holliday Date: Tue, 23 Mar 2010 22:30:02 +0000 Subject: [PATCH 17/34] Converts Spotify URI/HTTP Links to pretty ones. --- plugins/SpotifyPlugin.php | 113 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 113 insertions(+) create mode 100644 plugins/SpotifyPlugin.php diff --git a/plugins/SpotifyPlugin.php b/plugins/SpotifyPlugin.php new file mode 100644 index 0000000000..e7a5a53826 --- /dev/null +++ b/plugins/SpotifyPlugin.php @@ -0,0 +1,113 @@ +. + * + * @category Plugin + * @package StatusNet + * @author Nick Holliday + * @copyright Nick Holliday + * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 + * @link http://status.net/ + * + * @see Event + */ +if (!defined('STATUSNET')) { + exit(1); +} +define('SPOTIFYPLUGIN_VERSION', '0.1'); + +/** + * Plugin to create pretty Spotify URLs + * + * The Spotify API is called before the notice is saved to gather artist and track information. + * + * @category Plugin + * @package StatusNet + * @author Nick Holliday + * @copyright Nick Holliday + * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 + * @link http://status.net/ + * + * @see Event + */ + +class SpotifyPlugin extends Plugin +{ + + function __construct() + { + parent::__construct(); + } + + function onStartNoticeSave($notice) + { + $notice->rendered = preg_replace_callback('/spotify:[a-z]{5,6}:[a-z0-9]{22}/i', + "renderSpotifyURILink", + $notice->rendered); + + $notice->rendered = preg_replace_callback('/http:\/\/open.spotify.com\/[a-z]{5,6}\/[a-z0-9]{22}<\/a>/i', + "renderSpotifyHTTPLink", + $notice->rendered); + + return true; + } + + function userAgent() + { + return 'SpotifyPlugin/'.SPOTIFYPLUGIN_VERSION . + ' StatusNet/' . STATUSNET_VERSION; + } +} + +function doSpotifyLookup($uri, $isArtist) +{ + $request = HTTPClient::start(); + $response = $request->get('http://ws.spotify.com/lookup/1/?uri=' . $uri); + if ($response->isOk()) { + $xml = simplexml_load_string($response->getBody()); + + if($isArtist) + return $xml->name; + else + return $xml->artist->name . ' - ' . $xml->name; + } +} + +function renderSpotifyURILink($match) +{ + $isArtist = false; + if(preg_match('/artist/', $match[0]) > 0) $isArtist = true; + + $name = doSpotifyLookup($match[0], $isArtist); + return "" . $name . ""; +} + +function renderSpotifyHTTPLink($match) +{ + $match[0] = preg_replace('/http:\/\/open.spotify.com\//i', 'spotify:', $match[0]); + $match[0] = preg_replace('/<\/a>/', '', $match[0]); + $match[0] = preg_replace('/\//', ':', $match[0]); + + $isArtist = false; + if(preg_match('/artist/', $match[0]) > 0) $isArtist = true; + + $name = doSpotifyLookup($match[0], $isArtist); + return "" . $name . ""; +} From 9380eed794e1bd419a4af4dcbbcd176f164112fc Mon Sep 17 00:00:00 2001 From: Brion Vibber Date: Tue, 23 Mar 2010 18:44:54 -0700 Subject: [PATCH 18/34] add a general PuSHed post and an @-reply back to a subscribee by name to OStatus remote test cases --- plugins/OStatus/tests/remote-tests.php | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/plugins/OStatus/tests/remote-tests.php b/plugins/OStatus/tests/remote-tests.php index b064114911..a27ecb854f 100644 --- a/plugins/OStatus/tests/remote-tests.php +++ b/plugins/OStatus/tests/remote-tests.php @@ -78,6 +78,8 @@ class OStatusTester extends TestBase $this->testLocalPost(); $this->testMentionUrl(); $this->testSubscribe(); + $this->testPush(); + $this->testMentionSubscribee(); $this->testUnsubscribe(); $this->log("DONE!"); @@ -126,6 +128,26 @@ class OStatusTester extends TestBase $this->assertTrue($this->pub->hasSubscriber($this->sub->getProfileUri())); } + function testPush() + { + $this->assertTrue($this->sub->hasSubscription($this->pub->getProfileUri())); + $this->assertTrue($this->pub->hasSubscriber($this->sub->getProfileUri())); + + $name = $this->sub->username; + $post = $this->pub->post("Regular post, which $name should get via PuSH"); + $this->sub->assertReceived($post); + } + + function testMentionSubscribee() + { + $this->assertTrue($this->sub->hasSubscription($this->pub->getProfileUri())); + $this->assertFalse($this->pub->hasSubscription($this->sub->getProfileUri())); + + $name = $this->pub->username; + $post = $this->sub->post("Just a quick note back to my remote subscribee @$name"); + $this->pub->assertReceived($post); + } + function testUnsubscribe() { $this->assertTrue($this->sub->hasSubscription($this->pub->getProfileUri())); From 6b538cd9b31ffa25d2046e16d47a0cde26d0398f Mon Sep 17 00:00:00 2001 From: Craig Andrews Date: Tue, 23 Mar 2010 21:50:31 -0400 Subject: [PATCH 19/34] Fix some regressions caused by refactor of LDAP plugin --- .../LdapAuthenticationPlugin.php | 2 +- plugins/LdapCommon/LdapCommon.php | 24 +++++++++++++------ 2 files changed, 18 insertions(+), 8 deletions(-) diff --git a/plugins/LdapAuthentication/LdapAuthenticationPlugin.php b/plugins/LdapAuthentication/LdapAuthenticationPlugin.php index a55c45ff57..2e01738ec3 100644 --- a/plugins/LdapAuthentication/LdapAuthenticationPlugin.php +++ b/plugins/LdapAuthentication/LdapAuthenticationPlugin.php @@ -118,7 +118,7 @@ class LdapAuthenticationPlugin extends AuthenticationPlugin function suggestNicknameForUsername($username) { - $entry = $this->ldap_get_user($username, $this->attributes); + $entry = $this->ldapCommon->get_user($username, $this->attributes); if(!$entry){ //this really shouldn't happen $nickname = $username; diff --git a/plugins/LdapCommon/LdapCommon.php b/plugins/LdapCommon/LdapCommon.php index 39d872df53..e2ca569f39 100644 --- a/plugins/LdapCommon/LdapCommon.php +++ b/plugins/LdapCommon/LdapCommon.php @@ -47,7 +47,7 @@ class LdapCommon public $uniqueMember_attribute = null; public $attributes=array(); public $password_encoding=null; - + public function __construct($config) { Event::addHandler('Autoload',array($this,'onAutoload')); @@ -68,7 +68,7 @@ class LdapCommon } function onAutoload($cls) - { + { switch ($cls) { case 'MemcacheSchemaCache': @@ -77,6 +77,15 @@ class LdapCommon case 'Net_LDAP2': require_once 'Net/LDAP2.php'; return false; + case 'Net_LDAP2_Filter': + require_once 'Net/LDAP2/Filter.php'; + return false; + case 'Net_LDAP2_Filter': + require_once 'Net/LDAP2/Filter.php'; + return false; + case 'Net_LDAP2_Entry': + require_once 'Net/LDAP2/Entry.php'; + return false; } } @@ -97,8 +106,9 @@ class LdapCommon $config = $this->ldap_config; } $config_id = crc32(serialize($config)); - $ldap = self::$ldap_connections[$config_id]; - if(! isset($ldap)) { + if(array_key_exists($config_id,self::$ldap_connections)) { + $ldap = self::$ldap_connections[$config_id]; + } else { //cannot use Net_LDAP2::connect() as StatusNet uses //PEAR::setErrorHandling(PEAR_ERROR_CALLBACK, 'handleError'); //PEAR handling can be overridden on instance objects, so we do that. @@ -197,10 +207,10 @@ class LdapCommon return false; } } - + /** * get an LDAP entry for a user with a given username - * + * * @param string $username * $param array $attributes LDAP attributes to retrieve * @return string DN @@ -212,7 +222,7 @@ class LdapCommon 'attributes' => $attributes ); $search = $ldap->search(null,$filter,$options); - + if (PEAR::isError($search)) { common_log(LOG_WARNING, 'Error while getting DN for user: '.$search->getMessage()); return false; From fcf86b4fdf200b1f2955f4f93c5b85054c7254b7 Mon Sep 17 00:00:00 2001 From: Brion Vibber Date: Tue, 23 Mar 2010 18:56:40 -0700 Subject: [PATCH 20/34] Improve legibility of OStatus remote tests output --- plugins/OStatus/tests/remote-tests.php | 29 ++++++++++++++------------ 1 file changed, 16 insertions(+), 13 deletions(-) diff --git a/plugins/OStatus/tests/remote-tests.php b/plugins/OStatus/tests/remote-tests.php index a27ecb854f..24b4b1660a 100644 --- a/plugins/OStatus/tests/remote-tests.php +++ b/plugins/OStatus/tests/remote-tests.php @@ -75,13 +75,16 @@ class OStatusTester extends TestBase { $this->setup(); - $this->testLocalPost(); - $this->testMentionUrl(); - $this->testSubscribe(); - $this->testPush(); - $this->testMentionSubscribee(); - $this->testUnsubscribe(); + $methods = get_class_methods($this); + foreach ($methods as $method) { + if (strtolower(substr($method, 0, 4)) == 'test') { + print "\n"; + print "== $method ==\n"; + call_user_func(array($this, $method)); + } + } + print "\n"; $this->log("DONE!"); } @@ -372,6 +375,7 @@ class SNTestClient extends TestBase $this->assertEqual($this->fullname, $data['name']); $this->assertEqual($this->homepage, $data['url']); $this->assertEqual($this->bio, $data['description']); + $this->log(" looks good!"); } /** @@ -408,11 +412,11 @@ class SNTestClient extends TestBase } $tries--; if ($tries) { - $this->log("Didn't see it yet, waiting $timeout seconds"); + $this->log(" didn't see it yet, waiting $timeout seconds"); sleep($timeout); } } - throw new Exception("Message $notice_uri not received by $this->username"); + throw new Exception(" message $notice_uri not received by $this->username"); } /** @@ -442,10 +446,9 @@ class SNTestClient extends TestBase } foreach ($entries as $entry) { if ($entry->id == $notice_uri) { - $this->log("found it $notice_uri"); + $this->log(" found it $notice_uri"); return true; } - //$this->log("nope... " . $entry->id); } return false; } @@ -515,15 +518,15 @@ class SNTestClient extends TestBase foreach ($follows as $follow) { $target = $follow->getAttributeNS($ns_rdf, 'resource'); if ($target == ($subscribed . '#acct')) { - $this->log("Confirmed $subscriber subscribed to $subscribed"); + $this->log(" confirmed $subscriber subscribed to $subscribed"); return true; } } - $this->log("We found $subscriber but they don't follow $subscribed"); + $this->log(" we found $subscriber but they don't follow $subscribed"); return false; } } - $this->log("Can't find $subscriber in {$this->username}'s social graph."); + $this->log(" can't find $subscriber in {$this->username}'s social graph."); return false; } From 1f73156daeef47cf8a7214936383fbc496255fd7 Mon Sep 17 00:00:00 2001 From: Craig Andrews Date: Tue, 23 Mar 2010 21:57:47 -0400 Subject: [PATCH 21/34] Move the bundled Net/LDAP2 library to the LdapCommon directory --- plugins/LdapCommon/LdapCommon.php | 3 +++ {extlib => plugins/LdapCommon/extlib}/Net/LDAP2.php | 0 {extlib => plugins/LdapCommon/extlib}/Net/LDAP2/Entry.php | 0 {extlib => plugins/LdapCommon/extlib}/Net/LDAP2/Filter.php | 0 {extlib => plugins/LdapCommon/extlib}/Net/LDAP2/LDIF.php | 0 {extlib => plugins/LdapCommon/extlib}/Net/LDAP2/RootDSE.php | 0 {extlib => plugins/LdapCommon/extlib}/Net/LDAP2/Schema.php | 0 .../LdapCommon/extlib}/Net/LDAP2/SchemaCache.interface.php | 0 {extlib => plugins/LdapCommon/extlib}/Net/LDAP2/Search.php | 0 .../LdapCommon/extlib}/Net/LDAP2/SimpleFileSchemaCache.php | 0 {extlib => plugins/LdapCommon/extlib}/Net/LDAP2/Util.php | 0 11 files changed, 3 insertions(+) rename {extlib => plugins/LdapCommon/extlib}/Net/LDAP2.php (100%) rename {extlib => plugins/LdapCommon/extlib}/Net/LDAP2/Entry.php (100%) rename {extlib => plugins/LdapCommon/extlib}/Net/LDAP2/Filter.php (100%) rename {extlib => plugins/LdapCommon/extlib}/Net/LDAP2/LDIF.php (100%) rename {extlib => plugins/LdapCommon/extlib}/Net/LDAP2/RootDSE.php (100%) rename {extlib => plugins/LdapCommon/extlib}/Net/LDAP2/Schema.php (100%) rename {extlib => plugins/LdapCommon/extlib}/Net/LDAP2/SchemaCache.interface.php (100%) rename {extlib => plugins/LdapCommon/extlib}/Net/LDAP2/Search.php (100%) rename {extlib => plugins/LdapCommon/extlib}/Net/LDAP2/SimpleFileSchemaCache.php (100%) rename {extlib => plugins/LdapCommon/extlib}/Net/LDAP2/Util.php (100%) diff --git a/plugins/LdapCommon/LdapCommon.php b/plugins/LdapCommon/LdapCommon.php index e2ca569f39..ee436d8243 100644 --- a/plugins/LdapCommon/LdapCommon.php +++ b/plugins/LdapCommon/LdapCommon.php @@ -31,6 +31,9 @@ if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); } +// We bundle the Net/LDAP2 library... +set_include_path(get_include_path() . PATH_SEPARATOR . dirname(__FILE__) . '/extlib'); + class LdapCommon { protected static $ldap_connections = array(); diff --git a/extlib/Net/LDAP2.php b/plugins/LdapCommon/extlib/Net/LDAP2.php similarity index 100% rename from extlib/Net/LDAP2.php rename to plugins/LdapCommon/extlib/Net/LDAP2.php diff --git a/extlib/Net/LDAP2/Entry.php b/plugins/LdapCommon/extlib/Net/LDAP2/Entry.php similarity index 100% rename from extlib/Net/LDAP2/Entry.php rename to plugins/LdapCommon/extlib/Net/LDAP2/Entry.php diff --git a/extlib/Net/LDAP2/Filter.php b/plugins/LdapCommon/extlib/Net/LDAP2/Filter.php similarity index 100% rename from extlib/Net/LDAP2/Filter.php rename to plugins/LdapCommon/extlib/Net/LDAP2/Filter.php diff --git a/extlib/Net/LDAP2/LDIF.php b/plugins/LdapCommon/extlib/Net/LDAP2/LDIF.php similarity index 100% rename from extlib/Net/LDAP2/LDIF.php rename to plugins/LdapCommon/extlib/Net/LDAP2/LDIF.php diff --git a/extlib/Net/LDAP2/RootDSE.php b/plugins/LdapCommon/extlib/Net/LDAP2/RootDSE.php similarity index 100% rename from extlib/Net/LDAP2/RootDSE.php rename to plugins/LdapCommon/extlib/Net/LDAP2/RootDSE.php diff --git a/extlib/Net/LDAP2/Schema.php b/plugins/LdapCommon/extlib/Net/LDAP2/Schema.php similarity index 100% rename from extlib/Net/LDAP2/Schema.php rename to plugins/LdapCommon/extlib/Net/LDAP2/Schema.php diff --git a/extlib/Net/LDAP2/SchemaCache.interface.php b/plugins/LdapCommon/extlib/Net/LDAP2/SchemaCache.interface.php similarity index 100% rename from extlib/Net/LDAP2/SchemaCache.interface.php rename to plugins/LdapCommon/extlib/Net/LDAP2/SchemaCache.interface.php diff --git a/extlib/Net/LDAP2/Search.php b/plugins/LdapCommon/extlib/Net/LDAP2/Search.php similarity index 100% rename from extlib/Net/LDAP2/Search.php rename to plugins/LdapCommon/extlib/Net/LDAP2/Search.php diff --git a/extlib/Net/LDAP2/SimpleFileSchemaCache.php b/plugins/LdapCommon/extlib/Net/LDAP2/SimpleFileSchemaCache.php similarity index 100% rename from extlib/Net/LDAP2/SimpleFileSchemaCache.php rename to plugins/LdapCommon/extlib/Net/LDAP2/SimpleFileSchemaCache.php diff --git a/extlib/Net/LDAP2/Util.php b/plugins/LdapCommon/extlib/Net/LDAP2/Util.php similarity index 100% rename from extlib/Net/LDAP2/Util.php rename to plugins/LdapCommon/extlib/Net/LDAP2/Util.php From abe4be5438180f5e4f7618f60112023e5ccd788e Mon Sep 17 00:00:00 2001 From: Craig Andrews Date: Tue, 23 Mar 2010 22:42:30 -0400 Subject: [PATCH 22/34] Use $param instead of hardcoded 'attach' name. --- lib/mediafile.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/mediafile.php b/lib/mediafile.php index 10d90d0081..1c96c42d7a 100644 --- a/lib/mediafile.php +++ b/lib/mediafile.php @@ -171,7 +171,7 @@ class MediaFile return; } - if (!MediaFile::respectsQuota($user, $_FILES['attach']['size'])) { + if (!MediaFile::respectsQuota($user, $_FILES[$param]['size'])) { // Should never actually get here From a3da5b24c9fc602e147304333ac059d0aae13de7 Mon Sep 17 00:00:00 2001 From: Julien C Date: Sun, 7 Feb 2010 18:29:42 +0100 Subject: [PATCH 23/34] Misc small fixes, plus a new hook in tag.php --- EVENTS.txt | 2 +- actions/tag.php | 13 +++++++++---- plugins/RSSCloud/RSSCloudPlugin.php | 2 +- 3 files changed, 11 insertions(+), 6 deletions(-) diff --git a/EVENTS.txt b/EVENTS.txt index 2da6f3da61..cf9c6123f3 100644 --- a/EVENTS.txt +++ b/EVENTS.txt @@ -141,7 +141,7 @@ StartLogout: Before logging out EndLogout: After logging out - $action: the logout action -ArgsInitialized: After the argument array has been initialized +ArgsInitialize: After the argument array has been initialized - $args: associative array of arguments, can be modified StartAddressData: Allows the site owner to provide additional information about themselves for contact (e.g., tagline, email, location) diff --git a/actions/tag.php b/actions/tag.php index ee9617b662..72668a0c91 100644 --- a/actions/tag.php +++ b/actions/tag.php @@ -102,12 +102,17 @@ class TagAction extends Action function showContent() { - $nl = new NoticeList($this->notice, $this); + if(Event::handle('StartTagShowContent', array($this))) { + + $nl = new NoticeList($this->notice, $this); - $cnt = $nl->show(); + $cnt = $nl->show(); - $this->pagination($this->page > 1, $cnt > NOTICES_PER_PAGE, - $this->page, 'tag', array('tag' => $this->tag)); + $this->pagination($this->page > 1, $cnt > NOTICES_PER_PAGE, + $this->page, 'tag', array('tag' => $this->tag)); + + Event::handle('EndTagShowContent', array($this)) + } } function isReadOnly($args) diff --git a/plugins/RSSCloud/RSSCloudPlugin.php b/plugins/RSSCloud/RSSCloudPlugin.php index 9f444c8bba..001106acec 100644 --- a/plugins/RSSCloud/RSSCloudPlugin.php +++ b/plugins/RSSCloud/RSSCloudPlugin.php @@ -105,7 +105,7 @@ class RSSCloudPlugin extends Plugin * @return boolean hook return */ - function onRouterInitialized(&$m) + function onRouterInitialized($m) { $m->connect('/main/rsscloud/request_notify', array('action' => 'RSSCloudRequestNotify')); From 7b1b6045e61973b8835e7253d6b532a752535297 Mon Sep 17 00:00:00 2001 From: Zach Copley Date: Wed, 24 Mar 2010 00:00:55 -0700 Subject: [PATCH 24/34] Look for the first object in the Activity --- plugins/OStatus/actions/usersalmon.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/plugins/OStatus/actions/usersalmon.php b/plugins/OStatus/actions/usersalmon.php index ecdcfa1939..6c360c49f9 100644 --- a/plugins/OStatus/actions/usersalmon.php +++ b/plugins/OStatus/actions/usersalmon.php @@ -92,7 +92,7 @@ class UsersalmonAction extends SalmonAction throw new ClientException("Not to anyone in reply to anything!"); } - $existing = Notice::staticGet('uri', $this->act->object->id); + $existing = Notice::staticGet('uri', $this->act->objects[0]->id); if (!empty($existing)) { common_log(LOG_ERR, "Not saving notice '{$existing->uri}'; already exists."); @@ -143,7 +143,7 @@ class UsersalmonAction extends SalmonAction function handleFavorite() { - $notice = $this->getNotice($this->act->object); + $notice = $this->getNotice($this->act->objects[0]); $profile = $this->ensureProfile()->localProfile(); $old = Fave::pkeyGet(array('user_id' => $profile->id, @@ -164,7 +164,7 @@ class UsersalmonAction extends SalmonAction */ function handleUnfavorite() { - $notice = $this->getNotice($this->act->object); + $notice = $this->getNotice($this->act->objects[0]); $profile = $this->ensureProfile()->localProfile(); $fave = Fave::pkeyGet(array('user_id' => $profile->id, From 647b3a1f6bff2f0c8f02ea65939ebde088742b16 Mon Sep 17 00:00:00 2001 From: Sarven Capadisli Date: Wed, 24 Mar 2010 14:50:12 +0100 Subject: [PATCH 25/34] Moved print inside base stylesheet using media rules. One less HTTP GET. --- lib/action.php | 3 +-- theme/base/css/display.css | 32 ++++++++++++++++++++++++++++ theme/biz/css/base.css | 32 ++++++++++++++++++++++++++++ theme/biz/css/display.css | 3 ++- theme/cloudy/css/display.css | 30 ++++++++++++++++++++++++++ theme/default/css/display.css | 4 +++- theme/h4ck3r/css/base.css | 32 ++++++++++++++++++++++++++++ theme/h4ck3r/css/display.css | 5 ++++- theme/identica/css/display.css | 4 +++- theme/pigeonthoughts/css/base.css | 32 ++++++++++++++++++++++++++++ theme/pigeonthoughts/css/display.css | 4 +++- 11 files changed, 174 insertions(+), 7 deletions(-) diff --git a/lib/action.php b/lib/action.php index 491d7d4810..09113a598e 100644 --- a/lib/action.php +++ b/lib/action.php @@ -198,8 +198,7 @@ class Action extends HTMLOutputter // lawsuit if (Event::handle('StartShowStatusNetStyles', array($this)) && Event::handle('StartShowLaconicaStyles', array($this))) { - $this->cssLink('css/display.css',null,'screen, projection, tv'); - $this->cssLink('css/print.css','base','print'); + $this->cssLink('css/display.css',null, 'screen, projection, tv, print'); Event::handle('EndShowStatusNetStyles', array($this)); Event::handle('EndShowLaconicaStyles', array($this)); } diff --git a/theme/base/css/display.css b/theme/base/css/display.css index d58684efbe..36f0533b14 100644 --- a/theme/base/css/display.css +++ b/theme/base/css/display.css @@ -7,6 +7,7 @@ * @link http://status.net/ */ +@media screen, projection, tv { * { margin:0; padding:0; } img { display:block; border:0; } a abbr { cursor: pointer; border-bottom:0; } @@ -1688,3 +1689,34 @@ width:auto; #bookmarklet #wrap { min-width:0; } + +}/*end of @media screen, projection, tv*/ + + +@media print { +a:after { background-color:#FFFFFF; } +a:not([href^="#"]):after { content:" <"attr(href)"> "; } +img { border:none; } +p { orphans: 2; widows: 1; } + +#site_nav_global_primary, +#site_nav_local_views, +#form_notice, +.pagination, +#site_nav_global_secondary, +.entity_actions, +.notice-options, +#aside_primary, +.form_subscription_edit .submit { +display:none; +} +.timestamp dt, .timestamp dd, +.device dt, .device dd { +display:inline; +} +.profiles li, +.notices li { +margin-bottom:18px; +} + +}/*end of @media print*/ diff --git a/theme/biz/css/base.css b/theme/biz/css/base.css index 2c2ab33a01..43b8e4656c 100644 --- a/theme/biz/css/base.css +++ b/theme/biz/css/base.css @@ -7,6 +7,7 @@ * @link http://status.net/ */ +@media screen, projection, tv { * { margin:0; padding:0; } img { display:block; border:0; } a abbr { cursor: pointer; border-bottom:0; } @@ -1358,3 +1359,34 @@ display:none; .guide { clear:both; } + +}/*end of @media screen, projection, tv*/ + + +@media print { +a:after { background-color:#FFFFFF; } +a:not([href^="#"]):after { content:" <"attr(href)"> "; } +img { border:none; } +p { orphans: 2; widows: 1; } + +#site_nav_global_primary, +#site_nav_local_views, +#form_notice, +.pagination, +#site_nav_global_secondary, +.entity_actions, +.notice-options, +#aside_primary, +.form_subscription_edit .submit { +display:none; +} +.timestamp dt, .timestamp dd, +.device dt, .device dd { +display:inline; +} +.profiles li, +.notices li { +margin-bottom:18px; +} + +}/*end of @media print*/ diff --git a/theme/biz/css/display.css b/theme/biz/css/display.css index 3e97444f15..cafb152dcc 100644 --- a/theme/biz/css/display.css +++ b/theme/biz/css/display.css @@ -7,8 +7,9 @@ * @link http://status.net/ */ -@import url(base.css); +@import url(base.css) screen, projection, tv, print; +@media screen, projection, tv { html { background-color:#144A6E; } diff --git a/theme/cloudy/css/display.css b/theme/cloudy/css/display.css index 5bc32e6d95..d9e9f3ce20 100644 --- a/theme/cloudy/css/display.css +++ b/theme/cloudy/css/display.css @@ -7,6 +7,7 @@ * @link http://status.net/ */ +@media screen, projection, tv { * { margin:0; padding:0; } img { display:block; border:0; } a abbr { cursor: pointer; border-bottom:0; } @@ -2099,4 +2100,33 @@ border-left-color:#FFFFFF; #footer { background-color:#FFFFFF; } +}/*end of @media screen, projection, tv*/ + +@media print { +a:after { background-color:#FFFFFF; } +a:not([href^="#"]):after { content:" <"attr(href)"> "; } +img { border:none; } +p { orphans: 2; widows: 1; } + +#site_nav_global_primary, +#site_nav_local_views, +#form_notice, +.pagination, +#site_nav_global_secondary, +.entity_actions, +.notice-options, +#aside_primary, +.form_subscription_edit .submit { +display:none; +} +.timestamp dt, .timestamp dd, +.device dt, .device dd { +display:inline; +} +.profiles li, +.notices li { +margin-bottom:18px; +} + +}/*end of @media print*/ diff --git a/theme/default/css/display.css b/theme/default/css/display.css index d7f15cc469..7ccd234cd0 100644 --- a/theme/default/css/display.css +++ b/theme/default/css/display.css @@ -7,8 +7,9 @@ * @link http://status.net/ */ -@import url(../../base/css/display.css); +@import url(../../base/css/display.css) screen, projection, tv, print; +@media screen, projection, tv { body, a:active { background-color:#CEE1E9; @@ -516,3 +517,4 @@ background-position:90% 47%; background-position:10% 47%; } +}/*end of @media screen, projection, tv*/ diff --git a/theme/h4ck3r/css/base.css b/theme/h4ck3r/css/base.css index 18ea742a59..0302653fde 100644 --- a/theme/h4ck3r/css/base.css +++ b/theme/h4ck3r/css/base.css @@ -7,6 +7,7 @@ * @link http://status.net/ */ +@media screen, projection, tv { * { margin:0; padding:0; } img { display:block; border:0; } a abbr { cursor: pointer; border-bottom:0; } @@ -1137,3 +1138,34 @@ display:none; .guide { clear:both; } + +}/*end of @media screen, projection, tv*/ + + +@media print { +a:after { background-color:#FFFFFF; } +a:not([href^="#"]):after { content:" <"attr(href)"> "; } +img { border:none; } +p { orphans: 2; widows: 1; } + +#site_nav_global_primary, +#site_nav_local_views, +#form_notice, +.pagination, +#site_nav_global_secondary, +.entity_actions, +.notice-options, +#aside_primary, +.form_subscription_edit .submit { +display:none; +} +.timestamp dt, .timestamp dd, +.device dt, .device dd { +display:inline; +} +.profiles li, +.notices li { +margin-bottom:18px; +} + +}/*end of @media print*/ diff --git a/theme/h4ck3r/css/display.css b/theme/h4ck3r/css/display.css index 58b3f242ae..7112765abd 100644 --- a/theme/h4ck3r/css/display.css +++ b/theme/h4ck3r/css/display.css @@ -7,8 +7,9 @@ * @link http://status.net/ */ -@import url(base.css); +@import url(base.css) screen, projection, tv, print; +@media screen, projection, tv { html, body, a:active { @@ -234,3 +235,5 @@ background-position:10% 45%; background-image:url(../../base/images/icons/twotone/green/arrow-right.gif); background-position:90% 45%; } + +}/*end of @media screen, projection, tv*/ diff --git a/theme/identica/css/display.css b/theme/identica/css/display.css index d9f39e7803..3972657a79 100644 --- a/theme/identica/css/display.css +++ b/theme/identica/css/display.css @@ -7,8 +7,9 @@ * @link http://status.net/ */ -@import url(../../base/css/display.css); +@import url(../../base/css/display.css) screen, projection, tv, print; +@media screen, projection, tv { body, a:active { background-color:#F0F2F5; @@ -515,3 +516,4 @@ background-position:90% 47%; background-position:10% 47%; } +}/*end of @media screen, projection, tv*/ diff --git a/theme/pigeonthoughts/css/base.css b/theme/pigeonthoughts/css/base.css index 2814260bd3..bd12e6eaac 100644 --- a/theme/pigeonthoughts/css/base.css +++ b/theme/pigeonthoughts/css/base.css @@ -7,6 +7,7 @@ * @link http://status.net/ */ +@media screen, projection, tv { * { margin:0; padding:0; } img { display:block; border:0; } a abbr { cursor: pointer; border-bottom:0; } @@ -1383,3 +1384,34 @@ display:none; .guide { clear:both; } + +}/*end of @media screen, projection, tv*/ + + +@media print { +a:after { background-color:#FFFFFF; } +a:not([href^="#"]):after { content:" <"attr(href)"> "; } +img { border:none; } +p { orphans: 2; widows: 1; } + +#site_nav_global_primary, +#site_nav_local_views, +#form_notice, +.pagination, +#site_nav_global_secondary, +.entity_actions, +.notice-options, +#aside_primary, +.form_subscription_edit .submit { +display:none; +} +.timestamp dt, .timestamp dd, +.device dt, .device dd { +display:inline; +} +.profiles li, +.notices li { +margin-bottom:18px; +} + +}/*end of @media print*/ diff --git a/theme/pigeonthoughts/css/display.css b/theme/pigeonthoughts/css/display.css index dfeb01b48a..de5164ea82 100644 --- a/theme/pigeonthoughts/css/display.css +++ b/theme/pigeonthoughts/css/display.css @@ -7,8 +7,9 @@ * @link http://status.net/ */ -@import url(base.css); +@import url(base.css) screen, projection, tv, print; +@media screen, projection, tv { html { background:url(../images/illustrations/illu_pigeons-01.png) no-repeat 0 100%; } @@ -496,3 +497,4 @@ background-position:90% 47%; background-position:10% 47%; } +}/*end of @media screen, projection, tv*/ From 5808f86584a64d6dbd12e070b268f40c043917e4 Mon Sep 17 00:00:00 2001 From: Sarven Capadisli Date: Wed, 24 Mar 2010 15:13:38 +0100 Subject: [PATCH 26/34] Removed print stylesheet --- theme/base/css/print.css | 36 ------------------------------------ 1 file changed, 36 deletions(-) delete mode 100644 theme/base/css/print.css diff --git a/theme/base/css/print.css b/theme/base/css/print.css deleted file mode 100644 index 094d07fed2..0000000000 --- a/theme/base/css/print.css +++ /dev/null @@ -1,36 +0,0 @@ -/** theme: base - * - * @package StatusNet - * @author Sarven Capadisli - * @copyright 2009 StatusNet, Inc. - * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 - * @link http://status.net/ - */ - -a:after { background-color:#fff; } -a:not([href^="#"]):after { content:" ( "attr(href)" ) "; } - -img { border:none; } -p { orphans: 2; widows: 1; } - -#site_nav_global_primary, -#site_nav_local_views, -#form_notice, -.pagination, -#site_nav_global_secondary, -.entity_actions, -.notice-options, -#aside_primary, -.form_subscription_edit .submit { -display:none; -} - -.timestamp dt, .timestamp dd, -.device dt, .device dd { -display:inline; -} - -.profiles li, -.notices li { -margin-bottom:18px; -} From 10410907a0a6f1af9fb18cb3341db792baa49cf3 Mon Sep 17 00:00:00 2001 From: James Walker Date: Wed, 24 Mar 2010 14:27:35 -0400 Subject: [PATCH 27/34] A bit safer checking in the keypair parsing --- plugins/OStatus/lib/magicenvelope.php | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/plugins/OStatus/lib/magicenvelope.php b/plugins/OStatus/lib/magicenvelope.php index 9266cab5cf..799b5e3079 100644 --- a/plugins/OStatus/lib/magicenvelope.php +++ b/plugins/OStatus/lib/magicenvelope.php @@ -59,12 +59,21 @@ class MagicEnvelope } if ($xrd->links) { if ($link = Discovery::getService($xrd->links, Magicsig::PUBLICKEYREL)) { - list($type, $keypair) = explode(',', $link['href']); - if (empty($keypair)) { + $keypair = false; + $parts = explode(',', $link['href']); + if (count($parts) == 2) { + $keypair = $parts[1]; + } else { // Backwards compatibility check for separator bug in 0.9.0 - list($type, $keypair) = explode(';', $link['href']); + $parts = explode(';', $link['href']); + if (count($parts) == 2) { + $keypair = $parts[1]; + } + } + + if ($keypair) { + return $keypair; } - return $keypair; } } throw new Exception('Unable to locate signer public key'); From c4273f0ef32f65267ddf43dc5dc6977659a0697e Mon Sep 17 00:00:00 2001 From: James Walker Date: Wed, 24 Mar 2010 15:15:20 -0400 Subject: [PATCH 28/34] Check for 0.9.0 bad keys from old Crypt_RSA library --- plugins/OStatus/classes/Magicsig.php | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/plugins/OStatus/classes/Magicsig.php b/plugins/OStatus/classes/Magicsig.php index 87c684c93d..1a95414958 100644 --- a/plugins/OStatus/classes/Magicsig.php +++ b/plugins/OStatus/classes/Magicsig.php @@ -50,7 +50,15 @@ class Magicsig extends Memcached_DataObject { $obj = parent::staticGet(__CLASS__, $k, $v); if (!empty($obj)) { - return Magicsig::fromString($obj->keypair); + $obj = Magicsig::fromString($obj->keypair); + + // Double check keys: Crypt_RSA did not + // consistently generate good keypairs. + // We've also moved to 1024 bit keys. + if (strlen($obj->publicKey->modulus->toBits()) != 1024) { + $obj->delete(); + return false; + } } return $obj; From cfca789b34eeac6c531c4c7aac622ed2e2510390 Mon Sep 17 00:00:00 2001 From: James Walker Date: Wed, 24 Mar 2010 15:18:41 -0400 Subject: [PATCH 29/34] Updated Math_Biginteger from upstream - removing safe* workarounds --- plugins/OStatus/classes/Magicsig.php | 8 ++++---- plugins/OStatus/extlib/Math/BigInteger.php | 8 ++++---- plugins/OStatus/lib/safecrypt_rsa.php | 18 ------------------ plugins/OStatus/lib/safemath_biginteger.php | 20 -------------------- 4 files changed, 8 insertions(+), 46 deletions(-) delete mode 100644 plugins/OStatus/lib/safecrypt_rsa.php delete mode 100644 plugins/OStatus/lib/safemath_biginteger.php diff --git a/plugins/OStatus/classes/Magicsig.php b/plugins/OStatus/classes/Magicsig.php index 1a95414958..c7dd17c268 100644 --- a/plugins/OStatus/classes/Magicsig.php +++ b/plugins/OStatus/classes/Magicsig.php @@ -108,16 +108,16 @@ class Magicsig extends Memcached_DataObject public function generate($user_id) { - $rsa = new SafeCrypt_RSA(); + $rsa = new Crypt_RSA(); $keypair = $rsa->createKey(); $rsa->loadKey($keypair['privatekey']); - $this->privateKey = new SafeCrypt_RSA(); + $this->privateKey = new Crypt_RSA(); $this->privateKey->loadKey($keypair['privatekey']); - $this->publicKey = new SafeCrypt_RSA(); + $this->publicKey = new Crypt_RSA(); $this->publicKey->loadKey($keypair['publickey']); $this->user_id = $user_id; @@ -169,7 +169,7 @@ class Magicsig extends Memcached_DataObject { common_log(LOG_DEBUG, "Adding ".$type." key: (".$mod .', '. $exp .")"); - $rsa = new SafeCrypt_RSA(); + $rsa = new Crypt_RSA(); $rsa->signatureMode = CRYPT_RSA_SIGNATURE_PKCS1; $rsa->setHash('sha256'); $rsa->modulus = new Math_BigInteger(base64_url_decode($mod), 256); diff --git a/plugins/OStatus/extlib/Math/BigInteger.php b/plugins/OStatus/extlib/Math/BigInteger.php index 9733351d42..4373805f99 100644 --- a/plugins/OStatus/extlib/Math/BigInteger.php +++ b/plugins/OStatus/extlib/Math/BigInteger.php @@ -67,7 +67,7 @@ * @author Jim Wigginton * @copyright MMVI Jim Wigginton * @license http://www.gnu.org/licenses/lgpl.txt - * @version $Id: BigInteger.php,v 1.31 2010/03/01 17:28:19 terrafrost Exp $ + * @version $Id: BigInteger.php,v 1.33 2010/03/22 22:32:03 terrafrost Exp $ * @link http://pear.php.net/package/Math_BigInteger */ @@ -294,7 +294,7 @@ class Math_BigInteger { $this->value = array(); } - if ($x === 0) { + if (empty($x)) { return; } @@ -718,7 +718,7 @@ class Math_BigInteger { * * Will be called, automatically, when serialize() is called on a Math_BigInteger object. * - * @see __wakeup + * @see __wakeup() * @access public */ function __sleep() @@ -740,7 +740,7 @@ class Math_BigInteger { * * Will be called, automatically, when unserialize() is called on a Math_BigInteger object. * - * @see __sleep + * @see __sleep() * @access public */ function __wakeup() diff --git a/plugins/OStatus/lib/safecrypt_rsa.php b/plugins/OStatus/lib/safecrypt_rsa.php deleted file mode 100644 index f3aa2c9285..0000000000 --- a/plugins/OStatus/lib/safecrypt_rsa.php +++ /dev/null @@ -1,18 +0,0 @@ -zero = new SafeMath_BigInteger(); - } -} - diff --git a/plugins/OStatus/lib/safemath_biginteger.php b/plugins/OStatus/lib/safemath_biginteger.php deleted file mode 100644 index c05e24d1ec..0000000000 --- a/plugins/OStatus/lib/safemath_biginteger.php +++ /dev/null @@ -1,20 +0,0 @@ -hex == '') { - $this->hex = '0'; - } - parent::__wakeup(); - } -} - From 9e0b9857f435bf45d353bc88eb2462d483bcc46b Mon Sep 17 00:00:00 2001 From: James Walker Date: Wed, 24 Mar 2010 15:26:03 -0400 Subject: [PATCH 30/34] Make sure we're requiring the library --- plugins/OStatus/classes/Magicsig.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/plugins/OStatus/classes/Magicsig.php b/plugins/OStatus/classes/Magicsig.php index c7dd17c268..864fef6285 100644 --- a/plugins/OStatus/classes/Magicsig.php +++ b/plugins/OStatus/classes/Magicsig.php @@ -27,6 +27,8 @@ * @link http://status.net/ */ +require_once 'Crypt/RSA.php'; + class Magicsig extends Memcached_DataObject { From e7ae36b52a8192021f3a48f1a3929bbeee877ccd Mon Sep 17 00:00:00 2001 From: Sarven Capadisli Date: Wed, 24 Mar 2010 20:50:07 +0100 Subject: [PATCH 31/34] Updated tag list output in subscriptions list. Matches userprofile. --- lib/subscriptionlist.php | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/lib/subscriptionlist.php b/lib/subscriptionlist.php index e1207774fd..fc8f33f2ec 100644 --- a/lib/subscriptionlist.php +++ b/lib/subscriptionlist.php @@ -113,12 +113,13 @@ class SubscriptionListItem extends ProfileListItem $this->out->elementStart('ul', 'tags xoxo'); foreach ($tags as $tag) { $this->out->elementStart('li'); - $this->out->element('span', 'mark_hash', '#'); - $this->out->element('a', array('rel' => 'tag', - 'href' => common_local_url($this->action->trimmed('action'), - array('nickname' => $this->owner->nickname, - 'tag' => $tag))), - $tag); + // Avoid space by using raw output. + $pt = '#'; + $this->out->raw($pt); $this->out->elementEnd('li'); } $this->out->elementEnd('ul'); From 09ff213d1c6b8dc42f28b9c637431bafa54146ec Mon Sep 17 00:00:00 2001 From: Sarven Capadisli Date: Wed, 24 Mar 2010 20:58:13 +0100 Subject: [PATCH 32/34] Using hCard label instead of location. Matches userprofile. --- lib/profilelist.php | 2 +- theme/base/css/display.css | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/profilelist.php b/lib/profilelist.php index d970e605ad..3e5513895c 100644 --- a/lib/profilelist.php +++ b/lib/profilelist.php @@ -213,7 +213,7 @@ class ProfileListItem extends Widget { if (!empty($this->profile->location)) { $this->out->text(' '); - $this->out->elementStart('span', 'location'); + $this->out->elementStart('span', 'label'); $this->out->raw($this->highlight($this->profile->location)); $this->out->elementEnd('span'); } diff --git a/theme/base/css/display.css b/theme/base/css/display.css index 36f0533b14..b0ab02bcec 100644 --- a/theme/base/css/display.css +++ b/theme/base/css/display.css @@ -926,7 +926,7 @@ display:inline; } .profile .entity_profile .fn, -.profile .entity_profile .location { +.profile .entity_profile .label { margin-left:11px; margin-bottom:4px; width:auto; From 9fe12be41eec8132fcfa6da2dc5fad926a932286 Mon Sep 17 00:00:00 2001 From: Sarven Capadisli Date: Wed, 24 Mar 2010 21:34:53 +0100 Subject: [PATCH 33/34] Using unique @for, @id pair for jabber and sms options in subscriptions --- actions/subscriptions.php | 22 ++++++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-) diff --git a/actions/subscriptions.php b/actions/subscriptions.php index ba6171ef4c..7b10b3425b 100644 --- a/actions/subscriptions.php +++ b/actions/subscriptions.php @@ -196,12 +196,30 @@ class SubscriptionsListItem extends SubscriptionListItem $this->out->hidden('token', common_session_token()); $this->out->hidden('profile', $this->profile->id); if (common_config('xmpp', 'enabled')) { - $this->out->checkbox('jabber', _('Jabber'), $sub->jabber); + $attrs = array('name' => 'jabber', + 'type' => 'checkbox', + 'class' => 'checkbox', + 'id' => 'jabber-'.$this->profile->id); + if ($sub->jabber) { + $attrs['checked'] = 'checked'; + } + + $this->out->element('input', $attrs); + $this->out->element('label', array('for' => 'jabber-'.$this->profile->id), _('Jabber')); } else { $this->out->hidden('jabber', $sub->jabber); } if (common_config('sms', 'enabled')) { - $this->out->checkbox('sms', _('SMS'), $sub->sms); + $attrs = array('name' => 'sms', + 'type' => 'checkbox', + 'class' => 'checkbox', + 'id' => 'sms-'.$this->profile->id); + if ($sub->sms) { + $attrs['checked'] = 'checked'; + } + + $this->out->element('input', $attrs); + $this->out->element('label', array('for' => 'sms-'.$this->profile->id), _('SMS')); } else { $this->out->hidden('sms', $sub->sms); } From a954fd65ba00328cd1a76e620113d2f639340aaf Mon Sep 17 00:00:00 2001 From: Brion Vibber Date: Wed, 24 Mar 2010 13:36:57 -0700 Subject: [PATCH 34/34] Fix for API group methods, caused failure or output corruption when pulling up local groups by name in api/statusnet/groups/is_member.json/xml --- lib/apiaction.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/apiaction.php b/lib/apiaction.php index e6aaf93161..9fc1a07799 100644 --- a/lib/apiaction.php +++ b/lib/apiaction.php @@ -1273,7 +1273,7 @@ class ApiAction extends Action if (empty($local)) { return null; } else { - return User_group::staticGet('id', $local->id); + return User_group::staticGet('id', $local->group_id); } }