diff options
232 files changed, 19949 insertions, 16338 deletions
@@ -710,11 +710,21 @@ private site, but users of the private site may be able to subscribe to users on a remote site. (Or not... it's not well tested.) The "proper behaviour" hasn't been defined here, so handle with care. -If fancy URLs is enabled, access to file attachments can also be -restricted to logged-in users only. Uncomment the appropriate rewrite -rule in .htaccess or your server's httpd.conf. (This most likely will -not work if you are using a virtual server for attachments, so consider -the performance/security tradeoff.) +Access to file attachments can also be restricted to logged-in users only. +1. Add a directory outside the web root where your file uploads will be + stored. Usually a command like this will work: + + mkdir /var/www/mublog-files + +2. Make the file uploads directory writeable by the web server. An + insecure way to do this is: + + chmod a+x /var/www/mublog-files + +3. Tell StatusNet to use this directory for file uploads. Add a line + like this to your config.php: + + $config['attachments']['dir'] = '/var/www/mublog-files'; Upgrading ========= @@ -1612,6 +1622,7 @@ if anyone's been overlooked in error. * Craig Andrews * mEDI * Brett Taylor +* Brigitte Schuster Thanks also to the developers of our upstream library code and to the thousands of people who have tried out Identi.ca, installed StatusNet, diff --git a/actions/all.php b/actions/all.php index 452803d8a..efa4521e2 100644 --- a/actions/all.php +++ b/actions/all.php @@ -81,7 +81,7 @@ class AllAction extends ProfileAction function title() { if ($this->page > 1) { - return sprintf(_("%s and friends, page %d"), $this->user->nickname, $this->page); + return sprintf(_("%1$s and friends, page %2$d"), $this->user->nickname, $this->page); } else { return sprintf(_("%s and friends"), $this->user->nickname); } @@ -131,7 +131,7 @@ class AllAction extends ProfileAction if ($this->user->id === $current_user->id) { $message .= _('Try subscribing to more people, [join a group](%%action.groups%%) or post something yourself.'); } else { - $message .= sprintf(_('You can try to [nudge %s](../%s) from his profile or [post something to his or her attention](%%%%action.newnotice%%%%?status_textarea=%s).'), $this->user->nickname, $this->user->nickname, '@' . $this->user->nickname); + $message .= sprintf(_('You can try to [nudge %1$s](../%2$s) from his profile or [post something to his or her attention](%%%%action.newnotice%%%%?status_textarea=%3$s).'), $this->user->nickname, $this->user->nickname, '@' . $this->user->nickname); } } else { $message .= sprintf(_('Why not [register an account](%%%%action.register%%%%) and then nudge %s or post a notice to his or her attention.'), $this->user->nickname); diff --git a/actions/apidirectmessage.php b/actions/apidirectmessage.php index 5b3f412ad..5fbc46518 100644 --- a/actions/apidirectmessage.php +++ b/actions/apidirectmessage.php @@ -153,7 +153,7 @@ class ApiDirectMessageAction extends ApiAuthAction $this->showJsonDirectMessages(); break; default: - $this->clientError(_('API method not found!'), $code = 404); + $this->clientError(_('API method not found.'), $code = 404); break; } } diff --git a/actions/apifavoritecreate.php b/actions/apifavoritecreate.php index 436739770..3618f9401 100644 --- a/actions/apifavoritecreate.php +++ b/actions/apifavoritecreate.php @@ -96,7 +96,7 @@ class ApiFavoriteCreateAction extends ApiAuthAction if (!in_array($this->format, array('xml', 'json'))) { $this->clientError( - _('API method not found!'), + _('API method not found.'), 404, $this->format ); @@ -116,7 +116,7 @@ class ApiFavoriteCreateAction extends ApiAuthAction if ($this->user->hasFave($this->notice)) { $this->clientError( - _('This status is already a favorite!'), + _('This status is already a favorite.'), 403, $this->format ); diff --git a/actions/apifavoritedestroy.php b/actions/apifavoritedestroy.php index f131d1c7f..c4daf480e 100644 --- a/actions/apifavoritedestroy.php +++ b/actions/apifavoritedestroy.php @@ -97,7 +97,7 @@ class ApiFavoriteDestroyAction extends ApiAuthAction if (!in_array($this->format, array('xml', 'json'))) { $this->clientError( - _('API method not found!'), + _('API method not found.'), 404, $this->format ); @@ -119,7 +119,7 @@ class ApiFavoriteDestroyAction extends ApiAuthAction if (!$fave->find(true)) { $this->clientError( - _('That status is not a favorite!'), + _('That status is not a favorite.'), 403, $this->favorite ); diff --git a/actions/apifriendshipscreate.php b/actions/apifriendshipscreate.php index a824e734b..1de2cc32e 100644 --- a/actions/apifriendshipscreate.php +++ b/actions/apifriendshipscreate.php @@ -97,7 +97,7 @@ class ApiFriendshipsCreateAction extends ApiAuthAction if (!in_array($this->format, array('xml', 'json'))) { $this->clientError( - _('API method not found!'), + _('API method not found.'), 404, $this->format ); diff --git a/actions/apifriendshipsdestroy.php b/actions/apifriendshipsdestroy.php index 3d9b7e001..91c6fd032 100644 --- a/actions/apifriendshipsdestroy.php +++ b/actions/apifriendshipsdestroy.php @@ -97,7 +97,7 @@ class ApiFriendshipsDestroyAction extends ApiAuthAction if (!in_array($this->format, array('xml', 'json'))) { $this->clientError( - _('API method not found!'), + _('API method not found.'), 404, $this->format ); @@ -117,7 +117,7 @@ class ApiFriendshipsDestroyAction extends ApiAuthAction if ($this->user->id == $this->other->id) { $this->clientError( - _("You cannot unfollow yourself!"), + _("You cannot unfollow yourself."), 403, $this->format ); diff --git a/actions/apifriendshipsshow.php b/actions/apifriendshipsshow.php index 8fc436738..73ecc9249 100644 --- a/actions/apifriendshipsshow.php +++ b/actions/apifriendshipsshow.php @@ -126,7 +126,7 @@ class ApiFriendshipsShowAction extends ApiBareAuthAction parent::handle($args); if (!in_array($this->format, array('xml', 'json'))) { - $this->clientError(_('API method not found!'), 404); + $this->clientError(_('API method not found.'), 404); return; } diff --git a/actions/apigroupcreate.php b/actions/apigroupcreate.php index 8827d1c5c..028d76a78 100644 --- a/actions/apigroupcreate.php +++ b/actions/apigroupcreate.php @@ -133,7 +133,7 @@ class ApiGroupCreateAction extends ApiAuthAction break; default: $this->clientError( - _('API method not found!'), + _('API method not found.'), 404, $this->format ); diff --git a/actions/apigroupismember.php b/actions/apigroupismember.php index 08348e97b..69ead0b53 100644 --- a/actions/apigroupismember.php +++ b/actions/apigroupismember.php @@ -111,7 +111,7 @@ class ApiGroupIsMemberAction extends ApiBareAuthAction break; default: $this->clientError( - _('API method not found!'), + _('API method not found.'), 400, $this->format ); diff --git a/actions/apigroupjoin.php b/actions/apigroupjoin.php index b531d9501..3309d63e7 100644 --- a/actions/apigroupjoin.php +++ b/actions/apigroupjoin.php @@ -135,7 +135,7 @@ class ApiGroupJoinAction extends ApiAuthAction common_log_db_error($member, 'INSERT', __FILE__); $this->serverError( sprintf( - _('Could not join user %s to group %s.'), + _('Could not join user %1$s to group %2$s.'), $this->user->nickname, $this->group->nickname ) @@ -152,7 +152,7 @@ class ApiGroupJoinAction extends ApiAuthAction break; default: $this->clientError( - _('API method not found!'), + _('API method not found.'), 404, $this->format ); diff --git a/actions/apigroupleave.php b/actions/apigroupleave.php index 514a3a557..6f8d40527 100644 --- a/actions/apigroupleave.php +++ b/actions/apigroupleave.php @@ -108,7 +108,7 @@ class ApiGroupLeaveAction extends ApiAuthAction $member = new Group_member(); $member->group_id = $this->group->id; - $member->profile_id = $this->auth->id; + $member->profile_id = $this->auth_user->id; if (!$member->find(true)) { $this->serverError(_('You are not a member of this group.')); @@ -118,12 +118,12 @@ class ApiGroupLeaveAction extends ApiAuthAction $result = $member->delete(); if (!$result) { - common_log_db_error($member, 'INSERT', __FILE__); + common_log_db_error($member, 'DELETE', __FILE__); $this->serverError( sprintf( - _('Could not remove user %s to group %s.'), + _('Could not remove user %1$s from group %2$s.'), $this->user->nickname, - $this->$group->nickname + $this->group->nickname ) ); return; @@ -138,7 +138,7 @@ class ApiGroupLeaveAction extends ApiAuthAction break; default: $this->clientError( - _('API method not found!'), + _('API method not found.'), 404, $this->format ); diff --git a/actions/apigrouplist.php b/actions/apigrouplist.php index 7b05f8a96..66b67a030 100644 --- a/actions/apigrouplist.php +++ b/actions/apigrouplist.php @@ -100,7 +100,7 @@ class ApiGroupListAction extends ApiBareAuthAction array('nickname' => $this->user->nickname) ); $subtitle = sprintf( - _("Groups %s is a member of on %s."), + _("Groups %1$s is a member of on %2$s."), $this->user->nickname, $sitename ); @@ -129,7 +129,7 @@ class ApiGroupListAction extends ApiBareAuthAction break; default: $this->clientError( - _('API method not found!'), + _('API method not found.'), 404, $this->format ); diff --git a/actions/apigrouplistall.php b/actions/apigrouplistall.php index c597839a8..1921c1f19 100644 --- a/actions/apigrouplistall.php +++ b/actions/apigrouplistall.php @@ -117,7 +117,7 @@ class ApiGroupListAllAction extends ApiPrivateAuthAction break; default: $this->clientError( - _('API method not found!'), + _('API method not found.'), 404, $this->format ); diff --git a/actions/apigroupmembership.php b/actions/apigroupmembership.php index dd2843161..3c7c8e883 100644 --- a/actions/apigroupmembership.php +++ b/actions/apigroupmembership.php @@ -103,7 +103,7 @@ class ApiGroupMembershipAction extends ApiPrivateAuthAction break; default: $this->clientError( - _('API method not found!'), + _('API method not found.'), 404, $this->format ); diff --git a/actions/apigroupshow.php b/actions/apigroupshow.php index aae4d249c..7aa49b1bf 100644 --- a/actions/apigroupshow.php +++ b/actions/apigroupshow.php @@ -102,7 +102,7 @@ class ApiGroupShowAction extends ApiPrivateAuthAction $this->showSingleJsonGroup($this->group); break; default: - $this->clientError(_('API method not found!'), 404, $this->format); + $this->clientError(_('API method not found.'), 404, $this->format); break; } diff --git a/actions/apihelptest.php b/actions/apihelptest.php index f2c459e6f..7b4017531 100644 --- a/actions/apihelptest.php +++ b/actions/apihelptest.php @@ -85,7 +85,7 @@ class ApiHelpTestAction extends ApiPrivateAuthAction $this->endDocument('json'); } else { $this->clientError( - _('API method not found!'), + _('API method not found.'), 404, $this->format ); diff --git a/actions/apistatusesdestroy.php b/actions/apistatusesdestroy.php index 8dc8793b5..f7d52f020 100644 --- a/actions/apistatusesdestroy.php +++ b/actions/apistatusesdestroy.php @@ -99,7 +99,7 @@ class ApiStatusesDestroyAction extends ApiAuthAction parent::handle($args); if (!in_array($this->format, array('xml', 'json'))) { - $this->clientError(_('API method not found!'), $code = 404); + $this->clientError(_('API method not found.'), $code = 404); return; } diff --git a/actions/apistatusesretweets.php b/actions/apistatusesretweets.php index 2efd59b37..f7a3dd60a 100644 --- a/actions/apistatusesretweets.php +++ b/actions/apistatusesretweets.php @@ -109,7 +109,7 @@ class ApiStatusesRetweetsAction extends ApiAuthAction $this->showJsonTimeline($strm); break; default: - $this->clientError(_('API method not found!'), $code = 404); + $this->clientError(_('API method not found.'), $code = 404); break; } } diff --git a/actions/apistatusesshow.php b/actions/apistatusesshow.php index e26c009c4..0315d2953 100644 --- a/actions/apistatusesshow.php +++ b/actions/apistatusesshow.php @@ -105,7 +105,7 @@ class ApiStatusesShowAction extends ApiPrivateAuthAction parent::handle($args); if (!in_array($this->format, array('xml', 'json'))) { - $this->clientError(_('API method not found!'), $code = 404); + $this->clientError(_('API method not found.'), $code = 404); return; } diff --git a/actions/apistatusnetconfig.php b/actions/apistatusnetconfig.php index ed1d151bf..ab96f2e5f 100644 --- a/actions/apistatusnetconfig.php +++ b/actions/apistatusnetconfig.php @@ -130,7 +130,7 @@ class ApiStatusnetConfigAction extends ApiAction break; default: $this->clientError( - _('API method not found!'), + _('API method not found.'), 404, $this->format ); diff --git a/actions/apistatusnetversion.php b/actions/apistatusnetversion.php index bbf891a89..5109cd806 100644 --- a/actions/apistatusnetversion.php +++ b/actions/apistatusnetversion.php @@ -90,7 +90,7 @@ class ApiStatusnetVersionAction extends ApiPrivateAuthAction break; default: $this->clientError( - _('API method not found!'), + _('API method not found.'), 404, $this->format ); diff --git a/actions/apisubscriptions.php b/actions/apisubscriptions.php index 2c691bb84..0ba324057 100644 --- a/actions/apisubscriptions.php +++ b/actions/apisubscriptions.php @@ -108,7 +108,7 @@ class ApiSubscriptionsAction extends ApiBareAuthAction parent::handle($args); if (!in_array($this->format, array('xml', 'json'))) { - $this->clientError(_('API method not found!'), $code = 404); + $this->clientError(_('API method not found.'), $code = 404); return; } diff --git a/actions/apitimelinefavorites.php b/actions/apitimelinefavorites.php index 008e04212..1027d97d4 100644 --- a/actions/apitimelinefavorites.php +++ b/actions/apitimelinefavorites.php @@ -105,7 +105,7 @@ class ApiTimelineFavoritesAction extends ApiBareAuthAction $sitename = common_config('site', 'name'); $title = sprintf( - _('%s / Favorites from %s'), + _('%1$s / Favorites from %2$s'), $sitename, $this->user->nickname ); @@ -117,7 +117,7 @@ class ApiTimelineFavoritesAction extends ApiBareAuthAction array('nickname' => $this->user->nickname) ); $subtitle = sprintf( - _('%s updates favorited by %s / %s.'), + _('%1$s updates favorited by %2$s / %2$s.'), $sitename, $profile->getBestName(), $this->user->nickname @@ -143,7 +143,7 @@ class ApiTimelineFavoritesAction extends ApiBareAuthAction $this->showJsonTimeline($this->notices); break; default: - $this->clientError(_('API method not found!'), $code = 404); + $this->clientError(_('API method not found.'), $code = 404); break; } } diff --git a/actions/apitimelinefriends.php b/actions/apitimelinefriends.php index 9ec7447e6..ef58b103c 100644 --- a/actions/apitimelinefriends.php +++ b/actions/apitimelinefriends.php @@ -153,7 +153,7 @@ class ApiTimelineFriendsAction extends ApiBareAuthAction $this->showJsonTimeline($this->notices); break; default: - $this->clientError(_('API method not found!'), $code = 404); + $this->clientError(_('API method not found.'), $code = 404); break; } } diff --git a/actions/apitimelinegroup.php b/actions/apitimelinegroup.php index 22c577f39..af414c680 100644 --- a/actions/apitimelinegroup.php +++ b/actions/apitimelinegroup.php @@ -147,7 +147,7 @@ class ApiTimelineGroupAction extends ApiPrivateAuthAction break; default: $this->clientError( - _('API method not found!'), + _('API method not found.'), 404, $this->format ); diff --git a/actions/apitimelinehome.php b/actions/apitimelinehome.php index 5f5ea37b1..828eae6cf 100644 --- a/actions/apitimelinehome.php +++ b/actions/apitimelinehome.php @@ -153,7 +153,7 @@ class ApiTimelineHomeAction extends ApiBareAuthAction $this->showJsonTimeline($this->notices); break; default: - $this->clientError(_('API method not found!'), $code = 404); + $this->clientError(_('API method not found.'), $code = 404); break; } } diff --git a/actions/apitimelinementions.php b/actions/apitimelinementions.php index 19f40aebc..9dc2162cc 100644 --- a/actions/apitimelinementions.php +++ b/actions/apitimelinementions.php @@ -148,7 +148,7 @@ class ApiTimelineMentionsAction extends ApiBareAuthAction $this->showJsonTimeline($this->notices); break; default: - $this->clientError(_('API method not found!'), $code = 404); + $this->clientError(_('API method not found.'), $code = 404); break; } } diff --git a/actions/apitimelinepublic.php b/actions/apitimelinepublic.php index 633f3c36e..3f4a46c0f 100644 --- a/actions/apitimelinepublic.php +++ b/actions/apitimelinepublic.php @@ -128,7 +128,7 @@ class ApiTimelinePublicAction extends ApiPrivateAuthAction $this->showJsonTimeline($this->notices); break; default: - $this->clientError(_('API method not found!'), $code = 404); + $this->clientError(_('API method not found.'), $code = 404); break; } } diff --git a/actions/apitimelineretweetedbyme.php b/actions/apitimelineretweetedbyme.php index 1e65678ad..88652c3fd 100644 --- a/actions/apitimelineretweetedbyme.php +++ b/actions/apitimelineretweetedbyme.php @@ -119,7 +119,7 @@ class ApiTimelineRetweetedByMeAction extends ApiAuthAction break; default: - $this->clientError(_('API method not found!'), $code = 404); + $this->clientError(_('API method not found.'), $code = 404); break; } } diff --git a/actions/apitimelineretweetedtome.php b/actions/apitimelineretweetedtome.php index 681b0b9e9..113ab96d2 100644 --- a/actions/apitimelineretweetedtome.php +++ b/actions/apitimelineretweetedtome.php @@ -118,7 +118,7 @@ class ApiTimelineRetweetedToMeAction extends ApiAuthAction break; default: - $this->clientError(_('API method not found!'), $code = 404); + $this->clientError(_('API method not found.'), $code = 404); break; } } diff --git a/actions/apitimelineretweetsofme.php b/actions/apitimelineretweetsofme.php index 479bff431..6ca2c779c 100644 --- a/actions/apitimelineretweetsofme.php +++ b/actions/apitimelineretweetsofme.php @@ -119,7 +119,7 @@ class ApiTimelineRetweetsOfMeAction extends ApiAuthAction break; default: - $this->clientError(_('API method not found!'), $code = 404); + $this->clientError(_('API method not found.'), $code = 404); break; } } diff --git a/actions/apitimelinetag.php b/actions/apitimelinetag.php index 1a50520f4..1427d23b6 100644 --- a/actions/apitimelinetag.php +++ b/actions/apitimelinetag.php @@ -138,7 +138,7 @@ class ApiTimelineTagAction extends ApiPrivateAuthAction $this->showJsonTimeline($this->notices); break; default: - $this->clientError(_('API method not found!'), $code = 404); + $this->clientError(_('API method not found.'), $code = 404); break; } } diff --git a/actions/apitimelineuser.php b/actions/apitimelineuser.php index 14c62a52e..830b16941 100644 --- a/actions/apitimelineuser.php +++ b/actions/apitimelineuser.php @@ -162,7 +162,7 @@ class ApiTimelineUserAction extends ApiBareAuthAction $this->showJsonTimeline($this->notices); break; default: - $this->clientError(_('API method not found!'), $code = 404); + $this->clientError(_('API method not found.'), $code = 404); break; } diff --git a/actions/apiusershow.php b/actions/apiusershow.php index aa7aec5a4..a7fe0dcc1 100644 --- a/actions/apiusershow.php +++ b/actions/apiusershow.php @@ -98,7 +98,7 @@ class ApiUserShowAction extends ApiPrivateAuthAction } if (!in_array($this->format, array('xml', 'json'))) { - $this->clientError(_('API method not found!'), $code = 404); + $this->clientError(_('API method not found.'), $code = 404); return; } diff --git a/actions/blockedfromgroup.php b/actions/blockedfromgroup.php index ca4a711cb..0b4caf5bf 100644 --- a/actions/blockedfromgroup.php +++ b/actions/blockedfromgroup.php @@ -70,14 +70,14 @@ class BlockedfromgroupAction extends GroupDesignAction } if (!$nickname) { - $this->clientError(_('No nickname'), 404); + $this->clientError(_('No nickname.'), 404); return false; } $this->group = User_group::staticGet('nickname', $nickname); if (!$this->group) { - $this->clientError(_('No such group'), 404); + $this->clientError(_('No such group.'), 404); return false; } @@ -90,7 +90,7 @@ class BlockedfromgroupAction extends GroupDesignAction return sprintf(_('%s blocked profiles'), $this->group->nickname); } else { - return sprintf(_('%s blocked profiles, page %d'), + return sprintf(_('%1$s blocked profiles, page %2$d'), $this->group->nickname, $this->page); } diff --git a/actions/deletenotice.php b/actions/deletenotice.php index ba8e86d0f..69cb1ebe8 100644 --- a/actions/deletenotice.php +++ b/actions/deletenotice.php @@ -155,7 +155,7 @@ class DeletenoticeAction extends Action if (!$token || $token != common_session_token()) { $this->showForm(_('There was a problem with your session token. ' . - ' Try again, please.')); + 'Try again, please.')); return; } diff --git a/actions/editgroup.php b/actions/editgroup.php index cf1608035..ad0b6e185 100644 --- a/actions/editgroup.php +++ b/actions/editgroup.php @@ -81,7 +81,7 @@ class EditgroupAction extends GroupDesignAction } if (!$nickname) { - $this->clientError(_('No nickname'), 404); + $this->clientError(_('No nickname.'), 404); return false; } @@ -93,14 +93,14 @@ class EditgroupAction extends GroupDesignAction } if (!$this->group) { - $this->clientError(_('No such group'), 404); + $this->clientError(_('No such group.'), 404); return false; } $cur = common_current_user(); if (!$cur->isAdmin($this->group)) { - $this->clientError(_('You must be an admin to edit the group'), 403); + $this->clientError(_('You must be an admin to edit the group.'), 403); return false; } @@ -165,7 +165,7 @@ class EditgroupAction extends GroupDesignAction { $cur = common_current_user(); if (!$cur->isAdmin($this->group)) { - $this->clientError(_('You must be an admin to edit the group'), 403); + $this->clientError(_('You must be an admin to edit the group.'), 403); return; } diff --git a/actions/emailsettings.php b/actions/emailsettings.php index 761aaa8f3..bfef2970d 100644 --- a/actions/emailsettings.php +++ b/actions/emailsettings.php @@ -57,7 +57,7 @@ class EmailsettingsAction extends AccountSettingsAction function title() { - return _('Email Settings'); + return _('Email settings'); } /** @@ -118,7 +118,7 @@ class EmailsettingsAction extends AccountSettingsAction } else { $this->elementStart('ul', 'form_data'); $this->elementStart('li'); - $this->input('email', _('Email Address'), + $this->input('email', _('Email address'), ($this->arg('email')) ? $this->arg('email') : null, _('Email address, like "UserName@example.org"')); $this->elementEnd('li'); @@ -328,7 +328,7 @@ class EmailsettingsAction extends AccountSettingsAction return; } if (!Validate::email($email, common_config('email', 'check_domain'))) { - $this->showForm(_('Not a valid email address')); + $this->showForm(_('Not a valid email address.')); return; } else if ($user->email == $email) { $this->showForm(_('That is already your email address.')); diff --git a/actions/getfile.php b/actions/getfile.php index ecda34c0f..cd327e410 100644 --- a/actions/getfile.php +++ b/actions/getfile.php @@ -1,13 +1,13 @@ <?php /** - * StatusNet, the distributed open-source microblogging tool + * StatusNet - the distributed open-source microblogging tool + * Copyright (C) 2009, StatusNet, Inc. * - * Returns a given file attachment, allowing private sites to only allow - * access to file attachments after login. + * Return a requested file * * PHP version 5 * - * LICENCE: This program is free software: you can redistribute it and/or modify + * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. @@ -20,28 +20,32 @@ * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see <http://www.gnu.org/licenses/>. * - * @category Personal + * @category PrivateAttachments * @package StatusNet * @author Jeffery To <jeffery.to@gmail.com> - * @copyright 2008-2009 StatusNet, Inc. - * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 + * @copyright 2009 StatusNet, Inc. + * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPL 3.0 * @link http://status.net/ */ -if (!defined('STATUSNET') && !defined('LACONICA')) { +if (!defined('STATUSNET')) { exit(1); } require_once 'MIME/Type.php'; /** - * Action for getting a file attachment + * An action for returning a requested file * - * @category Personal - * @package StatusNet - * @author Jeffery To <jeffery.to@gmail.com> - * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 - * @link http://status.net/ + * The StatusNet system will do an implicit user check if the site is + * private before allowing this to continue + * + * @category PrivateAttachments + * @package StatusNet + * @author Jeffery To <jeffery.to@gmail.com> + * @copyright 2009 StatusNet, Inc. + * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPL 3.0 + * @link http://status.net/ */ class GetfileAction extends Action @@ -68,7 +72,7 @@ class GetfileAction extends Action $path = null; if ($filename) { - $path = common_config('attachments', 'dir') . $filename; + $path = File::path($filename); } if (empty($path) or !file_exists($path)) { @@ -103,6 +107,10 @@ class GetfileAction extends Action function lastModified() { + if (common_config('site', 'use_x_sendfile')) { + return null; + } + return filemtime($this->path); } @@ -114,8 +122,24 @@ class GetfileAction extends Action * * @return string etag http header */ + function etag() { + if (common_config('site', 'use_x_sendfile')) { + return null; + } + + $cache = common_memcache(); + if($cache) { + $key = common_cache_key('attachments:etag:' . $this->path); + $etag = $cache->get($key); + if($etag === false) { + $etag = crc32(file_get_contents($this->path)); + $cache->set($key,$etag); + } + return $etag; + } + $stat = stat($this->path); return '"' . $stat['ino'] . '-' . $stat['size'] . '-' . $stat['mtime'] . '"'; } @@ -133,13 +157,19 @@ class GetfileAction extends Action // undo headers set by PHP sessions $sec = session_cache_expire() * 60; header('Expires: ' . date(DATE_RFC1123, time() + $sec)); - header('Cache-Control: public, max-age=' . $sec); - header('Pragma: public'); + header('Cache-Control: max-age=' . $sec); parent::handle($args); $path = $this->path; + header('Content-Type: ' . MIME_Type::autoDetect($path)); - readfile($path); + + if (common_config('site', 'use_x_sendfile')) { + header('X-Sendfile: ' . $path); + } else { + header('Content-Length: ' . filesize($path)); + readfile($path); + } } } diff --git a/actions/groupblock.php b/actions/groupblock.php index faf18c6ad..ec673358e 100644 --- a/actions/groupblock.php +++ b/actions/groupblock.php @@ -159,7 +159,7 @@ class GroupblockAction extends Action $this->hidden('token', common_session_token()); $this->element('legend', _('Block user')); $this->element('p', null, - sprintf(_('Are you sure you want to block user "%s" from the group "%s"? '. + sprintf(_('Are you sure you want to block user "%1$s" from the group "%2$s"? '. 'They will be removed from the group, unable to post, and '. 'unable to subscribe to the group in the future.'), $this->profile->getBestName(), diff --git a/actions/groupbyid.php b/actions/groupbyid.php index f65bf511a..5af7109cb 100644 --- a/actions/groupbyid.php +++ b/actions/groupbyid.php @@ -71,7 +71,7 @@ class GroupbyidAction extends Action $id = $this->arg('id'); if (!$id) { - $this->clientError(_('No ID')); + $this->clientError(_('No ID.')); return false; } @@ -80,7 +80,7 @@ class GroupbyidAction extends Action $this->group = User_group::staticGet('id', $id); if (!$this->group) { - $this->clientError(_('No such group'), 404); + $this->clientError(_('No such group.'), 404); return false; } diff --git a/actions/groupdesignsettings.php b/actions/groupdesignsettings.php index 1c998efe1..e290ba514 100644 --- a/actions/groupdesignsettings.php +++ b/actions/groupdesignsettings.php @@ -81,7 +81,7 @@ class GroupDesignSettingsAction extends DesignSettingsAction } if (!$nickname) { - $this->clientError(_('No nickname'), 404); + $this->clientError(_('No nickname.'), 404); return false; } @@ -94,14 +94,14 @@ class GroupDesignSettingsAction extends DesignSettingsAction } if (!$this->group) { - $this->clientError(_('No such group'), 404); + $this->clientError(_('No such group.'), 404); return false; } $cur = common_current_user(); if (!$cur->isAdmin($this->group)) { - $this->clientError(_('You must be an admin to edit the group'), 403); + $this->clientError(_('You must be an admin to edit the group.'), 403); return false; } @@ -284,7 +284,7 @@ class GroupDesignSettingsAction extends DesignSettingsAction if (empty($id)) { common_log_db_error($id, 'INSERT', __FILE__); - $this->showForm(_('Unable to save your design settings!')); + $this->showForm(_('Unable to save your design settings.')); return; } @@ -294,7 +294,7 @@ class GroupDesignSettingsAction extends DesignSettingsAction if (empty($result)) { common_log_db_error($original, 'UPDATE', __FILE__); - $this->showForm(_('Unable to save your design settings!')); + $this->showForm(_('Unable to save your design settings.')); $this->group->query('ROLLBACK'); return; } diff --git a/actions/grouplogo.php b/actions/grouplogo.php index a9dc7eb1d..f197aef33 100644 --- a/actions/grouplogo.php +++ b/actions/grouplogo.php @@ -83,7 +83,7 @@ class GrouplogoAction extends GroupDesignAction } if (!$nickname) { - $this->clientError(_('No nickname'), 404); + $this->clientError(_('No nickname.'), 404); return false; } @@ -96,14 +96,14 @@ class GrouplogoAction extends GroupDesignAction } if (!$this->group) { - $this->clientError(_('No such group'), 404); + $this->clientError(_('No such group.'), 404); return false; } $cur = common_current_user(); if (!$cur->isAdmin($this->group)) { - $this->clientError(_('You must be an admin to edit the group'), 403); + $this->clientError(_('You must be an admin to edit the group.'), 403); return false; } @@ -175,7 +175,7 @@ class GrouplogoAction extends GroupDesignAction if (!$profile) { common_log_db_error($user, 'SELECT', __FILE__); - $this->serverError(_('User without matching profile')); + $this->serverError(_('User without matching profile.')); return; } diff --git a/actions/groupmembers.php b/actions/groupmembers.php index b326a0df7..0f47c268d 100644 --- a/actions/groupmembers.php +++ b/actions/groupmembers.php @@ -73,14 +73,14 @@ class GroupmembersAction extends GroupDesignAction } if (!$nickname) { - $this->clientError(_('No nickname'), 404); + $this->clientError(_('No nickname.'), 404); return false; } $this->group = User_group::staticGet('nickname', $nickname); if (!$this->group) { - $this->clientError(_('No such group'), 404); + $this->clientError(_('No such group.'), 404); return false; } @@ -93,7 +93,7 @@ class GroupmembersAction extends GroupDesignAction return sprintf(_('%s group members'), $this->group->nickname); } else { - return sprintf(_('%s group members, page %d'), + return sprintf(_('%1$s group members, page %2$d'), $this->group->nickname, $this->page); } diff --git a/actions/imsettings.php b/actions/imsettings.php index f57933b43..751c6117c 100644 --- a/actions/imsettings.php +++ b/actions/imsettings.php @@ -56,7 +56,7 @@ class ImsettingsAction extends ConnectSettingsAction function title() { - return _('IM Settings'); + return _('IM settings'); } /** @@ -121,7 +121,7 @@ class ImsettingsAction extends ConnectSettingsAction } else { $this->elementStart('ul', 'form_data'); $this->elementStart('li'); - $this->input('jabber', _('IM Address'), + $this->input('jabber', _('IM address'), ($this->arg('jabber')) ? $this->arg('jabber') : null, sprintf(_('Jabber or GTalk address, '. 'like "UserName@example.org". '. diff --git a/actions/inbox.php b/actions/inbox.php index 6cb7f9e15..f605cc9e8 100644 --- a/actions/inbox.php +++ b/actions/inbox.php @@ -56,7 +56,7 @@ class InboxAction extends MailboxAction function title() { if ($this->page > 1) { - return sprintf(_("Inbox for %s - page %d"), $this->user->nickname, + return sprintf(_("Inbox for %1$s - page %2$d"), $this->user->nickname, $this->page); } else { return sprintf(_("Inbox for %s"), $this->user->nickname); diff --git a/actions/invite.php b/actions/invite.php index 3015202e9..d0ed64ec9 100644 --- a/actions/invite.php +++ b/actions/invite.php @@ -128,7 +128,7 @@ class InviteAction extends CurrentUserDesignAction $this->element('p', null, _('You are already subscribed to these users:')); $this->elementStart('ul'); foreach ($this->already as $other) { - $this->element('li', null, sprintf(_('%s (%s)'), $other->nickname, $other->email)); + $this->element('li', null, sprintf(_('%1$s (%2$s)'), $other->nickname, $other->email)); } $this->elementEnd('ul'); } @@ -136,7 +136,7 @@ class InviteAction extends CurrentUserDesignAction $this->element('p', null, _('These people are already users and you were automatically subscribed to them:')); $this->elementStart('ul'); foreach ($this->subbed as $other) { - $this->element('li', null, sprintf(_('%s (%s)'), $other->nickname, $other->email)); + $this->element('li', null, sprintf(_('%1$s (%2$s)'), $other->nickname, $other->email)); } $this->elementEnd('ul'); } diff --git a/actions/joingroup.php b/actions/joingroup.php index bf69b2ad1..05e33e7cb 100644 --- a/actions/joingroup.php +++ b/actions/joingroup.php @@ -73,21 +73,21 @@ class JoingroupAction extends Action } if (!$nickname) { - $this->clientError(_('No nickname'), 404); + $this->clientError(_('No nickname.'), 404); return false; } $this->group = User_group::staticGet('nickname', $nickname); if (!$this->group) { - $this->clientError(_('No such group'), 404); + $this->clientError(_('No such group.'), 404); return false; } $cur = common_current_user(); if ($cur->isMember($this->group)) { - $this->clientError(_('You are already a member of that group'), 403); + $this->clientError(_('You are already a member of that group.'), 403); return false; } @@ -125,14 +125,14 @@ class JoingroupAction extends Action if (!$result) { common_log_db_error($member, 'INSERT', __FILE__); - $this->serverError(sprintf(_('Could not join user %s to group %s'), + $this->serverError(sprintf(_('Could not join user %1$s to group %2$s.'), $cur->nickname, $this->group->nickname)); } if ($this->boolean('ajax')) { $this->startHTML('text/xml;charset=utf-8'); $this->elementStart('head'); - $this->element('title', null, sprintf(_('%s joined group %s'), + $this->element('title', null, sprintf(_('%1$s joined group %2$s'), $cur->nickname, $this->group->nickname)); $this->elementEnd('head'); diff --git a/actions/leavegroup.php b/actions/leavegroup.php index 08fce1509..b0f973e1a 100644 --- a/actions/leavegroup.php +++ b/actions/leavegroup.php @@ -123,15 +123,15 @@ class LeavegroupAction extends Action $result = $member->delete(); if (!$result) { - common_log_db_error($member, 'INSERT', __FILE__); - $this->serverError(sprintf(_('Could not remove user %s to group %s'), + common_log_db_error($member, 'DELETE', __FILE__); + $this->serverError(sprintf(_('Could not remove user %1$s from group %2$s.'), $cur->nickname, $this->group->nickname)); } if ($this->boolean('ajax')) { $this->startHTML('text/xml;charset=utf-8'); $this->elementStart('head'); - $this->element('title', null, sprintf(_('%s left group %s'), + $this->element('title', null, sprintf(_('%1$s left group %2$s'), $cur->nickname, $this->group->nickname)); $this->elementEnd('head'); diff --git a/actions/login.php b/actions/login.php index c775fa692..8ea3c800b 100644 --- a/actions/login.php +++ b/actions/login.php @@ -76,15 +76,10 @@ class LoginAction extends Action { parent::handle($args); - $disabled = common_config('logincommand','disabled'); - $disabled = isset($disabled) && $disabled; - if (common_is_real_login()) { $this->clientError(_('Already logged in.')); } else if ($_SERVER['REQUEST_METHOD'] == 'POST') { $this->checkLogin(); - } else if (!$disabled && isset($args['user_id']) && isset($args['token'])){ - $this->checkLogin($args['user_id'],$args['token']); } else { common_ensure_session(); $this->showForm(); @@ -103,46 +98,30 @@ class LoginAction extends Action function checkLogin($user_id=null, $token=null) { - if(isset($token) && isset($user_id)){ - //Token based login (from the LoginCommand) - $login_token = Login_token::staticGet('user_id',$user_id); - if($login_token && $login_token->token == $token){ - if($login_token->modified > time()+2*60){ - //token has expired - //delete the token as it is useless - $login_token->delete(); - $this->showForm(_('Invalid or expired token.')); - return; - }else{ - //delete the token so it cannot be reused - $login_token->delete(); - //it's a valid token - let them log in - $user = User::staticGet('id', $user_id); - //$user = User::staticGet('nickname', "candrews"); - } - }else{ - $this->showForm(_('Invalid or expired token.')); - return; - } - }else{ - // Regular form submission login - - // XXX: login throttle - - // CSRF protection - token set in NoticeForm - $token = $this->trimmed('token'); - if (!$token || $token != common_session_token()) { - $this->clientError(_('There was a problem with your session token. '. - 'Try again, please.')); - return; - } - - $nickname = $this->trimmed('nickname'); - $password = $this->arg('password'); - - $user = common_check_user($nickname, $password); + // XXX: login throttle + + // CSRF protection - token set in NoticeForm + $token = $this->trimmed('token'); + if (!$token || $token != common_session_token()) { + $st = common_session_token(); + if (empty($token)) { + common_log(LOG_WARNING, 'No token provided by client.'); + } else if (empty($st)) { + common_log(LOG_WARNING, 'No session token stored.'); + } else { + common_log(LOG_WARNING, 'Token = ' . $token . ' and session token = ' . $st); + } + + $this->clientError(_('There was a problem with your session token. '. + 'Try again, please.')); + return; } + $nickname = $this->trimmed('nickname'); + $password = $this->arg('password'); + + $user = common_check_user($nickname, $password); + if (!$user) { $this->showForm(_('Incorrect username or password.')); return; @@ -165,6 +144,7 @@ class LoginAction extends Action if ($url) { // We don't have to return to it again common_set_returnto(null); + $url = common_inject_session($url); } else { $url = common_local_url('all', array('nickname' => @@ -240,9 +220,9 @@ class LoginAction extends Action function showContent() { $this->elementStart('form', array('method' => 'post', - 'id' => 'form_login', - 'class' => 'form_settings', - 'action' => common_local_url('login'))); + 'id' => 'form_login', + 'class' => 'form_settings', + 'action' => common_local_url('login'))); $this->elementStart('fieldset'); $this->element('legend', null, _('Login to site')); $this->elementStart('ul', 'form_data'); @@ -255,7 +235,7 @@ class LoginAction extends Action $this->elementStart('li'); $this->checkbox('rememberme', _('Remember me'), false, _('Automatically login in the future; ' . - 'not for shared computers!')); + 'not for shared computers!')); $this->elementEnd('li'); $this->elementEnd('ul'); $this->submit('submit', _('Login')); diff --git a/actions/makeadmin.php b/actions/makeadmin.php index 2dfddebc2..9ad7d6e7c 100644 --- a/actions/makeadmin.php +++ b/actions/makeadmin.php @@ -92,7 +92,7 @@ class MakeadminAction extends Action return false; } if ($this->profile->isAdmin($this->group)) { - $this->clientError(sprintf(_('%s is already an admin for group "%s".'), + $this->clientError(sprintf(_('%1$s is already an admin for group "%2$s".'), $this->profile->getBestName(), $this->group->getBestName()), 401); @@ -129,7 +129,7 @@ class MakeadminAction extends Action 'profile_id' => $this->profile->id)); if (empty($member)) { - $this->serverError(_('Can\'t get membership record for %s in group %s'), + $this->serverError(_('Can\'t get membership record for %1$s in group %2$s.'), $this->profile->getBestName(), $this->group->getBestName()); } @@ -142,7 +142,7 @@ class MakeadminAction extends Action if (!$result) { common_log_db_error($member, 'UPDATE', __FILE__); - $this->serverError(_('Can\'t make %s an admin for group %s'), + $this->serverError(_('Can\'t make %1$s an admin for group %2$s.'), $this->profile->getBestName(), $this->group->getBestName()); } diff --git a/actions/newmessage.php b/actions/newmessage.php index 350452091..25e58feab 100644 --- a/actions/newmessage.php +++ b/actions/newmessage.php @@ -182,7 +182,7 @@ class NewmessageAction extends Action $this->elementEnd('head'); $this->elementStart('body'); $this->element('p', array('id' => 'command_result'), - sprintf(_('Direct message to %s sent'), + sprintf(_('Direct message to %s sent.'), $this->other->nickname)); $this->elementEnd('body'); $this->elementEnd('html'); diff --git a/actions/noticesearch.php b/actions/noticesearch.php index 76c877ff2..d0673420d 100644 --- a/actions/noticesearch.php +++ b/actions/noticesearch.php @@ -88,7 +88,7 @@ class NoticesearchAction extends SearchAction return array(new Feed(Feed::RSS1, common_local_url('noticesearchrss', array('q' => $q)), - sprintf(_('Search results for "%s" on %s'), + sprintf(_('Search results for "%1$s" on %2$s'), $q, common_config('site', 'name')))); } diff --git a/actions/otp.php b/actions/otp.php new file mode 100644 index 000000000..acf84aee8 --- /dev/null +++ b/actions/otp.php @@ -0,0 +1,145 @@ +<?php +/** + * StatusNet, the distributed open-source microblogging tool + * + * Allow one-time password login + * + * PHP version 5 + * + * LICENCE: This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * + * @category Login + * @package StatusNet + * @author Evan Prodromou <evan@status.net> + * @copyright 2010 StatusNet, Inc. + * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPLv3 + * @link http://status.net/ + */ + +if (!defined('STATUSNET')) { + exit(1); +} + +/** + * Allow one-time password login + * + * This action will automatically log in the user identified by the user_id + * parameter. A login_token record must be constructed beforehand, typically + * by code where the user is already authenticated. + * + * @category Login + * @package StatusNet + * @author Evan Prodromou <evan@status.net> + * @copyright 2010 StatusNet, Inc. + * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPLv3 + * @link http://status.net/ + */ + +class OtpAction extends Action +{ + var $user; + var $token; + var $rememberme; + var $returnto; + var $lt; + + function prepare($args) + { + parent::prepare($args); + + if (common_is_real_login()) { + $this->clientError(_('Already logged in.')); + return false; + } + + $id = $this->trimmed('user_id'); + + if (empty($id)) { + $this->clientError(_('No user ID specified.')); + return false; + } + + $this->user = User::staticGet('id', $id); + + if (empty($this->user)) { + $this->clientError(_('No such user.')); + return false; + } + + $this->token = $this->trimmed('token'); + + if (empty($this->token)) { + $this->clientError(_('No login token specified.')); + return false; + } + + $this->lt = Login_token::staticGet('user_id', $id); + + if (empty($this->lt)) { + $this->clientError(_('No login token requested.')); + return false; + } + + if ($this->lt->token != $this->token) { + $this->clientError(_('Invalid login token specified.')); + return false; + } + + if ($this->lt->modified > time() + Login_token::TIMEOUT) { + //token has expired + //delete the token as it is useless + $this->lt->delete(); + $this->lt = null; + $this->clientError(_('Login token expired.')); + return false; + } + + $this->rememberme = $this->boolean('rememberme'); + $this->returnto = $this->trimmed('returnto'); + + return true; + } + + function handle($args) + { + parent::handle($args); + + // success! + if (!common_set_user($this->user)) { + $this->serverError(_('Error setting user. You are probably not authorized.')); + return; + } + + // We're now logged in; disable the lt + + $this->lt->delete(); + $this->lt = null; + + if ($this->rememberme) { + common_rememberme($this->user); + } + + if (!empty($this->returnto)) { + $url = $this->returnto; + // We don't have to return to it again + common_set_returnto(null); + } else { + $url = common_local_url('all', + array('nickname' => + $this->user->nickname)); + } + + common_redirect($url, 303); + } +} diff --git a/actions/outbox.php b/actions/outbox.php index 537fad3ef..de30de018 100644 --- a/actions/outbox.php +++ b/actions/outbox.php @@ -55,7 +55,7 @@ class OutboxAction extends MailboxAction function title() { if ($this->page > 1) { - return sprintf(_("Outbox for %s - page %d"), + return sprintf(_("Outbox for %1$s - page %2$d"), $this->user->nickname, $page); } else { return sprintf(_("Outbox for %s"), $this->user->nickname); diff --git a/actions/pathsadminpanel.php b/actions/pathsadminpanel.php index d39c7c449..3779fcfaa 100644 --- a/actions/pathsadminpanel.php +++ b/actions/pathsadminpanel.php @@ -305,7 +305,7 @@ class PathsAdminPanelForm extends AdminForm $this->unli(); $this->li(); - $this->input('sslserver', _('SSL Server'), + $this->input('sslserver', _('SSL server'), _('Server to direct SSL requests to'), 'site'); $this->unli(); $this->out->elementEnd('ul'); diff --git a/actions/peopletag.php b/actions/peopletag.php index 6dbbc9261..4ba1dc0f1 100644 --- a/actions/peopletag.php +++ b/actions/peopletag.php @@ -141,7 +141,7 @@ class PeopletagAction extends Action */ function title() { - return sprintf(_('Users self-tagged with %s - page %d'), + return sprintf(_('Users self-tagged with %1$s - page %2$d'), $this->tag, $this->page); } diff --git a/actions/postnotice.php b/actions/postnotice.php index c2e1c44ca..fb0670376 100644 --- a/actions/postnotice.php +++ b/actions/postnotice.php @@ -87,8 +87,8 @@ class PostnoticeAction extends Action $license = $_POST['omb_notice_license']; $site_license = common_config('license', 'url'); if ($license && !common_compatible_license($license, $site_license)) { - throw new Exception(sprintf(_('Notice license ‘%s’ is not ' . - 'compatible with site license ‘%s’.'), + throw new Exception(sprintf(_('Notice license ‘%1$s’ is not ' . + 'compatible with site license ‘%2$s’.'), $license, $site_license)); } } diff --git a/actions/profilesettings.php b/actions/profilesettings.php index ee236fe62..0d6777879 100644 --- a/actions/profilesettings.php +++ b/actions/profilesettings.php @@ -316,7 +316,12 @@ class ProfilesettingsAction extends AccountSettingsAction $loc = Location::fromName($location); - if (!empty($loc)) { + if (empty($loc)) { + $profile->lat = null; + $profile->lon = null; + $profile->location_id = null; + $profile->location_ns = null; + } else { $profile->lat = $loc->lat; $profile->lon = $loc->lon; $profile->location_id = $loc->location_id; diff --git a/actions/register.php b/actions/register.php index 57f8e7bdf..698137346 100644 --- a/actions/register.php +++ b/actions/register.php @@ -259,6 +259,7 @@ class RegisterAction extends Action // Re-init language env in case it changed (not yet, but soon) common_init_language(); + $this->showSuccess(); } else { $this->showForm(_('Invalid username or password.')); @@ -534,9 +535,9 @@ class RegisterAction extends Action array('nickname' => $nickname)); $this->elementStart('div', 'success'); - $instr = sprintf(_('Congratulations, %s! And welcome to %%%%site.name%%%%. '. + $instr = sprintf(_('Congratulations, %1$s! And welcome to %%%%site.name%%%%. '. 'From here, you may want to...'. "\n\n" . - '* Go to [your profile](%s) '. + '* Go to [your profile](%2$s) '. 'and post your first message.' . "\n" . '* Add a [Jabber/GTalk address]'. '(%%%%action.imsettings%%%%) '. diff --git a/actions/replies.php b/actions/replies.php index a13b5a227..2e50f1c3c 100644 --- a/actions/replies.php +++ b/actions/replies.php @@ -124,7 +124,7 @@ class RepliesAction extends OwnerDesignAction if ($this->page == 1) { return sprintf(_("Replies to %s"), $this->user->nickname); } else { - return sprintf(_("Replies to %s, page %d"), + return sprintf(_("Replies to %1$s, page %2$d"), $this->user->nickname, $this->page); } @@ -195,14 +195,14 @@ class RepliesAction extends OwnerDesignAction function showEmptyListMessage() { - $message = sprintf(_('This is the timeline showing replies to %s but %s hasn\'t received a notice to his attention yet.'), $this->user->nickname, $this->user->nickname) . ' '; + $message = sprintf(_('This is the timeline showing replies to %1$s but %2$s hasn\'t received a notice to his attention yet.'), $this->user->nickname, $this->user->nickname) . ' '; if (common_logged_in()) { $current_user = common_current_user(); if ($this->user->id === $current_user->id) { $message .= _('You can engage other users in a conversation, subscribe to more people or [join groups](%%action.groups%%).'); } else { - $message .= sprintf(_('You can try to [nudge %s](../%s) or [post something to his or her attention](%%%%action.newnotice%%%%?status_textarea=%s).'), $this->user->nickname, $this->user->nickname, '@' . $this->user->nickname); + $message .= sprintf(_('You can try to [nudge %1$s](../%2$s) or [post something to his or her attention](%%%%action.newnotice%%%%?status_textarea=%3$s).'), $this->user->nickname, $this->user->nickname, '@' . $this->user->nickname); } } else { diff --git a/actions/showfavorites.php b/actions/showfavorites.php index b12fcdd9a..6023f0156 100644 --- a/actions/showfavorites.php +++ b/actions/showfavorites.php @@ -76,7 +76,7 @@ class ShowfavoritesAction extends OwnerDesignAction if ($this->page == 1) { return sprintf(_("%s's favorite notices"), $this->user->nickname); } else { - return sprintf(_("%s's favorite notices, page %d"), + return sprintf(_("%1$s's favorite notices, page %2$d"), $this->user->nickname, $this->page); } diff --git a/actions/showgroup.php b/actions/showgroup.php index a4af29391..06ae572e8 100644 --- a/actions/showgroup.php +++ b/actions/showgroup.php @@ -81,7 +81,7 @@ class ShowgroupAction extends GroupDesignAction if ($this->page == 1) { return sprintf(_("%s group"), $base); } else { - return sprintf(_("%s group, page %d"), + return sprintf(_("%1$s group, page %2$d"), $base, $this->page); } @@ -118,7 +118,7 @@ class ShowgroupAction extends GroupDesignAction } if (!$nickname) { - $this->clientError(_('No nickname'), 404); + $this->clientError(_('No nickname.'), 404); return false; } @@ -134,7 +134,7 @@ class ShowgroupAction extends GroupDesignAction common_redirect(common_local_url('groupbyid', $args), 301); return false; } else { - $this->clientError(_('No such group'), 404); + $this->clientError(_('No such group.'), 404); return false; } } diff --git a/actions/shownotice.php b/actions/shownotice.php index 5d16fdad9..d09100f67 100644 --- a/actions/shownotice.php +++ b/actions/shownotice.php @@ -103,7 +103,7 @@ class ShownoticeAction extends OwnerDesignAction $this->user = User::staticGet('id', $this->profile->id); - if (! $this->notice->is_local) { + if ($this->notice->is_local == Notice::REMOTE_OMB) { common_redirect($this->notice->uri); return false; } diff --git a/actions/showstream.php b/actions/showstream.php index 74b46cc95..75e10858d 100644 --- a/actions/showstream.php +++ b/actions/showstream.php @@ -76,7 +76,7 @@ class ShowstreamAction extends ProfileAction if ($this->page == 1) { return $base; } else { - return sprintf(_("%s, page %d"), + return sprintf(_("%1$s, page %2$d"), $base, $this->page); } @@ -119,7 +119,7 @@ class ShowstreamAction extends ProfileAction common_local_url('userrss', array('nickname' => $this->user->nickname, 'tag' => $this->tag)), - sprintf(_('Notice feed for %s tagged %s (RSS 1.0)'), + sprintf(_('Notice feed for %1$s tagged %2$s (RSS 1.0)'), $this->user->nickname, $this->tag))); } @@ -188,14 +188,14 @@ class ShowstreamAction extends ProfileAction function showEmptyListMessage() { - $message = sprintf(_('This is the timeline for %s but %s hasn\'t posted anything yet.'), $this->user->nickname, $this->user->nickname) . ' '; + $message = sprintf(_('This is the timeline for %1$s but %2$s hasn\'t posted anything yet.'), $this->user->nickname, $this->user->nickname) . ' '; if (common_logged_in()) { $current_user = common_current_user(); if ($this->user->id === $current_user->id) { $message .= _('Seen anything interesting recently? You haven\'t posted any notices yet, now would be a good time to start :)'); } else { - $message .= sprintf(_('You can try to nudge %s or [post something to his or her attention](%%%%action.newnotice%%%%?status_textarea=%s).'), $this->user->nickname, '@' . $this->user->nickname); + $message .= sprintf(_('You can try to nudge %1$s or [post something to his or her attention](%%%%action.newnotice%%%%?status_textarea=%2$s).'), $this->user->nickname, '@' . $this->user->nickname); } } else { diff --git a/actions/siteadminpanel.php b/actions/siteadminpanel.php index 5e29f4c19..dd388a18a 100644 --- a/actions/siteadminpanel.php +++ b/actions/siteadminpanel.php @@ -151,10 +151,10 @@ class SiteadminpanelAction extends AdminPanelAction $values['site']['email'] = common_canonical_email($values['site']['email']); if (empty($values['site']['email'])) { - $this->clientError(_('You must have a valid contact email address')); + $this->clientError(_('You must have a valid contact email address.')); } if (!Validate::email($values['site']['email'], common_config('email', 'check_domain'))) { - $this->clientError(_('Not a valid email address')); + $this->clientError(_('Not a valid email address.')); } // Validate timezone @@ -169,7 +169,7 @@ class SiteadminpanelAction extends AdminPanelAction if (!is_null($values['site']['language']) && !in_array($values['site']['language'], array_keys(get_nice_language_list()))) { - $this->clientError(sprintf(_('Unknown language "%s"'), $values['site']['language'])); + $this->clientError(sprintf(_('Unknown language "%s".'), $values['site']['language'])); } // Validate report URL diff --git a/actions/smssettings.php b/actions/smssettings.php index 672abcef8..751495d57 100644 --- a/actions/smssettings.php +++ b/actions/smssettings.php @@ -55,7 +55,7 @@ class SmssettingsAction extends ConnectSettingsAction function title() { - return _('SMS Settings'); + return _('SMS settings'); } /** @@ -135,7 +135,7 @@ class SmssettingsAction extends ConnectSettingsAction } else { $this->elementStart('ul', 'form_data'); $this->elementStart('li'); - $this->input('sms', _('SMS Phone number'), + $this->input('sms', _('SMS phone number'), ($this->arg('sms')) ? $this->arg('sms') : null, _('Phone number, no punctuation or spaces, '. 'with area code')); diff --git a/actions/subscribers.php b/actions/subscribers.php index cc9452820..cd3e2ee5b 100644 --- a/actions/subscribers.php +++ b/actions/subscribers.php @@ -49,7 +49,7 @@ class SubscribersAction extends GalleryAction if ($this->page == 1) { return sprintf(_('%s subscribers'), $this->user->nickname); } else { - return sprintf(_('%s subscribers, page %d'), + return sprintf(_('%1$s subscribers, page %2$d'), $this->user->nickname, $this->page); } diff --git a/actions/subscriptions.php b/actions/subscriptions.php index 0dc5ee762..0ef31aa9f 100644 --- a/actions/subscriptions.php +++ b/actions/subscriptions.php @@ -51,7 +51,7 @@ class SubscriptionsAction extends GalleryAction if ($this->page == 1) { return sprintf(_('%s subscriptions'), $this->user->nickname); } else { - return sprintf(_('%s subscriptions, page %d'), + return sprintf(_('%1$s subscriptions, page %2$d'), $this->user->nickname, $this->page); } diff --git a/actions/tag.php b/actions/tag.php index 3a88c1229..12857236e 100644 --- a/actions/tag.php +++ b/actions/tag.php @@ -65,7 +65,7 @@ class TagAction extends Action if ($this->page == 1) { return sprintf(_("Notices tagged with %s"), $this->tag); } else { - return sprintf(_("Notices tagged with %s, page %d"), + return sprintf(_("Notices tagged with %1$s, page %2$d"), $this->tag, $this->page); } diff --git a/actions/tagother.php b/actions/tagother.php index e9e13b939..735d876da 100644 --- a/actions/tagother.php +++ b/actions/tagother.php @@ -163,8 +163,8 @@ class TagotherAction extends Action $token = $this->trimmed('token'); if (!$token || $token != common_session_token()) { - $this->showForm(_('There was a problem with your session token.'. - ' Try again, please.')); + $this->showForm(_('There was a problem with your session token. '. + 'Try again, please.')); return; } diff --git a/actions/twitapisearchatom.php b/actions/twitapisearchatom.php index 1cb8d7efe..baed2a0c7 100644 --- a/actions/twitapisearchatom.php +++ b/actions/twitapisearchatom.php @@ -208,7 +208,14 @@ class TwitapisearchatomAction extends ApiAction $this->showFeed(); foreach ($notices as $n) { - $this->showEntry($n); + + $profile = $n->getProfile(); + + // Don't show notices from deleted users + + if (!empty($profile)) { + $this->showEntry($n); + } } $this->endAtom(); diff --git a/actions/unsubscribe.php b/actions/unsubscribe.php index 4a5863489..dbb4e4153 100644 --- a/actions/unsubscribe.php +++ b/actions/unsubscribe.php @@ -81,7 +81,7 @@ class UnsubscribeAction extends Action $other = Profile::staticGet('id', $other_id); if (!$other) { - $this->clientError(_('No profile with that id.')); + $this->clientError(_('No profile with that ID.')); return; } diff --git a/actions/updateprofile.php b/actions/updateprofile.php index 3cec9523c..e416a6fa9 100644 --- a/actions/updateprofile.php +++ b/actions/updateprofile.php @@ -59,8 +59,8 @@ class UpdateprofileAction extends Action $license = $_POST['omb_listenee_license']; $site_license = common_config('license', 'url'); if (!common_compatible_license($license, $site_license)) { - $this->clientError(sprintf(_('Listenee stream license ‘%s’ is not '. - 'compatible with site license ‘%s’.'), + $this->clientError(sprintf(_('Listenee stream license ‘%1$s’ is not '. + 'compatible with site license ‘%2$s’.'), $license, $site_license)); return false; } diff --git a/actions/userauthorization.php b/actions/userauthorization.php index dc59e6c94..4321f1302 100644 --- a/actions/userauthorization.php +++ b/actions/userauthorization.php @@ -293,7 +293,7 @@ class UserauthorizationAction extends Action $user = User::staticGet('uri', $listener); if (!$user) { - throw new Exception(sprintf(_('Listener URI ‘%s’ not found here'), + throw new Exception(sprintf(_('Listener URI ‘%s’ not found here.'), $listener)); } @@ -327,8 +327,8 @@ class UserauthorizationAction extends Action $license = $_GET['omb_listenee_license']; $site_license = common_config('license', 'url'); if (!common_compatible_license($license, $site_license)) { - throw new Exception(sprintf(_('Listenee stream license ‘%s’ is not ' . - 'compatible with site license ‘%s’.'), + throw new Exception(sprintf(_('Listenee stream license ‘%1$s’ is not ' . + 'compatible with site license ‘%2$s’.'), $license, $site_license)); } diff --git a/actions/userdesignsettings.php b/actions/userdesignsettings.php index 31a097970..1cf878000 100644 --- a/actions/userdesignsettings.php +++ b/actions/userdesignsettings.php @@ -207,7 +207,7 @@ class UserDesignSettingsAction extends DesignSettingsAction if (empty($id)) { common_log_db_error($id, 'INSERT', __FILE__); - $this->showForm(_('Unable to save your design settings!')); + $this->showForm(_('Unable to save your design settings.')); return; } @@ -217,7 +217,7 @@ class UserDesignSettingsAction extends DesignSettingsAction if (empty($result)) { common_log_db_error($original, 'UPDATE', __FILE__); - $this->showForm(_('Unable to save your design settings!')); + $this->showForm(_('Unable to save your design settings.')); $user->query('ROLLBACK'); return; } @@ -260,7 +260,7 @@ class UserDesignSettingsAction extends DesignSettingsAction if (empty($id)) { common_log_db_error($id, 'INSERT', __FILE__); - $this->showForm(_('Unable to save your design settings!')); + $this->showForm(_('Unable to save your design settings.')); return; } @@ -270,7 +270,7 @@ class UserDesignSettingsAction extends DesignSettingsAction if (empty($result)) { common_log_db_error($original, 'UPDATE', __FILE__); - $this->showForm(_('Unable to save your design settings!')); + $this->showForm(_('Unable to save your design settings.')); $user->query('ROLLBACK'); return; } diff --git a/actions/usergroups.php b/actions/usergroups.php index 84e105153..504226143 100644 --- a/actions/usergroups.php +++ b/actions/usergroups.php @@ -61,7 +61,7 @@ class UsergroupsAction extends OwnerDesignAction if ($this->page == 1) { return sprintf(_("%s groups"), $this->user->nickname); } else { - return sprintf(_("%s groups, page %d"), + return sprintf(_("%1$s groups, page %2$d"), $this->user->nickname, $this->page); } diff --git a/actions/version.php b/actions/version.php new file mode 100644 index 000000000..c1f673c45 --- /dev/null +++ b/actions/version.php @@ -0,0 +1,270 @@ +<?php +/** + * StatusNet - the distributed open-source microblogging tool + * Copyright (C) 2008, 2009, StatusNet, Inc. + * + * Show version information for this software and plugins + * + * PHP version 5 + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * + * @category Info + * @package StatusNet + * @author Evan Prodromou <evan@status.net> + * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPLv3 + * @link http://status.net/ + */ + +if (!defined('STATUSNET')) { + exit(1); +} + +/** + * Version info page + * + * A page that shows version information for this site. Helpful for + * debugging, for giving credit to authors, and for linking to more + * complete documentation for admins. + * + * @category Info + * @package StatusNet + * @author Evan Prodromou <evan@status.net> + * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPLv3 + * @link http://status.net/ + */ + +class VersionAction extends Action +{ + var $pluginVersions = array(); + + /** + * Return true since we're read-only. + * + * @param array $args other arguments + * + * @return boolean is read only action? + */ + + function isReadOnly($args) + { + return true; + } + + /** + * Returns the page title + * + * @return string page title + */ + + function title() + { + return sprintf(_("StatusNet %s"), STATUSNET_VERSION); + } + + /** + * Prepare to run + * + * Fire off an event to let plugins report their + * versions. + * + * @param array $args array misc. arguments + * + * @return boolean true + */ + + function prepare($args) + { + parent::prepare($args); + + Event::handle('PluginVersion', array(&$this->pluginVersions)); + + return true; + } + + /** + * Execute the action + * + * Shows a page with the version information in the + * content area. + * + * @param array $args ignored. + * + * @return void + */ + + function handle($args) + { + parent::handle($args); + $this->showPage(); + } + + + /* + * Override to add hentry, and content-inner classes + * + * @return void + */ + function showContentBlock() + { + $this->elementStart('div', array('id' => 'content', 'class' => 'hentry')); + $this->showPageTitle(); + $this->showPageNoticeBlock(); + $this->elementStart('div', array('id' => 'content_inner', + 'class' => 'entry-content')); + // show the actual content (forms, lists, whatever) + $this->showContent(); + $this->elementEnd('div'); + $this->elementEnd('div'); + } + + + /* + * Overrride to add entry-title class + * + * @return void + */ + function showPageTitle() { + $this->element('h1', array('class' => 'entry-title'), $this->title()); + } + + + /** + * Show version information + * + * @return void + */ + + function showContent() + { + $this->elementStart('p'); + + $this->raw(sprintf(_('This site is powered by %1$s version %2$s, '. + 'Copyright 2008-2010 StatusNet, Inc. '. + 'and contributors.'), + XMLStringer::estring('a', array('href' => 'http://status.net/'), + _('StatusNet')), + STATUSNET_VERSION)); + $this->elementEnd('p'); + + $this->element('h2', null, _('Contributors')); + + $this->element('p', null, implode(', ', $this->contributors)); + + $this->element('h2', null, _('License')); + + $this->element('p', null, + _('StatusNet is free software: you can redistribute it and/or modify '. + 'it under the terms of the GNU Affero General Public License as published by '. + 'the Free Software Foundation, either version 3 of the License, or '. + '(at your option) any later version. ')); + + $this->element('p', null, + _('This program is distributed in the hope that it will be useful, '. + 'but WITHOUT ANY WARRANTY; without even the implied warranty of '. + 'MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the '. + 'GNU Affero General Public License for more details. ')); + + $this->elementStart('p'); + $this->raw(sprintf(_('You should have received a copy of the GNU Affero General Public License '. + 'along with this program. If not, see %s.'), + XMLStringer::estring('a', array('href' => 'http://www.gnu.org/licenses/agpl.html'), + 'http://www.gnu.org/licenses/agpl.html'))); + $this->elementEnd('p'); + + // XXX: Theme information? + + if (count($this->pluginVersions)) { + $this->element('h2', null, _('Plugins')); + + $this->elementStart('table', array('id' => 'plugins_enabled')); + + $this->elementStart('thead'); + $this->elementStart('tr'); + $this->element('th', array('id' => 'plugin_name'), _('Name')); + $this->element('th', array('id' => 'plugin_version'), _('Version')); + $this->element('th', array('id' => 'plugin_authors'), _('Author(s)')); + $this->element('th', array('id' => 'plugin_description'), _('Description')); + $this->elementEnd('tr'); + $this->elementEnd('thead'); + + $this->elementStart('tbody'); + foreach ($this->pluginVersions as $plugin) { + $this->elementStart('tr'); + if (array_key_exists('homepage', $plugin)) { + $this->elementStart('th'); + $this->element('a', array('href' => $plugin['homepage']), + $plugin['name']); + $this->elementEnd('th'); + } else { + $this->element('th', null, $plugin['name']); + } + + $this->element('td', null, $plugin['version']); + + if (array_key_exists('author', $plugin)) { + $this->element('td', null, $plugin['author']); + } + + if (array_key_exists('rawdescription', $plugin)) { + $this->elementStart('td'); + $this->raw($plugin['rawdescription']); + $this->elementEnd('td'); + } else if (array_key_exists('description', $plugin)) { + $this->element('td', null, $plugin['description']); + } + $this->elementEnd('tr'); + } + $this->elementEnd('tbody'); + $this->elementEnd('table'); + } + + } + + var $contributors = array('Evan Prodromou (StatusNet)', + 'Zach Copley (StatusNet)', + 'Earle Martin (StatusNet)', + 'Marie-Claude Doyon (StatusNet)', + 'Sarven Capadisli (StatusNet)', + 'Robin Millette (StatusNet)', + 'Ciaran Gultnieks', + 'Michael Landers', + 'Ori Avtalion', + 'Garret Buell', + 'Mike Cochrane', + 'Matthew Gregg', + 'Florian Biree', + 'Erik Stambaugh', + 'drry', + 'Gina Haeussge', + 'Tryggvi Björgvinsson', + 'Adrian Lang', + 'Meitar Moscovitz', + 'Sean Murphy', + 'Leslie Michael Orchard', + 'Eric Helgeson', + 'Ken Sedgwick', + 'Brian Hendrickson', + 'Tobias Diekershoff', + 'Dan Moore', + 'Fil', + 'Jeff Mitchell', + 'Brenda Wallace', + 'Jeffery To', + 'Federico Marani', + 'Craig Andrews', + 'mEDI', + 'Brett Taylor', + 'Brigitte Schuster'); +} diff --git a/classes/Avatar.php b/classes/Avatar.php index 8d6424e8b..91bde0f04 100644 --- a/classes/Avatar.php +++ b/classes/Avatar.php @@ -37,7 +37,7 @@ class Avatar extends Memcached_DataObject } } - function &pkeyGet($kv) + function pkeyGet($kv) { return Memcached_DataObject::pkeyGet('Avatar', $kv); } diff --git a/classes/Config.php b/classes/Config.php index 6d914ca1f..43b99587f 100644 --- a/classes/Config.php +++ b/classes/Config.php @@ -120,7 +120,7 @@ class Config extends Memcached_DataObject return $result; } - function &pkeyGet($kv) + function pkeyGet($kv) { return Memcached_DataObject::pkeyGet('Config', $kv); } diff --git a/classes/Fave.php b/classes/Fave.php index 11e876ff1..8113c8e16 100644 --- a/classes/Fave.php +++ b/classes/Fave.php @@ -32,7 +32,7 @@ class Fave extends Memcached_DataObject return $fave; } - function &pkeyGet($kv) + function pkeyGet($kv) { return Memcached_DataObject::pkeyGet('Fave', $kv); } diff --git a/classes/File.php b/classes/File.php index e04a9d525..c527c4ffe 100644 --- a/classes/File.php +++ b/classes/File.php @@ -80,7 +80,14 @@ class File extends Memcached_DataObject if (isset($redir_data['type']) && (('text/html' === substr($redir_data['type'], 0, 9) || 'application/xhtml+xml' === substr($redir_data['type'], 0, 21))) && ($oembed_data = File_oembed::_getOembed($given_url))) { + + $fo = File_oembed::staticGet('file_id', $file_id); + + if (empty($fo)) { File_oembed::saveNew($oembed_data, $file_id); + } else { + common_log(LOG_WARNING, "Strangely, a File_oembed object exists for new file $file_id", __FILE__); + } } return $x; } @@ -182,25 +189,32 @@ class File extends Memcached_DataObject static function url($filename) { - $path = common_config('attachments', 'path'); + if(common_config('site','private')) { - if ($path[strlen($path)-1] != '/') { - $path .= '/'; - } + return common_local_url('getfile', + array('filename' => $filename)); - if ($path[0] != '/') { - $path = '/'.$path; - } + } else { + $path = common_config('attachments', 'path'); - $server = common_config('attachments', 'server'); + if ($path[strlen($path)-1] != '/') { + $path .= '/'; + } - if (empty($server)) { - $server = common_config('site', 'server'); - } + if ($path[0] != '/') { + $path = '/'.$path; + } - // XXX: protocol + $server = common_config('attachments', 'server'); - return 'http://'.$server.$path.$filename; + if (empty($server)) { + $server = common_config('site', 'server'); + } + + // XXX: protocol + + return 'http://'.$server.$path.$filename; + } } function getEnclosure(){ diff --git a/classes/File_oembed.php b/classes/File_oembed.php index e41ccfd09..11f160718 100644 --- a/classes/File_oembed.php +++ b/classes/File_oembed.php @@ -115,7 +115,13 @@ class File_oembed extends Memcached_DataObject } $file_oembed->insert(); if (!empty($data->thumbnail_url)) { - File_thumbnail::saveNew($data, $file_id); + $ft = File_thumbnail::staticGet('file_id', $file_id); + if (!empty($ft)) { + common_log(LOG_WARNING, "Strangely, a File_thumbnail object exists for new file $file_id", + __FILE__); + } else { + File_thumbnail::saveNew($data, $file_id); + } } } } diff --git a/classes/File_to_post.php b/classes/File_to_post.php index e3db91b20..72a42b088 100644 --- a/classes/File_to_post.php +++ b/classes/File_to_post.php @@ -62,7 +62,7 @@ class File_to_post extends Memcached_DataObject } } - function &pkeyGet($kv) + function pkeyGet($kv) { return Memcached_DataObject::pkeyGet('File_to_post', $kv); } diff --git a/classes/Group_block.php b/classes/Group_block.php index de2cf5f6e..9f4d59295 100644 --- a/classes/Group_block.php +++ b/classes/Group_block.php @@ -40,7 +40,7 @@ class Group_block extends Memcached_DataObject /* the code above is auto generated do not remove the tag below */ ###END_AUTOCODE - function &pkeyGet($kv) + function pkeyGet($kv) { return Memcached_DataObject::pkeyGet('Group_block', $kv); } diff --git a/classes/Group_inbox.php b/classes/Group_inbox.php index 1af7439f7..2a0787e38 100644 --- a/classes/Group_inbox.php +++ b/classes/Group_inbox.php @@ -20,7 +20,7 @@ class Group_inbox extends Memcached_DataObject /* the code above is auto generated do not remove the tag below */ ###END_AUTOCODE - function &pkeyGet($kv) + function pkeyGet($kv) { return Memcached_DataObject::pkeyGet('Group_inbox', $kv); } diff --git a/classes/Group_member.php b/classes/Group_member.php index 3c23a991f..069b2c7a1 100644 --- a/classes/Group_member.php +++ b/classes/Group_member.php @@ -21,7 +21,7 @@ class Group_member extends Memcached_DataObject /* the code above is auto generated do not remove the tag below */ ###END_AUTOCODE - function &pkeyGet($kv) + function pkeyGet($kv) { return Memcached_DataObject::pkeyGet('Group_member', $kv); } diff --git a/classes/Login_token.php b/classes/Login_token.php index 746cd7f22..51dc61262 100644 --- a/classes/Login_token.php +++ b/classes/Login_token.php @@ -40,6 +40,8 @@ class Login_token extends Memcached_DataObject /* the code above is auto generated do not remove the tag below */ ###END_AUTOCODE + const TIMEOUT = 120; // seconds after which to timeout the token + /* DB_DataObject calculates the sequence key(s) by taking the first key returned by the keys() function. In this case, the keys() function returns user_id as the first key. user_id is not a sequence, but @@ -52,4 +54,29 @@ class Login_token extends Memcached_DataObject { return array(false,false); } + + function makeNew($user) + { + $login_token = Login_token::staticGet('user_id', $user->id); + + if (!empty($login_token)) { + $login_token->delete(); + } + + $login_token = new Login_token(); + + $login_token->user_id = $user->id; + $login_token->token = common_good_rand(16); + $login_token->created = common_sql_now(); + + $result = $login_token->insert(); + + if (!$result) { + common_log_db_error($login_token, 'INSERT', __FILE__); + throw new Exception(sprintf(_('Could not create login token for %s'), + $user->nickname)); + } + + return $login_token; + } } diff --git a/classes/Memcached_DataObject.php b/classes/Memcached_DataObject.php index a3a69e667..b68a4af8e 100644 --- a/classes/Memcached_DataObject.php +++ b/classes/Memcached_DataObject.php @@ -19,6 +19,8 @@ if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); } +require_once INSTALLDIR.'/classes/Memcached_DataObject.php'; + class Memcached_DataObject extends DB_DataObject { /** @@ -91,7 +93,7 @@ class Memcached_DataObject extends DB_DataObject unset($i); } $i = Memcached_DataObject::getcached($cls, $k, $v); - if ($i !== false) { // false == cache miss + if ($i) { return $i; } else { $i = DB_DataObject::factory($cls); @@ -103,12 +105,6 @@ class Memcached_DataObject extends DB_DataObject $i->encache(); return $i; } else { - // save the fact that no such row exists - $c = self::memcache(); - if (!empty($c)) { - $ck = self::cachekey($cls, $k, $v); - $c->set($ck, null); - } return false; } } @@ -117,13 +113,10 @@ class Memcached_DataObject extends DB_DataObject function &pkeyGet($cls, $kv) { $i = Memcached_DataObject::multicache($cls, $kv); - if ($i !== false) { // false == cache miss + if ($i) { return $i; } else { - $i = DB_DataObject::factory($cls); - if (empty($i)) { - return false; - } + $i = new $cls(); foreach ($kv as $k => $v) { $i->$k = $v; } @@ -131,11 +124,6 @@ class Memcached_DataObject extends DB_DataObject $i->encache(); } else { $i = null; - $c = self::memcache(); - if (!empty($c)) { - $ck = self::multicacheKey($cls, $kv); - $c->set($ck, null); - } } return $i; } @@ -183,7 +171,16 @@ class Memcached_DataObject extends DB_DataObject if (!$c) { return false; } else { - return $c->get(Memcached_DataObject::cacheKey($cls, $k, $v)); + $obj = $c->get(Memcached_DataObject::cacheKey($cls, $k, $v)); + if (0 == strcasecmp($cls, 'User')) { + // Special case for User + if (is_object($obj) && is_object($obj->id)) { + common_log(LOG_ERR, "User " . $obj->nickname . " was cached with User as ID; deleting"); + $c->delete(Memcached_DataObject::cacheKey($cls, $k, $v)); + return false; + } + } + return $obj; } } @@ -200,90 +197,73 @@ class Memcached_DataObject extends DB_DataObject function encache() { $c = $this->memcache(); - if (!$c) { return false; - } - - $keys = $this->_allCacheKeys(); - - foreach ($keys as $key) { - $c->set($key, $this); + } else if ($this->tableName() == 'user' && is_object($this->id)) { + // Special case for User bug + $e = new Exception(); + common_log(LOG_ERR, __METHOD__ . ' caching user with User object as ID ' . + str_replace("\n", " ", $e->getTraceAsString())); + return false; + } else { + $pkey = array(); + $pval = array(); + $types = $this->keyTypes(); + ksort($types); + foreach ($types as $key => $type) { + if ($type == 'K') { + $pkey[] = $key; + $pval[] = $this->$key; + } else { + $c->set($this->cacheKey($this->tableName(), $key, $this->$key), $this); + } + } + # XXX: should work for both compound and scalar pkeys + $pvals = implode(',', $pval); + $pkeys = implode(',', $pkey); + $c->set($this->cacheKey($this->tableName(), $pkeys, $pvals), $this); } } function decache() { $c = $this->memcache(); - if (!$c) { return false; - } - - $keys = $this->_allCacheKeys(); - - foreach ($keys as $key) { - $c->delete($key, $this); - } - } - - function _allCacheKeys() - { - $ckeys = array(); - - $types = $this->keyTypes(); - ksort($types); - - $pkey = array(); - $pval = array(); - - foreach ($types as $key => $type) { - - assert(!empty($key)); - - if ($type == 'U') { - if (empty($this->$key)) { - continue; + } else { + $pkey = array(); + $pval = array(); + $types = $this->keyTypes(); + ksort($types); + foreach ($types as $key => $type) { + if ($type == 'K') { + $pkey[] = $key; + $pval[] = $this->$key; + } else { + $c->delete($this->cacheKey($this->tableName(), $key, $this->$key)); } - $ckeys[] = $this->cacheKey($this->tableName(), $key, $this->$key); - } else if ($type == 'K' || $type == 'N') { - $pkey[] = $key; - $pval[] = $this->$key; - } else { - throw new Exception("Unknown key type $key => $type for " . $this->tableName()); } + # should work for both compound and scalar pkeys + # XXX: comma works for now but may not be safe separator for future keys + $pvals = implode(',', $pval); + $pkeys = implode(',', $pkey); + $c->delete($this->cacheKey($this->tableName(), $pkeys, $pvals)); } - - assert(count($pkey) > 0); - - // XXX: should work for both compound and scalar pkeys - $pvals = implode(',', $pval); - $pkeys = implode(',', $pkey); - - $ckeys[] = $this->cacheKey($this->tableName(), $pkeys, $pvals); - - return $ckeys; } function multicache($cls, $kv) { ksort($kv); - $c = self::memcache(); + $c = Memcached_DataObject::memcache(); if (!$c) { return false; } else { - return $c->get(self::multicacheKey($cls, $kv)); + $pkeys = implode(',', array_keys($kv)); + $pvals = implode(',', array_values($kv)); + return $c->get(Memcached_DataObject::cacheKey($cls, $pkeys, $pvals)); } } - static function multicacheKey($cls, $kv) - { - ksort($kv); - $pkeys = implode(',', array_keys($kv)); - $pvals = implode(',', array_values($kv)); - return self::cacheKey($cls, $pkeys, $pvals); - } - function getSearchEngine($table) { require_once INSTALLDIR.'/lib/search_engines.php'; @@ -318,8 +298,7 @@ class Memcached_DataObject extends DB_DataObject $key_part = common_keyize($cls).':'.md5($qry); $ckey = common_cache_key($key_part); $stored = $c->get($ckey); - - if ($stored !== false) { + if ($stored) { return new ArrayWrapper($stored); } diff --git a/classes/Notice.php b/classes/Notice.php index e8bc509a6..9bda47827 100644 --- a/classes/Notice.php +++ b/classes/Notice.php @@ -63,7 +63,7 @@ class Notice extends Memcached_DataObject public $created; // datetime multiple_key not_null default_0000-00-00%2000%3A00%3A00 public $modified; // timestamp not_null default_CURRENT_TIMESTAMP public $reply_to; // int(4) - public $is_local; // tinyint(1) + public $is_local; // int(4) public $source; // varchar(32) public $conversation; // int(4) public $lat; // decimal(10,7) @@ -1356,12 +1356,21 @@ class Notice extends Memcached_DataObject { $author = Profile::staticGet('id', $this->profile_id); - // FIXME: truncate on long repeats...? - $content = sprintf(_('RT @%1$s %2$s'), $author->nickname, $this->content); + $maxlen = common_config('site', 'textlimit'); + if ($maxlen > 0 && mb_strlen($content) > $maxlen) { + // Web interface and current Twitter API clients will + // pull the original notice's text, but some older + // clients and RSS/Atom feeds will see this trimmed text. + // + // Unfortunately this is likely to lose tags or URLs + // at the end of long notices. + $content = mb_substr($content, 0, $maxlen - 4) . ' ...'; + } + return self::saveNew($repeater_id, $content, $source, array('repeat_of' => $this->id)); } diff --git a/classes/Notice_inbox.php b/classes/Notice_inbox.php index d3ddad656..e350e6e2f 100644 --- a/classes/Notice_inbox.php +++ b/classes/Notice_inbox.php @@ -101,7 +101,7 @@ class Notice_inbox extends Memcached_DataObject return $ids; } - function &pkeyGet($kv) + function pkeyGet($kv) { return Memcached_DataObject::pkeyGet('Notice_inbox', $kv); } diff --git a/classes/Notice_tag.php b/classes/Notice_tag.php index 02740280f..79231f0b0 100644 --- a/classes/Notice_tag.php +++ b/classes/Notice_tag.php @@ -96,7 +96,7 @@ class Notice_tag extends Memcached_DataObject } } - function &pkeyGet($kv) + function pkeyGet($kv) { return Memcached_DataObject::pkeyGet('Notice_tag', $kv); } diff --git a/classes/Profile.php b/classes/Profile.php index 03196447b..25d908dbf 100644 --- a/classes/Profile.php +++ b/classes/Profile.php @@ -504,6 +504,7 @@ class Profile extends Memcached_DataObject 'Reply', 'Group_member', ); + Event::handle('ProfileDeleteRelated', array($this, &$related)); foreach ($related as $cls) { $inst = new $cls(); diff --git a/classes/Profile_role.php b/classes/Profile_role.php index afa7fb74e..74aca3730 100644 --- a/classes/Profile_role.php +++ b/classes/Profile_role.php @@ -43,7 +43,7 @@ class Profile_role extends Memcached_DataObject /* the code above is auto generated do not remove the tag below */ ###END_AUTOCODE - function &pkeyGet($kv) + function pkeyGet($kv) { return Memcached_DataObject::pkeyGet('Profile_role', $kv); } diff --git a/classes/Queue_item.php b/classes/Queue_item.php index 295c321b5..9c673540d 100644 --- a/classes/Queue_item.php +++ b/classes/Queue_item.php @@ -55,7 +55,7 @@ class Queue_item extends Memcached_DataObject return null; } - function &pkeyGet($kv) + function pkeyGet($kv) { return Memcached_DataObject::pkeyGet('Queue_item', $kv); } diff --git a/classes/Status_network.php b/classes/Status_network.php index b3117640d..776f6abb0 100644 --- a/classes/Status_network.php +++ b/classes/Status_network.php @@ -150,9 +150,19 @@ class Status_network extends DB_DataObject } if (!empty($sn)) { - if (!empty($sn->hostname) && 0 != strcasecmp($sn->hostname, $servername)) { - $sn->redirectToHostname(); + + // Redirect to the right URL + + if (!empty($sn->hostname) && + empty($_SERVER['HTTPS']) && + 0 != strcasecmp($sn->hostname, $servername)) { + $sn->redirectTo('http://'.$sn->hostname.$_SERVER['REQUEST_URI']); + } else if (!empty($_SERVER['HTTPS']) && + 0 != strcasecmp($sn->hostname, $servername) && + 0 != strcasecmp($sn->nickname.'.'.$wildcard, $servername)) { + $sn->redirectTo('https://'.$sn->nickname.'.'.$wildcard.$_SERVER['REQUEST_URI']); } + $dbhost = (empty($sn->dbhost)) ? 'localhost' : $sn->dbhost; $dbuser = (empty($sn->dbuser)) ? $sn->nickname : $sn->dbuser; $dbpass = $sn->dbpass; @@ -160,7 +170,11 @@ class Status_network extends DB_DataObject $config['db']['database'] = "mysqli://$dbuser:$dbpass@$dbhost/$dbname"; - $config['site']['name'] = $sn->sitename; + $config['site']['name'] = $sn->sitename; + + if (!empty($sn->hostname)) { + $config['site']['server'] = $sn->hostname; + } if (!empty($sn->theme)) { $config['site']['theme'] = $sn->theme; @@ -179,11 +193,8 @@ class Status_network extends DB_DataObject // (C) 2006 by Heiko Richler http://www.richler.de/ // LGPL - function redirectToHostname() + function redirectTo($destination) { - $destination = 'http://'.$this->hostname; - $destination .= $_SERVER['REQUEST_URI']; - $old = 'http'. (($_SERVER['HTTPS'] == 'on') ? 'S' : ''). '://'. diff --git a/classes/Subscription.php b/classes/Subscription.php index fedfd5f19..faf1331cd 100644 --- a/classes/Subscription.php +++ b/classes/Subscription.php @@ -46,7 +46,7 @@ class Subscription extends Memcached_DataObject /* the code above is auto generated do not remove the tag below */ ###END_AUTOCODE - function &pkeyGet($kv) + function pkeyGet($kv) { return Memcached_DataObject::pkeyGet('Subscription', $kv); } diff --git a/plugins/Authentication/User_username.php b/classes/User_username.php index 853fd5cb8..853fd5cb8 100644 --- a/plugins/Authentication/User_username.php +++ b/classes/User_username.php diff --git a/classes/statusnet.ini b/classes/statusnet.ini index ac31148da..0db2c5d6e 100644 --- a/classes/statusnet.ini +++ b/classes/statusnet.ini @@ -92,6 +92,7 @@ modified = 384 [file__keys] id = N +url = U [file_oembed] file_id = 129 diff --git a/config.php.sample b/config.php.sample index 91e6614c0..b8852dc67 100644 --- a/config.php.sample +++ b/config.php.sample @@ -41,6 +41,20 @@ $config['site']['path'] = 'statusnet'; // Make the site invisible to non-logged-in users // $config['site']['private'] = true; +// If your web server supports X-Sendfile (Apache with mod_xsendfile, +// lighttpd, nginx), you can enable X-Sendfile support for better +// performance. Presently, only attachment serving when the site is +// in private mode will use X-Sendfile. +// $config['site']['X-Sendfile'] = false; +// You may also need to enable X-Sendfile support for your web server and +// allow it to access files outside of the web root. For Apache with +// mod_xsendfile, you can add these to your .htaccess or server config: +// +// XSendFile on +// XSendFileAllowAbove on +// +// See http://tn123.ath.cx/mod_xsendfile/ for mod_xsendfile. + // If you want logging sent to a file instead of syslog // $config['site']['logfile'] = '/tmp/statusnet.log'; @@ -265,6 +279,7 @@ $config['sphinx']['port'] = 3312; // $config['attachments']['user_quota'] = 50000000; // $config['attachments']['monthly_quota'] = 15000000; // $config['attachments']['uploads'] = true; -// $config['attachments']['path'] = "/file/"; +// $config['attachments']['path'] = "/file/"; //ignored if site is private +// $config['attachments']['dir'] = INSTALLDIR . '/file/'; // $config['oohembed']['endpoint'] = 'http://oohembed.com/oohembed/'; diff --git a/db/statusnet_pg.sql b/db/statusnet_pg.sql index 020bfd967..998cc71e9 100644 --- a/db/statusnet_pg.sql +++ b/db/statusnet_pg.sql @@ -136,7 +136,7 @@ create table notice ( lon decimal(10,7) /* comment 'longitude'*/ , location_id integer /* comment 'location id if possible'*/ , location_ns integer /* comment 'namespace for location'*/ , - repeat_of integer /* comment 'notice this is a repeat of' */ references notice (id) , + repeat_of integer /* comment 'notice this is a repeat of' */ references notice (id) /* FULLTEXT(content) */ ); diff --git a/htaccess.sample b/htaccess.sample index 91ae9da9b..37eb8e01e 100644 --- a/htaccess.sample +++ b/htaccess.sample @@ -5,14 +5,6 @@ RewriteBase /mublog/ - # If your site is private and want to only allow logged-in users to - # be able to download file attachments, uncomment this rule. - # - # If you have a custom attachment path - # ($config['attachments']['path']), change "file/" to match. - # - #RewriteRule ^file/(.*) getfile/$1 - RewriteCond %{REQUEST_FILENAME} !-f RewriteCond %{REQUEST_FILENAME} !-d RewriteRule (.*) index.php?p=$1 [L,QSA] diff --git a/js/json2.js b/js/json2.js new file mode 100644 index 000000000..ecd5e959c --- /dev/null +++ b/js/json2.js @@ -0,0 +1,4 @@ +/* +http://www.JSON.org/json2.js minified +*/ +if(!this.JSON){JSON={};}(function(){function f(n){return n<10?'0'+n:n;}if(typeof Date.prototype.toJSON!=='function'){Date.prototype.toJSON=function(key){return this.getUTCFullYear()+'-'+f(this.getUTCMonth()+1)+'-'+f(this.getUTCDate())+'T'+f(this.getUTCHours())+':'+f(this.getUTCMinutes())+':'+f(this.getUTCSeconds())+'Z';};String.prototype.toJSON=Number.prototype.toJSON=Boolean.prototype.toJSON=function(key){return this.valueOf();};}var cx=/[\u0000\u00ad\u0600-\u0604\u070f\u17b4\u17b5\u200c-\u200f\u2028-\u202f\u2060-\u206f\ufeff\ufff0-\uffff]/g,escapable=/[\\\"\x00-\x1f\x7f-\x9f\u00ad\u0600-\u0604\u070f\u17b4\u17b5\u200c-\u200f\u2028-\u202f\u2060-\u206f\ufeff\ufff0-\uffff]/g,gap,indent,meta={'\b':'\\b','\t':'\\t','\n':'\\n','\f':'\\f','\r':'\\r','"':'\\"','\\':'\\\\'},rep;function quote(string){escapable.lastIndex=0;return escapable.test(string)?'"'+string.replace(escapable,function(a){var c=meta[a];return typeof c==='string'?c:'\\u'+('0000'+a.charCodeAt(0).toString(16)).slice(-4);})+'"':'"'+string+'"';}function str(key,holder){var i,k,v,length,mind=gap,partial,value=holder[key];if(value&&typeof value==='object'&&typeof value.toJSON==='function'){value=value.toJSON(key);}if(typeof rep==='function'){value=rep.call(holder,key,value);}switch(typeof value){case'string':return quote(value);case'number':return isFinite(value)?String(value):'null';case'boolean':case'null':return String(value);case'object':if(!value){return'null';}gap+=indent;partial=[];if(Object.prototype.toString.apply(value)==='[object Array]'){length=value.length;for(i=0;i<length;i+=1){partial[i]=str(i,value)||'null';}v=partial.length===0?'[]':gap?'[\n'+gap+partial.join(',\n'+gap)+'\n'+mind+']':'['+partial.join(',')+']';gap=mind;return v;}if(rep&&typeof rep==='object'){length=rep.length;for(i=0;i<length;i+=1){k=rep[i];if(typeof k==='string'){v=str(k,value);if(v){partial.push(quote(k)+(gap?': ':':')+v);}}}}else{for(k in value){if(Object.hasOwnProperty.call(value,k)){v=str(k,value);if(v){partial.push(quote(k)+(gap?': ':':')+v);}}}}v=partial.length===0?'{}':gap?'{\n'+gap+partial.join(',\n'+gap)+'\n'+mind+'}':'{'+partial.join(',')+'}';gap=mind;return v;}}if(typeof JSON.stringify!=='function'){JSON.stringify=function(value,replacer,space){var i;gap='';indent='';if(typeof space==='number'){for(i=0;i<space;i+=1){indent+=' ';}}else if(typeof space==='string'){indent=space;}rep=replacer;if(replacer&&typeof replacer!=='function'&&(typeof replacer!=='object'||typeof replacer.length!=='number')){throw new Error('JSON.stringify');}return str('',{'':value});};}if(typeof JSON.parse!=='function'){JSON.parse=function(text,reviver){var j;function walk(holder,key){var k,v,value=holder[key];if(value&&typeof value==='object'){for(k in value){if(Object.hasOwnProperty.call(value,k)){v=walk(value,k);if(v!==undefined){value[k]=v;}else{delete value[k];}}}}return reviver.call(holder,key,value);}cx.lastIndex=0;if(cx.test(text)){text=text.replace(cx,function(a){return'\\u'+('0000'+a.charCodeAt(0).toString(16)).slice(-4);});}if(/^[\],:{}\s]*$/.test(text.replace(/\\(?:["\\\/bfnrt]|u[0-9a-fA-F]{4})/g,'@').replace(/"[^"\\\n\r]*"|true|false|null|-?\d+(?:\.\d*)?(?:[eE][+\-]?\d+)?/g,']').replace(/(?:^|:|,)(?:\s*\[)+/g,''))){j=eval('('+text+')');return typeof reviver==='function'?walk({'':j},''):j;}throw new SyntaxError('JSON.parse');};}}()); diff --git a/js/util.js b/js/util.js index 2d108118a..43f492274 100644 --- a/js/util.js +++ b/js/util.js @@ -51,9 +51,9 @@ var SN = { // StatusNet NoticeLon: 'notice_data-lon', NoticeLocationId: 'notice_data-location_id', NoticeLocationNs: 'notice_data-location_ns', - NoticeLocationName: 'notice_data-location_name', - NoticeLocationCookieName: 'location_enabled', + NoticeGeoName: 'notice_data-geo_name', NoticeDataGeo: 'notice_data-geo', + NoticeDataGeoCookie: 'notice_data-geo_cookie', NoticeDataGeoSelected: 'notice_data-geo_selected' } }, @@ -178,12 +178,13 @@ var SN = { // StatusNet }, FormNoticeXHR: function(form) { + var NDG, NLat, NLon, NLNS, NLID; form_id = form.attr('id'); form.append('<input type="hidden" name="ajax" value="1"/>'); form.ajaxForm({ dataType: 'xml', timeout: '60000', - beforeSend: function(xhr) { + beforeSend: function(formData) { if ($('#'+form_id+' #'+SN.C.S.NoticeDataText)[0].value.length === 0) { form.addClass(SN.C.S.Warning); return false; @@ -191,6 +192,29 @@ var SN = { // StatusNet form.addClass(SN.C.S.Processing); $('#'+form_id+' #'+SN.C.S.NoticeActionSubmit).addClass(SN.C.S.Disabled); $('#'+form_id+' #'+SN.C.S.NoticeActionSubmit).attr(SN.C.S.Disabled, SN.C.S.Disabled); + + NLat = $('#'+SN.C.S.NoticeLat).val(); + NLon = $('#'+SN.C.S.NoticeLon).val(); + NLNS = $('#'+SN.C.S.NoticeLocationNs).val(); + NLID = $('#'+SN.C.S.NoticeLocationId).val(); + NDG = $('#'+SN.C.S.NoticeDataGeo).attr('checked'); + + cookieValue = $.cookie(SN.C.S.NoticeDataGeoCookie); + + if (cookieValue !== null && cookieValue != 'disabled') { + cookieValue = JSON.parse(cookieValue); + NLat = $('#'+SN.C.S.NoticeLat).val(cookieValue.NLat).val(); + NLon = $('#'+SN.C.S.NoticeLon).val(cookieValue.NLon).val(); + NLNS = $('#'+SN.C.S.NoticeLocationNs).val(cookieValue.NLNS).val(); + NLID = $('#'+SN.C.S.NoticeLocationId).val(cookieValue.NLID).val(); + } + if (cookieValue == 'disabled') { + NDG = $('#'+SN.C.S.NoticeDataGeo).attr('checked', false).attr('checked'); + } + else { + NDG = $('#'+SN.C.S.NoticeDataGeo).attr('checked', true).attr('checked'); + } + return true; }, error: function (xhr, textStatus, errorThrown) { @@ -265,6 +289,7 @@ var SN = { // StatusNet } } $('#'+form_id).resetForm(); + $('#'+form_id+' #'+SN.C.S.NoticeInReplyTo).val(''); $('#'+form_id+' #'+SN.C.S.NoticeDataAttachSelected).remove(); SN.U.FormNoticeEnhancements($('#'+form_id)); } @@ -273,6 +298,12 @@ var SN = { // StatusNet form.removeClass(SN.C.S.Processing); $('#'+form_id+' #'+SN.C.S.NoticeActionSubmit).removeAttr(SN.C.S.Disabled); $('#'+form_id+' #'+SN.C.S.NoticeActionSubmit).removeClass(SN.C.S.Disabled); + + $('#'+SN.C.S.NoticeLat).val(NLat); + $('#'+SN.C.S.NoticeLon).val(NLon); + $('#'+SN.C.S.NoticeLocationNs).val(NLNS); + $('#'+SN.C.S.NoticeLocationId).val(NLID); + $('#'+SN.C.S.NoticeDataGeo).attr('checked', NDG); } }); }, @@ -442,121 +473,220 @@ var SN = { // StatusNet }, NoticeLocationAttach: function() { + var NLat = $('#'+SN.C.S.NoticeLat).val(); + var NLon = $('#'+SN.C.S.NoticeLon).val(); + var NLNS = $('#'+SN.C.S.NoticeLocationNs).val(); + var NLID = $('#'+SN.C.S.NoticeLocationId).val(); + var NLN = $('#'+SN.C.S.NoticeGeoName).text(); + var NDGe = $('#'+SN.C.S.NoticeDataGeo); + function removeNoticeDataGeo() { - $('label[for='+SN.C.S.NoticeDataGeo+']').removeClass('checked'); + $('label[for='+SN.C.S.NoticeDataGeo+']').removeClass('checked').attr('title', jQuery.trim($('label[for='+SN.C.S.NoticeDataGeo+']').text())); $('#'+SN.C.S.NoticeDataGeoSelected).hide(); + $('#'+SN.C.S.NoticeLat).val(''); $('#'+SN.C.S.NoticeLon).val(''); $('#'+SN.C.S.NoticeLocationNs).val(''); $('#'+SN.C.S.NoticeLocationId).val(''); + $('#'+SN.C.S.NoticeDataGeo).attr('checked', false); + + $.cookie(SN.C.S.NoticeDataGeoCookie, 'disabled'); } - var NDG = $('#'+SN.C.S.NoticeDataGeo); - if (NDG.length > 0) { - var NLE = $('#notice_data-location_wrap'); - var geocodeURL = NLE.attr('title'); - NLE.removeAttr('title'); + function getJSONgeocodeURL(geocodeURL, data) { + $.getJSON(geocodeURL, data, function(location) { + var lns, lid; + + if (typeof(location.location_ns) != 'undefined') { + $('#'+SN.C.S.NoticeLocationNs).val(location.location_ns); + lns = location.location_ns; + } + + if (typeof(location.location_id) != 'undefined') { + $('#'+SN.C.S.NoticeLocationId).val(location.location_id); + lid = location.location_id; + } + + if (typeof(location.name) == 'undefined') { + NLN_text = position.coords.latitude + ';' + position.coords.longitude; + } + else { + NLN_text = location.name; + } + + $('#'+SN.C.S.NoticeGeoName) + .replaceWith('<a id="notice_data-geo_name"/>'); + + $('#'+SN.C.S.NoticeGeoName) + .attr('href', location.url) + .text(NLN_text) + .click(function() { + window.open(location.url); + + return false; + }); + + $('#'+SN.C.S.NoticeLat).val(data.lat); + $('#'+SN.C.S.NoticeLon).val(data.lon); + $('#'+SN.C.S.NoticeLocationNs).val(lns); + $('#'+SN.C.S.NoticeLocationId).val(lid); + $('#'+SN.C.S.NoticeDataGeo).attr('checked', true); + + var cookieValue = { + 'NLat': data.lat, + 'NLon': data.lon, + 'NLNS': lns, + 'NLID': lid, + 'NLN': NLN_text, + 'NLNU': location.url, + 'NDG': true, + 'NDGSM': false + }; + $.cookie(SN.C.S.NoticeDataGeoCookie, JSON.stringify(cookieValue)); + }); + } + + if (NDGe.length > 0) { + if ($.cookie(SN.C.S.NoticeDataGeoCookie) == 'disabled') { + NDGe.attr('checked', false); + } + else { + NDGe.attr('checked', true); + } + + var NGW = $('#notice_data-geo_wrap'); + var geocodeURL = NGW.attr('title'); + NGW.removeAttr('title'); $('label[for='+SN.C.S.NoticeDataGeo+']').attr('title', jQuery.trim($('label[for='+SN.C.S.NoticeDataGeo+']').text())); - if (navigator.geolocation) { - NDG.change(function() { - $.cookie(SN.C.S.NoticeLocationCookieName, $('#'+SN.C.S.NoticeDataGeo).attr('checked')); + NDGe.change(function() { + var NLN = $('#'+SN.C.S.NoticeGeoName); + if (NLN.length > 0) { + NLN.remove(); + } - var NLN = $('#'+SN.C.S.NoticeLocationName); - if (NLN.length > 0) { - NLN.remove(); - } + if ($('#'+SN.C.S.NoticeDataGeo).attr('checked') === true || $.cookie(SN.C.S.NoticeDataGeoCookie) === null) { + $('label[for='+SN.C.S.NoticeDataGeo+']').addClass('checked').attr('title', NoticeDataGeoShareDisable_text); var S = '<div id="'+SN.C.S.NoticeDataGeoSelected+'" class="'+SN.C.S.Success+'"/>'; var NDGS = $('#'+SN.C.S.NoticeDataGeoSelected); + if (NDGS.length > 0) { NDGS.replaceWith(S); } else { $('#'+SN.C.S.FormNotice).append(S); } + NDGS = $('#'+SN.C.S.NoticeDataGeoSelected); - NDGS.prepend('<span id="'+SN.C.S.NoticeLocationName+'">Geo</span>'); + NDGS.prepend('<span id="'+SN.C.S.NoticeGeoName+'">Geo</span> <button class="minimize" title="'+NoticeDataGeoInfoMinimize_text+'">_</button> <button class="close" title="'+NoticeDataGeoShareDisable_text+'">×</button>'); - var NLN = $('#'+SN.C.S.NoticeLocationName); + var NLN = $('#'+SN.C.S.NoticeGeoName); + NLN.addClass('processing'); - if ($('#'+SN.C.S.NoticeDataGeo).attr('checked') === true) { - NLN.addClass('processing'); - $('label[for='+SN.C.S.NoticeDataGeo+']').addClass('checked'); + $('#'+SN.C.S.NoticeDataGeoSelected+' button.close').click(function(){ + removeNoticeDataGeo(); - NDGS.append('<button class="minimize">_</button> <button class="close">×</button>'); + $('#'+SN.C.S.NoticeDataGeoSelected).remove(); - $('#'+SN.C.S.NoticeDataGeoSelected+' button.close').click(function(){ - $('#'+SN.C.S.NoticeDataGeoSelected).remove(); - $('#'+SN.C.S.NoticeDataGeo).attr('checked', false); - $('label[for='+SN.C.S.NoticeDataGeo+']').removeClass('checked'); + $('#'+SN.C.S.NoticeDataText).focus(); - return false; - }); + return false; + }); - $('#'+SN.C.S.NoticeDataGeoSelected+' button.minimize').click(function(){ - $('#'+SN.C.S.NoticeDataGeoSelected).hide(); + $('#'+SN.C.S.NoticeDataGeoSelected+' button.minimize').click(function(){ + $('#'+SN.C.S.NoticeDataGeoSelected).hide(); - return false; - }); + var cookieValue = { + 'NLat': $('#'+SN.C.S.NoticeLat).val(), + 'NLon': $('#'+SN.C.S.NoticeLat).val(), + 'NLNS': $('#'+SN.C.S.NoticeLocationNs).val(), + 'NLID': $('#'+SN.C.S.NoticeLocationId).val(), + 'NLN': $('#'+SN.C.S.NoticeGeoName).text(), + 'NLNU': $('#'+SN.C.S.NoticeGeoName).attr('href'), + 'NDG': true, + 'NDGSM': true + }; + $.cookie(SN.C.S.NoticeDataGeoCookie, JSON.stringify(cookieValue)); - navigator.geolocation.getCurrentPosition( - function(position) { - $('#'+SN.C.S.NoticeLat).val(position.coords.latitude); - $('#'+SN.C.S.NoticeLon).val(position.coords.longitude); + $('#'+SN.C.S.NoticeDataText).focus(); + return false; + }); + + if ($.cookie(SN.C.S.NoticeDataGeoCookie) === null || $.cookie(SN.C.S.NoticeDataGeoCookie) == 'disabled') { + if (navigator.geolocation) { + navigator.geolocation.getCurrentPosition( + function(position) { + $('#'+SN.C.S.NoticeLat).val(position.coords.latitude); + $('#'+SN.C.S.NoticeLon).val(position.coords.longitude); + + var data = { + 'lat': position.coords.latitude, + 'lon': position.coords.longitude, + 'token': $('#token').val() + }; + + getJSONgeocodeURL(geocodeURL, data); + }, + + function(error) { + if (error.PERMISSION_DENIED == 1) { + removeNoticeDataGeo(); + } + } + ); + } + else { + if (NLat.length > 0 && NLon.length > 0) { var data = { - 'lat': position.coords.latitude, - 'lon': position.coords.longitude, + 'lat': NLat, + 'lon': NLon, 'token': $('#token').val() }; - $.getJSON(geocodeURL, data, function(location) { - NLN = $('#'+SN.C.S.NoticeLocationName); - NLN.replaceWith('<a id="notice_data-location_name"/>'); - NLN = $('#'+SN.C.S.NoticeLocationName); - - if (typeof(location.location_ns) != 'undefined') { - $('#'+SN.C.S.NoticeLocationNs).val(location.location_ns); - } + getJSONgeocodeURL(geocodeURL, data); + } + else { + removeNoticeDataGeo(); + $('#'+SN.C.S.NoticeDataGeo).remove(); + $('label[for='+SN.C.S.NoticeDataGeo+']').remove(); + } + } + } + else { + var cookieValue = JSON.parse($.cookie(SN.C.S.NoticeDataGeoCookie)); - if (typeof(location.location_id) != 'undefined') { - $('#'+SN.C.S.NoticeLocationId).val(location.location_id); - } + if (cookieValue.NDGSM === true) { + $('#'+SN.C.S.NoticeDataGeoSelected).hide(); + } - if (typeof(location.name) == 'undefined') { - NLN_text = position.coords.latitude + ';' + position.coords.longitude; - } - else { - NLN_text = location.name; - } + $('#'+SN.C.S.NoticeLat).val(cookieValue.NLat); + $('#'+SN.C.S.NoticeLon).val(cookieValue.NLon); + $('#'+SN.C.S.NoticeLocationNs).val(cookieValue.NLNS); + $('#'+SN.C.S.NoticeLocationId).val(cookieValue.NLID); + $('#'+SN.C.S.NoticeDataGeo).attr('checked', cookieValue.NDG); - NLN.attr('href', location.url); - NLN.text(NLN_text); - NLN.click(function() { - window.open(location.url); + $('#'+SN.C.S.NoticeGeoName) + .replaceWith('<a id="notice_data-geo_name"/>'); - return false; - }); - }); - }, + $('#'+SN.C.S.NoticeGeoName) + .attr('href', cookieValue.NLNU) + .text(cookieValue.NLN) + .click(function() { + window.open($(this).attr('href')); - function(error) { - if (error.PERMISSION_DENIED == 1) { - removeNoticeDataGeo(); - } - } - ); - } - else { - removeNoticeDataGeo(); + return false; + }); } - }).change(); + } + else { + removeNoticeDataGeo(); + } - var cookieVal = $.cookie(SN.C.S.NoticeLocationCookieName); - NDG.attr('checked', (cookieVal === null || cookieVal == 'true')); - } + $('#'+SN.C.S.NoticeDataText).focus(); + }).change(); } }, @@ -592,13 +722,14 @@ var SN = { // StatusNet Init: { NoticeForm: function() { if ($('body.user_in').length > 0) { + SN.U.NoticeLocationAttach(); + $('.'+SN.C.S.FormNotice).each(function() { SN.U.FormNoticeXHR($(this)); SN.U.FormNoticeEnhancements($(this)); }); SN.U.NoticeDataAttach(); - SN.U.NoticeLocationAttach(); } }, diff --git a/lib/action.php b/lib/action.php index 35df03566..6efa9163d 100644 --- a/lib/action.php +++ b/lib/action.php @@ -141,7 +141,7 @@ class Action extends HTMLOutputter // lawsuit function showTitle() { $this->element('title', null, - sprintf(_("%s - %s"), + sprintf(_("%1$s - %2$s"), $this->title(), common_config('site', 'name'))); } @@ -253,6 +253,7 @@ class Action extends HTMLOutputter // lawsuit $this->script('js/jquery.min.js'); $this->script('js/jquery.form.js'); $this->script('js/jquery.cookie.js'); + $this->script('js/json2.js'); $this->script('js/jquery.joverlay.min.js'); Event::handle('EndShowJQueryScripts', array($this)); } @@ -736,6 +737,8 @@ class Action extends HTMLOutputter // lawsuit _('Privacy')); $this->menuItem(common_local_url('doc', array('title' => 'source')), _('Source')); + $this->menuItem(common_local_url('version'), + _('Version')); $this->menuItem(common_local_url('doc', array('title' => 'contact')), _('Contact')); $this->menuItem(common_local_url('doc', array('title' => 'badge')), diff --git a/lib/adminpanelaction.php b/lib/adminpanelaction.php index 7997eb2b1..a6981ac61 100644 --- a/lib/adminpanelaction.php +++ b/lib/adminpanelaction.php @@ -70,7 +70,7 @@ class AdminPanelAction extends Action if (!common_logged_in()) { $this->clientError(_('Not logged in.')); - return; + return false; } $user = common_current_user(); @@ -94,7 +94,18 @@ class AdminPanelAction extends Action if (!$user->hasRight(Right::CONFIGURESITE)) { $this->clientError(_('You cannot make changes to this site.')); - return; + return false; + } + + // This panel must be enabled + + $name = $this->trimmed('action'); + + $name = mb_substr($name, 0, -10); + + if (!in_array($name, common_config('admin', 'panels'))) { + $this->clientError(_('Changes to that panel are not allowed.'), 403); + return false; } return true; @@ -224,7 +235,7 @@ class AdminPanelAction extends Action $this->clientError(_('saveSettings() not implemented.')); return; } - + /** * Delete a design setting * @@ -296,20 +307,33 @@ class AdminPanelNav extends Widget if (Event::handle('StartAdminPanelNav', array($this))) { - $this->out->menuItem(common_local_url('siteadminpanel'), _('Site'), - _('Basic site configuration'), $action_name == 'siteadminpanel', 'nav_site_admin_panel'); + if ($this->canAdmin('site')) { + $this->out->menuItem(common_local_url('siteadminpanel'), _('Site'), + _('Basic site configuration'), $action_name == 'siteadminpanel', 'nav_site_admin_panel'); + } - $this->out->menuItem(common_local_url('designadminpanel'), _('Design'), - _('Design configuration'), $action_name == 'designadminpanel', 'nav_design_admin_panel'); + if ($this->canAdmin('design')) { + $this->out->menuItem(common_local_url('designadminpanel'), _('Design'), + _('Design configuration'), $action_name == 'designadminpanel', 'nav_design_admin_panel'); + } - $this->out->menuItem(common_local_url('useradminpanel'), _('User'), - _('Paths configuration'), $action_name == 'useradminpanel', 'nav_design_admin_panel'); + if ($this->canAdmin('user')) { + $this->out->menuItem(common_local_url('useradminpanel'), _('User'), + _('Paths configuration'), $action_name == 'useradminpanel', 'nav_design_admin_panel'); + } - $this->out->menuItem(common_local_url('pathsadminpanel'), _('Paths'), - _('Paths configuration'), $action_name == 'pathsadminpanel', 'nav_design_admin_panel'); + if ($this->canAdmin('paths')) { + $this->out->menuItem(common_local_url('pathsadminpanel'), _('Paths'), + _('Paths configuration'), $action_name == 'pathsadminpanel', 'nav_design_admin_panel'); + } Event::handle('EndAdminPanelNav', array($this)); } $this->action->elementEnd('ul'); } + + function canAdmin($name) + { + return in_array($name, common_config('admin', 'panels')); + } } diff --git a/lib/api.php b/lib/api.php index 4ed49e452..d21851d50 100644 --- a/lib/api.php +++ b/lib/api.php @@ -140,12 +140,14 @@ class ApiAction extends Action // Note: some profiles don't have an associated user + $defaultDesign = Design::siteDesign(); + if (!empty($user)) { $design = $user->getDesign(); } if (empty($design)) { - $design = Design::siteDesign(); + $design = $defaultDesign; } $color = Design::toWebColor(empty($design->backgroundcolor) ? $defaultDesign->backgroundcolor : $design->backgroundcolor); @@ -787,7 +789,7 @@ class ApiAction extends Action $from = $message->getFrom(); - $entry['title'] = sprintf('Message from %s to %s', + $entry['title'] = sprintf('Message from %1$s to %2$s', $from->nickname, $message->getTo()->nickname); $entry['content'] = common_xml_safe_str($message->rendered); diff --git a/plugins/Authentication/AuthenticationPlugin.php b/lib/authenticationplugin.php index 75e8d2b76..de479a576 100644 --- a/plugins/Authentication/AuthenticationPlugin.php +++ b/lib/authenticationplugin.php @@ -146,7 +146,10 @@ abstract class AuthenticationPlugin extends Plugin }else{ $authenticated = $this->checkPassword($nickname, $password); if($authenticated){ - if(Event::handle('AutoRegister', array($nickname, $this->provider_name, &$authenticatedUser))){ + if(! Event::handle('AutoRegister', array($nickname, $this->provider_name, &$authenticatedUser))){ + //unlike most Event::handle lines of code, this one has a ! (not) + //we want to do this if the event *was* handled - this isn't a "default" implementation + //like most code of this form. if($authenticatedUser){ return false; } @@ -204,18 +207,6 @@ abstract class AuthenticationPlugin extends Plugin } } - function onAutoload($cls) - { - switch ($cls) - { - case 'User_username': - require_once(INSTALLDIR.'/plugins/Authentication/User_username.php'); - return false; - default: - return true; - } - } - function onCheckSchema() { $schema = Schema::get(); $schema->ensureTable('user_username', diff --git a/plugins/Authorization/AuthorizationPlugin.php b/lib/authorizationplugin.php index e4e046d08..733b0c065 100644 --- a/plugins/Authorization/AuthorizationPlugin.php +++ b/lib/authorizationplugin.php @@ -66,9 +66,6 @@ abstract class AuthorizationPlugin extends Plugin } //------------Below are the methods that connect StatusNet to the implementing Auth plugin------------\\ - function onInitializePlugin(){ - - } function onStartSetUser(&$user) { $loginAllowed = $this->loginAllowed($user); diff --git a/lib/cache.php b/lib/cache.php index bac3499e5..b7b34c050 100644 --- a/lib/cache.php +++ b/lib/cache.php @@ -120,7 +120,7 @@ class Cache if (Event::handle('StartCacheGet', array(&$key, &$value))) { if (array_key_exists($key, $this->_items)) { - $value = $this->_items[$key]; + $value = unserialize($this->_items[$key]); } Event::handle('EndCacheGet', array($key, &$value)); } @@ -146,7 +146,7 @@ class Cache if (Event::handle('StartCacheSet', array(&$key, &$value, &$flag, &$expiry, &$success))) { - $this->_items[$key] = $value; + $this->_items[$key] = serialize($value); $success = true; @@ -170,7 +170,7 @@ class Cache $success = false; if (Event::handle('StartCacheDelete', array(&$key, &$success))) { - if (array_key_exists($key, $this->_items[$key])) { + if (array_key_exists($key, $this->_items)) { unset($this->_items[$key]); } $success = true; diff --git a/lib/command.php b/lib/command.php index 67140c348..f846fb823 100644 --- a/lib/command.php +++ b/lib/command.php @@ -650,25 +650,17 @@ class LoginCommand extends Command $channel->error($this->user, _('Login command is disabled')); return; } - $login_token = Login_token::staticGet('user_id',$this->user->id); - if($login_token){ - $login_token->delete(); - } - $login_token = new Login_token(); - $login_token->user_id = $this->user->id; - $login_token->token = common_good_rand(16); - $login_token->created = common_sql_now(); - $result = $login_token->insert(); - if (!$result) { - common_log_db_error($login_token, 'INSERT', __FILE__); - $channel->error($this->user, sprintf(_('Could not create login token for %s'), - $this->user->nickname)); - return; + + try { + $login_token = Login_token::makeNew($this->user); + } catch (Exception $e) { + $channel->error($this->user, $e->getMessage()); } + $channel->output($this->user, sprintf(_('This link is useable only once, and is good for only 2 minutes: %s'), - common_local_url('login', - array('user_id'=>$login_token->user_id, 'token'=>$login_token->token)))); + common_local_url('otp', + array('user_id' => $login_token->user_id, 'token' => $login_token->token)))); } } diff --git a/lib/common.php b/lib/common.php index b0e5c4390..7342c177a 100644 --- a/lib/common.php +++ b/lib/common.php @@ -197,7 +197,7 @@ function _have_config() // XXX: Find a way to use htmlwriter for this instead of handcoded markup if (!_have_config()) { echo '<p>'. _('No configuration file found. ') .'</p>'; - echo '<p>'. _('I looked for configuration files in the following places: ') .'<br/> '. implode($_config_files, '<br/>'); + echo '<p>'. _('I looked for configuration files in the following places: ') .'<br /> '. implode($_config_files, '<br />'); echo '<p>'. _('You may wish to run the installer to fix this.') .'</p>'; echo '<a href="install.php">'. _('Go to the installer.') .'</a>'; exit; @@ -238,6 +238,27 @@ function __autoload($cls) } } +// Load default plugins + +foreach ($config['plugins']['default'] as $name => $params) { + if (is_null($params)) { + addPlugin($name); + } else if (is_array($params)) { + if (count($params) == 0) { + addPlugin($name); + } else { + $keys = array_keys($params); + if (is_string($keys[0])) { + addPlugin($name, $params); + } else { + foreach ($params as $paramset) { + addPlugin($name, $paramset); + } + } + } + } +} + // XXX: how many of these could be auto-loaded on use? // XXX: note that these files should not use config options // at compile time since DB config options are not yet loaded. diff --git a/lib/default.php b/lib/default.php index eea11eb2b..fa862f3ff 100644 --- a/lib/default.php +++ b/lib/default.php @@ -54,6 +54,7 @@ $default = 'dupelimit' => 60, # default for same person saying the same thing 'textlimit' => 140, 'indent' => true, + 'use_x_sendfile' => false, ), 'db' => array('database' => 'YOU HAVE TO SET THIS IN config.php', @@ -229,4 +230,23 @@ $default = array('timeout' => 5), // HTTP request timeout in seconds when contacting remote hosts for OMB updates 'logincommand' => array('disabled' => true), + 'plugins' => + array('default' => array('LilUrl' => array('shortenerName'=>'ur1.ca', + 'freeService' => true, + 'serviceUrl'=>'http://ur1.ca/'), + 'PtitUrl' => array('shortenerName' => 'ptiturl.com', + 'serviceUrl' => 'http://ptiturl.com/?creer=oui&action=Reduire&url=%1$s'), + 'SimpleUrl' => array(array('shortenerName' => 'is.gd', 'serviceUrl' => 'http://is.gd/api.php?longurl=%1$s'), + array('shortenerName' => 'snipr.com', 'serviceUrl' => 'http://snipr.com/site/snip?r=simple&link=%1$s'), + array('shortenerName' => 'metamark.net', 'serviceUrl' => 'http://metamark.net/api/rest/simple?long_url=%1$s'), + array('shortenerName' => 'tinyurl.com', 'serviceUrl' => 'http://tinyurl.com/api-create.php?url=%1$s')), + 'TightUrl' => array('shortenerName' => '2tu.us', 'freeService' => true,'serviceUrl'=>'http://2tu.us/?save=y&url=%1$s'), + 'Geonames' => null, + 'Mapstraction' => null, + 'Linkback' => null, + 'WikiHashtags' => null, + 'OpenID' => null), + ), + 'admin' => + array('panels' => array('design', 'site', 'user', 'paths')), ); diff --git a/lib/htmloutputter.php b/lib/htmloutputter.php index 2091c6e2c..31660ce95 100644 --- a/lib/htmloutputter.php +++ b/lib/htmloutputter.php @@ -352,7 +352,7 @@ class HTMLOutputter extends XMLOutputter { if(Event::handle('StartScriptElement', array($this,&$src,&$type))) { $url = parse_url($src); - if( empty($url->scheme) && empty($url->host) && empty($url->query) && empty($url->fragment)) + if( empty($url['scheme']) && empty($url['host']) && empty($url['query']) && empty($url['fragment'])) { $src = common_path($src) . '?version=' . STATUSNET_VERSION; } diff --git a/lib/jabber.php b/lib/jabber.php index 01aed8ffa..a821856a8 100644 --- a/lib/jabber.php +++ b/lib/jabber.php @@ -440,7 +440,7 @@ function jabber_public_notice($notice) // XXX: should we send out non-local messages if public,localonly // = false? I think not - if ($public && $notice->is_local) { + if ($public && $notice->is_local == Notice::LOCAL_PUBLIC) { $profile = Profile::staticGet($notice->profile_id); if (!$profile) { diff --git a/lib/jsonsearchresultslist.php b/lib/jsonsearchresultslist.php index 569bfa873..0d72ddf7a 100644 --- a/lib/jsonsearchresultslist.php +++ b/lib/jsonsearchresultslist.php @@ -105,8 +105,14 @@ class JSONSearchResultsList break; } - $item = new ResultItem($this->notice); - array_push($this->results, $item); + $profile = $this->notice->getProfile(); + + // Don't show notices from deleted users + + if (!empty($profile)) { + $item = new ResultItem($this->notice); + array_push($this->results, $item); + } } $time_end = microtime(true); diff --git a/lib/mail.php b/lib/mail.php index 472a88e06..c724764cc 100644 --- a/lib/mail.php +++ b/lib/mail.php @@ -251,11 +251,11 @@ function mail_subscribe_notify_profile($listenee, $other) common_config('site', 'name'), $other->profileurl, ($other->location) ? - sprintf(_("Location: %s\n"), $other->location) : '', + sprintf(_("Location: %s"), $other->location) . "\n" : '', ($other->homepage) ? - sprintf(_("Homepage: %s\n"), $other->homepage) : '', + sprintf(_("Homepage: %s"), $other->homepage) . "\n" : '', ($other->bio) ? - sprintf(_("Bio: %s\n\n"), $other->bio) : '', + sprintf(_("Bio: %s"), $other->bio) . "\n\n" : '', common_config('site', 'name'), common_local_url('emailsettings')); @@ -652,4 +652,3 @@ function mail_notify_attn($user, $notice) common_init_locale(); mail_to_user($user, $subject, $body); } - diff --git a/lib/mailhandler.php b/lib/mailhandler.php new file mode 100644 index 000000000..85be89f18 --- /dev/null +++ b/lib/mailhandler.php @@ -0,0 +1,275 @@ +<?php +/* + * StatusNet - the distributed open-source microblogging tool + * Copyright (C) 2008, 2009, StatusNet, Inc. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + */ + +require_once(INSTALLDIR . '/lib/mail.php'); +require_once(INSTALLDIR . '/lib/mediafile.php'); +require_once('Mail/mimeDecode.php'); + +# FIXME: we use both Mail_mimeDecode and mailparse +# Need to move everything to mailparse + +class MailHandler +{ + function __construct() + { + } + + function handle_message($rawmessage) + { + list($from, $to, $msg, $attachments) = $this->parse_message($rawmessage); + if (!$from || !$to || !$msg) { + $this->error(null, _('Could not parse message.')); + } + common_log(LOG_INFO, "Mail from $from to $to with ".count($attachments) .' attachment(s): ' .substr($msg, 0, 20)); + $user = $this->user_from_header($from); + if (!$user) { + $this->error($from, _('Not a registered user.')); + return false; + } + if (!$this->user_match_to($user, $to)) { + $this->error($from, _('Sorry, that is not your incoming email address.')); + return false; + } + if (!$user->emailpost) { + $this->error($from, _('Sorry, no incoming email allowed.')); + return false; + } + $response = $this->handle_command($user, $from, $msg); + if ($response) { + return true; + } + $msg = $this->cleanup_msg($msg); + $msg = common_shorten_links($msg); + if (Notice::contentTooLong($msg)) { + $this->error($from, sprintf(_('That\'s too long. '. + 'Max notice size is %d chars.'), + Notice::maxContent())); + } + + $mediafiles = array(); + + foreach($attachments as $attachment){ + + $mf = null; + + try { + $mf = MediaFile::fromFileHandle($attachment, $user); + } catch(ClientException $ce) { + $this->error($from, $ce->getMessage()); + } + + $msg .= ' ' . $mf->shortUrl(); + + array_push($mediafiles, $mf); + fclose($attachment); + } + + $err = $this->add_notice($user, $msg, $mediafiles); + + if (is_string($err)) { + $this->error($from, $err); + return false; + } else { + return true; + } + } + + function error($from, $msg) + { + file_put_contents("php://stderr", $msg . "\n"); + exit(1); + } + + function user_from_header($from_hdr) + { + $froms = mailparse_rfc822_parse_addresses($from_hdr); + if (!$froms) { + return null; + } + $from = $froms[0]; + $addr = common_canonical_email($from['address']); + $user = User::staticGet('email', $addr); + if (!$user) { + $user = User::staticGet('smsemail', $addr); + } + return $user; + } + + function user_match_to($user, $to_hdr) + { + $incoming = $user->incomingemail; + $tos = mailparse_rfc822_parse_addresses($to_hdr); + foreach ($tos as $to) { + if (strcasecmp($incoming, $to['address']) == 0) { + return true; + } + } + return false; + } + + function handle_command($user, $from, $msg) + { + $inter = new CommandInterpreter(); + $cmd = $inter->handle_command($user, $msg); + if ($cmd) { + $cmd->execute(new MailChannel($from)); + return true; + } + return false; + } + + function respond($from, $to, $response) + { + + $headers['From'] = $to; + $headers['To'] = $from; + $headers['Subject'] = _('Command complete'); + + return mail_send(array($from), $headers, $response); + } + + function log($level, $msg) + { + common_log($level, 'MailDaemon: '.$msg); + } + + function add_notice($user, $msg, $mediafiles) + { + try { + $notice = Notice::saveNew($user->id, $msg, 'mail'); + } catch (Exception $e) { + $this->log(LOG_ERR, $e->getMessage()); + return $e->getMessage(); + } + foreach($mediafiles as $mf){ + $mf->attachToNotice($notice); + } + common_broadcast_notice($notice); + $this->log(LOG_INFO, + 'Added notice ' . $notice->id . ' from user ' . $user->nickname); + return true; + } + + function parse_message($contents) + { + $parsed = Mail_mimeDecode::decode(array('input' => $contents, + 'include_bodies' => true, + 'decode_headers' => true, + 'decode_bodies' => true)); + if (!$parsed) { + return null; + } + + $from = $parsed->headers['from']; + + $to = $parsed->headers['to']; + + $type = $parsed->ctype_primary . '/' . $parsed->ctype_secondary; + + $attachments = array(); + + $this->extract_part($parsed,$msg,$attachments); + + return array($from, $to, $msg, $attachments); + } + + function extract_part($parsed,&$msg,&$attachments){ + if ($parsed->ctype_primary == 'multipart') { + if($parsed->ctype_secondary == 'alternative'){ + $altmsg = $this->extract_msg_from_multipart_alternative_part($parsed); + if(!empty($altmsg)) $msg = $altmsg; + }else{ + foreach($parsed->parts as $part){ + $this->extract_part($part,$msg,$attachments); + } + } + } else if ($parsed->ctype_primary == 'text' + && $parsed->ctype_secondary=='plain') { + $msg = $parsed->body; + if(strtolower($parsed->ctype_parameters['charset']) != "utf-8"){ + $msg = utf8_encode($msg); + } + }else if(!empty($parsed->body)){ + if(common_config('attachments', 'uploads')){ + //only save attachments if uploads are enabled + $attachment = tmpfile(); + fwrite($attachment, $parsed->body); + $attachments[] = $attachment; + } + } + } + + function extract_msg_from_multipart_alternative_part($parsed){ + foreach ($parsed->parts as $part) { + $this->extract_part($part,$msg,$attachments); + } + //we don't want any attachments that are a result of this parsing + return $msg; + } + + function unsupported_type($type) + { + $this->error(null, sprintf(_('Unsupported message type: %s'), $type)); + } + + function cleanup_msg($msg) + { + $lines = explode("\n", $msg); + + $output = ''; + + foreach ($lines as $line) { + // skip quotes + if (preg_match('/^\s*>.*$/', $line)) { + continue; + } + // skip start of quote + if (preg_match('/^\s*On.*wrote:\s*$/', $line)) { + continue; + } + // probably interesting to someone, not us + if (preg_match('/^\s*Sent via/', $line)) { + continue; + } + if (preg_match('/^\s*Sent from my/', $line)) { + continue; + } + + // skip everything after a sig + if (preg_match('/^\s*--+\s*$/', $line) || + preg_match('/^\s*__+\s*$/', $line)) + { + break; + } + // skip everything after Outlook quote + if (preg_match('/^\s*-+\s*Original Message\s*-+\s*$/', $line)) { + break; + } + // skip everything after weird forward + if (preg_match('/^\s*Begin\s+forward/', $line)) { + break; + } + + $output .= ' ' . $line; + } + + preg_replace('/\s+/', ' ', $output); + return trim($output); + } +} diff --git a/lib/mediafile.php b/lib/mediafile.php index 29d752f0c..e3d5b1dbc 100644 --- a/lib/mediafile.php +++ b/lib/mediafile.php @@ -176,7 +176,7 @@ class MediaFile // Should never actually get here @unlink($_FILES[$param]['tmp_name']); - throw new ClientException(_('File exceeds user\'s quota!')); + throw new ClientException(_('File exceeds user\'s quota.')); return; } @@ -198,7 +198,7 @@ class MediaFile } } else { - throw new ClientException(_('Could not determine file\'s mime-type!')); + throw new ClientException(_('Could not determine file\'s MIME type.')); return; } @@ -213,7 +213,7 @@ class MediaFile // Should never actually get here - throw new ClientException(_('File exceeds user\'s quota!')); + throw new ClientException(_('File exceeds user\'s quota.')); return; } @@ -234,7 +234,7 @@ class MediaFile $stream['uri'] . ' ' . $filepath)); } } else { - throw new ClientException(_('Could not determine file\'s mime-type!')); + throw new ClientException(_('Could not determine file\'s MIME type.')); return; } @@ -272,7 +272,7 @@ class MediaFile $hint = ''; } throw new ClientException(sprintf( - _('%s is not a supported filetype on this server.'), $filetype) . $hint); + _('%s is not a supported file type on this server.'), $filetype) . $hint); } static function respectsQuota($user, $filesize) @@ -286,4 +286,4 @@ class MediaFile } } -}
\ No newline at end of file +} diff --git a/lib/noticeform.php b/lib/noticeform.php index 99865645a..02e35a8d7 100644 --- a/lib/noticeform.php +++ b/lib/noticeform.php @@ -207,10 +207,12 @@ class NoticeForm extends Form $this->out->hidden('notice_data-location_id', empty($this->location_id) ? (empty($this->profile->location_id) ? null : $this->profile->location_id) : $this->location_id, 'location_id'); $this->out->hidden('notice_data-location_ns', empty($this->location_ns) ? (empty($this->profile->location_ns) ? null : $this->profile->location_ns) : $this->location_ns, 'location_ns'); - $this->out->elementStart('div', array('id' => 'notice_data-location_wrap', + $this->out->elementStart('div', array('id' => 'notice_data-geo_wrap', 'title' => common_local_url('geocode'))); - $this->out->checkbox('notice_data-geo', _('Share your location'), true); + $this->out->checkbox('notice_data-geo', _('Share my location'), true); $this->out->elementEnd('div'); + $this->out->inlineScript(' var NoticeDataGeoShareDisable_text = "'._('Do not share my location').'";'. + ' var NoticeDataGeoInfoMinimize_text = "'._('Hide this info').'";'); } Event::handle('EndShowNoticeFormData', array($this)); diff --git a/lib/noticelist.php b/lib/noticelist.php index 5eb2633ac..78abf34a7 100644 --- a/lib/noticelist.php +++ b/lib/noticelist.php @@ -379,7 +379,7 @@ class NoticeListItem extends Widget function showNoticeLink() { - if($this->notice->is_local){ + if($this->notice->is_local == Notice::LOCAL_PUBLIC || $this->notice->is_local == Notice::LOCAL_NONPUBLIC){ $noticeurl = common_local_url('shownotice', array('notice' => $this->notice->id)); }else{ diff --git a/lib/ping.php b/lib/ping.php index 5698c4038..735af9ef1 100644 --- a/lib/ping.php +++ b/lib/ping.php @@ -21,7 +21,7 @@ if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); } function ping_broadcast_notice($notice) { - if (!$notice->is_local) { + if ($notice->is_local != Notice::LOCAL_PUBLIC && $notice->is_local != Notice::LOCAL_NONPUBLIC) { return true; } @@ -115,4 +115,4 @@ function ping_notice_tags($notice) { return implode('|', $tags); } return NULL; -}
\ No newline at end of file +} diff --git a/lib/plugin.php b/lib/plugin.php index de7313e59..65ccdafbb 100644 --- a/lib/plugin.php +++ b/lib/plugin.php @@ -104,5 +104,16 @@ class Plugin { $this->log(LOG_DEBUG, $msg); } + + function onPluginVersion(&$versions) + { + $cls = get_class($this); + $name = mb_substr($cls, 0, -6); + + $versions[] = array('name' => $name, + 'version' => _('Unknown')); + + return true; + } } diff --git a/lib/router.php b/lib/router.php index 7ec962460..6b87ed27f 100644 --- a/lib/router.php +++ b/lib/router.php @@ -88,7 +88,10 @@ class Router $m->connect('doc/:title', array('action' => 'doc')); - $m->connect('main/login?user_id=:user_id&token=:token', array('action'=>'login'), array('user_id'=> '[0-9]+', 'token'=>'.+')); + $m->connect('main/otp/:user_id/:token', + array('action' => 'otp'), + array('user_id' => '[0-9]+', + 'token' => '.+')); // main stuff is repetitive @@ -101,7 +104,9 @@ class Router 'silence', 'unsilence', 'repeat', 'deleteuser', - 'geocode'); + 'geocode', + 'version', + ); foreach ($main as $a) { $m->connect('main/'.$a, array('action' => $a)); @@ -440,19 +445,19 @@ class Router // Social graph $m->connect('api/friends/ids/:id.:format', - array('action' => 'apiFriends', + array('action' => 'apiuserfriends', 'ids_only' => true)); $m->connect('api/followers/ids/:id.:format', - array('action' => 'apiFollowers', + array('action' => 'apiuserfollowers', 'ids_only' => true)); $m->connect('api/friends/ids.:format', - array('action' => 'apiFriends', + array('action' => 'apiuserfriends', 'ids_only' => true)); $m->connect('api/followers/ids.:format', - array('action' => 'apiFollowers', + array('action' => 'apiuserfollowers', 'ids_only' => true)); // account diff --git a/lib/schema.php b/lib/schema.php index 6fe442d56..a7f64ebed 100644 --- a/lib/schema.php +++ b/lib/schema.php @@ -528,6 +528,10 @@ class Schema $sql .= " auto_increment "; } + if (!empty($cd->extra)) { + $sql .= "{$cd->extra} "; + } + return $sql; } } diff --git a/lib/snapshot.php b/lib/snapshot.php index 2a10c6b93..a16087ac0 100644 --- a/lib/snapshot.php +++ b/lib/snapshot.php @@ -173,8 +173,12 @@ class Snapshot // XXX: Use OICU2 and OAuth to make authorized requests $reporturl = common_config('snapshot', 'reporturl'); - $request = HTTPClient::start(); - $request->post($reporturl, null, $this->stats); + try { + $request = HTTPClient::start(); + $request->post($reporturl, null, $this->stats); + } catch (Exception $e) { + common_log(LOG_WARNING, "Error in snapshot: " . $e->getMessage()); + } } /** diff --git a/lib/subscriptionlist.php b/lib/subscriptionlist.php index 89f63e321..e1207774f 100644 --- a/lib/subscriptionlist.php +++ b/lib/subscriptionlist.php @@ -123,7 +123,7 @@ class SubscriptionListItem extends ProfileListItem } $this->out->elementEnd('ul'); } else { - $this->out->text(_('(none)')); + $this->out->text(_('(None)')); } $this->out->elementEnd('dd'); $this->out->elementEnd('dl'); diff --git a/lib/util.php b/lib/util.php index 50bd0e2ac..3e52f5db1 100644 --- a/lib/util.php +++ b/lib/util.php @@ -119,6 +119,11 @@ function common_language() function common_munge_password($password, $id) { + if (is_object($id) || is_object($password)) { + $e = new Exception(); + common_log(LOG_ERR, __METHOD__ . ' object in param to common_munge_password ' . + str_replace("\n", " ", $e->getTraceAsString())); + } return md5($password . $id); } @@ -166,15 +171,27 @@ function common_ensure_session() if (common_config('sessions', 'handle')) { Session::setSaveHandler(); } + if (array_key_exists(session_name(), $_GET)) { + $id = $_GET[session_name()]; + common_log(LOG_INFO, 'Setting session from GET parameter: '.$id); + } else if (array_key_exists(session_name(), $_COOKIE)) { + $id = $_COOKIE[session_name()]; + common_log(LOG_INFO, 'Setting session from COOKIE: '.$id); + } + if (isset($id)) { + session_id($id); + setcookie(session_name(), $id); + } @session_start(); if (!isset($_SESSION['started'])) { $_SESSION['started'] = time(); - if (!empty($c)) { + if (!empty($id)) { common_log(LOG_WARNING, 'Session cookie "' . $_COOKIE[session_name()] . '" ' . ' is set but started value is null'); } } } + common_debug("Session ID = " . session_id()); } // Three kinds of arguments: @@ -809,20 +826,50 @@ function common_path($relative, $ssl=false) } else if (common_config('site', 'server')) { $serverpart = common_config('site', 'server'); } else { - common_log(LOG_ERR, 'Site Sever not configured, unable to determine site name.'); + common_log(LOG_ERR, 'Site server not configured, unable to determine site name.'); } } else { $proto = 'http'; if (common_config('site', 'server')) { $serverpart = common_config('site', 'server'); } else { - common_log(LOG_ERR, 'Site Sever not configured, unable to determine site name.'); + common_log(LOG_ERR, 'Site server not configured, unable to determine site name.'); } } + $relative = common_inject_session($relative, $serverpart); + return $proto.'://'.$serverpart.'/'.$pathpart.$relative; } +function common_inject_session($url, $serverpart = null) +{ + if (common_have_session()) { + + if (empty($serverpart)) { + $serverpart = parse_url($url, PHP_URL_HOST); + } + + $currentServer = $_SERVER['HTTP_HOST']; + + // Are we pointing to another server (like an SSL server?) + + if (!empty($currentServer) && + 0 != strcasecmp($currentServer, $serverpart)) { + // Pass the session ID as a GET parameter + $sesspart = session_name() . '=' . session_id(); + $i = strpos($url, '?'); + if ($i === false) { // no GET params, just append + $url .= '?' . $sesspart; + } else { + $url = substr($url, 0, $i + 1).$sesspart.'&'.substr($url, $i + 1); + } + } + } + + return $url; +} + function common_date_string($dt) { // XXX: do some sexy date formatting @@ -1010,7 +1057,12 @@ function common_profile_url($nickname) function common_root_url($ssl=false) { - return common_path('', $ssl); + $url = common_path('', $ssl); + $i = strpos($url, '?'); + if ($i !== false) { + $url = substr($url, 0, $i); + } + return $url; } // returns $bytes bytes of random data as a hexadecimal string diff --git a/locale/ar/LC_MESSAGES/statusnet.po b/locale/ar/LC_MESSAGES/statusnet.po index 65615afd1..36a3cdf22 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-01-03 10:37+0000\n" -"PO-Revision-Date: 2010-01-03 10:37:16+0000\n" +"POT-Creation-Date: 2010-01-10 11:27+0000\n" +"PO-Revision-Date: 2010-01-10 11:27:32+0000\n" "Language-Team: Arabic\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha (r60575); Translate extension (2009-12-06)\n" +"X-Generator: MediaWiki 1.16alpha (r60888); Translate extension (2010-01-04)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: ar\n" "X-Message-Group: out-statusnet\n" @@ -52,11 +52,6 @@ msgstr "لا صÙØØ© كهذه" msgid "No such user." msgstr "لا مستخدم كهذا." -#: actions/all.php:84 -#, php-format -msgid "%s and friends, page %d" -msgstr "" - #: actions/all.php:86 actions/all.php:167 actions/allrss.php:115 #: actions/apitimelinefriends.php:115 actions/apitimelinehome.php:115 #: lib/personalgroupnav.php:100 @@ -95,8 +90,8 @@ msgstr "" #: actions/all.php:134 #, php-format msgid "" -"You can try to [nudge %s](../%s) from his profile or [post something to his " -"or her attention](%%%%action.newnotice%%%%?status_textarea=%s)." +"You can try to [nudge %1$s](../%2$s) from his profile or [post something to " +"his or her attention](%%%%action.newnotice%%%%?status_textarea=%3$s)." msgstr "" #: actions/all.php:137 actions/replies.php:209 actions/showstream.php:202 @@ -121,6 +116,23 @@ msgstr "" #: actions/apiaccountupdateprofile.php:97 #: actions/apiaccountupdateprofilebackgroundimage.php:94 #: actions/apiaccountupdateprofilecolors.php:118 +#: actions/apidirectmessage.php:156 actions/apifavoritecreate.php:99 +#: actions/apifavoritedestroy.php:100 actions/apifriendshipscreate.php:100 +#: actions/apifriendshipsdestroy.php:100 actions/apifriendshipsshow.php:129 +#: actions/apigroupcreate.php:136 actions/apigroupismember.php:114 +#: actions/apigroupjoin.php:155 actions/apigroupleave.php:141 +#: actions/apigrouplist.php:132 actions/apigrouplistall.php:120 +#: actions/apigroupmembership.php:106 actions/apigroupshow.php:105 +#: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102 +#: actions/apistatusesretweets.php:112 actions/apistatusesshow.php:108 +#: actions/apistatusnetconfig.php:133 actions/apistatusnetversion.php:93 +#: actions/apisubscriptions.php:111 actions/apitimelinefavorites.php:146 +#: actions/apitimelinefriends.php:156 actions/apitimelinegroup.php:150 +#: actions/apitimelinehome.php:156 actions/apitimelinementions.php:151 +#: actions/apitimelinepublic.php:131 actions/apitimelineretweetedbyme.php:122 +#: actions/apitimelineretweetedtome.php:121 +#: actions/apitimelineretweetsofme.php:122 actions/apitimelinetag.php:141 +#: actions/apitimelineuser.php:165 actions/apiusershow.php:101 msgid "API method not found." msgstr "لم يتم العثور على وسيلة API." @@ -176,6 +188,9 @@ msgstr "" #: actions/apiaccountupdateprofilebackgroundimage.php:146 #: actions/apiaccountupdateprofilecolors.php:164 #: actions/apiaccountupdateprofilecolors.php:174 +#: actions/groupdesignsettings.php:287 actions/groupdesignsettings.php:297 +#: actions/userdesignsettings.php:210 actions/userdesignsettings.php:220 +#: actions/userdesignsettings.php:263 actions/userdesignsettings.php:273 msgid "Unable to save your design settings." msgstr "" @@ -216,26 +231,6 @@ msgstr "رسالة مباشرة %s" msgid "All the direct messages sent to %s" msgstr "" -#: actions/apidirectmessage.php:156 actions/apifavoritecreate.php:99 -#: actions/apifavoritedestroy.php:100 actions/apifriendshipscreate.php:100 -#: actions/apifriendshipsdestroy.php:100 actions/apifriendshipsshow.php:129 -#: actions/apigroupcreate.php:136 actions/apigroupismember.php:114 -#: actions/apigroupjoin.php:155 actions/apigroupleave.php:141 -#: actions/apigrouplist.php:132 actions/apigrouplistall.php:120 -#: actions/apigroupmembership.php:106 actions/apigroupshow.php:105 -#: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102 -#: actions/apistatusesretweets.php:112 actions/apistatusesshow.php:108 -#: actions/apistatusnetconfig.php:133 actions/apistatusnetversion.php:93 -#: actions/apisubscriptions.php:111 actions/apitimelinefavorites.php:146 -#: actions/apitimelinefriends.php:156 actions/apitimelinegroup.php:150 -#: actions/apitimelinehome.php:156 actions/apitimelinementions.php:151 -#: actions/apitimelinepublic.php:131 actions/apitimelineretweetedbyme.php:122 -#: actions/apitimelineretweetedtome.php:121 -#: actions/apitimelineretweetsofme.php:122 actions/apitimelinetag.php:141 -#: actions/apitimelineuser.php:165 actions/apiusershow.php:101 -msgid "API method not found!" -msgstr "" - #: actions/apidirectmessagenew.php:126 msgid "No message text!" msgstr "لا نص ÙÙŠ الرسالة!" @@ -259,15 +254,17 @@ msgid "No status found with that ID." msgstr "" #: actions/apifavoritecreate.php:119 -msgid "This status is already a favorite!" -msgstr "" +#, fuzzy +msgid "This status is already a favorite." +msgstr "هذا الإشعار Ù…Ùضلة مسبقًا!" #: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:176 msgid "Could not create favorite." msgstr "تعذّر إنشاء Ù…Ùضلة." #: actions/apifavoritedestroy.php:122 -msgid "That status is not a favorite!" +#, fuzzy +msgid "That status is not a favorite." msgstr "تلك الØالة ليست Ù…Ùضلة!" #: actions/apifavoritedestroy.php:134 actions/disfavor.php:87 @@ -288,8 +285,9 @@ msgid "Could not unfollow user: User not found." msgstr "" #: actions/apifriendshipsdestroy.php:120 -msgid "You cannot unfollow yourself!" -msgstr "" +#, fuzzy +msgid "You cannot unfollow yourself." +msgstr "لا يمكنك منع Ù†Ùسك!" #: actions/apifriendshipsexists.php:94 msgid "Two user ids or screen_names must be supplied." @@ -373,7 +371,7 @@ msgstr "" msgid "Group not found!" msgstr "لم توجد المجموعة!" -#: actions/apigroupjoin.php:110 +#: actions/apigroupjoin.php:110 actions/joingroup.php:90 lib/command.php:217 msgid "You are already a member of that group." msgstr "" @@ -381,30 +379,25 @@ msgstr "" msgid "You have been blocked from that group by the admin." msgstr "" -#: actions/apigroupjoin.php:138 -#, php-format -msgid "Could not join user %s to group %s." -msgstr "" +#: actions/apigroupjoin.php:138 actions/joingroup.php:128 lib/command.php:234 +#, fuzzy, php-format +msgid "Could not join user %1$s to group %2$s." +msgstr "تعذّر إنشاء المجموعة." #: actions/apigroupleave.php:114 msgid "You are not a member of this group." msgstr "" -#: actions/apigroupleave.php:124 -#, php-format -msgid "Could not remove user %s to group %s." -msgstr "" +#: actions/apigroupleave.php:124 actions/leavegroup.php:127 +#, fuzzy, php-format +msgid "Could not remove user %1$s from group %2$s." +msgstr "تعذّر إنشاء المجموعة." #: actions/apigrouplist.php:95 #, php-format msgid "%s's groups" msgstr "مجموعات %s" -#: actions/apigrouplist.php:103 -#, php-format -msgid "Groups %s is a member of on %s." -msgstr "" - #: actions/apigrouplistall.php:90 actions/usergroups.php:62 #, php-format msgid "%s groups" @@ -428,11 +421,11 @@ msgstr "" msgid "No such notice." msgstr "لا إشعار كهذا." -#: actions/apistatusesretweet.php:83 +#: actions/apistatusesretweet.php:83 lib/command.php:422 msgid "Cannot repeat your own notice." msgstr "لا يمكنك تكرار ملØوظتك الخاصة." -#: actions/apistatusesretweet.php:91 +#: actions/apistatusesretweet.php:91 lib/command.php:427 msgid "Already repeated that notice." msgstr "كرر بالÙعل هذه الملاØظة." @@ -445,7 +438,7 @@ msgid "No status with that ID found." msgstr "" #: actions/apistatusesupdate.php:157 actions/newnotice.php:155 -#: scripts/maildaemon.php:71 +#: lib/mailhandler.php:60 #, php-format msgid "That's too long. Max notice size is %d chars." msgstr "" @@ -465,12 +458,12 @@ msgstr "نسق غير مدعوم." #: actions/apitimelinefavorites.php:108 #, php-format -msgid "%s / Favorites from %s" +msgid "%1$s / Favorites from %2$s" msgstr "" #: actions/apitimelinefavorites.php:120 #, php-format -msgid "%s updates favorited by %s / %s." +msgid "%1$s updates favorited by %2$s / %2$s." msgstr "" #: actions/apitimelinegroup.php:109 actions/apitimelineuser.php:118 @@ -538,8 +531,11 @@ msgstr "لم يوجد." msgid "No such attachment." msgstr "لا مرÙÙ‚ كهذا." -#: actions/avatarbynickname.php:59 actions/grouprss.php:91 -#: actions/leavegroup.php:76 +#: actions/avatarbynickname.php:59 actions/blockedfromgroup.php:73 +#: actions/editgroup.php:84 actions/groupdesignsettings.php:84 +#: actions/grouplogo.php:86 actions/groupmembers.php:76 +#: actions/grouprss.php:91 actions/joingroup.php:76 actions/leavegroup.php:76 +#: actions/showgroup.php:121 msgid "No nickname." msgstr "لا اسم مستعار." @@ -562,8 +558,8 @@ msgid "You can upload your personal avatar. The maximum file size is %s." msgstr "" #: actions/avatarsettings.php:106 actions/avatarsettings.php:185 -#: actions/grouplogo.php:178 actions/remotesubscribe.php:191 -#: actions/userauthorization.php:72 actions/userrss.php:103 +#: actions/remotesubscribe.php:191 actions/userauthorization.php:72 +#: actions/userrss.php:103 msgid "User without matching profile" msgstr "" @@ -595,9 +591,9 @@ msgstr "ارÙع" msgid "Crop" msgstr "" -#: actions/avatarsettings.php:268 actions/disfavor.php:74 -#: actions/emailsettings.php:238 actions/favor.php:75 actions/geocode.php:50 -#: actions/groupblock.php:66 actions/grouplogo.php:309 +#: actions/avatarsettings.php:268 actions/deletenotice.php:157 +#: actions/disfavor.php:74 actions/emailsettings.php:238 actions/favor.php:75 +#: actions/geocode.php:50 actions/groupblock.php:66 actions/grouplogo.php:309 #: actions/groupunblock.php:66 actions/imsettings.php:206 #: actions/invite.php:56 actions/login.php:135 actions/makeadmin.php:66 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80 @@ -676,19 +672,15 @@ msgstr "امنع هذا المستخدم" msgid "Failed to save block information." msgstr "Ùشل ØÙظ معلومات المنع." -#: actions/blockedfromgroup.php:73 actions/editgroup.php:84 -#: actions/groupdesignsettings.php:84 actions/grouplogo.php:86 -#: actions/groupmembers.php:76 actions/joingroup.php:76 -#: actions/showgroup.php:121 -msgid "No nickname" -msgstr "لا اسم مستعار" - #: actions/blockedfromgroup.php:80 actions/editgroup.php:96 +#: actions/foafgroup.php:44 actions/foafgroup.php:62 actions/groupblock.php:86 #: actions/groupbyid.php:83 actions/groupdesignsettings.php:97 #: actions/grouplogo.php:99 actions/groupmembers.php:83 -#: actions/joingroup.php:83 actions/showgroup.php:137 -msgid "No such group" -msgstr "لا مجموعة كهذه" +#: actions/grouprss.php:98 actions/groupunblock.php:86 +#: actions/joingroup.php:83 actions/leavegroup.php:83 actions/makeadmin.php:86 +#: actions/showgroup.php:137 lib/command.php:212 lib/command.php:263 +msgid "No such group." +msgstr "لا مجموعة كهذه." #: actions/blockedfromgroup.php:90 #, php-format @@ -696,9 +688,9 @@ msgid "%s blocked profiles" msgstr "" #: actions/blockedfromgroup.php:93 -#, php-format -msgid "%s blocked profiles, page %d" -msgstr "" +#, fuzzy, php-format +msgid "%1$s blocked profiles, page %2$d" +msgstr "مشتركو %sØŒ الصÙØØ© %d" #: actions/blockedfromgroup.php:108 msgid "A list of the users blocked from joining this group." @@ -808,10 +800,6 @@ msgstr "لا تØذ٠هذا الإشعار" msgid "Delete this notice" msgstr "اØذ٠هذا الإشعار" -#: actions/deletenotice.php:157 -msgid "There was a problem with your session token. Try again, please." -msgstr "" - #: actions/deleteuser.php:67 msgid "You cannot delete users." msgstr "لا يمكنك Øذ٠المستخدمين." @@ -835,7 +823,7 @@ msgid "Delete this user" msgstr "اØذ٠هذا المستخدم" #: actions/designadminpanel.php:62 lib/accountsettingsaction.php:124 -#: lib/adminpanelaction.php:302 lib/groupnav.php:119 +#: lib/adminpanelaction.php:316 lib/groupnav.php:119 msgid "Design" msgstr "التصميم" @@ -973,7 +961,8 @@ msgstr "يجب أن تكون والجًا لتنشئ مجموعة." #: actions/editgroup.php:103 actions/editgroup.php:168 #: actions/groupdesignsettings.php:104 actions/grouplogo.php:106 -msgid "You must be an admin to edit the group" +#, fuzzy +msgid "You must be an admin to edit the group." msgstr "يجب أن تكون إداريًا لتعدّل المجموعة" #: actions/editgroup.php:154 @@ -998,7 +987,8 @@ msgid "Options saved." msgstr "ØÙÙظت الخيارات." #: actions/emailsettings.php:60 -msgid "Email Settings" +#, fuzzy +msgid "Email settings" msgstr "إعدادات البريد الإلكتروني" #: actions/emailsettings.php:71 @@ -1033,8 +1023,9 @@ msgid "Cancel" msgstr "ألغÙ" #: actions/emailsettings.php:121 -msgid "Email Address" -msgstr "عنوان البريد الإلكتروني" +#, fuzzy +msgid "Email address" +msgstr "عناوين البريد الإلكتروني" #: actions/emailsettings.php:123 msgid "Email address, like \"UserName@example.org\"" @@ -1107,9 +1098,10 @@ msgstr "لا عنوان بريد إلكتروني." msgid "Cannot normalize that email address" msgstr "" -#: actions/emailsettings.php:331 actions/siteadminpanel.php:157 -msgid "Not a valid email address" -msgstr "ليس عنوان بريد صالØ" +#: actions/emailsettings.php:331 actions/register.php:201 +#: actions/siteadminpanel.php:157 +msgid "Not a valid email address." +msgstr "ليس عنوان بريد صالØ." #: actions/emailsettings.php:334 msgid "That is already your email address." @@ -1283,18 +1275,11 @@ msgstr "" msgid "Error updating remote profile" msgstr "خطأ أثناء تØديث المل٠الشخصي البعيد" -#: actions/foafgroup.php:44 actions/foafgroup.php:62 actions/groupblock.php:86 -#: actions/grouprss.php:98 actions/groupunblock.php:86 -#: actions/leavegroup.php:83 actions/makeadmin.php:86 lib/command.php:212 -#: lib/command.php:263 -msgid "No such group." -msgstr "لا مجموعة كهذه." - -#: actions/getfile.php:75 +#: actions/getfile.php:79 msgid "No such file." msgstr "لا مل٠كهذا." -#: actions/getfile.php:79 +#: actions/getfile.php:83 msgid "Cannot read file." msgstr "تعذّرت قراءة الملÙ." @@ -1306,7 +1291,7 @@ msgstr "لا مل٠شخصي Ù…ÙØدّد." #: actions/groupblock.php:76 actions/groupunblock.php:76 #: actions/makeadmin.php:76 actions/subedit.php:53 actions/tagother.php:46 -#: lib/profileformaction.php:77 +#: actions/unsubscribe.php:84 lib/profileformaction.php:77 msgid "No profile with that ID." msgstr "لا مل٠شخصي بهذه الهوية." @@ -1334,9 +1319,9 @@ msgstr "امنع المستخدم من المجموعة" #: actions/groupblock.php:162 #, php-format msgid "" -"Are you sure you want to block user \"%s\" from the group \"%s\"? They will " -"be removed from the group, unable to post, and unable to subscribe to the " -"group in the future." +"Are you sure you want to block user \"%1$s\" from the group \"%2$s\"? They " +"will be removed from the group, unable to post, and unable to subscribe to " +"the group in the future." msgstr "" #: actions/groupblock.php:178 @@ -1351,9 +1336,9 @@ msgstr "امنع هذا المستخدم من هذه المجموعة" msgid "Database error blocking user from group." msgstr "خطأ ÙÙŠ قاعدة البيانات أثناء منع المستخدم من المجموعة." -#: actions/groupbyid.php:74 -msgid "No ID" -msgstr "لا هوية" +#: actions/groupbyid.php:74 actions/userbyid.php:70 +msgid "No ID." +msgstr "لا هوية." #: actions/groupdesignsettings.php:68 msgid "You must be logged in to edit a group." @@ -1374,12 +1359,6 @@ msgstr "" msgid "Couldn't update your design." msgstr "تعذّر تØديث تصميمك." -#: actions/groupdesignsettings.php:287 actions/groupdesignsettings.php:297 -#: actions/userdesignsettings.php:210 actions/userdesignsettings.php:220 -#: actions/userdesignsettings.php:263 actions/userdesignsettings.php:273 -msgid "Unable to save your design settings!" -msgstr "" - #: actions/groupdesignsettings.php:308 actions/userdesignsettings.php:231 msgid "Design preferences saved." msgstr "" @@ -1394,6 +1373,11 @@ msgid "" "You can upload a logo image for your group. The maximum file size is %s." msgstr "" +#: actions/grouplogo.php:178 +#, fuzzy +msgid "User without matching profile." +msgstr "ليس للمستخدم مل٠شخصي." + #: actions/grouplogo.php:362 msgid "Pick a square area of the image to be the logo." msgstr "" @@ -1412,15 +1396,15 @@ msgid "%s group members" msgstr "أعضاء مجموعة %s" #: actions/groupmembers.php:96 -#, php-format -msgid "%s group members, page %d" -msgstr "" +#, fuzzy, php-format +msgid "%1$s group members, page %2$d" +msgstr "مجموعات %sØŒ صÙØØ© %d" #: actions/groupmembers.php:111 msgid "A list of the users in this group." msgstr "قائمة بمستخدمي هذه المجموعة." -#: actions/groupmembers.php:175 lib/action.php:441 lib/groupnav.php:107 +#: actions/groupmembers.php:175 lib/action.php:442 lib/groupnav.php:107 msgid "Admin" msgstr "إداري" @@ -1512,7 +1496,8 @@ msgid "Error removing the block." msgstr "خطأ أثناء منع الØجب." #: actions/imsettings.php:59 -msgid "IM Settings" +#, fuzzy +msgid "IM settings" msgstr "إعدادات المراسلة الÙورية" #: actions/imsettings.php:70 @@ -1538,7 +1523,8 @@ msgid "" msgstr "" #: actions/imsettings.php:124 -msgid "IM Address" +#, fuzzy +msgid "IM address" msgstr "عنوان المراسلة الÙورية" #: actions/imsettings.php:126 @@ -1595,11 +1581,6 @@ msgstr "" msgid "That is not your Jabber ID." msgstr "هذه ليست هويتك ÙÙŠ جابر." -#: actions/inbox.php:59 -#, php-format -msgid "Inbox for %s - page %d" -msgstr "" - #: actions/inbox.php:62 #, php-format msgid "Inbox for %s" @@ -1635,10 +1616,10 @@ msgstr "دعوة مستخدمين جدد" msgid "You are already subscribed to these users:" msgstr "" -#: actions/invite.php:131 actions/invite.php:139 +#: actions/invite.php:131 actions/invite.php:139 lib/command.php:315 #, php-format -msgid "%s (%s)" -msgstr "%s (%s)" +msgid "%1$s (%2$s)" +msgstr "%1$s (%2$s)" #: actions/invite.php:136 msgid "" @@ -1676,7 +1657,7 @@ msgstr "رسالة شخصية" msgid "Optionally add a personal message to the invitation." msgstr "" -#: actions/invite.php:197 lib/messageform.php:178 lib/noticeform.php:232 +#: actions/invite.php:197 lib/messageform.php:178 lib/noticeform.php:234 msgid "Send" msgstr "أرسل" @@ -1720,18 +1701,9 @@ msgstr "" msgid "You must be logged in to join a group." msgstr "" -#: actions/joingroup.php:90 lib/command.php:217 -msgid "You are already a member of that group" -msgstr "" - -#: actions/joingroup.php:128 lib/command.php:234 -#, php-format -msgid "Could not join user %s to group %s" -msgstr "" - #: actions/joingroup.php:135 lib/command.php:239 -#, php-format -msgid "%s joined group %s" +#, fuzzy, php-format +msgid "%1$s joined group %2$s" msgstr "%s انضم إلى مجموعة %s" #: actions/leavegroup.php:60 @@ -1746,15 +1718,10 @@ msgstr "لست عضوا ÙÙŠ تلك المجموعة." msgid "Could not find membership record." msgstr "" -#: actions/leavegroup.php:127 lib/command.php:284 -#, php-format -msgid "Could not remove user %s to group %s" -msgstr "" - #: actions/leavegroup.php:134 lib/command.php:289 -#, php-format -msgid "%s left group %s" -msgstr "" +#, fuzzy, php-format +msgid "%1$s left group %2$s" +msgstr "%s انضم إلى مجموعة %s" #: actions/login.php:83 actions/register.php:137 msgid "Already logged in." @@ -1772,7 +1739,7 @@ msgstr "اسم المستخدم أو كلمة السر غير صØÙŠØان." msgid "Error setting user. You are probably not authorized." msgstr "خطأ أثناء ضبط المستخدم. لست Ù…ÙصرØًا على الأرجØ." -#: actions/login.php:208 actions/login.php:261 lib/action.php:459 +#: actions/login.php:208 actions/login.php:261 lib/action.php:460 #: lib/logingroupnav.php:79 msgid "Login" msgstr "Ù„Ùج" @@ -1823,18 +1790,18 @@ msgstr "" #: actions/makeadmin.php:95 #, php-format -msgid "%s is already an admin for group \"%s\"." +msgid "%1$s is already an admin for group \"%2$s\"." msgstr "" #: actions/makeadmin.php:132 -#, php-format -msgid "Can't get membership record for %s in group %s" -msgstr "" +#, fuzzy, php-format +msgid "Can't get membership record for %1$s in group %2$s." +msgstr "تعذّر إنشاء المجموعة." #: actions/makeadmin.php:145 -#, php-format -msgid "Can't make %s an admin for group %s" -msgstr "" +#, fuzzy, php-format +msgid "Can't make %1$s an admin for group %2$s." +msgstr "تعذّر إنشاء المجموعة." #: actions/microsummary.php:69 msgid "No current status" @@ -1875,9 +1842,9 @@ msgid "Message sent" msgstr "Ø£Ùرسلت الرسالة" #: actions/newmessage.php:185 lib/command.php:376 -#, php-format -msgid "Direct message to %s sent" -msgstr "" +#, fuzzy, php-format +msgid "Direct message to %s sent." +msgstr "رسالة مباشرة %s" #: actions/newmessage.php:210 actions/newnotice.php:245 lib/channel.php:170 msgid "Ajax Error" @@ -1903,8 +1870,8 @@ msgid "Text search" msgstr "بØØ« ÙÙŠ النصوص" #: actions/noticesearch.php:91 -#, php-format -msgid "Search results for \"%s\" on %s" +#, fuzzy, php-format +msgid "Search results for \"%1$s\" on %2$s" msgstr "نتائج البØØ« عن \"%s\" ÙÙŠ %s" #: actions/noticesearch.php:121 @@ -2006,11 +1973,6 @@ msgstr "أظهر أو أخÙ٠تصاميم الملÙات الشخصية." msgid "URL shortening service is too long (max 50 chars)." msgstr "" -#: actions/outbox.php:58 -#, php-format -msgid "Outbox for %s - page %d" -msgstr "" - #: actions/outbox.php:61 #, php-format msgid "Outbox for %s" @@ -2081,7 +2043,7 @@ msgstr "تعذّر ØÙظ كلمة السر الجديدة." msgid "Password saved." msgstr "ØÙÙظت كلمة السر." -#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:308 +#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:326 msgid "Paths" msgstr "المسارات" @@ -2114,7 +2076,7 @@ msgid "Invalid SSL server. The maximum length is 255 characters." msgstr "" #: actions/pathsadminpanel.php:217 actions/siteadminpanel.php:58 -#: lib/adminpanelaction.php:299 +#: lib/adminpanelaction.php:311 msgid "Site" msgstr "الموقع" @@ -2207,7 +2169,8 @@ msgid "When to use SSL" msgstr "" #: actions/pathsadminpanel.php:308 -msgid "SSL Server" +#, fuzzy +msgid "SSL server" msgstr "خادوم SSL" #: actions/pathsadminpanel.php:309 @@ -2236,7 +2199,7 @@ msgstr "ليس وسم أشخاص صالØ: %s" #: actions/peopletag.php:144 #, php-format -msgid "Users self-tagged with %s - page %d" +msgid "Users self-tagged with %1$s - page %2$d" msgstr "" #: actions/postnotice.php:84 @@ -2245,7 +2208,7 @@ msgstr "Ù…Øتوى إشعار غير صالØ" #: actions/postnotice.php:90 #, php-format -msgid "Notice license ‘%s’ is not compatible with site license ‘%s’." +msgid "Notice license ‘%1$s’ is not compatible with site license ‘%2$s’." msgstr "" #: actions/profilesettings.php:60 @@ -2362,19 +2325,19 @@ msgstr "وسم غير صالØ: \"%s\"" msgid "Couldn't update user for autosubscribe." msgstr "" -#: actions/profilesettings.php:354 +#: actions/profilesettings.php:359 msgid "Couldn't save location prefs." msgstr "لم يمكن ØÙظ تÙضيلات الموقع." -#: actions/profilesettings.php:366 +#: actions/profilesettings.php:371 msgid "Couldn't save profile." msgstr "تعذّر ØÙظ المل٠الشخصي." -#: actions/profilesettings.php:374 +#: actions/profilesettings.php:379 msgid "Couldn't save tags." msgstr "تعذّر ØÙظ الوسوم." -#: actions/profilesettings.php:382 lib/adminpanelaction.php:126 +#: actions/profilesettings.php:387 lib/adminpanelaction.php:137 msgid "Settings saved." msgstr "ØÙÙظت الإعدادات." @@ -2473,7 +2436,7 @@ msgid "" "one!" msgstr "" -#: actions/publictagcloud.php:135 +#: actions/publictagcloud.php:131 msgid "Tag cloud" msgstr "سØابة الوسوم" @@ -2609,7 +2572,7 @@ msgstr "عذرا، رمز دعوة غير صالØ." msgid "Registration successful" msgstr "Ù†Ø¬Ø Ø§Ù„ØªØ³Ø¬ÙŠÙ„" -#: actions/register.php:114 actions/register.php:502 lib/action.php:456 +#: actions/register.php:114 actions/register.php:502 lib/action.php:457 #: lib/logingroupnav.php:85 msgid "Register" msgstr "سجّل" @@ -2622,10 +2585,6 @@ msgstr "لا ÙŠÙØ³Ù…Ø Ø¨Ø§Ù„ØªØ³Ø¬ÙŠÙ„." msgid "You can't register if you don't agree to the license." msgstr "" -#: actions/register.php:201 -msgid "Not a valid email address." -msgstr "ليس عنوان بريد صالØ." - #: actions/register.php:212 msgid "Email address already exists." msgstr "عنوان البريد الإلكتروني موجود مسبقًا." @@ -2682,10 +2641,10 @@ msgstr "" #: actions/register.php:537 #, php-format msgid "" -"Congratulations, %s! And welcome to %%%%site.name%%%%. From here, you may " +"Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may " "want to...\n" "\n" -"* Go to [your profile](%s) and post your first message.\n" +"* Go to [your profile](%2$s) and post your first message.\n" "* Add a [Jabber/GTalk address](%%%%action.imsettings%%%%) so you can send " "notices through instant messages.\n" "* [Search for people](%%%%action.peoplesearch%%%%) that you may know or that " @@ -2787,11 +2746,6 @@ msgstr "مكرر!" msgid "Replies to %s" msgstr "الردود على %s" -#: actions/replies.php:127 -#, php-format -msgid "Replies to %s, page %d" -msgstr "الردود على %sØŒ الصÙØØ© %d" - #: actions/replies.php:144 #, php-format msgid "Replies feed for %s (RSS 1.0)" @@ -2810,8 +2764,8 @@ msgstr "" #: actions/replies.php:198 #, php-format msgid "" -"This is the timeline showing replies to %s but %s hasn't received a notice " -"to his attention yet." +"This is the timeline showing replies to %1$s but %2$s hasn't received a " +"notice to his attention yet." msgstr "" #: actions/replies.php:203 @@ -2824,8 +2778,8 @@ msgstr "" #: actions/replies.php:205 #, php-format msgid "" -"You can try to [nudge %s](../%s) or [post something to his or her attention]" -"(%%%%action.newnotice%%%%?status_textarea=%s)." +"You can try to [nudge %1$s](../%2$s) or [post something to his or her " +"attention](%%%%action.newnotice%%%%?status_textarea=%3$s)." msgstr "" #: actions/repliesrss.php:72 @@ -2841,11 +2795,6 @@ msgstr "" msgid "User is already sandboxed." msgstr "" -#: actions/showfavorites.php:79 -#, php-format -msgid "%s's favorite notices, page %d" -msgstr "" - #: actions/showfavorites.php:132 msgid "Could not retrieve favorite notices." msgstr "" @@ -2899,11 +2848,6 @@ msgstr "إنها Ø¥Øدى وسائل مشاركة ما تØب." msgid "%s group" msgstr "مجموعة %s" -#: actions/showgroup.php:84 -#, php-format -msgid "%s group, page %d" -msgstr "" - #: actions/showgroup.php:218 msgid "Group profile" msgstr "مل٠المجموعة الشخصي" @@ -2952,7 +2896,7 @@ msgstr "الأعضاء" #: actions/showgroup.php:386 lib/profileaction.php:117 #: lib/profileaction.php:148 lib/profileaction.php:236 lib/section.php:95 -#: lib/tagcloudsection.php:71 +#: lib/subscriptionlist.php:126 lib/tagcloudsection.php:71 msgid "(None)" msgstr "(لا شيء)" @@ -3018,14 +2962,9 @@ msgstr "ØÙذ٠الإشعار." msgid " tagged %s" msgstr "" -#: actions/showstream.php:79 -#, php-format -msgid "%s, page %d" -msgstr "" - #: actions/showstream.php:122 #, php-format -msgid "Notice feed for %s tagged %s (RSS 1.0)" +msgid "Notice feed for %1$s tagged %2$s (RSS 1.0)" msgstr "" #: actions/showstream.php:129 @@ -3050,7 +2989,7 @@ msgstr "" #: actions/showstream.php:191 #, php-format -msgid "This is the timeline for %s but %s hasn't posted anything yet." +msgid "This is the timeline for %1$s but %2$s hasn't posted anything yet." msgstr "" #: actions/showstream.php:196 @@ -3062,8 +3001,8 @@ msgstr "" #: actions/showstream.php:198 #, php-format msgid "" -"You can try to nudge %s or [post something to his or her attention](%%%%" -"action.newnotice%%%%?status_textarea=%s)." +"You can try to nudge %1$s or [post something to his or her attention](%%%%" +"action.newnotice%%%%?status_textarea=%2$s)." msgstr "" #: actions/showstream.php:234 @@ -3105,12 +3044,13 @@ msgid "Site name must have non-zero length." msgstr "يجب ألا يكون طول اسم الموقع صÙرًا." #: actions/siteadminpanel.php:154 -msgid "You must have a valid contact email address" +#, fuzzy +msgid "You must have a valid contact email address." msgstr "يجب أن تملك عنوان بريد إلكتروني ØµØ§Ù„Ø Ù„Ù„Ø§ØªØµØ§Ù„" #: actions/siteadminpanel.php:172 -#, php-format -msgid "Unknown language \"%s\"" +#, fuzzy, php-format +msgid "Unknown language \"%s\"." msgstr "لغة غير معروÙØ© \"%s\"" #: actions/siteadminpanel.php:179 @@ -3290,7 +3230,8 @@ msgid "Save site settings" msgstr "اذ٠إعدادت الموقع" #: actions/smssettings.php:58 -msgid "SMS Settings" +#, fuzzy +msgid "SMS settings" msgstr "إعدادات الرسائل القصيرة" #: actions/smssettings.php:69 @@ -3319,8 +3260,9 @@ msgid "Enter the code you received on your phone." msgstr "" #: actions/smssettings.php:138 -msgid "SMS Phone number" -msgstr "" +#, fuzzy +msgid "SMS phone number" +msgstr "لا رقم هاتÙ." #: actions/smssettings.php:140 msgid "Phone number, no punctuation or spaces, with area code" @@ -3403,8 +3345,8 @@ msgid "%s subscribers" msgstr "مشتركو %s" #: actions/subscribers.php:52 -#, php-format -msgid "%s subscribers, page %d" +#, fuzzy, php-format +msgid "%1$s subscribers, page %2$d" msgstr "مشتركو %sØŒ الصÙØØ© %d" #: actions/subscribers.php:63 @@ -3440,8 +3382,8 @@ msgid "%s subscriptions" msgstr "اشتراكات %s" #: actions/subscriptions.php:54 -#, php-format -msgid "%s subscriptions, page %d" +#, fuzzy, php-format +msgid "%1$s subscriptions, page %2$d" msgstr "اشتراكات %sØŒ الصÙØØ© %d" #: actions/subscriptions.php:65 @@ -3476,11 +3418,6 @@ msgstr "جابر" msgid "SMS" msgstr "رسائل قصيرة" -#: actions/tag.php:68 -#, php-format -msgid "Notices tagged with %s, page %d" -msgstr "" - #: actions/tag.php:86 #, php-format msgid "Notice feed for tag %s (RSS 1.0)" @@ -3560,20 +3497,17 @@ msgstr "المستخدم ليس Ù…Ùسكتًا." msgid "No profile id in request." msgstr "" -#: actions/unsubscribe.php:84 -msgid "No profile with that id." -msgstr "لا مل٠بهذه الهوية." - #: actions/unsubscribe.php:98 msgid "Unsubscribed" msgstr "" #: actions/updateprofile.php:62 actions/userauthorization.php:330 #, php-format -msgid "Listenee stream license ‘%s’ is not compatible with site license ‘%s’." +msgid "" +"Listenee stream license ‘%1$s’ is not compatible with site license ‘%2$s’." msgstr "" -#: actions/useradminpanel.php:58 lib/adminpanelaction.php:305 +#: actions/useradminpanel.php:58 lib/adminpanelaction.php:321 #: lib/personalgroupnav.php:115 msgid "User" msgstr "المستخدم" @@ -3671,7 +3605,7 @@ msgid "" "click “Rejectâ€." msgstr "" -#: actions/userauthorization.php:188 +#: actions/userauthorization.php:188 actions/version.php:165 msgid "License" msgstr "الرخصة" @@ -3720,7 +3654,7 @@ msgstr "" #: actions/userauthorization.php:296 #, php-format -msgid "Listener URI ‘%s’ not found here" +msgid "Listener URI ‘%s’ not found here." msgstr "" #: actions/userauthorization.php:301 @@ -3753,10 +3687,6 @@ msgstr "" msgid "Wrong image type for avatar URL ‘%s’." msgstr "" -#: actions/userbyid.php:70 -msgid "No ID." -msgstr "لا هوية." - #: actions/userdesignsettings.php:76 lib/designsettings.php:65 msgid "Profile design" msgstr "تصميم المل٠الشخصي" @@ -3771,11 +3701,6 @@ msgstr "" msgid "Enjoy your hotdog!" msgstr "استمتع بالنقانق!" -#: actions/usergroups.php:64 -#, php-format -msgid "%s groups, page %d" -msgstr "مجموعات %sØŒ صÙØØ© %d" - #: actions/usergroups.php:130 msgid "Search for more groups" msgstr "" @@ -3790,6 +3715,73 @@ msgstr "" msgid "Try [searching for groups](%%action.groupsearch%%) and joining them." msgstr "" +#: actions/version.php:73 +#, fuzzy, php-format +msgid "StatusNet %s" +msgstr "Ø¥Øصاءات" + +#: actions/version.php:153 +#, php-format +msgid "" +"This site is powered by %1$s version %2$s, Copyright 2008-2010 StatusNet, " +"Inc. and contributors." +msgstr "" + +#: actions/version.php:157 +#, fuzzy +msgid "StatusNet" +msgstr "ØÙØ°ÙÙت الØالة." + +#: actions/version.php:161 +msgid "Contributors" +msgstr "" + +#: actions/version.php:168 +msgid "" +"StatusNet is free software: you can redistribute it and/or modify it under " +"the terms of the GNU Affero General Public License as published by the Free " +"Software Foundation, either version 3 of the License, or (at your option) " +"any later version. " +msgstr "" + +#: actions/version.php:174 +msgid "" +"This program is distributed in the hope that it will be useful, but WITHOUT " +"ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or " +"FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License " +"for more details. " +msgstr "" + +#: actions/version.php:180 +#, php-format +msgid "" +"You should have received a copy of the GNU Affero General Public License " +"along with this program. If not, see %s." +msgstr "" + +#: actions/version.php:189 +msgid "Plugins" +msgstr "" + +#: actions/version.php:195 +#, fuzzy +msgid "Name" +msgstr "الاسم المستعار" + +#: actions/version.php:196 lib/action.php:741 +#, fuzzy +msgid "Version" +msgstr "الجلسات" + +#: actions/version.php:197 +#, fuzzy +msgid "Author(s)" +msgstr "المؤلÙ" + +#: actions/version.php:198 lib/groupeditform.php:172 +msgid "Description" +msgstr "الوصÙ" + #: classes/File.php:137 #, php-format msgid "" @@ -3856,7 +3848,7 @@ msgstr "مشكلة أثناء ØÙظ الإشعار." msgid "DB error inserting reply: %s" msgstr "" -#: classes/Notice.php:1361 +#: classes/Notice.php:1359 #, php-format msgid "RT @%1$s %2$s" msgstr "آر تي @%1$s %2$s" @@ -3902,137 +3894,132 @@ msgstr "أخرى" msgid "Other options" msgstr "خيارات أخرى" -#: lib/action.php:144 -#, php-format -msgid "%s - %s" -msgstr "%s - %s" - #: lib/action.php:159 msgid "Untitled page" msgstr "صÙØØ© غير Ù…Ùعنونة" -#: lib/action.php:426 +#: lib/action.php:427 msgid "Primary site navigation" msgstr "" -#: lib/action.php:432 +#: lib/action.php:433 msgid "Home" msgstr "الرئيسية" -#: lib/action.php:432 +#: lib/action.php:433 msgid "Personal profile and friends timeline" msgstr "المل٠الشخصي ومسار الأصدقاء الزمني" -#: lib/action.php:434 +#: lib/action.php:435 msgid "Account" msgstr "الØساب" -#: lib/action.php:434 +#: lib/action.php:435 msgid "Change your email, avatar, password, profile" msgstr "" -#: lib/action.php:437 +#: lib/action.php:438 msgid "Connect" msgstr "اتصل" -#: lib/action.php:437 +#: lib/action.php:438 msgid "Connect to services" msgstr "" -#: lib/action.php:441 +#: lib/action.php:442 msgid "Change site configuration" msgstr "غيّر ضبط الموقع" -#: lib/action.php:445 lib/subgroupnav.php:105 +#: lib/action.php:446 lib/subgroupnav.php:105 msgid "Invite" msgstr "ادعÙ" -#: lib/action.php:446 lib/subgroupnav.php:106 +#: lib/action.php:447 lib/subgroupnav.php:106 #, php-format msgid "Invite friends and colleagues to join you on %s" msgstr "" -#: lib/action.php:451 +#: lib/action.php:452 msgid "Logout" msgstr "اخرج" -#: lib/action.php:451 +#: lib/action.php:452 msgid "Logout from the site" msgstr "اخرج من الموقع" -#: lib/action.php:456 +#: lib/action.php:457 msgid "Create an account" msgstr "أنشئ Øسابًا" -#: lib/action.php:459 +#: lib/action.php:460 msgid "Login to the site" msgstr "Ù„Ùج إلى الموقع" -#: lib/action.php:462 lib/action.php:725 +#: lib/action.php:463 lib/action.php:726 msgid "Help" msgstr "مساعدة" -#: lib/action.php:462 +#: lib/action.php:463 msgid "Help me!" msgstr "ساعدني!" -#: lib/action.php:465 lib/searchaction.php:127 +#: lib/action.php:466 lib/searchaction.php:127 msgid "Search" msgstr "ابØØ«" -#: lib/action.php:465 +#: lib/action.php:466 msgid "Search for people or text" msgstr "ابØØ« عن أشخاص أو نص" -#: lib/action.php:486 +#: lib/action.php:487 msgid "Site notice" msgstr "إشعار الموقع" -#: lib/action.php:552 +#: lib/action.php:553 msgid "Local views" msgstr "المشاهدات المØلية" -#: lib/action.php:618 +#: lib/action.php:619 msgid "Page notice" msgstr "إشعار الصÙØØ©" -#: lib/action.php:720 +#: lib/action.php:721 msgid "Secondary site navigation" msgstr "" -#: lib/action.php:727 +#: lib/action.php:728 msgid "About" msgstr "عن" -#: lib/action.php:729 +#: lib/action.php:730 msgid "FAQ" msgstr "الأسئلة المكررة" -#: lib/action.php:733 +#: lib/action.php:734 msgid "TOS" msgstr "الشروط" -#: lib/action.php:736 +#: lib/action.php:737 msgid "Privacy" msgstr "خصوصية" -#: lib/action.php:738 +#: lib/action.php:739 msgid "Source" msgstr "المصدر" -#: lib/action.php:740 +#: lib/action.php:743 msgid "Contact" msgstr "اتصل" -#: lib/action.php:742 +#: lib/action.php:745 msgid "Badge" msgstr "" -#: lib/action.php:770 +#: lib/action.php:773 msgid "StatusNet software license" msgstr "" -#: lib/action.php:773 +#: lib/action.php:776 #, php-format msgid "" "**%%site.name%%** is a microblogging service brought to you by [%%site." @@ -4041,12 +4028,12 @@ msgstr "" "**%%site.name%%** خدمة تدوين مصغر يقدمها لك [%%site.broughtby%%](%%site." "broughtbyurl%%). " -#: lib/action.php:775 +#: lib/action.php:778 #, php-format msgid "**%%site.name%%** is a microblogging service. " msgstr "" -#: lib/action.php:777 +#: lib/action.php:780 #, php-format msgid "" "It runs the [StatusNet](http://status.net/) microblogging software, version %" @@ -4057,31 +4044,31 @@ msgstr "" "المتوÙر تØت [رخصة غنو Ø£Ùيرو العمومية](http://www.fsf.org/licensing/licenses/" "agpl-3.0.html)." -#: lib/action.php:791 +#: lib/action.php:794 msgid "Site content license" msgstr "رخصة Ù…Øتوى الموقع" -#: lib/action.php:800 +#: lib/action.php:803 msgid "All " msgstr "" -#: lib/action.php:805 +#: lib/action.php:808 msgid "license." msgstr "الرخصة." -#: lib/action.php:1099 +#: lib/action.php:1102 msgid "Pagination" msgstr "" -#: lib/action.php:1108 +#: lib/action.php:1111 msgid "After" msgstr "بعد" -#: lib/action.php:1116 +#: lib/action.php:1119 msgid "Before" msgstr "قبل" -#: lib/action.php:1164 +#: lib/action.php:1167 msgid "There was a problem with your session token." msgstr "" @@ -4089,27 +4076,32 @@ msgstr "" msgid "You cannot make changes to this site." msgstr "" -#: lib/adminpanelaction.php:195 +#: lib/adminpanelaction.php:107 +#, fuzzy +msgid "Changes to that panel are not allowed." +msgstr "لا ÙŠÙØ³Ù…Ø Ø¨Ø§Ù„ØªØ³Ø¬ÙŠÙ„." + +#: lib/adminpanelaction.php:206 msgid "showForm() not implemented." msgstr "" -#: lib/adminpanelaction.php:224 +#: lib/adminpanelaction.php:235 msgid "saveSettings() not implemented." msgstr "" -#: lib/adminpanelaction.php:247 +#: lib/adminpanelaction.php:258 msgid "Unable to delete design setting." msgstr "تعذّر Øذ٠إعدادات التصميم." -#: lib/adminpanelaction.php:300 +#: lib/adminpanelaction.php:312 msgid "Basic site configuration" msgstr "ضبط الموقع الأساسي" -#: lib/adminpanelaction.php:303 +#: lib/adminpanelaction.php:317 msgid "Design configuration" msgstr "ضبط التصميم" -#: lib/adminpanelaction.php:306 lib/adminpanelaction.php:309 +#: lib/adminpanelaction.php:322 lib/adminpanelaction.php:327 msgid "Paths configuration" msgstr "ضبط المسارات" @@ -4133,11 +4125,21 @@ msgstr "" msgid "Tags for this attachment" msgstr "وسوم هذا المرÙÙ‚" +#: lib/authenticationplugin.php:182 lib/authenticationplugin.php:187 +#, fuzzy +msgid "Password changing failed" +msgstr "تغيير كلمة السر" + +#: lib/authenticationplugin.php:197 +#, fuzzy +msgid "Password changing is not allowed" +msgstr "تغيير كلمة السر" + #: lib/channel.php:138 lib/channel.php:158 msgid "Command results" msgstr "نتائج الأمر" -#: lib/channel.php:210 +#: lib/channel.php:210 lib/mailhandler.php:142 msgid "Command complete" msgstr "اكتمل الأمر" @@ -4150,18 +4152,18 @@ msgid "Sorry, this command is not yet implemented." msgstr "" #: lib/command.php:88 -#, php-format -msgid "Could not find a user with nickname %s" -msgstr "" +#, fuzzy, php-format +msgid "Could not find a user with nickname %s." +msgstr "تعذّر إيجاد المستخدم الهدÙ." #: lib/command.php:92 msgid "It does not make a lot of sense to nudge yourself!" msgstr "" #: lib/command.php:99 -#, php-format -msgid "Nudge sent to %s" -msgstr "" +#, fuzzy, php-format +msgid "Nudge sent to %s." +msgstr "أرسل التنبيه" #: lib/command.php:126 #, php-format @@ -4175,34 +4177,36 @@ msgstr "" "الإشعارات: %3$s" #: lib/command.php:152 lib/command.php:399 lib/command.php:460 -msgid "Notice with that id does not exist" -msgstr "" +#, fuzzy +msgid "Notice with that id does not exist." +msgstr "لا مل٠بهذه الهوية." #: lib/command.php:168 lib/command.php:415 lib/command.php:476 #: lib/command.php:532 -msgid "User has no last notice" +#, fuzzy +msgid "User has no last notice." msgstr "ليس للمستخدم إشعار أخير" #: lib/command.php:190 msgid "Notice marked as fave." msgstr "" -#: lib/command.php:315 -#, php-format -msgid "%1$s (%2$s)" -msgstr "%1$s (%2$s)" +#: lib/command.php:284 +#, fuzzy, php-format +msgid "Could not remove user %1$s to group %2$s." +msgstr "تعذّر إنشاء المجموعة." #: lib/command.php:318 -#, php-format -msgid "Fullname: %s" +#, fuzzy, php-format +msgid "Full name: %s" msgstr "الاسم الكامل: %s" -#: lib/command.php:321 +#: lib/command.php:321 lib/mail.php:254 #, php-format msgid "Location: %s" msgstr "الموقع: %s" -#: lib/command.php:324 +#: lib/command.php:324 lib/mail.php:256 #, php-format msgid "Homepage: %s" msgstr "الصÙØØ© الرئيسية: %s" @@ -4214,24 +4218,16 @@ msgstr "عن: %s" #: lib/command.php:358 scripts/xmppdaemon.php:301 #, php-format -msgid "Message too long - maximum is %d characters, you sent %d" +msgid "Message too long - maximum is %1$d characters, you sent %2$d." msgstr "" #: lib/command.php:378 msgid "Error sending direct message." msgstr "" -#: lib/command.php:422 -msgid "Cannot repeat your own notice" -msgstr "" - -#: lib/command.php:427 -msgid "Already repeated that notice" -msgstr "كرر بالÙعل هذا الإشعار" - #: lib/command.php:435 -#, php-format -msgid "Notice from %s repeated" +#, fuzzy, php-format +msgid "Notice from %s repeated." msgstr "الإشعار من %s مكرر" #: lib/command.php:437 @@ -4240,12 +4236,12 @@ msgstr "خطأ تكرار الإشعار." #: lib/command.php:491 #, php-format -msgid "Notice too long - maximum is %d characters, you sent %d" +msgid "Notice too long - maximum is %1$d characters, you sent %2$d." msgstr "" #: lib/command.php:500 -#, php-format -msgid "Reply to %s sent" +#, fuzzy, php-format +msgid "Reply to %s sent." msgstr "رÙد على رسالة %s" #: lib/command.php:502 @@ -4253,7 +4249,7 @@ msgid "Error saving notice." msgstr "خطأ أثناء ØÙظ الإشعار." #: lib/command.php:556 -msgid "Specify the name of the user to subscribe to" +msgid "Specify the name of the user to subscribe to." msgstr "" #: lib/command.php:563 @@ -4262,7 +4258,7 @@ msgid "Subscribed to %s" msgstr "Ù…Ùشترك ب%s" #: lib/command.php:584 -msgid "Specify the name of the user to unsubscribe from" +msgid "Specify the name of the user to unsubscribe from." msgstr "" #: lib/command.php:591 @@ -4291,17 +4287,17 @@ msgid "Can't turn on notification." msgstr "" #: lib/command.php:650 -msgid "Login command is disabled" +msgid "Login command is disabled." msgstr "" #: lib/command.php:664 -#, php-format -msgid "Could not create login token for %s" +#, fuzzy, php-format +msgid "Could not create login token for %s." msgstr "لم يمكن إنشاء توكن الولوج Ù„%s" #: lib/command.php:669 #, php-format -msgid "This link is useable only once, and is good for only 2 minutes: %s" +msgid "This link is useable only once, and is good for only 2 minutes: %s." msgstr "" #: lib/command.php:685 @@ -4501,10 +4497,6 @@ msgstr "" msgid "Describe the group or topic in %d characters" msgstr "" -#: lib/groupeditform.php:172 -msgid "Description" -msgstr "الوصÙ" - #: lib/groupeditform.php:179 msgid "" "Location for the group, if any, like \"City, State (or Region), Country\"" @@ -4663,21 +4655,9 @@ msgid "" "Change your email address or notification options at %8$s\n" msgstr "" -#: lib/mail.php:254 -#, php-format -msgid "Location: %s\n" -msgstr "الموقع: %s\n" - -#: lib/mail.php:256 -#, php-format -msgid "Homepage: %s\n" -msgstr "الصÙØØ© الرئيسية: %s\n" - #: lib/mail.php:258 -#, php-format -msgid "" -"Bio: %s\n" -"\n" +#, fuzzy, php-format +msgid "Bio: %s" msgstr "السيرة: %s\n" #: lib/mail.php:286 @@ -4812,6 +4792,27 @@ msgstr "" msgid "from" msgstr "من" +#: lib/mailhandler.php:37 +msgid "Could not parse message." +msgstr "تعذّر تØليل الرسالة." + +#: lib/mailhandler.php:42 +msgid "Not a registered user." +msgstr "ليس مستخدمًا مسجلًا." + +#: lib/mailhandler.php:46 +msgid "Sorry, that is not your incoming email address." +msgstr "" + +#: lib/mailhandler.php:50 +msgid "Sorry, no incoming email allowed." +msgstr "" + +#: lib/mailhandler.php:228 +#, fuzzy, php-format +msgid "Unsupported message type: %s" +msgstr "نسق غير مدعوم." + #: lib/mediafile.php:98 lib/mediafile.php:123 msgid "There was a database error while saving your file. Please try again." msgstr "" @@ -4843,7 +4844,7 @@ msgid "File upload stopped by extension." msgstr "" #: lib/mediafile.php:179 lib/mediafile.php:216 -msgid "File exceeds user's quota!" +msgid "File exceeds user's quota." msgstr "" #: lib/mediafile.php:196 lib/mediafile.php:233 @@ -4851,8 +4852,9 @@ msgid "File could not be moved to destination directory." msgstr "" #: lib/mediafile.php:201 lib/mediafile.php:237 -msgid "Could not determine file's mime-type!" -msgstr "" +#, fuzzy +msgid "Could not determine file's MIME type." +msgstr "تعذّر Øذ٠المÙضلة." #: lib/mediafile.php:270 #, php-format @@ -4861,7 +4863,7 @@ msgstr "" #: lib/mediafile.php:275 #, php-format -msgid "%s is not a supported filetype on this server." +msgid "%s is not a supported file type on this server." msgstr "" #: lib/messageform.php:120 @@ -4894,7 +4896,17 @@ msgid "Attach a file" msgstr "أرÙÙ‚ ملÙًا" #: lib/noticeform.php:212 -msgid "Share your location" +#, fuzzy +msgid "Share my location." +msgstr "لم يمكن ØÙظ تÙضيلات الموقع." + +#: lib/noticeform.php:214 +#, fuzzy +msgid "Do not share my location." +msgstr "لم يمكن ØÙظ تÙضيلات الموقع." + +#: lib/noticeform.php:215 +msgid "Hide this info" msgstr "" #: lib/noticelist.php:428 @@ -5011,6 +5023,11 @@ msgstr "رسائلك المÙرسلة" msgid "Tags in %s's notices" msgstr "" +#: lib/plugin.php:114 +#, fuzzy +msgid "Unknown" +msgstr "إجراء غير معروÙ" + #: lib/profileaction.php:109 lib/profileaction.php:192 lib/subgroupnav.php:82 msgid "Subscriptions" msgstr "الاشتراكات" @@ -5180,10 +5197,6 @@ msgstr "" msgid "People Tagcloud as tagged" msgstr "" -#: lib/subscriptionlist.php:126 -msgid "(none)" -msgstr "(لا شيء)" - #: lib/tagcloudsection.php:56 msgid "None" msgstr "لا شيء" @@ -5297,19 +5310,3 @@ msgstr "%s ليس لونًا صØÙŠØًا!" #, php-format msgid "%s is not a valid color! Use 3 or 6 hex chars." msgstr "" - -#: scripts/maildaemon.php:48 -msgid "Could not parse message." -msgstr "تعذّر تØليل الرسالة." - -#: scripts/maildaemon.php:53 -msgid "Not a registered user." -msgstr "ليس مستخدمًا مسجلًا." - -#: scripts/maildaemon.php:57 -msgid "Sorry, that is not your incoming email address." -msgstr "" - -#: scripts/maildaemon.php:61 -msgid "Sorry, no incoming email allowed." -msgstr "" diff --git a/locale/arz/LC_MESSAGES/statusnet.po b/locale/arz/LC_MESSAGES/statusnet.po index e37d38882..d2c7679bc 100644 --- a/locale/arz/LC_MESSAGES/statusnet.po +++ b/locale/arz/LC_MESSAGES/statusnet.po @@ -8,12 +8,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-01-03 10:37+0000\n" -"PO-Revision-Date: 2010-01-03 10:37:19+0000\n" +"POT-Creation-Date: 2010-01-10 11:27+0000\n" +"PO-Revision-Date: 2010-01-10 11:27:36+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.16alpha (r60575); Translate extension (2009-12-06)\n" +"X-Generator: MediaWiki 1.16alpha (r60888); Translate extension (2010-01-04)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: arz\n" "X-Message-Group: out-statusnet\n" @@ -51,11 +51,6 @@ msgstr "لا صÙØÙ‡ كهذه" msgid "No such user." msgstr "لا مستخدم كهذا." -#: actions/all.php:84 -#, php-format -msgid "%s and friends, page %d" -msgstr "" - #: actions/all.php:86 actions/all.php:167 actions/allrss.php:115 #: actions/apitimelinefriends.php:115 actions/apitimelinehome.php:115 #: lib/personalgroupnav.php:100 @@ -94,8 +89,8 @@ msgstr "" #: actions/all.php:134 #, php-format msgid "" -"You can try to [nudge %s](../%s) from his profile or [post something to his " -"or her attention](%%%%action.newnotice%%%%?status_textarea=%s)." +"You can try to [nudge %1$s](../%2$s) from his profile or [post something to " +"his or her attention](%%%%action.newnotice%%%%?status_textarea=%3$s)." msgstr "" #: actions/all.php:137 actions/replies.php:209 actions/showstream.php:202 @@ -120,6 +115,23 @@ msgstr "" #: actions/apiaccountupdateprofile.php:97 #: actions/apiaccountupdateprofilebackgroundimage.php:94 #: actions/apiaccountupdateprofilecolors.php:118 +#: actions/apidirectmessage.php:156 actions/apifavoritecreate.php:99 +#: actions/apifavoritedestroy.php:100 actions/apifriendshipscreate.php:100 +#: actions/apifriendshipsdestroy.php:100 actions/apifriendshipsshow.php:129 +#: actions/apigroupcreate.php:136 actions/apigroupismember.php:114 +#: actions/apigroupjoin.php:155 actions/apigroupleave.php:141 +#: actions/apigrouplist.php:132 actions/apigrouplistall.php:120 +#: actions/apigroupmembership.php:106 actions/apigroupshow.php:105 +#: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102 +#: actions/apistatusesretweets.php:112 actions/apistatusesshow.php:108 +#: actions/apistatusnetconfig.php:133 actions/apistatusnetversion.php:93 +#: actions/apisubscriptions.php:111 actions/apitimelinefavorites.php:146 +#: actions/apitimelinefriends.php:156 actions/apitimelinegroup.php:150 +#: actions/apitimelinehome.php:156 actions/apitimelinementions.php:151 +#: actions/apitimelinepublic.php:131 actions/apitimelineretweetedbyme.php:122 +#: actions/apitimelineretweetedtome.php:121 +#: actions/apitimelineretweetsofme.php:122 actions/apitimelinetag.php:141 +#: actions/apitimelineuser.php:165 actions/apiusershow.php:101 msgid "API method not found." msgstr "لم يتم العثور على وسيله API." @@ -175,6 +187,9 @@ msgstr "" #: actions/apiaccountupdateprofilebackgroundimage.php:146 #: actions/apiaccountupdateprofilecolors.php:164 #: actions/apiaccountupdateprofilecolors.php:174 +#: actions/groupdesignsettings.php:287 actions/groupdesignsettings.php:297 +#: actions/userdesignsettings.php:210 actions/userdesignsettings.php:220 +#: actions/userdesignsettings.php:263 actions/userdesignsettings.php:273 msgid "Unable to save your design settings." msgstr "" @@ -215,26 +230,6 @@ msgstr "رساله مباشره %s" msgid "All the direct messages sent to %s" msgstr "" -#: actions/apidirectmessage.php:156 actions/apifavoritecreate.php:99 -#: actions/apifavoritedestroy.php:100 actions/apifriendshipscreate.php:100 -#: actions/apifriendshipsdestroy.php:100 actions/apifriendshipsshow.php:129 -#: actions/apigroupcreate.php:136 actions/apigroupismember.php:114 -#: actions/apigroupjoin.php:155 actions/apigroupleave.php:141 -#: actions/apigrouplist.php:132 actions/apigrouplistall.php:120 -#: actions/apigroupmembership.php:106 actions/apigroupshow.php:105 -#: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102 -#: actions/apistatusesretweets.php:112 actions/apistatusesshow.php:108 -#: actions/apistatusnetconfig.php:133 actions/apistatusnetversion.php:93 -#: actions/apisubscriptions.php:111 actions/apitimelinefavorites.php:146 -#: actions/apitimelinefriends.php:156 actions/apitimelinegroup.php:150 -#: actions/apitimelinehome.php:156 actions/apitimelinementions.php:151 -#: actions/apitimelinepublic.php:131 actions/apitimelineretweetedbyme.php:122 -#: actions/apitimelineretweetedtome.php:121 -#: actions/apitimelineretweetsofme.php:122 actions/apitimelinetag.php:141 -#: actions/apitimelineuser.php:165 actions/apiusershow.php:101 -msgid "API method not found!" -msgstr "" - #: actions/apidirectmessagenew.php:126 msgid "No message text!" msgstr "لا نص ÙÙ‰ الرسالة!" @@ -258,15 +253,17 @@ msgid "No status found with that ID." msgstr "" #: actions/apifavoritecreate.php:119 -msgid "This status is already a favorite!" -msgstr "" +#, fuzzy +msgid "This status is already a favorite." +msgstr "هذا الإشعار Ù…Ùضله مسبقًا!" #: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:176 msgid "Could not create favorite." msgstr "تعذّر إنشاء Ù…Ùضله." #: actions/apifavoritedestroy.php:122 -msgid "That status is not a favorite!" +#, fuzzy +msgid "That status is not a favorite." msgstr "تلك الØاله ليست Ù…Ùضلة!" #: actions/apifavoritedestroy.php:134 actions/disfavor.php:87 @@ -287,8 +284,9 @@ msgid "Could not unfollow user: User not found." msgstr "" #: actions/apifriendshipsdestroy.php:120 -msgid "You cannot unfollow yourself!" -msgstr "" +#, fuzzy +msgid "You cannot unfollow yourself." +msgstr "لا يمكنك منع Ù†Ùسك!" #: actions/apifriendshipsexists.php:94 msgid "Two user ids or screen_names must be supplied." @@ -372,7 +370,7 @@ msgstr "" msgid "Group not found!" msgstr "لم توجد المجموعة!" -#: actions/apigroupjoin.php:110 +#: actions/apigroupjoin.php:110 actions/joingroup.php:90 lib/command.php:217 msgid "You are already a member of that group." msgstr "" @@ -380,30 +378,25 @@ msgstr "" msgid "You have been blocked from that group by the admin." msgstr "" -#: actions/apigroupjoin.php:138 -#, php-format -msgid "Could not join user %s to group %s." -msgstr "" +#: actions/apigroupjoin.php:138 actions/joingroup.php:128 lib/command.php:234 +#, fuzzy, php-format +msgid "Could not join user %1$s to group %2$s." +msgstr "تعذّر إنشاء المجموعه." #: actions/apigroupleave.php:114 msgid "You are not a member of this group." msgstr "" -#: actions/apigroupleave.php:124 -#, php-format -msgid "Could not remove user %s to group %s." -msgstr "" +#: actions/apigroupleave.php:124 actions/leavegroup.php:127 +#, fuzzy, php-format +msgid "Could not remove user %1$s from group %2$s." +msgstr "تعذّر إنشاء المجموعه." #: actions/apigrouplist.php:95 #, php-format msgid "%s's groups" msgstr "مجموعات %s" -#: actions/apigrouplist.php:103 -#, php-format -msgid "Groups %s is a member of on %s." -msgstr "" - #: actions/apigrouplistall.php:90 actions/usergroups.php:62 #, php-format msgid "%s groups" @@ -427,11 +420,11 @@ msgstr "" msgid "No such notice." msgstr "لا إشعار كهذا." -#: actions/apistatusesretweet.php:83 +#: actions/apistatusesretweet.php:83 lib/command.php:422 msgid "Cannot repeat your own notice." msgstr "لا يمكنك تكرار ملØوظتك الخاصه." -#: actions/apistatusesretweet.php:91 +#: actions/apistatusesretweet.php:91 lib/command.php:427 msgid "Already repeated that notice." msgstr "كرر بالÙعل هذه الملاØظه." @@ -444,7 +437,7 @@ msgid "No status with that ID found." msgstr "" #: actions/apistatusesupdate.php:157 actions/newnotice.php:155 -#: scripts/maildaemon.php:71 +#: lib/mailhandler.php:60 #, php-format msgid "That's too long. Max notice size is %d chars." msgstr "" @@ -464,12 +457,12 @@ msgstr "نسق غير مدعوم." #: actions/apitimelinefavorites.php:108 #, php-format -msgid "%s / Favorites from %s" +msgid "%1$s / Favorites from %2$s" msgstr "" #: actions/apitimelinefavorites.php:120 #, php-format -msgid "%s updates favorited by %s / %s." +msgid "%1$s updates favorited by %2$s / %2$s." msgstr "" #: actions/apitimelinegroup.php:109 actions/apitimelineuser.php:118 @@ -537,8 +530,11 @@ msgstr "لم يوجد." msgid "No such attachment." msgstr "لا مرÙÙ‚ كهذا." -#: actions/avatarbynickname.php:59 actions/grouprss.php:91 -#: actions/leavegroup.php:76 +#: actions/avatarbynickname.php:59 actions/blockedfromgroup.php:73 +#: actions/editgroup.php:84 actions/groupdesignsettings.php:84 +#: actions/grouplogo.php:86 actions/groupmembers.php:76 +#: actions/grouprss.php:91 actions/joingroup.php:76 actions/leavegroup.php:76 +#: actions/showgroup.php:121 msgid "No nickname." msgstr "لا اسم مستعار." @@ -561,8 +557,8 @@ msgid "You can upload your personal avatar. The maximum file size is %s." msgstr "" #: actions/avatarsettings.php:106 actions/avatarsettings.php:185 -#: actions/grouplogo.php:178 actions/remotesubscribe.php:191 -#: actions/userauthorization.php:72 actions/userrss.php:103 +#: actions/remotesubscribe.php:191 actions/userauthorization.php:72 +#: actions/userrss.php:103 msgid "User without matching profile" msgstr "" @@ -594,9 +590,9 @@ msgstr "ارÙع" msgid "Crop" msgstr "" -#: actions/avatarsettings.php:268 actions/disfavor.php:74 -#: actions/emailsettings.php:238 actions/favor.php:75 actions/geocode.php:50 -#: actions/groupblock.php:66 actions/grouplogo.php:309 +#: actions/avatarsettings.php:268 actions/deletenotice.php:157 +#: actions/disfavor.php:74 actions/emailsettings.php:238 actions/favor.php:75 +#: actions/geocode.php:50 actions/groupblock.php:66 actions/grouplogo.php:309 #: actions/groupunblock.php:66 actions/imsettings.php:206 #: actions/invite.php:56 actions/login.php:135 actions/makeadmin.php:66 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80 @@ -675,19 +671,15 @@ msgstr "امنع هذا المستخدم" msgid "Failed to save block information." msgstr "Ùشل ØÙظ معلومات المنع." -#: actions/blockedfromgroup.php:73 actions/editgroup.php:84 -#: actions/groupdesignsettings.php:84 actions/grouplogo.php:86 -#: actions/groupmembers.php:76 actions/joingroup.php:76 -#: actions/showgroup.php:121 -msgid "No nickname" -msgstr "لا اسم مستعار" - #: actions/blockedfromgroup.php:80 actions/editgroup.php:96 +#: actions/foafgroup.php:44 actions/foafgroup.php:62 actions/groupblock.php:86 #: actions/groupbyid.php:83 actions/groupdesignsettings.php:97 #: actions/grouplogo.php:99 actions/groupmembers.php:83 -#: actions/joingroup.php:83 actions/showgroup.php:137 -msgid "No such group" -msgstr "لا مجموعه كهذه" +#: actions/grouprss.php:98 actions/groupunblock.php:86 +#: actions/joingroup.php:83 actions/leavegroup.php:83 actions/makeadmin.php:86 +#: actions/showgroup.php:137 lib/command.php:212 lib/command.php:263 +msgid "No such group." +msgstr "لا مجموعه كهذه." #: actions/blockedfromgroup.php:90 #, php-format @@ -695,9 +687,9 @@ msgid "%s blocked profiles" msgstr "" #: actions/blockedfromgroup.php:93 -#, php-format -msgid "%s blocked profiles, page %d" -msgstr "" +#, fuzzy, php-format +msgid "%1$s blocked profiles, page %2$d" +msgstr "مشتركو %sØŒ الصÙØÙ‡ %d" #: actions/blockedfromgroup.php:108 msgid "A list of the users blocked from joining this group." @@ -807,10 +799,6 @@ msgstr "لا تØذ٠هذا الإشعار" msgid "Delete this notice" msgstr "اØذ٠هذا الإشعار" -#: actions/deletenotice.php:157 -msgid "There was a problem with your session token. Try again, please." -msgstr "" - #: actions/deleteuser.php:67 msgid "You cannot delete users." msgstr "لا يمكنك Øذ٠المستخدمين." @@ -834,7 +822,7 @@ msgid "Delete this user" msgstr "اØذ٠هذا المستخدم" #: actions/designadminpanel.php:62 lib/accountsettingsaction.php:124 -#: lib/adminpanelaction.php:302 lib/groupnav.php:119 +#: lib/adminpanelaction.php:316 lib/groupnav.php:119 msgid "Design" msgstr "التصميم" @@ -972,7 +960,8 @@ msgstr "يجب أن تكون والجًا لتنشئ مجموعه." #: actions/editgroup.php:103 actions/editgroup.php:168 #: actions/groupdesignsettings.php:104 actions/grouplogo.php:106 -msgid "You must be an admin to edit the group" +#, fuzzy +msgid "You must be an admin to edit the group." msgstr "يجب أن تكون إداريًا لتعدّل المجموعة" #: actions/editgroup.php:154 @@ -997,7 +986,8 @@ msgid "Options saved." msgstr "ØÙÙظت الخيارات." #: actions/emailsettings.php:60 -msgid "Email Settings" +#, fuzzy +msgid "Email settings" msgstr "إعدادات البريد الإلكتروني" #: actions/emailsettings.php:71 @@ -1032,8 +1022,9 @@ msgid "Cancel" msgstr "ألغÙ" #: actions/emailsettings.php:121 -msgid "Email Address" -msgstr "عنوان البريد الإلكتروني" +#, fuzzy +msgid "Email address" +msgstr "عناوين البريد الإلكتروني" #: actions/emailsettings.php:123 msgid "Email address, like \"UserName@example.org\"" @@ -1106,9 +1097,10 @@ msgstr "لا عنوان بريد إلكترونى." msgid "Cannot normalize that email address" msgstr "" -#: actions/emailsettings.php:331 actions/siteadminpanel.php:157 -msgid "Not a valid email address" -msgstr "ليس عنوان بريد صالØ" +#: actions/emailsettings.php:331 actions/register.php:201 +#: actions/siteadminpanel.php:157 +msgid "Not a valid email address." +msgstr "ليس عنوان بريد صالØ." #: actions/emailsettings.php:334 msgid "That is already your email address." @@ -1282,18 +1274,11 @@ msgstr "" msgid "Error updating remote profile" msgstr "خطأ أثناء تØديث المل٠الشخصى البعيد" -#: actions/foafgroup.php:44 actions/foafgroup.php:62 actions/groupblock.php:86 -#: actions/grouprss.php:98 actions/groupunblock.php:86 -#: actions/leavegroup.php:83 actions/makeadmin.php:86 lib/command.php:212 -#: lib/command.php:263 -msgid "No such group." -msgstr "لا مجموعه كهذه." - -#: actions/getfile.php:75 +#: actions/getfile.php:79 msgid "No such file." msgstr "لا مل٠كهذا." -#: actions/getfile.php:79 +#: actions/getfile.php:83 msgid "Cannot read file." msgstr "تعذّرت قراءه الملÙ." @@ -1305,7 +1290,7 @@ msgstr "لا مل٠شخصى Ù…ÙØدّد." #: actions/groupblock.php:76 actions/groupunblock.php:76 #: actions/makeadmin.php:76 actions/subedit.php:53 actions/tagother.php:46 -#: lib/profileformaction.php:77 +#: actions/unsubscribe.php:84 lib/profileformaction.php:77 msgid "No profile with that ID." msgstr "لا مل٠شخصى بهذه الهويه." @@ -1333,9 +1318,9 @@ msgstr "امنع المستخدم من المجموعة" #: actions/groupblock.php:162 #, php-format msgid "" -"Are you sure you want to block user \"%s\" from the group \"%s\"? They will " -"be removed from the group, unable to post, and unable to subscribe to the " -"group in the future." +"Are you sure you want to block user \"%1$s\" from the group \"%2$s\"? They " +"will be removed from the group, unable to post, and unable to subscribe to " +"the group in the future." msgstr "" #: actions/groupblock.php:178 @@ -1350,9 +1335,9 @@ msgstr "امنع هذا المستخدم من هذه المجموعة" msgid "Database error blocking user from group." msgstr "خطأ ÙÙ‰ قاعده البيانات أثناء منع المستخدم من المجموعه." -#: actions/groupbyid.php:74 -msgid "No ID" -msgstr "لا هوية" +#: actions/groupbyid.php:74 actions/userbyid.php:70 +msgid "No ID." +msgstr "لا هويه." #: actions/groupdesignsettings.php:68 msgid "You must be logged in to edit a group." @@ -1373,12 +1358,6 @@ msgstr "" msgid "Couldn't update your design." msgstr "تعذّر تØديث تصميمك." -#: actions/groupdesignsettings.php:287 actions/groupdesignsettings.php:297 -#: actions/userdesignsettings.php:210 actions/userdesignsettings.php:220 -#: actions/userdesignsettings.php:263 actions/userdesignsettings.php:273 -msgid "Unable to save your design settings!" -msgstr "" - #: actions/groupdesignsettings.php:308 actions/userdesignsettings.php:231 msgid "Design preferences saved." msgstr "" @@ -1393,6 +1372,11 @@ msgid "" "You can upload a logo image for your group. The maximum file size is %s." msgstr "" +#: actions/grouplogo.php:178 +#, fuzzy +msgid "User without matching profile." +msgstr "ليس للمستخدم مل٠شخصى." + #: actions/grouplogo.php:362 msgid "Pick a square area of the image to be the logo." msgstr "" @@ -1411,15 +1395,15 @@ msgid "%s group members" msgstr "أعضاء مجموعه %s" #: actions/groupmembers.php:96 -#, php-format -msgid "%s group members, page %d" -msgstr "" +#, fuzzy, php-format +msgid "%1$s group members, page %2$d" +msgstr "مجموعات %sØŒ صÙØÙ‡ %d" #: actions/groupmembers.php:111 msgid "A list of the users in this group." msgstr "قائمه بمستخدمى هذه المجموعه." -#: actions/groupmembers.php:175 lib/action.php:441 lib/groupnav.php:107 +#: actions/groupmembers.php:175 lib/action.php:442 lib/groupnav.php:107 msgid "Admin" msgstr "إداري" @@ -1511,7 +1495,8 @@ msgid "Error removing the block." msgstr "خطأ أثناء منع الØجب." #: actions/imsettings.php:59 -msgid "IM Settings" +#, fuzzy +msgid "IM settings" msgstr "إعدادات المراسله الÙورية" #: actions/imsettings.php:70 @@ -1537,7 +1522,8 @@ msgid "" msgstr "" #: actions/imsettings.php:124 -msgid "IM Address" +#, fuzzy +msgid "IM address" msgstr "عنوان المراسله الÙورية" #: actions/imsettings.php:126 @@ -1594,11 +1580,6 @@ msgstr "" msgid "That is not your Jabber ID." msgstr "هذه ليست هويتك ÙÙ‰ جابر." -#: actions/inbox.php:59 -#, php-format -msgid "Inbox for %s - page %d" -msgstr "" - #: actions/inbox.php:62 #, php-format msgid "Inbox for %s" @@ -1634,10 +1615,10 @@ msgstr "دعوه مستخدمين جدد" msgid "You are already subscribed to these users:" msgstr "" -#: actions/invite.php:131 actions/invite.php:139 +#: actions/invite.php:131 actions/invite.php:139 lib/command.php:315 #, php-format -msgid "%s (%s)" -msgstr "%s (%s)" +msgid "%1$s (%2$s)" +msgstr "%1$s (%2$s)" #: actions/invite.php:136 msgid "" @@ -1675,7 +1656,7 @@ msgstr "رساله شخصية" msgid "Optionally add a personal message to the invitation." msgstr "" -#: actions/invite.php:197 lib/messageform.php:178 lib/noticeform.php:232 +#: actions/invite.php:197 lib/messageform.php:178 lib/noticeform.php:234 msgid "Send" msgstr "أرسل" @@ -1719,18 +1700,9 @@ msgstr "" msgid "You must be logged in to join a group." msgstr "" -#: actions/joingroup.php:90 lib/command.php:217 -msgid "You are already a member of that group" -msgstr "" - -#: actions/joingroup.php:128 lib/command.php:234 -#, php-format -msgid "Could not join user %s to group %s" -msgstr "" - #: actions/joingroup.php:135 lib/command.php:239 -#, php-format -msgid "%s joined group %s" +#, fuzzy, php-format +msgid "%1$s joined group %2$s" msgstr "%s انضم إلى مجموعه %s" #: actions/leavegroup.php:60 @@ -1745,15 +1717,10 @@ msgstr "لست عضوا ÙÙ‰ تلك المجموعه." msgid "Could not find membership record." msgstr "" -#: actions/leavegroup.php:127 lib/command.php:284 -#, php-format -msgid "Could not remove user %s to group %s" -msgstr "" - #: actions/leavegroup.php:134 lib/command.php:289 -#, php-format -msgid "%s left group %s" -msgstr "" +#, fuzzy, php-format +msgid "%1$s left group %2$s" +msgstr "%s انضم إلى مجموعه %s" #: actions/login.php:83 actions/register.php:137 msgid "Already logged in." @@ -1771,7 +1738,7 @@ msgstr "اسم المستخدم أو كلمه السر غير صØÙŠØان." msgid "Error setting user. You are probably not authorized." msgstr "خطأ أثناء ضبط المستخدم. لست Ù…ÙصرØًا على الأرجØ." -#: actions/login.php:208 actions/login.php:261 lib/action.php:459 +#: actions/login.php:208 actions/login.php:261 lib/action.php:460 #: lib/logingroupnav.php:79 msgid "Login" msgstr "Ù„Ùج" @@ -1822,18 +1789,18 @@ msgstr "" #: actions/makeadmin.php:95 #, php-format -msgid "%s is already an admin for group \"%s\"." +msgid "%1$s is already an admin for group \"%2$s\"." msgstr "" #: actions/makeadmin.php:132 -#, php-format -msgid "Can't get membership record for %s in group %s" -msgstr "" +#, fuzzy, php-format +msgid "Can't get membership record for %1$s in group %2$s." +msgstr "تعذّر إنشاء المجموعه." #: actions/makeadmin.php:145 -#, php-format -msgid "Can't make %s an admin for group %s" -msgstr "" +#, fuzzy, php-format +msgid "Can't make %1$s an admin for group %2$s." +msgstr "تعذّر إنشاء المجموعه." #: actions/microsummary.php:69 msgid "No current status" @@ -1874,9 +1841,9 @@ msgid "Message sent" msgstr "Ø£Ùرسلت الرسالة" #: actions/newmessage.php:185 lib/command.php:376 -#, php-format -msgid "Direct message to %s sent" -msgstr "" +#, fuzzy, php-format +msgid "Direct message to %s sent." +msgstr "رساله مباشره %s" #: actions/newmessage.php:210 actions/newnotice.php:245 lib/channel.php:170 msgid "Ajax Error" @@ -1902,8 +1869,8 @@ msgid "Text search" msgstr "بØØ« ÙÙ‰ النصوص" #: actions/noticesearch.php:91 -#, php-format -msgid "Search results for \"%s\" on %s" +#, fuzzy, php-format +msgid "Search results for \"%1$s\" on %2$s" msgstr "نتائج البØØ« عن \"%s\" ÙÙ‰ %s" #: actions/noticesearch.php:121 @@ -2005,11 +1972,6 @@ msgstr "أظهر أو أخÙ٠تصاميم الملÙات الشخصيه." msgid "URL shortening service is too long (max 50 chars)." msgstr "" -#: actions/outbox.php:58 -#, php-format -msgid "Outbox for %s - page %d" -msgstr "" - #: actions/outbox.php:61 #, php-format msgid "Outbox for %s" @@ -2080,7 +2042,7 @@ msgstr "تعذّر ØÙظ كلمه السر الجديده." msgid "Password saved." msgstr "ØÙÙظت كلمه السر." -#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:308 +#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:326 msgid "Paths" msgstr "المسارات" @@ -2113,7 +2075,7 @@ msgid "Invalid SSL server. The maximum length is 255 characters." msgstr "" #: actions/pathsadminpanel.php:217 actions/siteadminpanel.php:58 -#: lib/adminpanelaction.php:299 +#: lib/adminpanelaction.php:311 msgid "Site" msgstr "الموقع" @@ -2206,7 +2168,8 @@ msgid "When to use SSL" msgstr "" #: actions/pathsadminpanel.php:308 -msgid "SSL Server" +#, fuzzy +msgid "SSL server" msgstr "خادوم SSL" #: actions/pathsadminpanel.php:309 @@ -2235,7 +2198,7 @@ msgstr "ليس وسم أشخاص صالØ: %s" #: actions/peopletag.php:144 #, php-format -msgid "Users self-tagged with %s - page %d" +msgid "Users self-tagged with %1$s - page %2$d" msgstr "" #: actions/postnotice.php:84 @@ -2244,7 +2207,7 @@ msgstr "Ù…Øتوى إشعار غير صالØ" #: actions/postnotice.php:90 #, php-format -msgid "Notice license ‘%s’ is not compatible with site license ‘%s’." +msgid "Notice license ‘%1$s’ is not compatible with site license ‘%2$s’." msgstr "" #: actions/profilesettings.php:60 @@ -2361,19 +2324,19 @@ msgstr "وسم غير صالØ: \"%s\"" msgid "Couldn't update user for autosubscribe." msgstr "" -#: actions/profilesettings.php:354 +#: actions/profilesettings.php:359 msgid "Couldn't save location prefs." msgstr "لم يمكن ØÙظ تÙضيلات الموقع." -#: actions/profilesettings.php:366 +#: actions/profilesettings.php:371 msgid "Couldn't save profile." msgstr "تعذّر ØÙظ المل٠الشخصى." -#: actions/profilesettings.php:374 +#: actions/profilesettings.php:379 msgid "Couldn't save tags." msgstr "تعذّر ØÙظ الوسوم." -#: actions/profilesettings.php:382 lib/adminpanelaction.php:126 +#: actions/profilesettings.php:387 lib/adminpanelaction.php:137 msgid "Settings saved." msgstr "ØÙÙظت الإعدادات." @@ -2472,7 +2435,7 @@ msgid "" "one!" msgstr "" -#: actions/publictagcloud.php:135 +#: actions/publictagcloud.php:131 msgid "Tag cloud" msgstr "سØابه الوسوم" @@ -2608,7 +2571,7 @@ msgstr "عذرا، رمز دعوه غير صالØ." msgid "Registration successful" msgstr "Ù†Ø¬Ø Ø§Ù„ØªØ³Ø¬ÙŠÙ„" -#: actions/register.php:114 actions/register.php:502 lib/action.php:456 +#: actions/register.php:114 actions/register.php:502 lib/action.php:457 #: lib/logingroupnav.php:85 msgid "Register" msgstr "سجّل" @@ -2621,10 +2584,6 @@ msgstr "لا ÙŠÙØ³Ù…Ø Ø¨Ø§Ù„ØªØ³Ø¬ÙŠÙ„." msgid "You can't register if you don't agree to the license." msgstr "" -#: actions/register.php:201 -msgid "Not a valid email address." -msgstr "ليس عنوان بريد صالØ." - #: actions/register.php:212 msgid "Email address already exists." msgstr "عنوان البريد الإلكترونى موجود مسبقًا." @@ -2681,10 +2640,10 @@ msgstr "" #: actions/register.php:537 #, php-format msgid "" -"Congratulations, %s! And welcome to %%%%site.name%%%%. From here, you may " +"Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may " "want to...\n" "\n" -"* Go to [your profile](%s) and post your first message.\n" +"* Go to [your profile](%2$s) and post your first message.\n" "* Add a [Jabber/GTalk address](%%%%action.imsettings%%%%) so you can send " "notices through instant messages.\n" "* [Search for people](%%%%action.peoplesearch%%%%) that you may know or that " @@ -2786,11 +2745,6 @@ msgstr "مكرر!" msgid "Replies to %s" msgstr "الردود على %s" -#: actions/replies.php:127 -#, php-format -msgid "Replies to %s, page %d" -msgstr "الردود على %sØŒ الصÙØÙ‡ %d" - #: actions/replies.php:144 #, php-format msgid "Replies feed for %s (RSS 1.0)" @@ -2809,8 +2763,8 @@ msgstr "" #: actions/replies.php:198 #, php-format msgid "" -"This is the timeline showing replies to %s but %s hasn't received a notice " -"to his attention yet." +"This is the timeline showing replies to %1$s but %2$s hasn't received a " +"notice to his attention yet." msgstr "" #: actions/replies.php:203 @@ -2823,8 +2777,8 @@ msgstr "" #: actions/replies.php:205 #, php-format msgid "" -"You can try to [nudge %s](../%s) or [post something to his or her attention]" -"(%%%%action.newnotice%%%%?status_textarea=%s)." +"You can try to [nudge %1$s](../%2$s) or [post something to his or her " +"attention](%%%%action.newnotice%%%%?status_textarea=%3$s)." msgstr "" #: actions/repliesrss.php:72 @@ -2840,11 +2794,6 @@ msgstr "" msgid "User is already sandboxed." msgstr "" -#: actions/showfavorites.php:79 -#, php-format -msgid "%s's favorite notices, page %d" -msgstr "" - #: actions/showfavorites.php:132 msgid "Could not retrieve favorite notices." msgstr "" @@ -2898,11 +2847,6 @@ msgstr "إنها Ø¥Øدى وسائل مشاركه ما تØب." msgid "%s group" msgstr "مجموعه %s" -#: actions/showgroup.php:84 -#, php-format -msgid "%s group, page %d" -msgstr "" - #: actions/showgroup.php:218 msgid "Group profile" msgstr "مل٠المجموعه الشخصي" @@ -2951,7 +2895,7 @@ msgstr "الأعضاء" #: actions/showgroup.php:386 lib/profileaction.php:117 #: lib/profileaction.php:148 lib/profileaction.php:236 lib/section.php:95 -#: lib/tagcloudsection.php:71 +#: lib/subscriptionlist.php:126 lib/tagcloudsection.php:71 msgid "(None)" msgstr "(لا شيء)" @@ -3017,14 +2961,9 @@ msgstr "ØÙذ٠الإشعار." msgid " tagged %s" msgstr "" -#: actions/showstream.php:79 -#, php-format -msgid "%s, page %d" -msgstr "" - #: actions/showstream.php:122 #, php-format -msgid "Notice feed for %s tagged %s (RSS 1.0)" +msgid "Notice feed for %1$s tagged %2$s (RSS 1.0)" msgstr "" #: actions/showstream.php:129 @@ -3049,7 +2988,7 @@ msgstr "" #: actions/showstream.php:191 #, php-format -msgid "This is the timeline for %s but %s hasn't posted anything yet." +msgid "This is the timeline for %1$s but %2$s hasn't posted anything yet." msgstr "" #: actions/showstream.php:196 @@ -3061,8 +3000,8 @@ msgstr "" #: actions/showstream.php:198 #, php-format msgid "" -"You can try to nudge %s or [post something to his or her attention](%%%%" -"action.newnotice%%%%?status_textarea=%s)." +"You can try to nudge %1$s or [post something to his or her attention](%%%%" +"action.newnotice%%%%?status_textarea=%2$s)." msgstr "" #: actions/showstream.php:234 @@ -3104,12 +3043,13 @@ msgid "Site name must have non-zero length." msgstr "يجب ألا يكون طول اسم الموقع صÙرًا." #: actions/siteadminpanel.php:154 -msgid "You must have a valid contact email address" +#, fuzzy +msgid "You must have a valid contact email address." msgstr "يجب أن تملك عنوان بريد إلكترونى ØµØ§Ù„Ø Ù„Ù„Ø§ØªØµØ§Ù„" #: actions/siteadminpanel.php:172 -#, php-format -msgid "Unknown language \"%s\"" +#, fuzzy, php-format +msgid "Unknown language \"%s\"." msgstr "لغه غير معروÙÙ‡ \"%s\"" #: actions/siteadminpanel.php:179 @@ -3289,7 +3229,8 @@ msgid "Save site settings" msgstr "اذ٠إعدادت الموقع" #: actions/smssettings.php:58 -msgid "SMS Settings" +#, fuzzy +msgid "SMS settings" msgstr "إعدادات الرسائل القصيرة" #: actions/smssettings.php:69 @@ -3318,8 +3259,9 @@ msgid "Enter the code you received on your phone." msgstr "" #: actions/smssettings.php:138 -msgid "SMS Phone number" -msgstr "" +#, fuzzy +msgid "SMS phone number" +msgstr "لا رقم هاتÙ." #: actions/smssettings.php:140 msgid "Phone number, no punctuation or spaces, with area code" @@ -3402,8 +3344,8 @@ msgid "%s subscribers" msgstr "مشتركو %s" #: actions/subscribers.php:52 -#, php-format -msgid "%s subscribers, page %d" +#, fuzzy, php-format +msgid "%1$s subscribers, page %2$d" msgstr "مشتركو %sØŒ الصÙØÙ‡ %d" #: actions/subscribers.php:63 @@ -3439,8 +3381,8 @@ msgid "%s subscriptions" msgstr "اشتراكات %s" #: actions/subscriptions.php:54 -#, php-format -msgid "%s subscriptions, page %d" +#, fuzzy, php-format +msgid "%1$s subscriptions, page %2$d" msgstr "اشتراكات %sØŒ الصÙØÙ‡ %d" #: actions/subscriptions.php:65 @@ -3475,11 +3417,6 @@ msgstr "جابر" msgid "SMS" msgstr "رسائل قصيرة" -#: actions/tag.php:68 -#, php-format -msgid "Notices tagged with %s, page %d" -msgstr "" - #: actions/tag.php:86 #, php-format msgid "Notice feed for tag %s (RSS 1.0)" @@ -3559,20 +3496,17 @@ msgstr "المستخدم ليس Ù…Ùسكتًا." msgid "No profile id in request." msgstr "" -#: actions/unsubscribe.php:84 -msgid "No profile with that id." -msgstr "لا مل٠بهذه الهويه." - #: actions/unsubscribe.php:98 msgid "Unsubscribed" msgstr "" #: actions/updateprofile.php:62 actions/userauthorization.php:330 #, php-format -msgid "Listenee stream license ‘%s’ is not compatible with site license ‘%s’." +msgid "" +"Listenee stream license ‘%1$s’ is not compatible with site license ‘%2$s’." msgstr "" -#: actions/useradminpanel.php:58 lib/adminpanelaction.php:305 +#: actions/useradminpanel.php:58 lib/adminpanelaction.php:321 #: lib/personalgroupnav.php:115 msgid "User" msgstr "المستخدم" @@ -3670,7 +3604,7 @@ msgid "" "click “Rejectâ€." msgstr "" -#: actions/userauthorization.php:188 +#: actions/userauthorization.php:188 actions/version.php:165 msgid "License" msgstr "الرخصة" @@ -3719,7 +3653,7 @@ msgstr "" #: actions/userauthorization.php:296 #, php-format -msgid "Listener URI ‘%s’ not found here" +msgid "Listener URI ‘%s’ not found here." msgstr "" #: actions/userauthorization.php:301 @@ -3752,10 +3686,6 @@ msgstr "" msgid "Wrong image type for avatar URL ‘%s’." msgstr "" -#: actions/userbyid.php:70 -msgid "No ID." -msgstr "لا هويه." - #: actions/userdesignsettings.php:76 lib/designsettings.php:65 msgid "Profile design" msgstr "تصميم المل٠الشخصي" @@ -3770,11 +3700,6 @@ msgstr "" msgid "Enjoy your hotdog!" msgstr "استمتع بالنقانق!" -#: actions/usergroups.php:64 -#, php-format -msgid "%s groups, page %d" -msgstr "مجموعات %sØŒ صÙØÙ‡ %d" - #: actions/usergroups.php:130 msgid "Search for more groups" msgstr "" @@ -3789,6 +3714,73 @@ msgstr "" msgid "Try [searching for groups](%%action.groupsearch%%) and joining them." msgstr "" +#: actions/version.php:73 +#, fuzzy, php-format +msgid "StatusNet %s" +msgstr "Ø¥Øصاءات" + +#: actions/version.php:153 +#, php-format +msgid "" +"This site is powered by %1$s version %2$s, Copyright 2008-2010 StatusNet, " +"Inc. and contributors." +msgstr "" + +#: actions/version.php:157 +#, fuzzy +msgid "StatusNet" +msgstr "ØÙØ°ÙÙت الØاله." + +#: actions/version.php:161 +msgid "Contributors" +msgstr "" + +#: actions/version.php:168 +msgid "" +"StatusNet is free software: you can redistribute it and/or modify it under " +"the terms of the GNU Affero General Public License as published by the Free " +"Software Foundation, either version 3 of the License, or (at your option) " +"any later version. " +msgstr "" + +#: actions/version.php:174 +msgid "" +"This program is distributed in the hope that it will be useful, but WITHOUT " +"ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or " +"FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License " +"for more details. " +msgstr "" + +#: actions/version.php:180 +#, php-format +msgid "" +"You should have received a copy of the GNU Affero General Public License " +"along with this program. If not, see %s." +msgstr "" + +#: actions/version.php:189 +msgid "Plugins" +msgstr "" + +#: actions/version.php:195 +#, fuzzy +msgid "Name" +msgstr "الاسم المستعار" + +#: actions/version.php:196 lib/action.php:741 +#, fuzzy +msgid "Version" +msgstr "الجلسات" + +#: actions/version.php:197 +#, fuzzy +msgid "Author(s)" +msgstr "المؤلÙ" + +#: actions/version.php:198 lib/groupeditform.php:172 +msgid "Description" +msgstr "الوصÙ" + #: classes/File.php:137 #, php-format msgid "" @@ -3855,7 +3847,7 @@ msgstr "مشكله أثناء ØÙظ الإشعار." msgid "DB error inserting reply: %s" msgstr "" -#: classes/Notice.php:1361 +#: classes/Notice.php:1359 #, php-format msgid "RT @%1$s %2$s" msgstr "آر تى @%1$s %2$s" @@ -3901,137 +3893,132 @@ msgstr "أخرى" msgid "Other options" msgstr "خيارات أخرى" -#: lib/action.php:144 -#, php-format -msgid "%s - %s" -msgstr "%s - %s" - #: lib/action.php:159 msgid "Untitled page" msgstr "صÙØÙ‡ غير Ù…Ùعنونة" -#: lib/action.php:426 +#: lib/action.php:427 msgid "Primary site navigation" msgstr "" -#: lib/action.php:432 +#: lib/action.php:433 msgid "Home" msgstr "الرئيسية" -#: lib/action.php:432 +#: lib/action.php:433 msgid "Personal profile and friends timeline" msgstr "المل٠الشخصى ومسار الأصدقاء الزمني" -#: lib/action.php:434 +#: lib/action.php:435 msgid "Account" msgstr "الØساب" -#: lib/action.php:434 +#: lib/action.php:435 msgid "Change your email, avatar, password, profile" msgstr "" -#: lib/action.php:437 +#: lib/action.php:438 msgid "Connect" msgstr "اتصل" -#: lib/action.php:437 +#: lib/action.php:438 msgid "Connect to services" msgstr "" -#: lib/action.php:441 +#: lib/action.php:442 msgid "Change site configuration" msgstr "غيّر ضبط الموقع" -#: lib/action.php:445 lib/subgroupnav.php:105 +#: lib/action.php:446 lib/subgroupnav.php:105 msgid "Invite" msgstr "ادعÙ" -#: lib/action.php:446 lib/subgroupnav.php:106 +#: lib/action.php:447 lib/subgroupnav.php:106 #, php-format msgid "Invite friends and colleagues to join you on %s" msgstr "" -#: lib/action.php:451 +#: lib/action.php:452 msgid "Logout" msgstr "اخرج" -#: lib/action.php:451 +#: lib/action.php:452 msgid "Logout from the site" msgstr "اخرج من الموقع" -#: lib/action.php:456 +#: lib/action.php:457 msgid "Create an account" msgstr "أنشئ Øسابًا" -#: lib/action.php:459 +#: lib/action.php:460 msgid "Login to the site" msgstr "Ù„Ùج إلى الموقع" -#: lib/action.php:462 lib/action.php:725 +#: lib/action.php:463 lib/action.php:726 msgid "Help" msgstr "مساعدة" -#: lib/action.php:462 +#: lib/action.php:463 msgid "Help me!" msgstr "ساعدني!" -#: lib/action.php:465 lib/searchaction.php:127 +#: lib/action.php:466 lib/searchaction.php:127 msgid "Search" msgstr "ابØØ«" -#: lib/action.php:465 +#: lib/action.php:466 msgid "Search for people or text" msgstr "ابØØ« عن أشخاص أو نص" -#: lib/action.php:486 +#: lib/action.php:487 msgid "Site notice" msgstr "إشعار الموقع" -#: lib/action.php:552 +#: lib/action.php:553 msgid "Local views" msgstr "المشاهدات المØلية" -#: lib/action.php:618 +#: lib/action.php:619 msgid "Page notice" msgstr "إشعار الصÙØØ©" -#: lib/action.php:720 +#: lib/action.php:721 msgid "Secondary site navigation" msgstr "" -#: lib/action.php:727 +#: lib/action.php:728 msgid "About" msgstr "عن" -#: lib/action.php:729 +#: lib/action.php:730 msgid "FAQ" msgstr "الأسئله المكررة" -#: lib/action.php:733 +#: lib/action.php:734 msgid "TOS" msgstr "الشروط" -#: lib/action.php:736 +#: lib/action.php:737 msgid "Privacy" msgstr "خصوصية" -#: lib/action.php:738 +#: lib/action.php:739 msgid "Source" msgstr "المصدر" -#: lib/action.php:740 +#: lib/action.php:743 msgid "Contact" msgstr "اتصل" -#: lib/action.php:742 +#: lib/action.php:745 msgid "Badge" msgstr "" -#: lib/action.php:770 +#: lib/action.php:773 msgid "StatusNet software license" msgstr "" -#: lib/action.php:773 +#: lib/action.php:776 #, php-format msgid "" "**%%site.name%%** is a microblogging service brought to you by [%%site." @@ -4040,12 +4027,12 @@ msgstr "" "**%%site.name%%** خدمه تدوين مصغر يقدمها لك [%%site.broughtby%%](%%site." "broughtbyurl%%). " -#: lib/action.php:775 +#: lib/action.php:778 #, php-format msgid "**%%site.name%%** is a microblogging service. " msgstr "" -#: lib/action.php:777 +#: lib/action.php:780 #, php-format msgid "" "It runs the [StatusNet](http://status.net/) microblogging software, version %" @@ -4056,31 +4043,31 @@ msgstr "" "المتوÙر تØت [رخصه غنو Ø£Ùيرو العمومية](http://www.fsf.org/licensing/licenses/" "agpl-3.0.html)." -#: lib/action.php:791 +#: lib/action.php:794 msgid "Site content license" msgstr "رخصه Ù…Øتوى الموقع" -#: lib/action.php:800 +#: lib/action.php:803 msgid "All " msgstr "" -#: lib/action.php:805 +#: lib/action.php:808 msgid "license." msgstr "الرخصه." -#: lib/action.php:1099 +#: lib/action.php:1102 msgid "Pagination" msgstr "" -#: lib/action.php:1108 +#: lib/action.php:1111 msgid "After" msgstr "بعد" -#: lib/action.php:1116 +#: lib/action.php:1119 msgid "Before" msgstr "قبل" -#: lib/action.php:1164 +#: lib/action.php:1167 msgid "There was a problem with your session token." msgstr "" @@ -4088,27 +4075,32 @@ msgstr "" msgid "You cannot make changes to this site." msgstr "" -#: lib/adminpanelaction.php:195 +#: lib/adminpanelaction.php:107 +#, fuzzy +msgid "Changes to that panel are not allowed." +msgstr "لا ÙŠÙØ³Ù…Ø Ø¨Ø§Ù„ØªØ³Ø¬ÙŠÙ„." + +#: lib/adminpanelaction.php:206 msgid "showForm() not implemented." msgstr "" -#: lib/adminpanelaction.php:224 +#: lib/adminpanelaction.php:235 msgid "saveSettings() not implemented." msgstr "" -#: lib/adminpanelaction.php:247 +#: lib/adminpanelaction.php:258 msgid "Unable to delete design setting." msgstr "تعذّر Øذ٠إعدادات التصميم." -#: lib/adminpanelaction.php:300 +#: lib/adminpanelaction.php:312 msgid "Basic site configuration" msgstr "ضبط الموقع الأساسي" -#: lib/adminpanelaction.php:303 +#: lib/adminpanelaction.php:317 msgid "Design configuration" msgstr "ضبط التصميم" -#: lib/adminpanelaction.php:306 lib/adminpanelaction.php:309 +#: lib/adminpanelaction.php:322 lib/adminpanelaction.php:327 msgid "Paths configuration" msgstr "ضبط المسارات" @@ -4132,11 +4124,21 @@ msgstr "" msgid "Tags for this attachment" msgstr "وسوم هذا المرÙÙ‚" +#: lib/authenticationplugin.php:182 lib/authenticationplugin.php:187 +#, fuzzy +msgid "Password changing failed" +msgstr "تغيير كلمه السر" + +#: lib/authenticationplugin.php:197 +#, fuzzy +msgid "Password changing is not allowed" +msgstr "تغيير كلمه السر" + #: lib/channel.php:138 lib/channel.php:158 msgid "Command results" msgstr "نتائج الأمر" -#: lib/channel.php:210 +#: lib/channel.php:210 lib/mailhandler.php:142 msgid "Command complete" msgstr "اكتمل الأمر" @@ -4149,18 +4151,18 @@ msgid "Sorry, this command is not yet implemented." msgstr "" #: lib/command.php:88 -#, php-format -msgid "Could not find a user with nickname %s" -msgstr "" +#, fuzzy, php-format +msgid "Could not find a user with nickname %s." +msgstr "تعذّر إيجاد المستخدم الهدÙ." #: lib/command.php:92 msgid "It does not make a lot of sense to nudge yourself!" msgstr "" #: lib/command.php:99 -#, php-format -msgid "Nudge sent to %s" -msgstr "" +#, fuzzy, php-format +msgid "Nudge sent to %s." +msgstr "أرسل التنبيه" #: lib/command.php:126 #, php-format @@ -4174,34 +4176,36 @@ msgstr "" "الإشعارات: %3$s" #: lib/command.php:152 lib/command.php:399 lib/command.php:460 -msgid "Notice with that id does not exist" -msgstr "" +#, fuzzy +msgid "Notice with that id does not exist." +msgstr "لا مل٠بهذه الهويه." #: lib/command.php:168 lib/command.php:415 lib/command.php:476 #: lib/command.php:532 -msgid "User has no last notice" +#, fuzzy +msgid "User has no last notice." msgstr "ليس للمستخدم إشعار أخير" #: lib/command.php:190 msgid "Notice marked as fave." msgstr "" -#: lib/command.php:315 -#, php-format -msgid "%1$s (%2$s)" -msgstr "%1$s (%2$s)" +#: lib/command.php:284 +#, fuzzy, php-format +msgid "Could not remove user %1$s to group %2$s." +msgstr "تعذّر إنشاء المجموعه." #: lib/command.php:318 -#, php-format -msgid "Fullname: %s" +#, fuzzy, php-format +msgid "Full name: %s" msgstr "الاسم الكامل: %s" -#: lib/command.php:321 +#: lib/command.php:321 lib/mail.php:254 #, php-format msgid "Location: %s" msgstr "الموقع: %s" -#: lib/command.php:324 +#: lib/command.php:324 lib/mail.php:256 #, php-format msgid "Homepage: %s" msgstr "الصÙØÙ‡ الرئيسية: %s" @@ -4213,24 +4217,16 @@ msgstr "عن: %s" #: lib/command.php:358 scripts/xmppdaemon.php:301 #, php-format -msgid "Message too long - maximum is %d characters, you sent %d" +msgid "Message too long - maximum is %1$d characters, you sent %2$d." msgstr "" #: lib/command.php:378 msgid "Error sending direct message." msgstr "" -#: lib/command.php:422 -msgid "Cannot repeat your own notice" -msgstr "" - -#: lib/command.php:427 -msgid "Already repeated that notice" -msgstr "كرر بالÙعل هذا الإشعار" - #: lib/command.php:435 -#, php-format -msgid "Notice from %s repeated" +#, fuzzy, php-format +msgid "Notice from %s repeated." msgstr "الإشعار من %s مكرر" #: lib/command.php:437 @@ -4239,12 +4235,12 @@ msgstr "خطأ تكرار الإشعار." #: lib/command.php:491 #, php-format -msgid "Notice too long - maximum is %d characters, you sent %d" +msgid "Notice too long - maximum is %1$d characters, you sent %2$d." msgstr "" #: lib/command.php:500 -#, php-format -msgid "Reply to %s sent" +#, fuzzy, php-format +msgid "Reply to %s sent." msgstr "رÙد على رساله %s" #: lib/command.php:502 @@ -4252,7 +4248,7 @@ msgid "Error saving notice." msgstr "خطأ أثناء ØÙظ الإشعار." #: lib/command.php:556 -msgid "Specify the name of the user to subscribe to" +msgid "Specify the name of the user to subscribe to." msgstr "" #: lib/command.php:563 @@ -4261,7 +4257,7 @@ msgid "Subscribed to %s" msgstr "Ù…Ùشترك ب%s" #: lib/command.php:584 -msgid "Specify the name of the user to unsubscribe from" +msgid "Specify the name of the user to unsubscribe from." msgstr "" #: lib/command.php:591 @@ -4290,17 +4286,17 @@ msgid "Can't turn on notification." msgstr "" #: lib/command.php:650 -msgid "Login command is disabled" +msgid "Login command is disabled." msgstr "" #: lib/command.php:664 -#, php-format -msgid "Could not create login token for %s" +#, fuzzy, php-format +msgid "Could not create login token for %s." msgstr "لم يمكن إنشاء توكن الولوج Ù„%s" #: lib/command.php:669 #, php-format -msgid "This link is useable only once, and is good for only 2 minutes: %s" +msgid "This link is useable only once, and is good for only 2 minutes: %s." msgstr "" #: lib/command.php:685 @@ -4500,10 +4496,6 @@ msgstr "" msgid "Describe the group or topic in %d characters" msgstr "" -#: lib/groupeditform.php:172 -msgid "Description" -msgstr "الوصÙ" - #: lib/groupeditform.php:179 msgid "" "Location for the group, if any, like \"City, State (or Region), Country\"" @@ -4662,21 +4654,9 @@ msgid "" "Change your email address or notification options at %8$s\n" msgstr "" -#: lib/mail.php:254 -#, php-format -msgid "Location: %s\n" -msgstr "الموقع: %s\n" - -#: lib/mail.php:256 -#, php-format -msgid "Homepage: %s\n" -msgstr "الصÙØÙ‡ الرئيسية: %s\n" - #: lib/mail.php:258 -#, php-format -msgid "" -"Bio: %s\n" -"\n" +#, fuzzy, php-format +msgid "Bio: %s" msgstr "السيرة: %s\n" #: lib/mail.php:286 @@ -4811,6 +4791,27 @@ msgstr "" msgid "from" msgstr "من" +#: lib/mailhandler.php:37 +msgid "Could not parse message." +msgstr "تعذّر تØليل الرساله." + +#: lib/mailhandler.php:42 +msgid "Not a registered user." +msgstr "ليس مستخدمًا مسجلًا." + +#: lib/mailhandler.php:46 +msgid "Sorry, that is not your incoming email address." +msgstr "" + +#: lib/mailhandler.php:50 +msgid "Sorry, no incoming email allowed." +msgstr "" + +#: lib/mailhandler.php:228 +#, fuzzy, php-format +msgid "Unsupported message type: %s" +msgstr "نسق غير مدعوم." + #: lib/mediafile.php:98 lib/mediafile.php:123 msgid "There was a database error while saving your file. Please try again." msgstr "" @@ -4842,7 +4843,7 @@ msgid "File upload stopped by extension." msgstr "" #: lib/mediafile.php:179 lib/mediafile.php:216 -msgid "File exceeds user's quota!" +msgid "File exceeds user's quota." msgstr "" #: lib/mediafile.php:196 lib/mediafile.php:233 @@ -4850,8 +4851,9 @@ msgid "File could not be moved to destination directory." msgstr "" #: lib/mediafile.php:201 lib/mediafile.php:237 -msgid "Could not determine file's mime-type!" -msgstr "" +#, fuzzy +msgid "Could not determine file's MIME type." +msgstr "تعذّر Øذ٠المÙضله." #: lib/mediafile.php:270 #, php-format @@ -4860,7 +4862,7 @@ msgstr "" #: lib/mediafile.php:275 #, php-format -msgid "%s is not a supported filetype on this server." +msgid "%s is not a supported file type on this server." msgstr "" #: lib/messageform.php:120 @@ -4893,7 +4895,17 @@ msgid "Attach a file" msgstr "أرÙÙ‚ ملÙًا" #: lib/noticeform.php:212 -msgid "Share your location" +#, fuzzy +msgid "Share my location." +msgstr "لم يمكن ØÙظ تÙضيلات الموقع." + +#: lib/noticeform.php:214 +#, fuzzy +msgid "Do not share my location." +msgstr "لم يمكن ØÙظ تÙضيلات الموقع." + +#: lib/noticeform.php:215 +msgid "Hide this info" msgstr "" #: lib/noticelist.php:428 @@ -5010,6 +5022,11 @@ msgstr "رسائلك المÙرسلة" msgid "Tags in %s's notices" msgstr "" +#: lib/plugin.php:114 +#, fuzzy +msgid "Unknown" +msgstr "إجراء غير معروÙ" + #: lib/profileaction.php:109 lib/profileaction.php:192 lib/subgroupnav.php:82 msgid "Subscriptions" msgstr "الاشتراكات" @@ -5179,10 +5196,6 @@ msgstr "" msgid "People Tagcloud as tagged" msgstr "" -#: lib/subscriptionlist.php:126 -msgid "(none)" -msgstr "(لا شيء)" - #: lib/tagcloudsection.php:56 msgid "None" msgstr "لا شيء" @@ -5296,19 +5309,3 @@ msgstr "%s ليس لونًا صØÙŠØًا!" #, php-format msgid "%s is not a valid color! Use 3 or 6 hex chars." msgstr "" - -#: scripts/maildaemon.php:48 -msgid "Could not parse message." -msgstr "تعذّر تØليل الرساله." - -#: scripts/maildaemon.php:53 -msgid "Not a registered user." -msgstr "ليس مستخدمًا مسجلًا." - -#: scripts/maildaemon.php:57 -msgid "Sorry, that is not your incoming email address." -msgstr "" - -#: scripts/maildaemon.php:61 -msgid "Sorry, no incoming email allowed." -msgstr "" diff --git a/locale/bg/LC_MESSAGES/statusnet.po b/locale/bg/LC_MESSAGES/statusnet.po index 554dfbd0c..bffd397eb 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-01-03 10:37+0000\n" -"PO-Revision-Date: 2010-01-03 10:37:23+0000\n" +"POT-Creation-Date: 2010-01-10 11:27+0000\n" +"PO-Revision-Date: 2010-01-10 11:27:39+0000\n" "Language-Team: Bulgarian\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha (r60575); Translate extension (2009-12-06)\n" +"X-Generator: MediaWiki 1.16alpha (r60888); Translate extension (2010-01-04)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: bg\n" "X-Message-Group: out-statusnet\n" @@ -51,11 +51,6 @@ msgstr "ÐÑма такака Ñтраница." msgid "No such user." msgstr "ÐÑма такъв потребител" -#: actions/all.php:84 -#, php-format -msgid "%s and friends, page %d" -msgstr "%s и приÑтели, Ñтраница %d" - #: actions/all.php:86 actions/all.php:167 actions/allrss.php:115 #: actions/apitimelinefriends.php:115 actions/apitimelinehome.php:115 #: lib/personalgroupnav.php:100 @@ -94,8 +89,8 @@ msgstr "" #: actions/all.php:134 #, php-format msgid "" -"You can try to [nudge %s](../%s) from his profile or [post something to his " -"or her attention](%%%%action.newnotice%%%%?status_textarea=%s)." +"You can try to [nudge %1$s](../%2$s) from his profile or [post something to " +"his or her attention](%%%%action.newnotice%%%%?status_textarea=%3$s)." msgstr "" #: actions/all.php:137 actions/replies.php:209 actions/showstream.php:202 @@ -120,6 +115,23 @@ msgstr "Бележки от %1$s и приÑтели в %2$s." #: actions/apiaccountupdateprofile.php:97 #: actions/apiaccountupdateprofilebackgroundimage.php:94 #: actions/apiaccountupdateprofilecolors.php:118 +#: actions/apidirectmessage.php:156 actions/apifavoritecreate.php:99 +#: actions/apifavoritedestroy.php:100 actions/apifriendshipscreate.php:100 +#: actions/apifriendshipsdestroy.php:100 actions/apifriendshipsshow.php:129 +#: actions/apigroupcreate.php:136 actions/apigroupismember.php:114 +#: actions/apigroupjoin.php:155 actions/apigroupleave.php:141 +#: actions/apigrouplist.php:132 actions/apigrouplistall.php:120 +#: actions/apigroupmembership.php:106 actions/apigroupshow.php:105 +#: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102 +#: actions/apistatusesretweets.php:112 actions/apistatusesshow.php:108 +#: actions/apistatusnetconfig.php:133 actions/apistatusnetversion.php:93 +#: actions/apisubscriptions.php:111 actions/apitimelinefavorites.php:146 +#: actions/apitimelinefriends.php:156 actions/apitimelinegroup.php:150 +#: actions/apitimelinehome.php:156 actions/apitimelinementions.php:151 +#: actions/apitimelinepublic.php:131 actions/apitimelineretweetedbyme.php:122 +#: actions/apitimelineretweetedtome.php:121 +#: actions/apitimelineretweetsofme.php:122 actions/apitimelinetag.php:141 +#: actions/apitimelineuser.php:165 actions/apiusershow.php:101 msgid "API method not found." msgstr "Ðе е открит методът в API." @@ -175,6 +187,9 @@ msgstr "" #: actions/apiaccountupdateprofilebackgroundimage.php:146 #: actions/apiaccountupdateprofilecolors.php:164 #: actions/apiaccountupdateprofilecolors.php:174 +#: actions/groupdesignsettings.php:287 actions/groupdesignsettings.php:297 +#: actions/userdesignsettings.php:210 actions/userdesignsettings.php:220 +#: actions/userdesignsettings.php:263 actions/userdesignsettings.php:273 #, fuzzy msgid "Unable to save your design settings." msgstr "Грешка при запиÑване наÑтройките за Twitter" @@ -217,26 +232,6 @@ msgstr "Преки ÑÑŠÐ¾Ð±Ñ‰ÐµÐ½Ð¸Ñ Ð´Ð¾ %s" msgid "All the direct messages sent to %s" msgstr "Ð’Ñички преки ÑъобщениÑ, изпратени до %s" -#: actions/apidirectmessage.php:156 actions/apifavoritecreate.php:99 -#: actions/apifavoritedestroy.php:100 actions/apifriendshipscreate.php:100 -#: actions/apifriendshipsdestroy.php:100 actions/apifriendshipsshow.php:129 -#: actions/apigroupcreate.php:136 actions/apigroupismember.php:114 -#: actions/apigroupjoin.php:155 actions/apigroupleave.php:141 -#: actions/apigrouplist.php:132 actions/apigrouplistall.php:120 -#: actions/apigroupmembership.php:106 actions/apigroupshow.php:105 -#: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102 -#: actions/apistatusesretweets.php:112 actions/apistatusesshow.php:108 -#: actions/apistatusnetconfig.php:133 actions/apistatusnetversion.php:93 -#: actions/apisubscriptions.php:111 actions/apitimelinefavorites.php:146 -#: actions/apitimelinefriends.php:156 actions/apitimelinegroup.php:150 -#: actions/apitimelinehome.php:156 actions/apitimelinementions.php:151 -#: actions/apitimelinepublic.php:131 actions/apitimelineretweetedbyme.php:122 -#: actions/apitimelineretweetedtome.php:121 -#: actions/apitimelineretweetsofme.php:122 actions/apitimelinetag.php:141 -#: actions/apitimelineuser.php:165 actions/apiusershow.php:101 -msgid "API method not found!" -msgstr "Ðе е открит методът в API." - #: actions/apidirectmessagenew.php:126 msgid "No message text!" msgstr "ЛипÑва текÑÑ‚ на Ñъобщението" @@ -262,7 +257,8 @@ msgid "No status found with that ID." msgstr "Ðе е открита бележка Ñ Ñ‚Ð°ÐºÑŠÐ² идентификатор." #: actions/apifavoritecreate.php:119 -msgid "This status is already a favorite!" +#, fuzzy +msgid "This status is already a favorite." msgstr "Тази бележка вече е отбелÑзана като любима!" #: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:176 @@ -270,7 +266,8 @@ msgid "Could not create favorite." msgstr "Грешка при отбелÑзване като любима." #: actions/apifavoritedestroy.php:122 -msgid "That status is not a favorite!" +#, fuzzy +msgid "That status is not a favorite." msgstr "Тази бележка не е отбелÑзана като любима!" #: actions/apifavoritedestroy.php:134 actions/disfavor.php:87 @@ -291,7 +288,8 @@ msgid "Could not unfollow user: User not found." msgstr "Грешка при Ñпиране на проÑледÑването — потребителÑÑ‚ не е намерен." #: actions/apifriendshipsdestroy.php:120 -msgid "You cannot unfollow yourself!" +#, fuzzy +msgid "You cannot unfollow yourself." msgstr "Ðе можете да Ñпрете да Ñледите Ñебе Ñи!" #: actions/apifriendshipsexists.php:94 @@ -379,7 +377,7 @@ msgstr "" msgid "Group not found!" msgstr "Групата не е открита." -#: actions/apigroupjoin.php:110 +#: actions/apigroupjoin.php:110 actions/joingroup.php:90 lib/command.php:217 msgid "You are already a member of that group." msgstr "Вече членувате в тази група." @@ -387,18 +385,18 @@ msgstr "Вече членувате в тази група." msgid "You have been blocked from that group by the admin." msgstr "" -#: actions/apigroupjoin.php:138 +#: actions/apigroupjoin.php:138 actions/joingroup.php:128 lib/command.php:234 #, fuzzy, php-format -msgid "Could not join user %s to group %s." +msgid "Could not join user %1$s to group %2$s." msgstr "Грешка при проÑледÑване — потребителÑÑ‚ не е намерен." #: actions/apigroupleave.php:114 msgid "You are not a member of this group." msgstr "Ðе членувате в тази група." -#: actions/apigroupleave.php:124 +#: actions/apigroupleave.php:124 actions/leavegroup.php:127 #, fuzzy, php-format -msgid "Could not remove user %s to group %s." +msgid "Could not remove user %1$s from group %2$s." msgstr "Грешка при проÑледÑване — потребителÑÑ‚ не е намерен." #: actions/apigrouplist.php:95 @@ -406,11 +404,6 @@ msgstr "Грешка при проÑледÑване — потребителÑÑ msgid "%s's groups" msgstr "Групи на %s" -#: actions/apigrouplist.php:103 -#, fuzzy, php-format -msgid "Groups %s is a member of on %s." -msgstr "Групи, в които учаÑтва %s" - #: actions/apigrouplistall.php:90 actions/usergroups.php:62 #, php-format msgid "%s groups" @@ -434,11 +427,11 @@ msgstr "Ðе може да изтривате бележки на друг Ð¿Ð¾Ñ msgid "No such notice." msgstr "ÐÑма такава бележка." -#: actions/apistatusesretweet.php:83 +#: actions/apistatusesretweet.php:83 lib/command.php:422 msgid "Cannot repeat your own notice." msgstr "Ðе можете да повтарÑте ÑобÑтвени бележки." -#: actions/apistatusesretweet.php:91 +#: actions/apistatusesretweet.php:91 lib/command.php:427 msgid "Already repeated that notice." msgstr "Вече Ñте повторили тази бележка." @@ -451,7 +444,7 @@ msgid "No status with that ID found." msgstr "Ðе е открита бележка Ñ Ñ‚Ð°ÐºÑŠÐ² идентификатор." #: actions/apistatusesupdate.php:157 actions/newnotice.php:155 -#: scripts/maildaemon.php:71 +#: lib/mailhandler.php:60 #, fuzzy, php-format msgid "That's too long. Max notice size is %d chars." msgstr "Твърде дълга бележка. ТрÑбва да е най-много 140 знака." @@ -470,13 +463,13 @@ msgid "Unsupported format." msgstr "Ðеподдържан формат." #: actions/apitimelinefavorites.php:108 -#, php-format -msgid "%s / Favorites from %s" +#, fuzzy, php-format +msgid "%1$s / Favorites from %2$s" msgstr "%s / ОтбелÑзани като любими от %s" #: actions/apitimelinefavorites.php:120 -#, php-format -msgid "%s updates favorited by %s / %s." +#, fuzzy, php-format +msgid "%1$s updates favorited by %2$s / %2$s." msgstr "%s бележки отбелÑзани като любими от %s / %s." #: actions/apitimelinegroup.php:109 actions/apitimelineuser.php:118 @@ -545,8 +538,11 @@ msgstr "Ðе е открито." msgid "No such attachment." msgstr "ÐÑма такъв документ." -#: actions/avatarbynickname.php:59 actions/grouprss.php:91 -#: actions/leavegroup.php:76 +#: actions/avatarbynickname.php:59 actions/blockedfromgroup.php:73 +#: actions/editgroup.php:84 actions/groupdesignsettings.php:84 +#: actions/grouplogo.php:86 actions/groupmembers.php:76 +#: actions/grouprss.php:91 actions/joingroup.php:76 actions/leavegroup.php:76 +#: actions/showgroup.php:121 msgid "No nickname." msgstr "ÐÑма пÑевдоним." @@ -570,8 +566,8 @@ msgstr "" "Можете да качите личен аватар тук. МакÑималната големина на файла е %s." #: actions/avatarsettings.php:106 actions/avatarsettings.php:185 -#: actions/grouplogo.php:178 actions/remotesubscribe.php:191 -#: actions/userauthorization.php:72 actions/userrss.php:103 +#: actions/remotesubscribe.php:191 actions/userauthorization.php:72 +#: actions/userrss.php:103 msgid "User without matching profile" msgstr "Потребител без ÑъответÑтващ профил" @@ -603,9 +599,9 @@ msgstr "Качване" msgid "Crop" msgstr "ИзрÑзване" -#: actions/avatarsettings.php:268 actions/disfavor.php:74 -#: actions/emailsettings.php:238 actions/favor.php:75 actions/geocode.php:50 -#: actions/groupblock.php:66 actions/grouplogo.php:309 +#: actions/avatarsettings.php:268 actions/deletenotice.php:157 +#: actions/disfavor.php:74 actions/emailsettings.php:238 actions/favor.php:75 +#: actions/geocode.php:50 actions/groupblock.php:66 actions/grouplogo.php:309 #: actions/groupunblock.php:66 actions/imsettings.php:206 #: actions/invite.php:56 actions/login.php:135 actions/makeadmin.php:66 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80 @@ -684,19 +680,15 @@ msgstr "Блокиране на потребителÑ" msgid "Failed to save block information." msgstr "Грешка при запиÑване данните за блокирането." -#: actions/blockedfromgroup.php:73 actions/editgroup.php:84 -#: actions/groupdesignsettings.php:84 actions/grouplogo.php:86 -#: actions/groupmembers.php:76 actions/joingroup.php:76 -#: actions/showgroup.php:121 -msgid "No nickname" -msgstr "ÐÑма пÑевдоним." - #: actions/blockedfromgroup.php:80 actions/editgroup.php:96 +#: actions/foafgroup.php:44 actions/foafgroup.php:62 actions/groupblock.php:86 #: actions/groupbyid.php:83 actions/groupdesignsettings.php:97 #: actions/grouplogo.php:99 actions/groupmembers.php:83 -#: actions/joingroup.php:83 actions/showgroup.php:137 -msgid "No such group" -msgstr "ÐÑма такава група." +#: actions/grouprss.php:98 actions/groupunblock.php:86 +#: actions/joingroup.php:83 actions/leavegroup.php:83 actions/makeadmin.php:86 +#: actions/showgroup.php:137 lib/command.php:212 lib/command.php:263 +msgid "No such group." +msgstr "ÐÑма такава група" #: actions/blockedfromgroup.php:90 #, php-format @@ -704,8 +696,8 @@ msgid "%s blocked profiles" msgstr "Блокирани за %s" #: actions/blockedfromgroup.php:93 -#, php-format -msgid "%s blocked profiles, page %d" +#, fuzzy, php-format +msgid "%1$s blocked profiles, page %2$d" msgstr "Блокирани за %s, Ñтраница %d" #: actions/blockedfromgroup.php:108 @@ -818,11 +810,6 @@ msgstr "Да не Ñе изтрива бележката" msgid "Delete this notice" msgstr "Изтриване на бележката" -#: actions/deletenotice.php:157 -#, fuzzy -msgid "There was a problem with your session token. Try again, please." -msgstr "Имаше проблем ÑÑŠÑ ÑеÑиÑта ви в Ñайта. МолÑ, опитайте отново!" - #: actions/deleteuser.php:67 msgid "You cannot delete users." msgstr "Ðе можете да изтривате потребители." @@ -846,7 +833,7 @@ msgid "Delete this user" msgstr "Изтриване на този потребител" #: actions/designadminpanel.php:62 lib/accountsettingsaction.php:124 -#: lib/adminpanelaction.php:302 lib/groupnav.php:119 +#: lib/adminpanelaction.php:316 lib/groupnav.php:119 msgid "Design" msgstr "" @@ -989,7 +976,8 @@ msgstr "За да Ñъздавате група, Ñ‚Ñ€Ñбва да Ñте вле #: actions/editgroup.php:103 actions/editgroup.php:168 #: actions/groupdesignsettings.php:104 actions/grouplogo.php:106 -msgid "You must be an admin to edit the group" +#, fuzzy +msgid "You must be an admin to edit the group." msgstr "За да редактирате групата, Ñ‚Ñ€Ñбва да Ñте й админиÑтратор." #: actions/editgroup.php:154 @@ -1015,7 +1003,8 @@ msgid "Options saved." msgstr "ÐаÑтройките Ñа запазени." #: actions/emailsettings.php:60 -msgid "Email Settings" +#, fuzzy +msgid "Email settings" msgstr "ÐаÑтройки на е-поща" #: actions/emailsettings.php:71 @@ -1052,8 +1041,9 @@ msgid "Cancel" msgstr "Отказ" #: actions/emailsettings.php:121 -msgid "Email Address" -msgstr "ÐÐ´Ñ€ÐµÑ Ð½Ð° е-поща" +#, fuzzy +msgid "Email address" +msgstr "ÐдреÑи на е-поща" #: actions/emailsettings.php:123 msgid "Email address, like \"UserName@example.org\"" @@ -1127,9 +1117,10 @@ msgstr "Ðе е въведена е-поща." msgid "Cannot normalize that email address" msgstr "Грешка при нормализиране адреÑа на е-пощата" -#: actions/emailsettings.php:331 actions/siteadminpanel.php:157 -msgid "Not a valid email address" -msgstr "Това не е правилен Ð°Ð´Ñ€ÐµÑ Ð½Ð° е-поща." +#: actions/emailsettings.php:331 actions/register.php:201 +#: actions/siteadminpanel.php:157 +msgid "Not a valid email address." +msgstr "Ðеправилен Ð°Ð´Ñ€ÐµÑ Ð½Ð° е-поща." #: actions/emailsettings.php:334 msgid "That is already your email address." @@ -1312,18 +1303,11 @@ msgstr "Ðепозната верÑÐ¸Ñ Ð½Ð° протокола OMB." msgid "Error updating remote profile" msgstr "Грешка при обновÑване на отдалечен профил" -#: actions/foafgroup.php:44 actions/foafgroup.php:62 actions/groupblock.php:86 -#: actions/grouprss.php:98 actions/groupunblock.php:86 -#: actions/leavegroup.php:83 actions/makeadmin.php:86 lib/command.php:212 -#: lib/command.php:263 -msgid "No such group." -msgstr "ÐÑма такава група" - -#: actions/getfile.php:75 +#: actions/getfile.php:79 msgid "No such file." msgstr "ÐÑма такъв файл." -#: actions/getfile.php:79 +#: actions/getfile.php:83 msgid "Cannot read file." msgstr "Грешка при четене на файла." @@ -1335,7 +1319,7 @@ msgstr "Ðе е указан профил." #: actions/groupblock.php:76 actions/groupunblock.php:76 #: actions/makeadmin.php:76 actions/subedit.php:53 actions/tagother.php:46 -#: lib/profileformaction.php:77 +#: actions/unsubscribe.php:84 lib/profileformaction.php:77 msgid "No profile with that ID." msgstr "Ðе е открит профил Ñ Ñ‚Ð°ÐºÑŠÐ² идентификатор." @@ -1364,9 +1348,9 @@ msgstr "Блокиране на потребителÑ" #: actions/groupblock.php:162 #, php-format msgid "" -"Are you sure you want to block user \"%s\" from the group \"%s\"? They will " -"be removed from the group, unable to post, and unable to subscribe to the " -"group in the future." +"Are you sure you want to block user \"%1$s\" from the group \"%2$s\"? They " +"will be removed from the group, unable to post, and unable to subscribe to " +"the group in the future." msgstr "" #: actions/groupblock.php:178 @@ -1383,9 +1367,9 @@ msgstr "СпиÑък Ñ Ð¿Ð¾Ñ‚Ñ€ÐµÐ±Ð¸Ñ‚ÐµÐ»Ð¸Ñ‚Ðµ в тази група." msgid "Database error blocking user from group." msgstr "" -#: actions/groupbyid.php:74 -msgid "No ID" -msgstr "ЛипÑва ID" +#: actions/groupbyid.php:74 actions/userbyid.php:70 +msgid "No ID." +msgstr "ЛипÑва ID." #: actions/groupdesignsettings.php:68 msgid "You must be logged in to edit a group." @@ -1408,13 +1392,6 @@ msgstr "" msgid "Couldn't update your design." msgstr "Грешка при обновÑване на потребителÑ." -#: actions/groupdesignsettings.php:287 actions/groupdesignsettings.php:297 -#: actions/userdesignsettings.php:210 actions/userdesignsettings.php:220 -#: actions/userdesignsettings.php:263 actions/userdesignsettings.php:273 -#, fuzzy -msgid "Unable to save your design settings!" -msgstr "Грешка при запиÑване наÑтройките за Twitter" - #: actions/groupdesignsettings.php:308 actions/userdesignsettings.php:231 #, fuzzy msgid "Design preferences saved." @@ -1430,6 +1407,11 @@ msgid "" "You can upload a logo image for your group. The maximum file size is %s." msgstr "Може да качите лого за групата ви." +#: actions/grouplogo.php:178 +#, fuzzy +msgid "User without matching profile." +msgstr "Потребител без ÑъответÑтващ профил" + #: actions/grouplogo.php:362 #, fuzzy msgid "Pick a square area of the image to be the logo." @@ -1449,15 +1431,15 @@ msgid "%s group members" msgstr "Членове на групата %s" #: actions/groupmembers.php:96 -#, php-format -msgid "%s group members, page %d" +#, fuzzy, php-format +msgid "%1$s group members, page %2$d" msgstr "Членове на групата %s, Ñтраница %d" #: actions/groupmembers.php:111 msgid "A list of the users in this group." msgstr "СпиÑък Ñ Ð¿Ð¾Ñ‚Ñ€ÐµÐ±Ð¸Ñ‚ÐµÐ»Ð¸Ñ‚Ðµ в тази група." -#: actions/groupmembers.php:175 lib/action.php:441 lib/groupnav.php:107 +#: actions/groupmembers.php:175 lib/action.php:442 lib/groupnav.php:107 msgid "Admin" msgstr "ÐаÑтройки" @@ -1554,7 +1536,8 @@ msgid "Error removing the block." msgstr "Грешка при запазване на потребител." #: actions/imsettings.php:59 -msgid "IM Settings" +#, fuzzy +msgid "IM settings" msgstr "IM наÑтройки" #: actions/imsettings.php:70 @@ -1585,7 +1568,8 @@ msgstr "" "Ñъобщение Ñ Ð¸Ð½Ñтрукции. (Добавихте ли %s в ÑпиÑъка Ñи там?)" #: actions/imsettings.php:124 -msgid "IM Address" +#, fuzzy +msgid "IM address" msgstr "IM адреÑ" #: actions/imsettings.php:126 @@ -1646,11 +1630,6 @@ msgstr "" msgid "That is not your Jabber ID." msgstr "Това не е вашиÑÑ‚ Jabber ID." -#: actions/inbox.php:59 -#, php-format -msgid "Inbox for %s - page %d" -msgstr "ВходÑща ÐºÑƒÑ‚Ð¸Ñ Ð·Ð° %s — Ñтраница %d" - #: actions/inbox.php:62 #, php-format msgid "Inbox for %s" @@ -1686,10 +1665,10 @@ msgstr "Покани за нови потребители" msgid "You are already subscribed to these users:" msgstr "Вече Ñте абонирани за Ñледните потребители:" -#: actions/invite.php:131 actions/invite.php:139 +#: actions/invite.php:131 actions/invite.php:139 lib/command.php:315 #, php-format -msgid "%s (%s)" -msgstr "%s (%s)" +msgid "%1$s (%2$s)" +msgstr "%1$s (%2$s)" #: actions/invite.php:136 msgid "" @@ -1731,7 +1710,7 @@ msgstr "Лично Ñъобщение" msgid "Optionally add a personal message to the invitation." msgstr "Може да добавите и лично Ñъобщение към поканата." -#: actions/invite.php:197 lib/messageform.php:178 lib/noticeform.php:232 +#: actions/invite.php:197 lib/messageform.php:178 lib/noticeform.php:234 msgid "Send" msgstr "Прати" @@ -1801,18 +1780,9 @@ msgstr "" msgid "You must be logged in to join a group." msgstr "За да Ñе приÑъедините към група, Ñ‚Ñ€Ñбва да Ñте влезли." -#: actions/joingroup.php:90 lib/command.php:217 -msgid "You are already a member of that group" -msgstr "Вече членувате в тази група." - -#: actions/joingroup.php:128 lib/command.php:234 -#, fuzzy, php-format -msgid "Could not join user %s to group %s" -msgstr "Грешка при проÑледÑване — потребителÑÑ‚ не е намерен." - #: actions/joingroup.php:135 lib/command.php:239 -#, php-format -msgid "%s joined group %s" +#, fuzzy, php-format +msgid "%1$s joined group %2$s" msgstr "%s Ñе приÑъедини към групата %s" #: actions/leavegroup.php:60 @@ -1828,14 +1798,9 @@ msgstr "Ðе членувате в тази група." msgid "Could not find membership record." msgstr "Грешка при обновÑване запиÑа на потребител." -#: actions/leavegroup.php:127 lib/command.php:284 -#, fuzzy, php-format -msgid "Could not remove user %s to group %s" -msgstr "Грешка при проÑледÑване — потребителÑÑ‚ не е намерен." - #: actions/leavegroup.php:134 lib/command.php:289 -#, php-format -msgid "%s left group %s" +#, fuzzy, php-format +msgid "%1$s left group %2$s" msgstr "%s напуÑна групата %s" #: actions/login.php:83 actions/register.php:137 @@ -1856,7 +1821,7 @@ msgstr "Грешно име или парола." msgid "Error setting user. You are probably not authorized." msgstr "Забранено." -#: actions/login.php:208 actions/login.php:261 lib/action.php:459 +#: actions/login.php:208 actions/login.php:261 lib/action.php:460 #: lib/logingroupnav.php:79 msgid "Login" msgstr "Вход" @@ -1910,19 +1875,19 @@ msgid "Only an admin can make another user an admin." msgstr "" #: actions/makeadmin.php:95 -#, php-format -msgid "%s is already an admin for group \"%s\"." -msgstr "" +#, fuzzy, php-format +msgid "%1$s is already an admin for group \"%2$s\"." +msgstr "ПотребителÑÑ‚ вече е блокиран за групата." #: actions/makeadmin.php:132 -#, php-format -msgid "Can't get membership record for %s in group %s" -msgstr "" +#, fuzzy, php-format +msgid "Can't get membership record for %1$s in group %2$s." +msgstr "Грешка при проÑледÑване — потребителÑÑ‚ не е намерен." #: actions/makeadmin.php:145 -#, php-format -msgid "Can't make %s an admin for group %s" -msgstr "" +#, fuzzy, php-format +msgid "Can't make %1$s an admin for group %2$s." +msgstr "За да редактирате групата, Ñ‚Ñ€Ñбва да Ñте й админиÑтратор." #: actions/microsummary.php:69 msgid "No current status" @@ -1965,8 +1930,8 @@ msgid "Message sent" msgstr "Съобщението е изпратено" #: actions/newmessage.php:185 lib/command.php:376 -#, php-format -msgid "Direct message to %s sent" +#, fuzzy, php-format +msgid "Direct message to %s sent." msgstr "ПрÑкото Ñъобщение до %s е изпратено." #: actions/newmessage.php:210 actions/newnotice.php:245 lib/channel.php:170 @@ -1996,7 +1961,7 @@ msgstr "ТърÑене на текÑÑ‚" #: actions/noticesearch.php:91 #, fuzzy, php-format -msgid "Search results for \"%s\" on %s" +msgid "Search results for \"%1$s\" on %2$s" msgstr " ТърÑене на \"%s\" в потока" #: actions/noticesearch.php:121 @@ -2099,11 +2064,6 @@ msgstr "" msgid "URL shortening service is too long (max 50 chars)." msgstr "УÑлугата за Ñъкращаване е твърде дълга (може да е до 50 знака)." -#: actions/outbox.php:58 -#, php-format -msgid "Outbox for %s - page %d" -msgstr "ИзходÑща ÐºÑƒÑ‚Ð¸Ñ Ð·Ð° %s — Ñтраница %d" - #: actions/outbox.php:61 #, php-format msgid "Outbox for %s" @@ -2175,7 +2135,7 @@ msgstr "Грешка при запазване на новата парола." msgid "Password saved." msgstr "Паролата е запиÑана." -#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:308 +#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:326 msgid "Paths" msgstr "Пътища" @@ -2208,7 +2168,7 @@ msgid "Invalid SSL server. The maximum length is 255 characters." msgstr "" #: actions/pathsadminpanel.php:217 actions/siteadminpanel.php:58 -#: lib/adminpanelaction.php:299 +#: lib/adminpanelaction.php:311 msgid "Site" msgstr "Сайт" @@ -2301,7 +2261,8 @@ msgid "When to use SSL" msgstr "Кога да Ñе използва SSL" #: actions/pathsadminpanel.php:308 -msgid "SSL Server" +#, fuzzy +msgid "SSL server" msgstr "SSL-Ñървър" #: actions/pathsadminpanel.php:309 @@ -2331,9 +2292,9 @@ msgid "Not a valid people tag: %s" msgstr "Това не е правилен Ð°Ð´Ñ€ÐµÑ Ð½Ð° е-поща." #: actions/peopletag.php:144 -#, php-format -msgid "Users self-tagged with %s - page %d" -msgstr "" +#, fuzzy, php-format +msgid "Users self-tagged with %1$s - page %2$d" +msgstr "Бележки Ñ ÐµÑ‚Ð¸ÐºÐµÑ‚ %s, Ñтраница %d" #: actions/postnotice.php:84 msgid "Invalid notice content" @@ -2341,7 +2302,7 @@ msgstr "Ðевалидно Ñъдържание на бележка" #: actions/postnotice.php:90 #, php-format -msgid "Notice license ‘%s’ is not compatible with site license ‘%s’." +msgid "Notice license ‘%1$s’ is not compatible with site license ‘%2$s’." msgstr "" #: actions/profilesettings.php:60 @@ -2460,20 +2421,20 @@ msgstr "Ðеправилен етикет: \"%s\"" msgid "Couldn't update user for autosubscribe." msgstr "" -#: actions/profilesettings.php:354 +#: actions/profilesettings.php:359 #, fuzzy msgid "Couldn't save location prefs." msgstr "Грешка при запазване етикетите." -#: actions/profilesettings.php:366 +#: actions/profilesettings.php:371 msgid "Couldn't save profile." msgstr "Грешка при запазване на профила." -#: actions/profilesettings.php:374 +#: actions/profilesettings.php:379 msgid "Couldn't save tags." msgstr "Грешка при запазване етикетите." -#: actions/profilesettings.php:382 lib/adminpanelaction.php:126 +#: actions/profilesettings.php:387 lib/adminpanelaction.php:137 msgid "Settings saved." msgstr "ÐаÑтройките Ñа запазени." @@ -2567,7 +2528,7 @@ msgid "" "one!" msgstr "" -#: actions/publictagcloud.php:135 +#: actions/publictagcloud.php:131 msgid "Tag cloud" msgstr "" @@ -2706,7 +2667,7 @@ msgstr "Грешка в кода за потвърждение." msgid "Registration successful" msgstr "ЗапиÑването е уÑпешно." -#: actions/register.php:114 actions/register.php:502 lib/action.php:456 +#: actions/register.php:114 actions/register.php:502 lib/action.php:457 #: lib/logingroupnav.php:85 msgid "Register" msgstr "РегиÑтриране" @@ -2719,10 +2680,6 @@ msgstr "ЗапиÑването не е позволено." msgid "You can't register if you don't agree to the license." msgstr "Ðе можете да Ñе региÑтрате, ако не Ñте ÑъглаÑни Ñ Ð»Ð¸Ñ†ÐµÐ½Ð·Ð°." -#: actions/register.php:201 -msgid "Not a valid email address." -msgstr "Ðеправилен Ð°Ð´Ñ€ÐµÑ Ð½Ð° е-поща." - #: actions/register.php:212 msgid "Email address already exists." msgstr "ÐдреÑÑŠÑ‚ на е-поща вече Ñе използва." @@ -2780,12 +2737,12 @@ msgid "" msgstr " оÑвен тези лични данни: парола, е-поща, меÑинджър, телефон." #: actions/register.php:537 -#, php-format +#, fuzzy, php-format msgid "" -"Congratulations, %s! And welcome to %%%%site.name%%%%. From here, you may " +"Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may " "want to...\n" "\n" -"* Go to [your profile](%s) and post your first message.\n" +"* Go to [your profile](%2$s) and post your first message.\n" "* Add a [Jabber/GTalk address](%%%%action.imsettings%%%%) so you can send " "notices through instant messages.\n" "* [Search for people](%%%%action.peoplesearch%%%%) that you may know or that " @@ -2909,11 +2866,6 @@ msgstr "Повторено!" msgid "Replies to %s" msgstr "Отговори на %s" -#: actions/replies.php:127 -#, php-format -msgid "Replies to %s, page %d" -msgstr "Отговори на %s, Ñтраница %d" - #: actions/replies.php:144 #, php-format msgid "Replies feed for %s (RSS 1.0)" @@ -2932,8 +2884,8 @@ msgstr "ЕмиÑÐ¸Ñ Ñ Ð¾Ñ‚Ð³Ð¾Ð²Ð¾Ñ€Ð¸ на %s (Atom)" #: actions/replies.php:198 #, php-format msgid "" -"This is the timeline showing replies to %s but %s hasn't received a notice " -"to his attention yet." +"This is the timeline showing replies to %1$s but %2$s hasn't received a " +"notice to his attention yet." msgstr "" #: actions/replies.php:203 @@ -2946,8 +2898,8 @@ msgstr "" #: actions/replies.php:205 #, php-format msgid "" -"You can try to [nudge %s](../%s) or [post something to his or her attention]" -"(%%%%action.newnotice%%%%?status_textarea=%s)." +"You can try to [nudge %1$s](../%2$s) or [post something to his or her " +"attention](%%%%action.newnotice%%%%?status_textarea=%3$s)." msgstr "" #: actions/repliesrss.php:72 @@ -2965,11 +2917,6 @@ msgstr "Ðе може да изпращате ÑÑŠÐ¾Ð±Ñ‰ÐµÐ½Ð¸Ñ Ð´Ð¾ този Ð msgid "User is already sandboxed." msgstr "ПотребителÑÑ‚ ви е блокирал." -#: actions/showfavorites.php:79 -#, php-format -msgid "%s's favorite notices, page %d" -msgstr "Любими бележки на %s, Ñтраница %d" - #: actions/showfavorites.php:132 msgid "Could not retrieve favorite notices." msgstr "Грешка при изтеглÑне на любимите бележки" @@ -3019,11 +2966,6 @@ msgstr "Така можете да Ñподелите какво хареÑÐ²Ð°Ñ msgid "%s group" msgstr "Група %s" -#: actions/showgroup.php:84 -#, php-format -msgid "%s group, page %d" -msgstr "Група %s, Ñтраница %d" - #: actions/showgroup.php:218 msgid "Group profile" msgstr "Профил на групата" @@ -3072,7 +3014,7 @@ msgstr "Членове" #: actions/showgroup.php:386 lib/profileaction.php:117 #: lib/profileaction.php:148 lib/profileaction.php:236 lib/section.php:95 -#: lib/tagcloudsection.php:71 +#: lib/subscriptionlist.php:126 lib/tagcloudsection.php:71 msgid "(None)" msgstr "" @@ -3138,14 +3080,9 @@ msgstr "Бележката е изтрита." msgid " tagged %s" msgstr "Бележки Ñ ÐµÑ‚Ð¸ÐºÐµÑ‚ %s" -#: actions/showstream.php:79 -#, php-format -msgid "%s, page %d" -msgstr "%s, Ñтраница %d" - #: actions/showstream.php:122 #, fuzzy, php-format -msgid "Notice feed for %s tagged %s (RSS 1.0)" +msgid "Notice feed for %1$s tagged %2$s (RSS 1.0)" msgstr "ЕмиÑÐ¸Ñ Ñ Ð±ÐµÐ»ÐµÐ¶ÐºÐ¸ на %s" #: actions/showstream.php:129 @@ -3170,7 +3107,7 @@ msgstr "FOAF за %s" #: actions/showstream.php:191 #, php-format -msgid "This is the timeline for %s but %s hasn't posted anything yet." +msgid "This is the timeline for %1$s but %2$s hasn't posted anything yet." msgstr "" #: actions/showstream.php:196 @@ -3182,8 +3119,8 @@ msgstr "" #: actions/showstream.php:198 #, php-format msgid "" -"You can try to nudge %s or [post something to his or her attention](%%%%" -"action.newnotice%%%%?status_textarea=%s)." +"You can try to nudge %1$s or [post something to his or her attention](%%%%" +"action.newnotice%%%%?status_textarea=%2$s)." msgstr "" #: actions/showstream.php:234 @@ -3225,12 +3162,13 @@ msgid "Site name must have non-zero length." msgstr "Името на Ñайта е задължително." #: actions/siteadminpanel.php:154 -msgid "You must have a valid contact email address" +#, fuzzy +msgid "You must have a valid contact email address." msgstr "ÐдреÑÑŠÑ‚ на е-поща за контакт е задължителен" #: actions/siteadminpanel.php:172 -#, php-format -msgid "Unknown language \"%s\"" +#, fuzzy, php-format +msgid "Unknown language \"%s\"." msgstr "Ðепознат език \"%s\"" #: actions/siteadminpanel.php:179 @@ -3411,7 +3349,8 @@ msgid "Save site settings" msgstr "Запазване наÑтройките на Ñайта" #: actions/smssettings.php:58 -msgid "SMS Settings" +#, fuzzy +msgid "SMS settings" msgstr "ÐаÑтройки за SMS" #: actions/smssettings.php:69 @@ -3441,7 +3380,8 @@ msgid "Enter the code you received on your phone." msgstr "Въведете кода, който получихте по телефона." #: actions/smssettings.php:138 -msgid "SMS Phone number" +#, fuzzy +msgid "SMS phone number" msgstr "Телефонен номер за SMS" #: actions/smssettings.php:140 @@ -3535,9 +3475,9 @@ msgid "%s subscribers" msgstr "%s абоната" #: actions/subscribers.php:52 -#, php-format -msgid "%s subscribers, page %d" -msgstr "" +#, fuzzy, php-format +msgid "%1$s subscribers, page %2$d" +msgstr "Ðбонаменти на %s, Ñтраница %d" #: actions/subscribers.php:63 msgid "These are the people who listen to your notices." @@ -3572,8 +3512,8 @@ msgid "%s subscriptions" msgstr "Ðбонаменти на %s" #: actions/subscriptions.php:54 -#, php-format -msgid "%s subscriptions, page %d" +#, fuzzy, php-format +msgid "%1$s subscriptions, page %2$d" msgstr "Ðбонаменти на %s, Ñтраница %d" #: actions/subscriptions.php:65 @@ -3608,11 +3548,6 @@ msgstr "Jabber" msgid "SMS" msgstr "SMS" -#: actions/tag.php:68 -#, php-format -msgid "Notices tagged with %s, page %d" -msgstr "Бележки Ñ ÐµÑ‚Ð¸ÐºÐµÑ‚ %s, Ñтраница %d" - #: actions/tag.php:86 #, fuzzy, php-format msgid "Notice feed for tag %s (RSS 1.0)" @@ -3696,11 +3631,6 @@ msgstr "ПотребителÑÑ‚ не е заглушен." msgid "No profile id in request." msgstr "Сървърът не е върнал Ð°Ð´Ñ€ÐµÑ Ð½Ð° профила." -#: actions/unsubscribe.php:84 -#, fuzzy -msgid "No profile with that id." -msgstr "Ðе е открита бележка Ñ Ñ‚Ð°ÐºÑŠÐ² идентификатор." - #: actions/unsubscribe.php:98 #, fuzzy msgid "Unsubscribed" @@ -3708,10 +3638,11 @@ msgstr "ОтпиÑване" #: actions/updateprofile.php:62 actions/userauthorization.php:330 #, php-format -msgid "Listenee stream license ‘%s’ is not compatible with site license ‘%s’." +msgid "" +"Listenee stream license ‘%1$s’ is not compatible with site license ‘%2$s’." msgstr "" -#: actions/useradminpanel.php:58 lib/adminpanelaction.php:305 +#: actions/useradminpanel.php:58 lib/adminpanelaction.php:321 #: lib/personalgroupnav.php:115 msgid "User" msgstr "Потребител" @@ -3816,7 +3747,7 @@ msgstr "" "Проверете тези детайли и Ñе уверете, че иÑкате да Ñе абонирате за бележките " "на този потребител. Ðко не иÑкате абонамента, натиÑнете \"Cancel\" (Отказ)." -#: actions/userauthorization.php:188 +#: actions/userauthorization.php:188 actions/version.php:165 msgid "License" msgstr "Лиценз" @@ -3872,7 +3803,7 @@ msgstr "" #: actions/userauthorization.php:296 #, php-format -msgid "Listener URI ‘%s’ not found here" +msgid "Listener URI ‘%s’ not found here." msgstr "" #: actions/userauthorization.php:301 @@ -3905,10 +3836,6 @@ msgstr "Грешка при четене адреÑа на аватара '%s'" msgid "Wrong image type for avatar URL ‘%s’." msgstr "Грешен вид изображение за '%s'" -#: actions/userbyid.php:70 -msgid "No ID." -msgstr "ЛипÑва ID." - #: actions/userdesignsettings.php:76 lib/designsettings.php:65 #, fuzzy msgid "Profile design" @@ -3924,11 +3851,6 @@ msgstr "" msgid "Enjoy your hotdog!" msgstr "" -#: actions/usergroups.php:64 -#, php-format -msgid "%s groups, page %d" -msgstr "Групи на %s, Ñтраница %d" - #: actions/usergroups.php:130 #, fuzzy msgid "Search for more groups" @@ -3944,6 +3866,73 @@ msgstr "%s не членува в Ð½Ð¸ÐºÐ¾Ñ Ð³Ñ€ÑƒÐ¿Ð°." msgid "Try [searching for groups](%%action.groupsearch%%) and joining them." msgstr "" +#: actions/version.php:73 +#, fuzzy, php-format +msgid "StatusNet %s" +msgstr "СтатиÑтики" + +#: actions/version.php:153 +#, php-format +msgid "" +"This site is powered by %1$s version %2$s, Copyright 2008-2010 StatusNet, " +"Inc. and contributors." +msgstr "" + +#: actions/version.php:157 +#, fuzzy +msgid "StatusNet" +msgstr "Бележката е изтрита." + +#: actions/version.php:161 +msgid "Contributors" +msgstr "" + +#: actions/version.php:168 +msgid "" +"StatusNet is free software: you can redistribute it and/or modify it under " +"the terms of the GNU Affero General Public License as published by the Free " +"Software Foundation, either version 3 of the License, or (at your option) " +"any later version. " +msgstr "" + +#: actions/version.php:174 +msgid "" +"This program is distributed in the hope that it will be useful, but WITHOUT " +"ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or " +"FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License " +"for more details. " +msgstr "" + +#: actions/version.php:180 +#, php-format +msgid "" +"You should have received a copy of the GNU Affero General Public License " +"along with this program. If not, see %s." +msgstr "" + +#: actions/version.php:189 +msgid "Plugins" +msgstr "" + +#: actions/version.php:195 +#, fuzzy +msgid "Name" +msgstr "ПÑевдоним" + +#: actions/version.php:196 lib/action.php:741 +#, fuzzy +msgid "Version" +msgstr "СеÑии" + +#: actions/version.php:197 +#, fuzzy +msgid "Author(s)" +msgstr "Ðвтор" + +#: actions/version.php:198 lib/groupeditform.php:172 +msgid "Description" +msgstr "ОпиÑание" + #: classes/File.php:137 #, php-format msgid "" @@ -4017,7 +4006,7 @@ msgstr "Проблем при запиÑване на бележката." msgid "DB error inserting reply: %s" msgstr "Грешка в базата от данни — отговор при вмъкването: %s" -#: classes/Notice.php:1361 +#: classes/Notice.php:1359 #, php-format msgid "RT @%1$s %2$s" msgstr "RT @%1$s %2$s" @@ -4065,141 +4054,136 @@ msgstr "Друго" msgid "Other options" msgstr "Други наÑтройки" -#: lib/action.php:144 -#, php-format -msgid "%s - %s" -msgstr "%s - %s" - #: lib/action.php:159 msgid "Untitled page" msgstr "Ðеозаглавена Ñтраница" -#: lib/action.php:426 +#: lib/action.php:427 msgid "Primary site navigation" msgstr "" -#: lib/action.php:432 +#: lib/action.php:433 msgid "Home" msgstr "Ðачало" -#: lib/action.php:432 +#: lib/action.php:433 msgid "Personal profile and friends timeline" msgstr "" -#: lib/action.php:434 +#: lib/action.php:435 msgid "Account" msgstr "Сметка" -#: lib/action.php:434 +#: lib/action.php:435 msgid "Change your email, avatar, password, profile" msgstr "ПромÑна на поща, аватар, парола, профил" -#: lib/action.php:437 +#: lib/action.php:438 msgid "Connect" msgstr "Свързване" -#: lib/action.php:437 +#: lib/action.php:438 msgid "Connect to services" msgstr "Свързване към уÑлуги" -#: lib/action.php:441 +#: lib/action.php:442 msgid "Change site configuration" msgstr "ПромÑна наÑтройките на Ñайта" -#: lib/action.php:445 lib/subgroupnav.php:105 +#: lib/action.php:446 lib/subgroupnav.php:105 msgid "Invite" msgstr "Покани" -#: lib/action.php:446 lib/subgroupnav.php:106 +#: lib/action.php:447 lib/subgroupnav.php:106 #, php-format msgid "Invite friends and colleagues to join you on %s" msgstr "Поканете приÑтели и колеги да Ñе приÑъединÑÑ‚ към Ð²Ð°Ñ Ð² %s" -#: lib/action.php:451 +#: lib/action.php:452 msgid "Logout" msgstr "Изход" -#: lib/action.php:451 +#: lib/action.php:452 msgid "Logout from the site" msgstr "Излизане от Ñайта" -#: lib/action.php:456 +#: lib/action.php:457 msgid "Create an account" msgstr "Създаване на нова Ñметка" -#: lib/action.php:459 +#: lib/action.php:460 msgid "Login to the site" msgstr "Влизане в Ñайта" -#: lib/action.php:462 lib/action.php:725 +#: lib/action.php:463 lib/action.php:726 msgid "Help" msgstr "Помощ" -#: lib/action.php:462 +#: lib/action.php:463 #, fuzzy msgid "Help me!" msgstr "Помощ" -#: lib/action.php:465 lib/searchaction.php:127 +#: lib/action.php:466 lib/searchaction.php:127 msgid "Search" msgstr "ТърÑене" -#: lib/action.php:465 +#: lib/action.php:466 msgid "Search for people or text" msgstr "ТърÑене за хора или бележки" -#: lib/action.php:486 +#: lib/action.php:487 #, fuzzy msgid "Site notice" msgstr "Ðова бележка" -#: lib/action.php:552 +#: lib/action.php:553 msgid "Local views" msgstr "" -#: lib/action.php:618 +#: lib/action.php:619 #, fuzzy msgid "Page notice" msgstr "Ðова бележка" -#: lib/action.php:720 +#: lib/action.php:721 #, fuzzy msgid "Secondary site navigation" msgstr "Ðбонаменти" -#: lib/action.php:727 +#: lib/action.php:728 msgid "About" msgstr "ОтноÑно" -#: lib/action.php:729 +#: lib/action.php:730 msgid "FAQ" msgstr "ВъпроÑи" -#: lib/action.php:733 +#: lib/action.php:734 msgid "TOS" msgstr "УÑловиÑ" -#: lib/action.php:736 +#: lib/action.php:737 msgid "Privacy" msgstr "ПоверителноÑÑ‚" -#: lib/action.php:738 +#: lib/action.php:739 msgid "Source" msgstr "Изходен код" -#: lib/action.php:740 +#: lib/action.php:743 msgid "Contact" msgstr "Контакт" -#: lib/action.php:742 +#: lib/action.php:745 msgid "Badge" msgstr "Табелка" -#: lib/action.php:770 +#: lib/action.php:773 msgid "StatusNet software license" msgstr "Лиценз на програмата StatusNet" -#: lib/action.php:773 +#: lib/action.php:776 #, php-format msgid "" "**%%site.name%%** is a microblogging service brought to you by [%%site." @@ -4208,12 +4192,12 @@ msgstr "" "**%%site.name%%** е уÑлуга за микроблогване, предоÑтавена ви от [%%site." "broughtby%%](%%site.broughtbyurl%%). " -#: lib/action.php:775 +#: lib/action.php:778 #, php-format msgid "**%%site.name%%** is a microblogging service. " msgstr "**%%site.name%%** е уÑлуга за микроблогване. " -#: lib/action.php:777 +#: lib/action.php:780 #, php-format msgid "" "It runs the [StatusNet](http://status.net/) microblogging software, version %" @@ -4224,31 +4208,31 @@ msgstr "" "доÑтъпна под [GNU Affero General Public License](http://www.fsf.org/" "licensing/licenses/agpl-3.0.html)." -#: lib/action.php:791 +#: lib/action.php:794 msgid "Site content license" msgstr "Лиценз на Ñъдържанието" -#: lib/action.php:800 +#: lib/action.php:803 msgid "All " msgstr "Ð’Ñички " -#: lib/action.php:805 +#: lib/action.php:808 msgid "license." msgstr "лиценз." -#: lib/action.php:1099 +#: lib/action.php:1102 msgid "Pagination" msgstr "Страниране" -#: lib/action.php:1108 +#: lib/action.php:1111 msgid "After" msgstr "След" -#: lib/action.php:1116 +#: lib/action.php:1119 msgid "Before" msgstr "Преди" -#: lib/action.php:1164 +#: lib/action.php:1167 msgid "There was a problem with your session token." msgstr "Имаше проблем ÑÑŠÑ ÑеÑиÑта ви в Ñайта." @@ -4256,30 +4240,35 @@ msgstr "Имаше проблем ÑÑŠÑ ÑеÑиÑта ви в Ñайта." msgid "You cannot make changes to this site." msgstr "Ðе можете да променÑте този Ñайт." -#: lib/adminpanelaction.php:195 +#: lib/adminpanelaction.php:107 +#, fuzzy +msgid "Changes to that panel are not allowed." +msgstr "ЗапиÑването не е позволено." + +#: lib/adminpanelaction.php:206 #, fuzzy msgid "showForm() not implemented." msgstr "Командата вÑе още не Ñе поддържа." -#: lib/adminpanelaction.php:224 +#: lib/adminpanelaction.php:235 #, fuzzy msgid "saveSettings() not implemented." msgstr "Командата вÑе още не Ñе поддържа." -#: lib/adminpanelaction.php:247 +#: lib/adminpanelaction.php:258 #, fuzzy msgid "Unable to delete design setting." msgstr "Грешка при запиÑване наÑтройките за Twitter" -#: lib/adminpanelaction.php:300 +#: lib/adminpanelaction.php:312 msgid "Basic site configuration" msgstr "ОÑновна наÑтройка на Ñайта" -#: lib/adminpanelaction.php:303 +#: lib/adminpanelaction.php:317 msgid "Design configuration" msgstr "ÐаÑтройка на оформлението" -#: lib/adminpanelaction.php:306 lib/adminpanelaction.php:309 +#: lib/adminpanelaction.php:322 lib/adminpanelaction.php:327 msgid "Paths configuration" msgstr "ÐаÑтройка на пътищата" @@ -4303,11 +4292,21 @@ msgstr "" msgid "Tags for this attachment" msgstr "" +#: lib/authenticationplugin.php:182 lib/authenticationplugin.php:187 +#, fuzzy +msgid "Password changing failed" +msgstr "Паролата е запиÑана." + +#: lib/authenticationplugin.php:197 +#, fuzzy +msgid "Password changing is not allowed" +msgstr "Паролата е запиÑана." + #: lib/channel.php:138 lib/channel.php:158 msgid "Command results" msgstr "Резултат от командата" -#: lib/channel.php:210 +#: lib/channel.php:210 lib/mailhandler.php:142 msgid "Command complete" msgstr "Командата е изпълнена" @@ -4321,7 +4320,7 @@ msgstr "За Ñъжаление тази команда вÑе още не Ñе #: lib/command.php:88 #, fuzzy, php-format -msgid "Could not find a user with nickname %s" +msgid "Could not find a user with nickname %s." msgstr "Грешка при обновÑване на потребител Ñ Ð¿Ð¾Ñ‚Ð²ÑŠÑ€Ð´ÐµÐ½ email адреÑ." #: lib/command.php:92 @@ -4329,8 +4328,8 @@ msgid "It does not make a lot of sense to nudge yourself!" msgstr "" #: lib/command.php:99 -#, php-format -msgid "Nudge sent to %s" +#, fuzzy, php-format +msgid "Nudge sent to %s." msgstr "Изпратено е побутване на %s" #: lib/command.php:126 @@ -4345,34 +4344,36 @@ msgstr "" "Бележки: %3$s" #: lib/command.php:152 lib/command.php:399 lib/command.php:460 -msgid "Notice with that id does not exist" -msgstr "" +#, fuzzy +msgid "Notice with that id does not exist." +msgstr "Ðе е открита бележка Ñ Ñ‚Ð°ÐºÑŠÐ² идентификатор." #: lib/command.php:168 lib/command.php:415 lib/command.php:476 #: lib/command.php:532 -msgid "User has no last notice" +#, fuzzy +msgid "User has no last notice." msgstr "ПотребителÑÑ‚ нÑма поÑледна бележка" #: lib/command.php:190 msgid "Notice marked as fave." msgstr "Бележката е отбелÑзана като любима." -#: lib/command.php:315 -#, php-format -msgid "%1$s (%2$s)" -msgstr "%1$s (%2$s)" +#: lib/command.php:284 +#, fuzzy, php-format +msgid "Could not remove user %1$s to group %2$s." +msgstr "Грешка при проÑледÑване — потребителÑÑ‚ не е намерен." #: lib/command.php:318 -#, php-format -msgid "Fullname: %s" +#, fuzzy, php-format +msgid "Full name: %s" msgstr "Пълно име: %s" -#: lib/command.php:321 +#: lib/command.php:321 lib/mail.php:254 #, php-format msgid "Location: %s" msgstr "МеÑтоположение: %s" -#: lib/command.php:324 +#: lib/command.php:324 lib/mail.php:256 #, php-format msgid "Homepage: %s" msgstr "Домашна Ñтраница: %s" @@ -4384,7 +4385,7 @@ msgstr "ОтноÑно: %s" #: lib/command.php:358 scripts/xmppdaemon.php:301 #, fuzzy, php-format -msgid "Message too long - maximum is %d characters, you sent %d" +msgid "Message too long - maximum is %1$d characters, you sent %2$d." msgstr "" "Съобщението е твърде дълго. Ðай-много може да е 140 знака, а Ñте въвели %d." @@ -4392,18 +4393,9 @@ msgstr "" msgid "Error sending direct message." msgstr "Грешка при изпращане на прÑкото Ñъобщение" -#: lib/command.php:422 -msgid "Cannot repeat your own notice" -msgstr "Ðе можете да повтарÑте ÑобÑтвена бележка" - -#: lib/command.php:427 -#, fuzzy -msgid "Already repeated that notice" -msgstr "Изтриване на бележката" - #: lib/command.php:435 -#, php-format -msgid "Notice from %s repeated" +#, fuzzy, php-format +msgid "Notice from %s repeated." msgstr "Бележката от %s е повторена" #: lib/command.php:437 @@ -4412,13 +4404,13 @@ msgstr "Грешка при повтарÑне на бележката." #: lib/command.php:491 #, fuzzy, php-format -msgid "Notice too long - maximum is %d characters, you sent %d" +msgid "Notice too long - maximum is %1$d characters, you sent %2$d." msgstr "" "Съобщението е твърде дълго. Ðай-много може да е 140 знака, а Ñте въвели %d." #: lib/command.php:500 -#, php-format -msgid "Reply to %s sent" +#, fuzzy, php-format +msgid "Reply to %s sent." msgstr "Отговорът до %s е изпратен" #: lib/command.php:502 @@ -4426,7 +4418,8 @@ msgid "Error saving notice." msgstr "Грешка при запиÑване на бележката." #: lib/command.php:556 -msgid "Specify the name of the user to subscribe to" +#, fuzzy +msgid "Specify the name of the user to subscribe to." msgstr "Уточнете името на потребителÑ, за когото Ñе абонирате." #: lib/command.php:563 @@ -4435,7 +4428,8 @@ msgid "Subscribed to %s" msgstr "Ðбонирани Ñте за %s." #: lib/command.php:584 -msgid "Specify the name of the user to unsubscribe from" +#, fuzzy +msgid "Specify the name of the user to unsubscribe from." msgstr "Уточнете името на потребителÑ, от когото Ñе отпиÑвате." #: lib/command.php:591 @@ -4464,17 +4458,17 @@ msgid "Can't turn on notification." msgstr "Грешка при включване на уведомлението." #: lib/command.php:650 -msgid "Login command is disabled" +msgid "Login command is disabled." msgstr "" #: lib/command.php:664 #, fuzzy, php-format -msgid "Could not create login token for %s" +msgid "Could not create login token for %s." msgstr "Грешка при отбелÑзване като любима." #: lib/command.php:669 #, php-format -msgid "This link is useable only once, and is good for only 2 minutes: %s" +msgid "This link is useable only once, and is good for only 2 minutes: %s." msgstr "" #: lib/command.php:685 @@ -4666,10 +4660,6 @@ msgstr "Опишете групата или темата" msgid "Describe the group or topic in %d characters" msgstr "Опишете групата или темата в до %d букви" -#: lib/groupeditform.php:172 -msgid "Description" -msgstr "ОпиÑание" - #: lib/groupeditform.php:179 msgid "" "Location for the group, if any, like \"City, State (or Region), Country\"" @@ -4840,21 +4830,9 @@ msgstr "" "----\n" "Може да Ñмените адреÑа и наÑтройките за уведомÑване по е-поща на %8$s\n" -#: lib/mail.php:254 -#, php-format -msgid "Location: %s\n" -msgstr "МеÑтоположение: %s\n" - -#: lib/mail.php:256 -#, php-format -msgid "Homepage: %s\n" -msgstr "Лична Ñтраница: %s\n" - #: lib/mail.php:258 -#, php-format -msgid "" -"Bio: %s\n" -"\n" +#, fuzzy, php-format +msgid "Bio: %s" msgstr "" "БиографиÑ: %s\n" "\n" @@ -4991,6 +4969,27 @@ msgstr "" msgid "from" msgstr "от" +#: lib/mailhandler.php:37 +msgid "Could not parse message." +msgstr "Грешка при обработка на Ñъобщението" + +#: lib/mailhandler.php:42 +msgid "Not a registered user." +msgstr "Това не е региÑтриран потребител." + +#: lib/mailhandler.php:46 +msgid "Sorry, that is not your incoming email address." +msgstr "Това не е вашиÑÑ‚ входÑщ адреÑ." + +#: lib/mailhandler.php:50 +msgid "Sorry, no incoming email allowed." +msgstr "ВходÑщата поща не е разрешена." + +#: lib/mailhandler.php:228 +#, fuzzy, php-format +msgid "Unsupported message type: %s" +msgstr "Форматът на файла Ñ Ð¸Ð·Ð¾Ð±Ñ€Ð°Ð¶ÐµÐ½Ð¸ÐµÑ‚Ð¾ не Ñе поддържа." + #: lib/mediafile.php:98 lib/mediafile.php:123 msgid "There was a database error while saving your file. Please try again." msgstr "" @@ -5022,7 +5021,7 @@ msgid "File upload stopped by extension." msgstr "" #: lib/mediafile.php:179 lib/mediafile.php:216 -msgid "File exceeds user's quota!" +msgid "File exceeds user's quota." msgstr "" #: lib/mediafile.php:196 lib/mediafile.php:233 @@ -5030,7 +5029,8 @@ msgid "File could not be moved to destination directory." msgstr "" #: lib/mediafile.php:201 lib/mediafile.php:237 -msgid "Could not determine file's mime-type!" +#, fuzzy +msgid "Could not determine file's MIME type." msgstr "Грешка при изтеглÑне на Ð¾Ð±Ñ‰Ð¸Ñ Ð¿Ð¾Ñ‚Ð¾Ðº" #: lib/mediafile.php:270 @@ -5040,7 +5040,7 @@ msgstr "" #: lib/mediafile.php:275 #, php-format -msgid "%s is not a supported filetype on this server." +msgid "%s is not a supported file type on this server." msgstr "" #: lib/messageform.php:120 @@ -5073,7 +5073,17 @@ msgid "Attach a file" msgstr "ПрикрепÑне на файл" #: lib/noticeform.php:212 -msgid "Share your location" +#, fuzzy +msgid "Share my location." +msgstr "Грешка при запазване етикетите." + +#: lib/noticeform.php:214 +#, fuzzy +msgid "Do not share my location." +msgstr "Грешка при запазване етикетите." + +#: lib/noticeform.php:215 +msgid "Hide this info" msgstr "" #: lib/noticelist.php:428 @@ -5192,6 +5202,11 @@ msgstr "Изпратените от Ð²Ð°Ñ ÑъобщениÑ" msgid "Tags in %s's notices" msgstr "Етикети в бележките на %s" +#: lib/plugin.php:114 +#, fuzzy +msgid "Unknown" +msgstr "Ðепознато дейÑтвие" + #: lib/profileaction.php:109 lib/profileaction.php:192 lib/subgroupnav.php:82 msgid "Subscriptions" msgstr "Ðбонаменти" @@ -5369,10 +5384,6 @@ msgstr "" msgid "People Tagcloud as tagged" msgstr "" -#: lib/subscriptionlist.php:126 -msgid "(none)" -msgstr "(нÑма)" - #: lib/tagcloudsection.php:56 msgid "None" msgstr "Без" @@ -5488,19 +5499,3 @@ msgstr "%s не е допуÑтим цвÑÑ‚!" #, php-format msgid "%s is not a valid color! Use 3 or 6 hex chars." msgstr "%s не е допуÑтим цвÑÑ‚! Използвайте 3 или 6 шеÑтнадеÑетични знака." - -#: scripts/maildaemon.php:48 -msgid "Could not parse message." -msgstr "Грешка при обработка на Ñъобщението" - -#: scripts/maildaemon.php:53 -msgid "Not a registered user." -msgstr "Това не е региÑтриран потребител." - -#: scripts/maildaemon.php:57 -msgid "Sorry, that is not your incoming email address." -msgstr "Това не е вашиÑÑ‚ входÑщ адреÑ." - -#: scripts/maildaemon.php:61 -msgid "Sorry, no incoming email allowed." -msgstr "ВходÑщата поща не е разрешена." diff --git a/locale/ca/LC_MESSAGES/statusnet.po b/locale/ca/LC_MESSAGES/statusnet.po index b6e079c61..e9ef85b17 100644 --- a/locale/ca/LC_MESSAGES/statusnet.po +++ b/locale/ca/LC_MESSAGES/statusnet.po @@ -9,12 +9,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-01-03 10:37+0000\n" -"PO-Revision-Date: 2010-01-03 10:37:26+0000\n" +"POT-Creation-Date: 2010-01-10 11:27+0000\n" +"PO-Revision-Date: 2010-01-10 11:27:42+0000\n" "Language-Team: Catalan\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha (r60575); Translate extension (2009-12-06)\n" +"X-Generator: MediaWiki 1.16alpha (r60888); Translate extension (2010-01-04)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: ca\n" "X-Message-Group: out-statusnet\n" @@ -51,11 +51,6 @@ msgstr "No existeix la pà gina." msgid "No such user." msgstr "No existeix aquest usuari." -#: actions/all.php:84 -#, php-format -msgid "%s and friends, page %d" -msgstr "%s i amics, pà gina %d" - #: actions/all.php:86 actions/all.php:167 actions/allrss.php:115 #: actions/apitimelinefriends.php:115 actions/apitimelinehome.php:115 #: lib/personalgroupnav.php:100 @@ -96,8 +91,8 @@ msgstr "" #: actions/all.php:134 #, php-format msgid "" -"You can try to [nudge %s](../%s) from his profile or [post something to his " -"or her attention](%%%%action.newnotice%%%%?status_textarea=%s)." +"You can try to [nudge %1$s](../%2$s) from his profile or [post something to " +"his or her attention](%%%%action.newnotice%%%%?status_textarea=%3$s)." msgstr "" #: actions/all.php:137 actions/replies.php:209 actions/showstream.php:202 @@ -122,6 +117,23 @@ msgstr "Actualitzacions de %1$s i amics a %2$s!" #: actions/apiaccountupdateprofile.php:97 #: actions/apiaccountupdateprofilebackgroundimage.php:94 #: actions/apiaccountupdateprofilecolors.php:118 +#: actions/apidirectmessage.php:156 actions/apifavoritecreate.php:99 +#: actions/apifavoritedestroy.php:100 actions/apifriendshipscreate.php:100 +#: actions/apifriendshipsdestroy.php:100 actions/apifriendshipsshow.php:129 +#: actions/apigroupcreate.php:136 actions/apigroupismember.php:114 +#: actions/apigroupjoin.php:155 actions/apigroupleave.php:141 +#: actions/apigrouplist.php:132 actions/apigrouplistall.php:120 +#: actions/apigroupmembership.php:106 actions/apigroupshow.php:105 +#: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102 +#: actions/apistatusesretweets.php:112 actions/apistatusesshow.php:108 +#: actions/apistatusnetconfig.php:133 actions/apistatusnetversion.php:93 +#: actions/apisubscriptions.php:111 actions/apitimelinefavorites.php:146 +#: actions/apitimelinefriends.php:156 actions/apitimelinegroup.php:150 +#: actions/apitimelinehome.php:156 actions/apitimelinementions.php:151 +#: actions/apitimelinepublic.php:131 actions/apitimelineretweetedbyme.php:122 +#: actions/apitimelineretweetedtome.php:121 +#: actions/apitimelineretweetsofme.php:122 actions/apitimelinetag.php:141 +#: actions/apitimelineuser.php:165 actions/apiusershow.php:101 #, fuzzy msgid "API method not found." msgstr "No s'ha trobat el mètode API!" @@ -180,6 +192,9 @@ msgstr "" #: actions/apiaccountupdateprofilebackgroundimage.php:146 #: actions/apiaccountupdateprofilecolors.php:164 #: actions/apiaccountupdateprofilecolors.php:174 +#: actions/groupdesignsettings.php:287 actions/groupdesignsettings.php:297 +#: actions/userdesignsettings.php:210 actions/userdesignsettings.php:220 +#: actions/userdesignsettings.php:263 actions/userdesignsettings.php:273 #, fuzzy msgid "Unable to save your design settings." msgstr "No s'ha pogut guardar la teva configuració de Twitter!" @@ -223,26 +238,6 @@ msgstr "Missatges directes a %s" msgid "All the direct messages sent to %s" msgstr "Tots els missatges directes enviats a %s" -#: actions/apidirectmessage.php:156 actions/apifavoritecreate.php:99 -#: actions/apifavoritedestroy.php:100 actions/apifriendshipscreate.php:100 -#: actions/apifriendshipsdestroy.php:100 actions/apifriendshipsshow.php:129 -#: actions/apigroupcreate.php:136 actions/apigroupismember.php:114 -#: actions/apigroupjoin.php:155 actions/apigroupleave.php:141 -#: actions/apigrouplist.php:132 actions/apigrouplistall.php:120 -#: actions/apigroupmembership.php:106 actions/apigroupshow.php:105 -#: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102 -#: actions/apistatusesretweets.php:112 actions/apistatusesshow.php:108 -#: actions/apistatusnetconfig.php:133 actions/apistatusnetversion.php:93 -#: actions/apisubscriptions.php:111 actions/apitimelinefavorites.php:146 -#: actions/apitimelinefriends.php:156 actions/apitimelinegroup.php:150 -#: actions/apitimelinehome.php:156 actions/apitimelinementions.php:151 -#: actions/apitimelinepublic.php:131 actions/apitimelineretweetedbyme.php:122 -#: actions/apitimelineretweetedtome.php:121 -#: actions/apitimelineretweetsofme.php:122 actions/apitimelinetag.php:141 -#: actions/apitimelineuser.php:165 actions/apiusershow.php:101 -msgid "API method not found!" -msgstr "No s'ha trobat el mètode API!" - #: actions/apidirectmessagenew.php:126 msgid "No message text!" msgstr "No hi ha text al missatge!" @@ -268,7 +263,8 @@ msgid "No status found with that ID." msgstr "No s'ha trobat cap estatus amb aquesta ID." #: actions/apifavoritecreate.php:119 -msgid "This status is already a favorite!" +#, fuzzy +msgid "This status is already a favorite." msgstr "Aquest estat ja és un preferit!" #: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:176 @@ -276,7 +272,8 @@ msgid "Could not create favorite." msgstr "No es pot crear favorit." #: actions/apifavoritedestroy.php:122 -msgid "That status is not a favorite!" +#, fuzzy +msgid "That status is not a favorite." msgstr "L'estat no és un preferit!" #: actions/apifavoritedestroy.php:134 actions/disfavor.php:87 @@ -299,8 +296,9 @@ msgid "Could not unfollow user: User not found." msgstr "No pots subscriure't a aquest usuari: L'usuari no existeix." #: actions/apifriendshipsdestroy.php:120 -msgid "You cannot unfollow yourself!" -msgstr "" +#, fuzzy +msgid "You cannot unfollow yourself." +msgstr "No podeu suprimir els usuaris." #: actions/apifriendshipsexists.php:94 msgid "Two user ids or screen_names must be supplied." @@ -379,7 +377,7 @@ msgstr "L'à lies «%s» ja està en ús. Proveu-ne un altre." #: actions/apigroupcreate.php:286 actions/editgroup.php:234 #: actions/newgroup.php:178 msgid "Alias can't be the same as nickname." -msgstr "" +msgstr "L'à lies no pot ser el mateix que el sobrenom." #: actions/apigroupismember.php:95 actions/apigroupjoin.php:104 #: actions/apigroupleave.php:104 actions/apigroupmembership.php:91 @@ -387,7 +385,7 @@ msgstr "" msgid "Group not found!" msgstr "No s'ha trobat el grup!" -#: actions/apigroupjoin.php:110 +#: actions/apigroupjoin.php:110 actions/joingroup.php:90 lib/command.php:217 msgid "You are already a member of that group." msgstr "Ja sou membre del grup." @@ -395,18 +393,18 @@ msgstr "Ja sou membre del grup." msgid "You have been blocked from that group by the admin." msgstr "" -#: actions/apigroupjoin.php:138 -#, php-format -msgid "Could not join user %s to group %s." +#: actions/apigroupjoin.php:138 actions/joingroup.php:128 lib/command.php:234 +#, fuzzy, php-format +msgid "Could not join user %1$s to group %2$s." msgstr "No s'ha pogut afegir l'usuari %s al grup %s." #: actions/apigroupleave.php:114 msgid "You are not a member of this group." msgstr "No sou un membre del grup." -#: actions/apigroupleave.php:124 -#, php-format -msgid "Could not remove user %s to group %s." +#: actions/apigroupleave.php:124 actions/leavegroup.php:127 +#, fuzzy, php-format +msgid "Could not remove user %1$s from group %2$s." msgstr "No s'ha pogut suprimir l'usuari %s del grup %s." #: actions/apigrouplist.php:95 @@ -414,11 +412,6 @@ msgstr "No s'ha pogut suprimir l'usuari %s del grup %s." msgid "%s's groups" msgstr "Grups de %s" -#: actions/apigrouplist.php:103 -#, fuzzy, php-format -msgid "Groups %s is a member of on %s." -msgstr "%s grups són membres de" - #: actions/apigrouplistall.php:90 actions/usergroups.php:62 #, php-format msgid "%s groups" @@ -442,12 +435,12 @@ msgstr "No pots eliminar l'estatus d'un altre usuari." msgid "No such notice." msgstr "No existeix aquest avÃs." -#: actions/apistatusesretweet.php:83 +#: actions/apistatusesretweet.php:83 lib/command.php:422 #, fuzzy msgid "Cannot repeat your own notice." msgstr "No es poden posar en on les notificacions." -#: actions/apistatusesretweet.php:91 +#: actions/apistatusesretweet.php:91 lib/command.php:427 #, fuzzy msgid "Already repeated that notice." msgstr "Eliminar aquesta nota" @@ -461,7 +454,7 @@ msgid "No status with that ID found." msgstr "No s'ha trobat cap estatus amb la ID trobada." #: actions/apistatusesupdate.php:157 actions/newnotice.php:155 -#: scripts/maildaemon.php:71 +#: lib/mailhandler.php:60 #, php-format msgid "That's too long. Max notice size is %d chars." msgstr "Massa llarg. La longitud mà xima és de %d carà cters." @@ -480,13 +473,13 @@ msgid "Unsupported format." msgstr "El format no està implementat." #: actions/apitimelinefavorites.php:108 -#, php-format -msgid "%s / Favorites from %s" +#, fuzzy, php-format +msgid "%1$s / Favorites from %2$s" msgstr "%s / Preferits de %s" #: actions/apitimelinefavorites.php:120 -#, php-format -msgid "%s updates favorited by %s / %s." +#, fuzzy, php-format +msgid "%1$s updates favorited by %2$s / %2$s." msgstr "%s actualitzacions favorites per %s / %s." #: actions/apitimelinegroup.php:109 actions/apitimelineuser.php:118 @@ -554,8 +547,11 @@ msgstr "No s'ha trobat." msgid "No such attachment." msgstr "No existeix l'adjunció." -#: actions/avatarbynickname.php:59 actions/grouprss.php:91 -#: actions/leavegroup.php:76 +#: actions/avatarbynickname.php:59 actions/blockedfromgroup.php:73 +#: actions/editgroup.php:84 actions/groupdesignsettings.php:84 +#: actions/grouplogo.php:86 actions/groupmembers.php:76 +#: actions/grouprss.php:91 actions/joingroup.php:76 actions/leavegroup.php:76 +#: actions/showgroup.php:121 msgid "No nickname." msgstr "Cap sobrenom." @@ -579,8 +575,8 @@ msgstr "" "Podeu pujar el vostre avatar personal. La mida mà xima del fitxer és %s." #: actions/avatarsettings.php:106 actions/avatarsettings.php:185 -#: actions/grouplogo.php:178 actions/remotesubscribe.php:191 -#: actions/userauthorization.php:72 actions/userrss.php:103 +#: actions/remotesubscribe.php:191 actions/userauthorization.php:72 +#: actions/userrss.php:103 msgid "User without matching profile" msgstr "Usuari sense perfil coincident" @@ -612,9 +608,9 @@ msgstr "Puja" msgid "Crop" msgstr "Retalla" -#: actions/avatarsettings.php:268 actions/disfavor.php:74 -#: actions/emailsettings.php:238 actions/favor.php:75 actions/geocode.php:50 -#: actions/groupblock.php:66 actions/grouplogo.php:309 +#: actions/avatarsettings.php:268 actions/deletenotice.php:157 +#: actions/disfavor.php:74 actions/emailsettings.php:238 actions/favor.php:75 +#: actions/geocode.php:50 actions/groupblock.php:66 actions/grouplogo.php:309 #: actions/groupunblock.php:66 actions/imsettings.php:206 #: actions/invite.php:56 actions/login.php:135 actions/makeadmin.php:66 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80 @@ -697,19 +693,15 @@ msgstr "Bloquejar aquest usuari" msgid "Failed to save block information." msgstr "Error al guardar la informació del block." -#: actions/blockedfromgroup.php:73 actions/editgroup.php:84 -#: actions/groupdesignsettings.php:84 actions/grouplogo.php:86 -#: actions/groupmembers.php:76 actions/joingroup.php:76 -#: actions/showgroup.php:121 -msgid "No nickname" -msgstr "Cap sobrenom." - #: actions/blockedfromgroup.php:80 actions/editgroup.php:96 +#: actions/foafgroup.php:44 actions/foafgroup.php:62 actions/groupblock.php:86 #: actions/groupbyid.php:83 actions/groupdesignsettings.php:97 #: actions/grouplogo.php:99 actions/groupmembers.php:83 -#: actions/joingroup.php:83 actions/showgroup.php:137 -msgid "No such group" -msgstr "No existeix tal grup" +#: actions/grouprss.php:98 actions/groupunblock.php:86 +#: actions/joingroup.php:83 actions/leavegroup.php:83 actions/makeadmin.php:86 +#: actions/showgroup.php:137 lib/command.php:212 lib/command.php:263 +msgid "No such group." +msgstr "No s'ha trobat el grup." #: actions/blockedfromgroup.php:90 #, php-format @@ -717,8 +709,8 @@ msgid "%s blocked profiles" msgstr "%s perfils blocats" #: actions/blockedfromgroup.php:93 -#, php-format -msgid "%s blocked profiles, page %d" +#, fuzzy, php-format +msgid "%1$s blocked profiles, page %2$d" msgstr "%s perfils blocats, pà gina %d" #: actions/blockedfromgroup.php:108 @@ -835,13 +827,6 @@ msgstr "No es pot esborrar la notificació." msgid "Delete this notice" msgstr "Eliminar aquesta nota" -#: actions/deletenotice.php:157 -#, fuzzy -msgid "There was a problem with your session token. Try again, please." -msgstr "" -"Sembla que hi ha hagut un problema amb la teva sessió. Prova-ho de nou, si " -"us plau." - #: actions/deleteuser.php:67 msgid "You cannot delete users." msgstr "No podeu suprimir els usuaris." @@ -866,7 +851,7 @@ msgid "Delete this user" msgstr "Suprimeix l'usuari" #: actions/designadminpanel.php:62 lib/accountsettingsaction.php:124 -#: lib/adminpanelaction.php:302 lib/groupnav.php:119 +#: lib/adminpanelaction.php:316 lib/groupnav.php:119 msgid "Design" msgstr "Disseny" @@ -1004,7 +989,8 @@ msgstr "Has d'haver entrat per crear un grup." #: actions/editgroup.php:103 actions/editgroup.php:168 #: actions/groupdesignsettings.php:104 actions/grouplogo.php:106 -msgid "You must be an admin to edit the group" +#, fuzzy +msgid "You must be an admin to edit the group." msgstr "Has de ser admin per editar aquest grup" #: actions/editgroup.php:154 @@ -1029,7 +1015,8 @@ msgid "Options saved." msgstr "Configuració guardada." #: actions/emailsettings.php:60 -msgid "Email Settings" +#, fuzzy +msgid "Email settings" msgstr "Configuració del correu electrònic" #: actions/emailsettings.php:71 @@ -1066,8 +1053,9 @@ msgid "Cancel" msgstr "Cancel·la" #: actions/emailsettings.php:121 -msgid "Email Address" -msgstr "Adreça electrònica" +#, fuzzy +msgid "Email address" +msgstr "Direcció de correu electrònic" #: actions/emailsettings.php:123 msgid "Email address, like \"UserName@example.org\"" @@ -1145,9 +1133,10 @@ msgstr "No hi ha cap adreça electrònica." msgid "Cannot normalize that email address" msgstr "No es pot normalitzar l'adreça electrònica." -#: actions/emailsettings.php:331 actions/siteadminpanel.php:157 -msgid "Not a valid email address" -msgstr "No és una adreça electrònica và lida." +#: actions/emailsettings.php:331 actions/register.php:201 +#: actions/siteadminpanel.php:157 +msgid "Not a valid email address." +msgstr "Adreça de correu electrònic no và lida." #: actions/emailsettings.php:334 msgid "That is already your email address." @@ -1326,18 +1315,11 @@ msgstr "Versió desconeguda del protocol OMB." msgid "Error updating remote profile" msgstr "Error en actualitzar el perfil remot" -#: actions/foafgroup.php:44 actions/foafgroup.php:62 actions/groupblock.php:86 -#: actions/grouprss.php:98 actions/groupunblock.php:86 -#: actions/leavegroup.php:83 actions/makeadmin.php:86 lib/command.php:212 -#: lib/command.php:263 -msgid "No such group." -msgstr "No s'ha trobat el grup." - -#: actions/getfile.php:75 +#: actions/getfile.php:79 msgid "No such file." msgstr "No existeix el fitxer." -#: actions/getfile.php:79 +#: actions/getfile.php:83 msgid "Cannot read file." msgstr "No es pot llegir el fitxer." @@ -1349,7 +1331,7 @@ msgstr "No s'ha especificat perfil." #: actions/groupblock.php:76 actions/groupunblock.php:76 #: actions/makeadmin.php:76 actions/subedit.php:53 actions/tagother.php:46 -#: lib/profileformaction.php:77 +#: actions/unsubscribe.php:84 lib/profileformaction.php:77 msgid "No profile with that ID." msgstr "No hi ha cap perfil amb aquesta ID." @@ -1376,11 +1358,11 @@ msgid "Block user from group" msgstr "Bloca l'usuari del grup" #: actions/groupblock.php:162 -#, php-format +#, fuzzy, php-format msgid "" -"Are you sure you want to block user \"%s\" from the group \"%s\"? They will " -"be removed from the group, unable to post, and unable to subscribe to the " -"group in the future." +"Are you sure you want to block user \"%1$s\" from the group \"%2$s\"? They " +"will be removed from the group, unable to post, and unable to subscribe to " +"the group in the future." msgstr "" "Esteu segur que voleu blocar l'usuari «%s» del grup «%s»? Se suprimiran del " "grup, i no podran enviar-hi res ni subscriure-s'hi en el futur." @@ -1397,8 +1379,9 @@ msgstr "Bloca l'usuari del grup" msgid "Database error blocking user from group." msgstr "" -#: actions/groupbyid.php:74 -msgid "No ID" +#: actions/groupbyid.php:74 actions/userbyid.php:70 +#, fuzzy +msgid "No ID." msgstr "No ID" #: actions/groupdesignsettings.php:68 @@ -1414,23 +1397,17 @@ msgid "" "Customize the way your group looks with a background image and a colour " "palette of your choice." msgstr "" +"Personalitzeu l'aspecte del vostre grup amb una imatge de fons i una paleta " +"de colors de la vostra elecció." #: actions/groupdesignsettings.php:263 actions/userdesignsettings.php:186 #: lib/designsettings.php:391 lib/designsettings.php:413 msgid "Couldn't update your design." msgstr "No s'ha pogut actualitzar el vostre disseny." -#: actions/groupdesignsettings.php:287 actions/groupdesignsettings.php:297 -#: actions/userdesignsettings.php:210 actions/userdesignsettings.php:220 -#: actions/userdesignsettings.php:263 actions/userdesignsettings.php:273 -#, fuzzy -msgid "Unable to save your design settings!" -msgstr "No s'ha pogut guardar la teva configuració de Twitter!" - #: actions/groupdesignsettings.php:308 actions/userdesignsettings.php:231 -#, fuzzy msgid "Design preferences saved." -msgstr "Preferències de sincronització guardades." +msgstr "S'han desat les preferències de disseny." #: actions/grouplogo.php:139 actions/grouplogo.php:192 msgid "Group logo" @@ -1442,12 +1419,14 @@ msgid "" "You can upload a logo image for your group. The maximum file size is %s." msgstr "Pots pujar una imatge de logo per al grup." -#: actions/grouplogo.php:362 +#: actions/grouplogo.php:178 #, fuzzy +msgid "User without matching profile." +msgstr "Usuari sense perfil coincident" + +#: actions/grouplogo.php:362 msgid "Pick a square area of the image to be the logo." -msgstr "" -"Selecciona un quadrat de l'à rea de la imatge que vols que sigui el teu " -"avatar." +msgstr "Trieu una à rea quadrada de la imatge perquè en sigui el logotip." #: actions/grouplogo.php:396 msgid "Logo updated." @@ -1463,15 +1442,15 @@ msgid "%s group members" msgstr "%s membre/s en el grup" #: actions/groupmembers.php:96 -#, php-format -msgid "%s group members, page %d" +#, fuzzy, php-format +msgid "%1$s group members, page %2$d" msgstr "%s membre/s en el grup, pà gina %d" #: actions/groupmembers.php:111 msgid "A list of the users in this group." msgstr "La llista dels usuaris d'aquest grup." -#: actions/groupmembers.php:175 lib/action.php:441 lib/groupnav.php:107 +#: actions/groupmembers.php:175 lib/action.php:442 lib/groupnav.php:107 msgid "Admin" msgstr "Admin" @@ -1565,7 +1544,8 @@ msgid "Error removing the block." msgstr "S'ha produït un error en suprimir el bloc." #: actions/imsettings.php:59 -msgid "IM Settings" +#, fuzzy +msgid "IM settings" msgstr "Configuració de missatgeria instantà nia" #: actions/imsettings.php:70 @@ -1596,7 +1576,8 @@ msgstr "" "llista d'amics?)" #: actions/imsettings.php:124 -msgid "IM Address" +#, fuzzy +msgid "IM address" msgstr "Adreça de missatgeria instantà nia" #: actions/imsettings.php:126 @@ -1660,11 +1641,6 @@ msgstr "" msgid "That is not your Jabber ID." msgstr "Aquest no és el teu Jabber ID." -#: actions/inbox.php:59 -#, php-format -msgid "Inbox for %s - page %d" -msgstr "Safata d'entrada per %s - pà gina %d" - #: actions/inbox.php:62 #, php-format msgid "Inbox for %s" @@ -1704,10 +1680,10 @@ msgstr "Invitar nous usuaris" msgid "You are already subscribed to these users:" msgstr "Ja està s subscrit a aquests usuaris:" -#: actions/invite.php:131 actions/invite.php:139 +#: actions/invite.php:131 actions/invite.php:139 lib/command.php:315 #, php-format -msgid "%s (%s)" -msgstr "%s (%s)" +msgid "%1$s (%2$s)" +msgstr "%1$s (%2$s)" #: actions/invite.php:136 msgid "" @@ -1750,7 +1726,7 @@ msgstr "Missatge personal" msgid "Optionally add a personal message to the invitation." msgstr "Opcionalment pots afegir un missatge a la invitació." -#: actions/invite.php:197 lib/messageform.php:178 lib/noticeform.php:232 +#: actions/invite.php:197 lib/messageform.php:178 lib/noticeform.php:234 msgid "Send" msgstr "Envia" @@ -1820,18 +1796,9 @@ msgstr "" msgid "You must be logged in to join a group." msgstr "Has d'haver entrat per participar en un grup." -#: actions/joingroup.php:90 lib/command.php:217 -msgid "You are already a member of that group" -msgstr "Ja ets membre d'aquest grup" - -#: actions/joingroup.php:128 lib/command.php:234 -#, php-format -msgid "Could not join user %s to group %s" -msgstr "No s'ha pogut afegir l'usuari %s al grup %s" - #: actions/joingroup.php:135 lib/command.php:239 -#, php-format -msgid "%s joined group %s" +#, fuzzy, php-format +msgid "%1$s joined group %2$s" msgstr "%s s'ha pogut afegir al grup %s" #: actions/leavegroup.php:60 @@ -1846,14 +1813,9 @@ msgstr "No ets membre d'aquest grup." msgid "Could not find membership record." msgstr "No s'han trobat registres dels membres." -#: actions/leavegroup.php:127 lib/command.php:284 -#, php-format -msgid "Could not remove user %s to group %s" -msgstr "No s'ha pogut eliminar l'usuari %s del grup %s" - #: actions/leavegroup.php:134 lib/command.php:289 -#, php-format -msgid "%s left group %s" +#, fuzzy, php-format +msgid "%1$s left group %2$s" msgstr "%s ha abandonat el grup %s" #: actions/login.php:83 actions/register.php:137 @@ -1874,7 +1836,7 @@ msgstr "Nom d'usuari o contrasenya incorrectes." msgid "Error setting user. You are probably not authorized." msgstr "No autoritzat." -#: actions/login.php:208 actions/login.php:261 lib/action.php:459 +#: actions/login.php:208 actions/login.php:261 lib/action.php:460 #: lib/logingroupnav.php:79 msgid "Login" msgstr "Inici de sessió" @@ -1931,18 +1893,18 @@ msgid "Only an admin can make another user an admin." msgstr "Només un administrador poc fer a un altre usuari administrador." #: actions/makeadmin.php:95 -#, php-format -msgid "%s is already an admin for group \"%s\"." +#, fuzzy, php-format +msgid "%1$s is already an admin for group \"%2$s\"." msgstr "%s ja és un administrador del grup «%s»." #: actions/makeadmin.php:132 -#, php-format -msgid "Can't get membership record for %s in group %s" -msgstr "" +#, fuzzy, php-format +msgid "Can't get membership record for %1$s in group %2$s." +msgstr "No s'ha pogut eliminar l'usuari %s del grup %s" #: actions/makeadmin.php:145 -#, php-format -msgid "Can't make %s an admin for group %s" +#, fuzzy, php-format +msgid "Can't make %1$s an admin for group %2$s." msgstr "No es pot fer %s un administrador del grup %s" #: actions/microsummary.php:69 @@ -1984,8 +1946,8 @@ msgid "Message sent" msgstr "S'ha enviat el missatge" #: actions/newmessage.php:185 lib/command.php:376 -#, php-format -msgid "Direct message to %s sent" +#, fuzzy, php-format +msgid "Direct message to %s sent." msgstr "Missatge directe per a %s enviat" #: actions/newmessage.php:210 actions/newnotice.php:245 lib/channel.php:170 @@ -2014,8 +1976,8 @@ msgid "Text search" msgstr "Cerca de text" #: actions/noticesearch.php:91 -#, php-format -msgid "Search results for \"%s\" on %s" +#, fuzzy, php-format +msgid "Search results for \"%1$s\" on %2$s" msgstr "Cerca resultats de «%s» a %s" #: actions/noticesearch.php:121 @@ -2121,11 +2083,6 @@ msgid "URL shortening service is too long (max 50 chars)." msgstr "" "El servei d'auto-escurçament d'URL és massa llarga (mà x. 50 carà cters)." -#: actions/outbox.php:58 -#, php-format -msgid "Outbox for %s - page %d" -msgstr "Safata de sortida per %s - pà gina %d" - #: actions/outbox.php:61 #, php-format msgid "Outbox for %s" @@ -2198,7 +2155,7 @@ msgstr "No es pot guardar la nova contrasenya." msgid "Password saved." msgstr "Contrasenya guardada." -#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:308 +#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:326 msgid "Paths" msgstr "Camins" @@ -2231,7 +2188,7 @@ msgid "Invalid SSL server. The maximum length is 255 characters." msgstr "" #: actions/pathsadminpanel.php:217 actions/siteadminpanel.php:58 -#: lib/adminpanelaction.php:299 +#: lib/adminpanelaction.php:311 msgid "Site" msgstr "Lloc" @@ -2324,7 +2281,8 @@ msgid "When to use SSL" msgstr "" #: actions/pathsadminpanel.php:308 -msgid "SSL Server" +#, fuzzy +msgid "SSL server" msgstr "Servidor SSL" #: actions/pathsadminpanel.php:309 @@ -2355,8 +2313,8 @@ msgid "Not a valid people tag: %s" msgstr "Etiqueta no và lida per a la gent: %s" #: actions/peopletag.php:144 -#, php-format -msgid "Users self-tagged with %s - page %d" +#, fuzzy, php-format +msgid "Users self-tagged with %1$s - page %2$d" msgstr "Usuaris que s'han etiquetat %s - pà gina %d" #: actions/postnotice.php:84 @@ -2365,7 +2323,7 @@ msgstr "El contingut de l'avÃs és invà lid" #: actions/postnotice.php:90 #, php-format -msgid "Notice license ‘%s’ is not compatible with site license ‘%s’." +msgid "Notice license ‘%1$s’ is not compatible with site license ‘%2$s’." msgstr "" #: actions/profilesettings.php:60 @@ -2490,20 +2448,20 @@ msgstr "Etiqueta no và lida: \"%s\"" msgid "Couldn't update user for autosubscribe." msgstr "No es pot actualitzar l'usuari per autosubscriure." -#: actions/profilesettings.php:354 +#: actions/profilesettings.php:359 #, fuzzy msgid "Couldn't save location prefs." msgstr "No s'han pogut guardar les etiquetes." -#: actions/profilesettings.php:366 +#: actions/profilesettings.php:371 msgid "Couldn't save profile." msgstr "No s'ha pogut guardar el perfil." -#: actions/profilesettings.php:374 +#: actions/profilesettings.php:379 msgid "Couldn't save tags." msgstr "No s'han pogut guardar les etiquetes." -#: actions/profilesettings.php:382 lib/adminpanelaction.php:126 +#: actions/profilesettings.php:387 lib/adminpanelaction.php:137 msgid "Settings saved." msgstr "Configuració guardada." @@ -2600,7 +2558,7 @@ msgid "" "one!" msgstr "" -#: actions/publictagcloud.php:135 +#: actions/publictagcloud.php:131 msgid "Tag cloud" msgstr "Núvol d'etiquetes" @@ -2637,6 +2595,8 @@ msgid "" "If you have forgotten or lost your password, you can get a new one sent to " "the email address you have stored in your account." msgstr "" +"Si heu oblidat o perdut la vostra contrasenya, podeu aconseguir-ne una de " +"nova a partir de l'adreça electrònica que s'ha associat al vostre compte." #: actions/recoverpassword.php:158 msgid "You have been identified. Enter a new password below. " @@ -2740,7 +2700,7 @@ msgstr "El codi d'invitació no és và lid." msgid "Registration successful" msgstr "Registre satisfactori" -#: actions/register.php:114 actions/register.php:502 lib/action.php:456 +#: actions/register.php:114 actions/register.php:502 lib/action.php:457 #: lib/logingroupnav.php:85 msgid "Register" msgstr "Registre" @@ -2753,10 +2713,6 @@ msgstr "Registre no permès." msgid "You can't register if you don't agree to the license." msgstr "No pots registrar-te si no està s d'acord amb la llicència." -#: actions/register.php:201 -msgid "Not a valid email address." -msgstr "Adreça de correu electrònic no và lida." - #: actions/register.php:212 msgid "Email address already exists." msgstr "L'adreça de correu electrònic ja existeix." @@ -2818,12 +2774,12 @@ msgstr "" "electrònic, adreça de missatgeria instantà nia, número de telèfon." #: actions/register.php:537 -#, php-format +#, fuzzy, php-format msgid "" -"Congratulations, %s! And welcome to %%%%site.name%%%%. From here, you may " +"Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may " "want to...\n" "\n" -"* Go to [your profile](%s) and post your first message.\n" +"* Go to [your profile](%2$s) and post your first message.\n" "* Add a [Jabber/GTalk address](%%%%action.imsettings%%%%) so you can send " "notices through instant messages.\n" "* [Search for people](%%%%action.peoplesearch%%%%) that you may know or that " @@ -2873,9 +2829,8 @@ msgid "Remote subscribe" msgstr "Subscripció remota" #: actions/remotesubscribe.php:124 -#, fuzzy msgid "Subscribe to a remote user" -msgstr "Subscriure's a aquest usuari" +msgstr "Subscriu a un usuari remot" #: actions/remotesubscribe.php:129 msgid "User nickname" @@ -2951,11 +2906,6 @@ msgstr "Repetit!" msgid "Replies to %s" msgstr "Respostes a %s" -#: actions/replies.php:127 -#, php-format -msgid "Replies to %s, page %d" -msgstr "Respostes a %s, pà gina %d" - #: actions/replies.php:144 #, fuzzy, php-format msgid "Replies feed for %s (RSS 1.0)" @@ -2972,11 +2922,13 @@ msgid "Replies feed for %s (Atom)" msgstr "Feed d'avisos de %s" #: actions/replies.php:198 -#, php-format +#, fuzzy, php-format msgid "" -"This is the timeline showing replies to %s but %s hasn't received a notice " -"to his attention yet." +"This is the timeline showing replies to %1$s but %2$s hasn't received a " +"notice to his attention yet." msgstr "" +"Aquesta és la lÃnia temporal de %s i amics, però ningú hi ha enviat res " +"encara." #: actions/replies.php:203 #, php-format @@ -2988,8 +2940,8 @@ msgstr "" #: actions/replies.php:205 #, php-format msgid "" -"You can try to [nudge %s](../%s) or [post something to his or her attention]" -"(%%%%action.newnotice%%%%?status_textarea=%s)." +"You can try to [nudge %1$s](../%2$s) or [post something to his or her " +"attention](%%%%action.newnotice%%%%?status_textarea=%3$s)." msgstr "" #: actions/repliesrss.php:72 @@ -3007,11 +2959,6 @@ msgstr "No pots enviar un missatge a aquest usuari." msgid "User is already sandboxed." msgstr "Un usuari t'ha bloquejat." -#: actions/showfavorites.php:79 -#, fuzzy, php-format -msgid "%s's favorite notices, page %d" -msgstr "%s notificacions favorites, pà gina %d" - #: actions/showfavorites.php:132 msgid "Could not retrieve favorite notices." msgstr "No s'han pogut recuperar els avisos preferits." @@ -3061,11 +3008,6 @@ msgstr "És una forma de compartir allò que us agrada." msgid "%s group" msgstr "%s grup" -#: actions/showgroup.php:84 -#, php-format -msgid "%s group, page %d" -msgstr "%s grup, pà gina %d" - #: actions/showgroup.php:218 msgid "Group profile" msgstr "Perfil del grup" @@ -3114,7 +3056,7 @@ msgstr "Membres" #: actions/showgroup.php:386 lib/profileaction.php:117 #: lib/profileaction.php:148 lib/profileaction.php:236 lib/section.php:95 -#: lib/tagcloudsection.php:71 +#: lib/subscriptionlist.php:126 lib/tagcloudsection.php:71 msgid "(None)" msgstr "(Cap)" @@ -3183,14 +3125,9 @@ msgstr "Notificació publicada" msgid " tagged %s" msgstr "Aviso etiquetats amb %s" -#: actions/showstream.php:79 -#, php-format -msgid "%s, page %d" -msgstr "%s, pà gina %d" - #: actions/showstream.php:122 #, fuzzy, php-format -msgid "Notice feed for %s tagged %s (RSS 1.0)" +msgid "Notice feed for %1$s tagged %2$s (RSS 1.0)" msgstr "Feed d'avisos del grup %s" #: actions/showstream.php:129 @@ -3214,9 +3151,11 @@ msgid "FOAF for %s" msgstr "Safata de sortida per %s" #: actions/showstream.php:191 -#, php-format -msgid "This is the timeline for %s but %s hasn't posted anything yet." +#, fuzzy, php-format +msgid "This is the timeline for %1$s but %2$s hasn't posted anything yet." msgstr "" +"Aquesta és la lÃnia temporal de %s i amics, però ningú hi ha enviat res " +"encara." #: actions/showstream.php:196 msgid "" @@ -3227,8 +3166,8 @@ msgstr "" #: actions/showstream.php:198 #, php-format msgid "" -"You can try to nudge %s or [post something to his or her attention](%%%%" -"action.newnotice%%%%?status_textarea=%s)." +"You can try to nudge %1$s or [post something to his or her attention](%%%%" +"action.newnotice%%%%?status_textarea=%2$s)." msgstr "" #: actions/showstream.php:234 @@ -3272,12 +3211,13 @@ msgid "Site name must have non-zero length." msgstr "El nom del lloc ha de tenir una longitud superior a zero." #: actions/siteadminpanel.php:154 -msgid "You must have a valid contact email address" +#, fuzzy +msgid "You must have a valid contact email address." msgstr "Heu de tenir una adreça electrònica de contacte và lida" #: actions/siteadminpanel.php:172 -#, php-format -msgid "Unknown language \"%s\"" +#, fuzzy, php-format +msgid "Unknown language \"%s\"." msgstr "Llengua desconeguda «%s»" #: actions/siteadminpanel.php:179 @@ -3329,9 +3269,8 @@ msgid "URL used for credits link in footer of each page" msgstr "" #: actions/siteadminpanel.php:271 -#, fuzzy msgid "Contact email address for your site" -msgstr "Nou correu electrònic per publicar a %s" +msgstr "Adreça electrònica de contacte del vostre lloc" #: actions/siteadminpanel.php:277 msgid "Local" @@ -3461,7 +3400,8 @@ msgid "Save site settings" msgstr "Configuració de l'avatar" #: actions/smssettings.php:58 -msgid "SMS Settings" +#, fuzzy +msgid "SMS settings" msgstr "Configuració SMS" #: actions/smssettings.php:69 @@ -3492,7 +3432,8 @@ msgid "Enter the code you received on your phone." msgstr "Escriu el codi que has rebut en el teu telèfon mòbil." #: actions/smssettings.php:138 -msgid "SMS Phone number" +#, fuzzy +msgid "SMS phone number" msgstr "Número de telèfon pels SMS" #: actions/smssettings.php:140 @@ -3585,8 +3526,8 @@ msgid "%s subscribers" msgstr "%s subscriptors" #: actions/subscribers.php:52 -#, php-format -msgid "%s subscribers, page %d" +#, fuzzy, php-format +msgid "%1$s subscribers, page %2$d" msgstr "%s subscriptors, pà gina %d" #: actions/subscribers.php:63 @@ -3624,8 +3565,8 @@ msgid "%s subscriptions" msgstr "%s subscripcions" #: actions/subscriptions.php:54 -#, php-format -msgid "%s subscriptions, page %d" +#, fuzzy, php-format +msgid "%1$s subscriptions, page %2$d" msgstr "%s subscripcions, pà gina %d" #: actions/subscriptions.php:65 @@ -3660,11 +3601,6 @@ msgstr "Jabber" msgid "SMS" msgstr "SMS" -#: actions/tag.php:68 -#, php-format -msgid "Notices tagged with %s, page %d" -msgstr "Notificació etiquetada amb %s, pà gina %d" - #: actions/tag.php:86 #, fuzzy, php-format msgid "Notice feed for tag %s (RSS 1.0)" @@ -3753,20 +3689,17 @@ msgstr "L'usuari no té perfil." msgid "No profile id in request." msgstr "No id en el perfil sol·licitat." -#: actions/unsubscribe.php:84 -msgid "No profile with that id." -msgstr "No hi ha cap perfil amb aquesta id." - #: actions/unsubscribe.php:98 msgid "Unsubscribed" msgstr "No subscrit" #: actions/updateprofile.php:62 actions/userauthorization.php:330 #, php-format -msgid "Listenee stream license ‘%s’ is not compatible with site license ‘%s’." +msgid "" +"Listenee stream license ‘%1$s’ is not compatible with site license ‘%2$s’." msgstr "" -#: actions/useradminpanel.php:58 lib/adminpanelaction.php:305 +#: actions/useradminpanel.php:58 lib/adminpanelaction.php:321 #: lib/personalgroupnav.php:115 msgid "User" msgstr "Usuari" @@ -3868,7 +3801,7 @@ msgstr "" "subscriure't als avisos d'aquest usuari. Si no has demanat subscriure't als " "avisos de ningú, clica \"Cancel·lar\"." -#: actions/userauthorization.php:188 +#: actions/userauthorization.php:188 actions/version.php:165 msgid "License" msgstr "Llicència" @@ -3924,7 +3857,7 @@ msgstr "" #: actions/userauthorization.php:296 #, php-format -msgid "Listener URI ‘%s’ not found here" +msgid "Listener URI ‘%s’ not found here." msgstr "" #: actions/userauthorization.php:301 @@ -3957,11 +3890,6 @@ msgstr "No es pot llegir l'URL de l'avatar '%s'" msgid "Wrong image type for avatar URL ‘%s’." msgstr "Tipus d'imatge incorrecte per a '%s'" -#: actions/userbyid.php:70 -#, fuzzy -msgid "No ID." -msgstr "No ID" - #: actions/userdesignsettings.php:76 lib/designsettings.php:65 msgid "Profile design" msgstr "Disseny del perfil" @@ -3978,11 +3906,6 @@ msgstr "" msgid "Enjoy your hotdog!" msgstr "Gaudiu de l'entrepà !" -#: actions/usergroups.php:64 -#, php-format -msgid "%s groups, page %d" -msgstr "%s grups, pà gina %d" - #: actions/usergroups.php:130 msgid "Search for more groups" msgstr "Cerca més grups" @@ -3997,6 +3920,73 @@ msgstr "%s no és membre de cap grup." msgid "Try [searching for groups](%%action.groupsearch%%) and joining them." msgstr "" +#: actions/version.php:73 +#, fuzzy, php-format +msgid "StatusNet %s" +msgstr "EstadÃstiques" + +#: actions/version.php:153 +#, php-format +msgid "" +"This site is powered by %1$s version %2$s, Copyright 2008-2010 StatusNet, " +"Inc. and contributors." +msgstr "" + +#: actions/version.php:157 +#, fuzzy +msgid "StatusNet" +msgstr "S'ha suprimit l'estat." + +#: actions/version.php:161 +msgid "Contributors" +msgstr "" + +#: actions/version.php:168 +msgid "" +"StatusNet is free software: you can redistribute it and/or modify it under " +"the terms of the GNU Affero General Public License as published by the Free " +"Software Foundation, either version 3 of the License, or (at your option) " +"any later version. " +msgstr "" + +#: actions/version.php:174 +msgid "" +"This program is distributed in the hope that it will be useful, but WITHOUT " +"ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or " +"FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License " +"for more details. " +msgstr "" + +#: actions/version.php:180 +#, php-format +msgid "" +"You should have received a copy of the GNU Affero General Public License " +"along with this program. If not, see %s." +msgstr "" + +#: actions/version.php:189 +msgid "Plugins" +msgstr "" + +#: actions/version.php:195 +#, fuzzy +msgid "Name" +msgstr "Sobrenom" + +#: actions/version.php:196 lib/action.php:741 +#, fuzzy +msgid "Version" +msgstr "Sessions" + +#: actions/version.php:197 +#, fuzzy +msgid "Author(s)" +msgstr "Autoria" + +#: actions/version.php:198 lib/groupeditform.php:172 +msgid "Description" +msgstr "Descripció" + #: classes/File.php:137 #, php-format msgid "" @@ -4070,7 +4060,7 @@ msgstr "Problema en guardar l'avÃs." msgid "DB error inserting reply: %s" msgstr "Error de BD en inserir resposta: %s" -#: classes/Notice.php:1361 +#: classes/Notice.php:1359 #, fuzzy, php-format msgid "RT @%1$s %2$s" msgstr "%1$s (%2$s)" @@ -4117,138 +4107,133 @@ msgstr "Altres" msgid "Other options" msgstr "Altres opcions" -#: lib/action.php:144 -#, php-format -msgid "%s - %s" -msgstr "%s - %s" - #: lib/action.php:159 msgid "Untitled page" msgstr "Pà gina sense titol" -#: lib/action.php:426 +#: lib/action.php:427 msgid "Primary site navigation" msgstr "Navegació primà ria del lloc" -#: lib/action.php:432 +#: lib/action.php:433 msgid "Home" msgstr "Inici" -#: lib/action.php:432 +#: lib/action.php:433 msgid "Personal profile and friends timeline" msgstr "Perfil personal i lÃnia temporal dels amics" -#: lib/action.php:434 +#: lib/action.php:435 msgid "Account" msgstr "Compte" -#: lib/action.php:434 +#: lib/action.php:435 msgid "Change your email, avatar, password, profile" msgstr "Canviar correu electrònic, avatar, contrasenya, perfil" -#: lib/action.php:437 +#: lib/action.php:438 msgid "Connect" msgstr "Connexió" -#: lib/action.php:437 +#: lib/action.php:438 #, fuzzy msgid "Connect to services" msgstr "No s'ha pogut redirigir al servidor: %s" -#: lib/action.php:441 +#: lib/action.php:442 msgid "Change site configuration" msgstr "Canvia la configuració del lloc" -#: lib/action.php:445 lib/subgroupnav.php:105 +#: lib/action.php:446 lib/subgroupnav.php:105 msgid "Invite" msgstr "Convida" -#: lib/action.php:446 lib/subgroupnav.php:106 +#: lib/action.php:447 lib/subgroupnav.php:106 #, php-format msgid "Invite friends and colleagues to join you on %s" msgstr "Convidar amics i companys perquè participin a %s" -#: lib/action.php:451 +#: lib/action.php:452 msgid "Logout" msgstr "Finalitza la sessió" -#: lib/action.php:451 +#: lib/action.php:452 msgid "Logout from the site" msgstr "Finalitza la sessió del lloc" -#: lib/action.php:456 +#: lib/action.php:457 msgid "Create an account" msgstr "Crea un compte" -#: lib/action.php:459 +#: lib/action.php:460 msgid "Login to the site" msgstr "Inicia una sessió al lloc" -#: lib/action.php:462 lib/action.php:725 +#: lib/action.php:463 lib/action.php:726 msgid "Help" msgstr "Ajuda" -#: lib/action.php:462 +#: lib/action.php:463 msgid "Help me!" msgstr "Ajuda'm" -#: lib/action.php:465 lib/searchaction.php:127 +#: lib/action.php:466 lib/searchaction.php:127 msgid "Search" msgstr "Cerca" -#: lib/action.php:465 +#: lib/action.php:466 msgid "Search for people or text" msgstr "Cerca gent o text" -#: lib/action.php:486 +#: lib/action.php:487 msgid "Site notice" msgstr "AvÃs del lloc" -#: lib/action.php:552 +#: lib/action.php:553 msgid "Local views" msgstr "Vistes locals" -#: lib/action.php:618 +#: lib/action.php:619 msgid "Page notice" msgstr "Notificació pà gina" -#: lib/action.php:720 +#: lib/action.php:721 msgid "Secondary site navigation" msgstr "Navegació del lloc secundà ria" -#: lib/action.php:727 +#: lib/action.php:728 msgid "About" msgstr "Quant a" -#: lib/action.php:729 +#: lib/action.php:730 msgid "FAQ" msgstr "Preguntes més freqüents" -#: lib/action.php:733 +#: lib/action.php:734 msgid "TOS" msgstr "" -#: lib/action.php:736 +#: lib/action.php:737 msgid "Privacy" msgstr "Privadesa" -#: lib/action.php:738 +#: lib/action.php:739 msgid "Source" msgstr "Font" -#: lib/action.php:740 +#: lib/action.php:743 msgid "Contact" msgstr "Contacte" -#: lib/action.php:742 +#: lib/action.php:745 msgid "Badge" msgstr "InsÃgnia" -#: lib/action.php:770 +#: lib/action.php:773 msgid "StatusNet software license" msgstr "Llicència del programari StatusNet" -#: lib/action.php:773 +#: lib/action.php:776 #, php-format msgid "" "**%%site.name%%** is a microblogging service brought to you by [%%site." @@ -4257,12 +4242,12 @@ msgstr "" "**%%site.name%%** és un servei de microblogging de [%%site.broughtby%%**](%%" "site.broughtbyurl%%)." -#: lib/action.php:775 +#: lib/action.php:778 #, php-format msgid "**%%site.name%%** is a microblogging service. " msgstr "**%%site.name%%** és un servei de microblogging." -#: lib/action.php:777 +#: lib/action.php:780 #, php-format msgid "" "It runs the [StatusNet](http://status.net/) microblogging software, version %" @@ -4273,32 +4258,31 @@ msgstr "" "%s, disponible sota la [GNU Affero General Public License](http://www.fsf." "org/licensing/licenses/agpl-3.0.html)." -#: lib/action.php:791 -#, fuzzy +#: lib/action.php:794 msgid "Site content license" -msgstr "Llicència del programari StatusNet" +msgstr "Llicència de contingut del lloc" -#: lib/action.php:800 +#: lib/action.php:803 msgid "All " msgstr "Tot " -#: lib/action.php:805 +#: lib/action.php:808 msgid "license." msgstr "llicència." -#: lib/action.php:1099 +#: lib/action.php:1102 msgid "Pagination" msgstr "Paginació" -#: lib/action.php:1108 +#: lib/action.php:1111 msgid "After" msgstr "Posteriors" -#: lib/action.php:1116 +#: lib/action.php:1119 msgid "Before" msgstr "Anteriors" -#: lib/action.php:1164 +#: lib/action.php:1167 msgid "There was a problem with your session token." msgstr "Ha ocorregut algun problema amb la teva sessió." @@ -4306,30 +4290,35 @@ msgstr "Ha ocorregut algun problema amb la teva sessió." msgid "You cannot make changes to this site." msgstr "No podeu fer canvis al lloc." -#: lib/adminpanelaction.php:195 +#: lib/adminpanelaction.php:107 +#, fuzzy +msgid "Changes to that panel are not allowed." +msgstr "Registre no permès." + +#: lib/adminpanelaction.php:206 #, fuzzy msgid "showForm() not implemented." msgstr "Comanda encara no implementada." -#: lib/adminpanelaction.php:224 +#: lib/adminpanelaction.php:235 #, fuzzy msgid "saveSettings() not implemented." msgstr "Comanda encara no implementada." -#: lib/adminpanelaction.php:247 +#: lib/adminpanelaction.php:258 #, fuzzy msgid "Unable to delete design setting." msgstr "No s'ha pogut guardar la teva configuració de Twitter!" -#: lib/adminpanelaction.php:300 +#: lib/adminpanelaction.php:312 msgid "Basic site configuration" msgstr "Configuració bà sica del lloc" -#: lib/adminpanelaction.php:303 +#: lib/adminpanelaction.php:317 msgid "Design configuration" msgstr "Configuració del disseny" -#: lib/adminpanelaction.php:306 lib/adminpanelaction.php:309 +#: lib/adminpanelaction.php:322 lib/adminpanelaction.php:327 msgid "Paths configuration" msgstr "Configuració dels camins" @@ -4342,9 +4331,8 @@ msgid "Author" msgstr "Autoria" #: lib/attachmentlist.php:278 -#, fuzzy msgid "Provider" -msgstr "Perfil" +msgstr "Proveïdor" #: lib/attachmentnoticesection.php:67 msgid "Notices where this attachment appears" @@ -4354,11 +4342,20 @@ msgstr "" msgid "Tags for this attachment" msgstr "Etiquetes de l'adjunció" +#: lib/authenticationplugin.php:182 lib/authenticationplugin.php:187 +msgid "Password changing failed" +msgstr "El canvi de contrasenya ha fallat" + +#: lib/authenticationplugin.php:197 +#, fuzzy +msgid "Password changing is not allowed" +msgstr "Contrasenya canviada." + #: lib/channel.php:138 lib/channel.php:158 msgid "Command results" msgstr "Resultats de les comandes" -#: lib/channel.php:210 +#: lib/channel.php:210 lib/mailhandler.php:142 msgid "Command complete" msgstr "Comanda completada" @@ -4372,7 +4369,7 @@ msgstr "Perdona, aquesta comanda no està implementada." #: lib/command.php:88 #, fuzzy, php-format -msgid "Could not find a user with nickname %s" +msgid "Could not find a user with nickname %s." msgstr "No es pot actualitzar l'usuari amb el correu electrònic confirmat" #: lib/command.php:92 @@ -4381,7 +4378,7 @@ msgstr "" #: lib/command.php:99 #, fuzzy, php-format -msgid "Nudge sent to %s" +msgid "Nudge sent to %s." msgstr "Reclamació enviada" #: lib/command.php:126 @@ -4393,34 +4390,36 @@ msgid "" msgstr "" #: lib/command.php:152 lib/command.php:399 lib/command.php:460 -msgid "Notice with that id does not exist" -msgstr "" +#, fuzzy +msgid "Notice with that id does not exist." +msgstr "No hi ha cap perfil amb aquesta id." #: lib/command.php:168 lib/command.php:415 lib/command.php:476 #: lib/command.php:532 -msgid "User has no last notice" +#, fuzzy +msgid "User has no last notice." msgstr "L'usuari no té última nota" #: lib/command.php:190 msgid "Notice marked as fave." msgstr "Nota marcada com a favorita." -#: lib/command.php:315 -#, php-format -msgid "%1$s (%2$s)" -msgstr "%1$s (%2$s)" +#: lib/command.php:284 +#, fuzzy, php-format +msgid "Could not remove user %1$s to group %2$s." +msgstr "No s'ha pogut eliminar l'usuari %s del grup %s" #: lib/command.php:318 -#, php-format -msgid "Fullname: %s" +#, fuzzy, php-format +msgid "Full name: %s" msgstr "Nom complet: %s" -#: lib/command.php:321 +#: lib/command.php:321 lib/mail.php:254 #, php-format msgid "Location: %s" msgstr "Localització: %s" -#: lib/command.php:324 +#: lib/command.php:324 lib/mail.php:256 #, php-format msgid "Homepage: %s" msgstr "Pà gina web: %s" @@ -4432,26 +4431,16 @@ msgstr "Sobre tu: %s" #: lib/command.php:358 scripts/xmppdaemon.php:301 #, fuzzy, php-format -msgid "Message too long - maximum is %d characters, you sent %d" +msgid "Message too long - maximum is %1$d characters, you sent %2$d." msgstr "Missatge massa llarg - mà xim és 140 carà cters, tu has enviat %d" #: lib/command.php:378 msgid "Error sending direct message." msgstr "Error al enviar el missatge directe." -#: lib/command.php:422 -#, fuzzy -msgid "Cannot repeat your own notice" -msgstr "No es poden posar en on les notificacions." - -#: lib/command.php:427 -#, fuzzy -msgid "Already repeated that notice" -msgstr "Eliminar aquesta nota" - #: lib/command.php:435 #, fuzzy, php-format -msgid "Notice from %s repeated" +msgid "Notice from %s repeated." msgstr "Notificació publicada" #: lib/command.php:437 @@ -4461,12 +4450,12 @@ msgstr "Problema en guardar l'avÃs." #: lib/command.php:491 #, fuzzy, php-format -msgid "Notice too long - maximum is %d characters, you sent %d" +msgid "Notice too long - maximum is %1$d characters, you sent %2$d." msgstr "Missatge massa llarg - mà xim és 140 carà cters, tu has enviat %d" #: lib/command.php:500 -#, php-format -msgid "Reply to %s sent" +#, fuzzy, php-format +msgid "Reply to %s sent." msgstr "S'ha enviat la resposta a %s" #: lib/command.php:502 @@ -4475,7 +4464,8 @@ msgid "Error saving notice." msgstr "Problema en guardar l'avÃs." #: lib/command.php:556 -msgid "Specify the name of the user to subscribe to" +#, fuzzy +msgid "Specify the name of the user to subscribe to." msgstr "Especifica el nom de l'usuari a que vols subscriure't" #: lib/command.php:563 @@ -4484,7 +4474,8 @@ msgid "Subscribed to %s" msgstr "Subscrit a %s" #: lib/command.php:584 -msgid "Specify the name of the user to unsubscribe from" +#, fuzzy +msgid "Specify the name of the user to unsubscribe from." msgstr "Especifica el nom de l'usuari del que vols deixar d'estar subscrit" #: lib/command.php:591 @@ -4513,17 +4504,17 @@ msgid "Can't turn on notification." msgstr "No es poden posar en on les notificacions." #: lib/command.php:650 -msgid "Login command is disabled" +msgid "Login command is disabled." msgstr "" #: lib/command.php:664 #, fuzzy, php-format -msgid "Could not create login token for %s" +msgid "Could not create login token for %s." msgstr "No s'han pogut crear els à lies." #: lib/command.php:669 #, php-format -msgid "This link is useable only once, and is good for only 2 minutes: %s" +msgid "This link is useable only once, and is good for only 2 minutes: %s." msgstr "" #: lib/command.php:685 @@ -4716,10 +4707,6 @@ msgstr "Descriu el grup amb 140 carà cters" msgid "Describe the group or topic in %d characters" msgstr "Descriu el grup amb 140 carà cters" -#: lib/groupeditform.php:172 -msgid "Description" -msgstr "Descripció" - #: lib/groupeditform.php:179 msgid "" "Location for the group, if any, like \"City, State (or Region), Country\"" @@ -4885,21 +4872,9 @@ msgstr "" "Atentament,\n" "%4$s.\n" -#: lib/mail.php:254 -#, php-format -msgid "Location: %s\n" -msgstr "Ubicació: %s\n" - -#: lib/mail.php:256 -#, php-format -msgid "Homepage: %s\n" -msgstr "Pà gina personal: %s\n" - #: lib/mail.php:258 -#, php-format -msgid "" -"Bio: %s\n" -"\n" +#, fuzzy, php-format +msgid "Bio: %s" msgstr "" "Biografia: %s\n" "\n" @@ -5044,6 +5019,27 @@ msgstr "" msgid "from" msgstr "de" +#: lib/mailhandler.php:37 +msgid "Could not parse message." +msgstr "No es pot analitzar el missatge." + +#: lib/mailhandler.php:42 +msgid "Not a registered user." +msgstr "Usuari no registrat." + +#: lib/mailhandler.php:46 +msgid "Sorry, that is not your incoming email address." +msgstr "Ho sentim, aquesta no és la vostra adreça electrònica d'entrada." + +#: lib/mailhandler.php:50 +msgid "Sorry, no incoming email allowed." +msgstr "Ho sentim, no s'hi permet correu d'entrada." + +#: lib/mailhandler.php:228 +#, fuzzy, php-format +msgid "Unsupported message type: %s" +msgstr "Format d'imatge no suportat." + #: lib/mediafile.php:98 lib/mediafile.php:123 msgid "There was a database error while saving your file. Please try again." msgstr "" @@ -5064,7 +5060,7 @@ msgstr "" #: lib/mediafile.php:159 msgid "Missing a temporary folder." -msgstr "" +msgstr "Manca una carpeta temporal." #: lib/mediafile.php:162 msgid "Failed to write file to disk." @@ -5075,7 +5071,7 @@ msgid "File upload stopped by extension." msgstr "" #: lib/mediafile.php:179 lib/mediafile.php:216 -msgid "File exceeds user's quota!" +msgid "File exceeds user's quota." msgstr "" #: lib/mediafile.php:196 lib/mediafile.php:233 @@ -5083,7 +5079,8 @@ msgid "File could not be moved to destination directory." msgstr "" #: lib/mediafile.php:201 lib/mediafile.php:237 -msgid "Could not determine file's mime-type!" +#, fuzzy +msgid "Could not determine file's MIME type." msgstr "No s'ha pogut recuperar la conversa pública." #: lib/mediafile.php:270 @@ -5093,7 +5090,7 @@ msgstr "" #: lib/mediafile.php:275 #, php-format -msgid "%s is not a supported filetype on this server." +msgid "%s is not a supported file type on this server." msgstr "" #: lib/messageform.php:120 @@ -5126,7 +5123,17 @@ msgid "Attach a file" msgstr "Adjunta un fitxer" #: lib/noticeform.php:212 -msgid "Share your location" +#, fuzzy +msgid "Share my location." +msgstr "Comparteix la vostra ubicació" + +#: lib/noticeform.php:214 +#, fuzzy +msgid "Do not share my location." +msgstr "Comparteix la vostra ubicació" + +#: lib/noticeform.php:215 +msgid "Hide this info" msgstr "" #: lib/noticelist.php:428 @@ -5156,14 +5163,12 @@ msgid "at" msgstr "" #: lib/noticelist.php:531 -#, fuzzy msgid "in context" -msgstr "Cap contingut!" +msgstr "en context" #: lib/noticelist.php:556 -#, fuzzy msgid "Repeated by" -msgstr "S'ha creat" +msgstr "Repetit per" #: lib/noticelist.php:585 msgid "Reply to this notice" @@ -5208,9 +5213,8 @@ msgid "Duplicate notice" msgstr "Eliminar nota." #: lib/oauthstore.php:466 lib/subs.php:48 -#, fuzzy msgid "You have been banned from subscribing." -msgstr "Aquest usuari t'ha bloquejat com a subscriptor." +msgstr "Se us ha banejat la subscripció." #: lib/oauthstore.php:491 msgid "Couldn't insert new subscription." @@ -5249,6 +5253,11 @@ msgstr "Els teus missatges enviats" msgid "Tags in %s's notices" msgstr "Etiquetes en les notificacions de %s's" +#: lib/plugin.php:114 +#, fuzzy +msgid "Unknown" +msgstr "Acció desconeguda" + #: lib/profileaction.php:109 lib/profileaction.php:192 lib/subgroupnav.php:82 msgid "Subscriptions" msgstr "Subscripcions" @@ -5266,9 +5275,8 @@ msgid "All subscribers" msgstr "Tots els subscriptors" #: lib/profileaction.php:178 -#, fuzzy msgid "User ID" -msgstr "Usuari" +msgstr "ID de l'usuari" #: lib/profileaction.php:183 msgid "Member since" @@ -5284,9 +5292,8 @@ msgid "No return-to arguments." msgstr "No argument de la id." #: lib/profileformaction.php:137 -#, fuzzy msgid "Unimplemented method." -msgstr "mètode no implementat" +msgstr "Mètode no implementat" #: lib/publicgroupnav.php:78 msgid "Public" @@ -5426,10 +5433,6 @@ msgstr "" msgid "People Tagcloud as tagged" msgstr "" -#: lib/subscriptionlist.php:126 -msgid "(none)" -msgstr "(cap)" - #: lib/tagcloudsection.php:56 msgid "None" msgstr "Cap" @@ -5544,19 +5547,3 @@ msgstr "%s no és un color và lid!" #, php-format msgid "%s is not a valid color! Use 3 or 6 hex chars." msgstr "%s no és un color và lid! Feu servir 3 o 6 carà cters hexadecimals." - -#: scripts/maildaemon.php:48 -msgid "Could not parse message." -msgstr "No es pot analitzar el missatge." - -#: scripts/maildaemon.php:53 -msgid "Not a registered user." -msgstr "Usuari no registrat." - -#: scripts/maildaemon.php:57 -msgid "Sorry, that is not your incoming email address." -msgstr "Ho sentim, aquesta no és la vostra adreça electrònica d'entrada." - -#: scripts/maildaemon.php:61 -msgid "Sorry, no incoming email allowed." -msgstr "Ho sentim, no s'hi permet correu d'entrada." diff --git a/locale/cs/LC_MESSAGES/statusnet.po b/locale/cs/LC_MESSAGES/statusnet.po index 103cf1557..e7b46fb8e 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-01-03 10:37+0000\n" -"PO-Revision-Date: 2010-01-03 10:37:29+0000\n" +"POT-Creation-Date: 2010-01-10 11:27+0000\n" +"PO-Revision-Date: 2010-01-10 11:27:46+0000\n" "Language-Team: Czech\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha (r60575); Translate extension (2009-12-06)\n" +"X-Generator: MediaWiki 1.16alpha (r60888); Translate extension (2010-01-04)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: cs\n" "X-Message-Group: out-statusnet\n" @@ -52,11 +52,6 @@ msgstr "Žádné takové oznámenÃ." msgid "No such user." msgstr "Žádný takový uživatel." -#: actions/all.php:84 -#, fuzzy, php-format -msgid "%s and friends, page %d" -msgstr "%s a přátelé" - #: actions/all.php:86 actions/all.php:167 actions/allrss.php:115 #: actions/apitimelinefriends.php:115 actions/apitimelinehome.php:115 #: lib/personalgroupnav.php:100 @@ -95,8 +90,8 @@ msgstr "" #: actions/all.php:134 #, php-format msgid "" -"You can try to [nudge %s](../%s) from his profile or [post something to his " -"or her attention](%%%%action.newnotice%%%%?status_textarea=%s)." +"You can try to [nudge %1$s](../%2$s) from his profile or [post something to " +"his or her attention](%%%%action.newnotice%%%%?status_textarea=%3$s)." msgstr "" #: actions/all.php:137 actions/replies.php:209 actions/showstream.php:202 @@ -122,6 +117,23 @@ msgstr "" #: actions/apiaccountupdateprofile.php:97 #: actions/apiaccountupdateprofilebackgroundimage.php:94 #: actions/apiaccountupdateprofilecolors.php:118 +#: actions/apidirectmessage.php:156 actions/apifavoritecreate.php:99 +#: actions/apifavoritedestroy.php:100 actions/apifriendshipscreate.php:100 +#: actions/apifriendshipsdestroy.php:100 actions/apifriendshipsshow.php:129 +#: actions/apigroupcreate.php:136 actions/apigroupismember.php:114 +#: actions/apigroupjoin.php:155 actions/apigroupleave.php:141 +#: actions/apigrouplist.php:132 actions/apigrouplistall.php:120 +#: actions/apigroupmembership.php:106 actions/apigroupshow.php:105 +#: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102 +#: actions/apistatusesretweets.php:112 actions/apistatusesshow.php:108 +#: actions/apistatusnetconfig.php:133 actions/apistatusnetversion.php:93 +#: actions/apisubscriptions.php:111 actions/apitimelinefavorites.php:146 +#: actions/apitimelinefriends.php:156 actions/apitimelinegroup.php:150 +#: actions/apitimelinehome.php:156 actions/apitimelinementions.php:151 +#: actions/apitimelinepublic.php:131 actions/apitimelineretweetedbyme.php:122 +#: actions/apitimelineretweetedtome.php:121 +#: actions/apitimelineretweetsofme.php:122 actions/apitimelinetag.php:141 +#: actions/apitimelineuser.php:165 actions/apiusershow.php:101 #, fuzzy msgid "API method not found." msgstr "PotvrzujÃcà kód nebyl nalezen" @@ -180,6 +192,9 @@ msgstr "" #: actions/apiaccountupdateprofilebackgroundimage.php:146 #: actions/apiaccountupdateprofilecolors.php:164 #: actions/apiaccountupdateprofilecolors.php:174 +#: actions/groupdesignsettings.php:287 actions/groupdesignsettings.php:297 +#: actions/userdesignsettings.php:210 actions/userdesignsettings.php:220 +#: actions/userdesignsettings.php:263 actions/userdesignsettings.php:273 msgid "Unable to save your design settings." msgstr "" @@ -222,26 +237,6 @@ msgstr "" msgid "All the direct messages sent to %s" msgstr "" -#: actions/apidirectmessage.php:156 actions/apifavoritecreate.php:99 -#: actions/apifavoritedestroy.php:100 actions/apifriendshipscreate.php:100 -#: actions/apifriendshipsdestroy.php:100 actions/apifriendshipsshow.php:129 -#: actions/apigroupcreate.php:136 actions/apigroupismember.php:114 -#: actions/apigroupjoin.php:155 actions/apigroupleave.php:141 -#: actions/apigrouplist.php:132 actions/apigrouplistall.php:120 -#: actions/apigroupmembership.php:106 actions/apigroupshow.php:105 -#: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102 -#: actions/apistatusesretweets.php:112 actions/apistatusesshow.php:108 -#: actions/apistatusnetconfig.php:133 actions/apistatusnetversion.php:93 -#: actions/apisubscriptions.php:111 actions/apitimelinefavorites.php:146 -#: actions/apitimelinefriends.php:156 actions/apitimelinegroup.php:150 -#: actions/apitimelinehome.php:156 actions/apitimelinementions.php:151 -#: actions/apitimelinepublic.php:131 actions/apitimelineretweetedbyme.php:122 -#: actions/apitimelineretweetedtome.php:121 -#: actions/apitimelineretweetsofme.php:122 actions/apitimelinetag.php:141 -#: actions/apitimelineuser.php:165 actions/apiusershow.php:101 -msgid "API method not found!" -msgstr "" - #: actions/apidirectmessagenew.php:126 msgid "No message text!" msgstr "" @@ -265,15 +260,16 @@ msgid "No status found with that ID." msgstr "" #: actions/apifavoritecreate.php:119 -msgid "This status is already a favorite!" -msgstr "" +#, fuzzy +msgid "This status is already a favorite." +msgstr "Toto je již vaÅ¡e Jabber" #: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:176 msgid "Could not create favorite." msgstr "" #: actions/apifavoritedestroy.php:122 -msgid "That status is not a favorite!" +msgid "That status is not a favorite." msgstr "" #: actions/apifavoritedestroy.php:134 actions/disfavor.php:87 @@ -295,8 +291,9 @@ msgid "Could not unfollow user: User not found." msgstr "Nelze pÅ™esmÄ›rovat na server: %s" #: actions/apifriendshipsdestroy.php:120 -msgid "You cannot unfollow yourself!" -msgstr "" +#, fuzzy +msgid "You cannot unfollow yourself." +msgstr "Nelze aktualizovat uživatele" #: actions/apifriendshipsexists.php:94 msgid "Two user ids or screen_names must be supplied." @@ -383,7 +380,7 @@ msgstr "" msgid "Group not found!" msgstr "Žádný požadavek nebyl nalezen!" -#: actions/apigroupjoin.php:110 +#: actions/apigroupjoin.php:110 actions/joingroup.php:90 lib/command.php:217 #, fuzzy msgid "You are already a member of that group." msgstr "Již jste pÅ™ihlášen" @@ -392,9 +389,9 @@ msgstr "Již jste pÅ™ihlášen" msgid "You have been blocked from that group by the admin." msgstr "" -#: actions/apigroupjoin.php:138 +#: actions/apigroupjoin.php:138 actions/joingroup.php:128 lib/command.php:234 #, fuzzy, php-format -msgid "Could not join user %s to group %s." +msgid "Could not join user %1$s to group %2$s." msgstr "Nelze pÅ™esmÄ›rovat na server: %s" #: actions/apigroupleave.php:114 @@ -402,9 +399,9 @@ msgstr "Nelze pÅ™esmÄ›rovat na server: %s" msgid "You are not a member of this group." msgstr "Neodeslal jste nám profil" -#: actions/apigroupleave.php:124 +#: actions/apigroupleave.php:124 actions/leavegroup.php:127 #, fuzzy, php-format -msgid "Could not remove user %s to group %s." +msgid "Could not remove user %1$s from group %2$s." msgstr "Nelze vytvoÅ™it OpenID z: %s" #: actions/apigrouplist.php:95 @@ -412,11 +409,6 @@ msgstr "Nelze vytvoÅ™it OpenID z: %s" msgid "%s's groups" msgstr "Profil" -#: actions/apigrouplist.php:103 -#, fuzzy, php-format -msgid "Groups %s is a member of on %s." -msgstr "Neodeslal jste nám profil" - #: actions/apigrouplistall.php:90 actions/usergroups.php:62 #, php-format msgid "%s groups" @@ -440,12 +432,12 @@ msgstr "" msgid "No such notice." msgstr "Žádné takové oznámenÃ." -#: actions/apistatusesretweet.php:83 +#: actions/apistatusesretweet.php:83 lib/command.php:422 #, fuzzy msgid "Cannot repeat your own notice." msgstr "Nemůžete se registrovat, pokud nesouhlasÃte s licencÃ." -#: actions/apistatusesretweet.php:91 +#: actions/apistatusesretweet.php:91 lib/command.php:427 #, fuzzy msgid "Already repeated that notice." msgstr "Odstranit toto oznámenÃ" @@ -460,7 +452,7 @@ msgid "No status with that ID found." msgstr "" #: actions/apistatusesupdate.php:157 actions/newnotice.php:155 -#: scripts/maildaemon.php:71 +#: lib/mailhandler.php:60 #, fuzzy, php-format msgid "That's too long. Max notice size is %d chars." msgstr "Je to pÅ™ÃliÅ¡ dlouhé. Maximálnà sdÄ›lenà délka je 140 znaků" @@ -480,14 +472,14 @@ msgid "Unsupported format." msgstr "Nepodporovaný formát obrázku." #: actions/apitimelinefavorites.php:108 -#, php-format -msgid "%s / Favorites from %s" -msgstr "" +#, fuzzy, php-format +msgid "%1$s / Favorites from %2$s" +msgstr "%1 statusů na %2" #: actions/apitimelinefavorites.php:120 -#, php-format -msgid "%s updates favorited by %s / %s." -msgstr "" +#, fuzzy, php-format +msgid "%1$s updates favorited by %2$s / %2$s." +msgstr "Mikroblog od %s" #: actions/apitimelinegroup.php:109 actions/apitimelineuser.php:118 #: actions/grouprss.php:131 actions/userrss.php:90 @@ -556,8 +548,11 @@ msgstr "Žádný požadavek nebyl nalezen!" msgid "No such attachment." msgstr "Žádný takový dokument." -#: actions/avatarbynickname.php:59 actions/grouprss.php:91 -#: actions/leavegroup.php:76 +#: actions/avatarbynickname.php:59 actions/blockedfromgroup.php:73 +#: actions/editgroup.php:84 actions/groupdesignsettings.php:84 +#: actions/grouplogo.php:86 actions/groupmembers.php:76 +#: actions/grouprss.php:91 actions/joingroup.php:76 actions/leavegroup.php:76 +#: actions/showgroup.php:121 msgid "No nickname." msgstr "Žádná pÅ™ezdÃvka." @@ -580,8 +575,8 @@ msgid "You can upload your personal avatar. The maximum file size is %s." msgstr "" #: actions/avatarsettings.php:106 actions/avatarsettings.php:185 -#: actions/grouplogo.php:178 actions/remotesubscribe.php:191 -#: actions/userauthorization.php:72 actions/userrss.php:103 +#: actions/remotesubscribe.php:191 actions/userauthorization.php:72 +#: actions/userrss.php:103 msgid "User without matching profile" msgstr "" @@ -614,9 +609,9 @@ msgstr "Upload" msgid "Crop" msgstr "" -#: actions/avatarsettings.php:268 actions/disfavor.php:74 -#: actions/emailsettings.php:238 actions/favor.php:75 actions/geocode.php:50 -#: actions/groupblock.php:66 actions/grouplogo.php:309 +#: actions/avatarsettings.php:268 actions/deletenotice.php:157 +#: actions/disfavor.php:74 actions/emailsettings.php:238 actions/favor.php:75 +#: actions/geocode.php:50 actions/groupblock.php:66 actions/grouplogo.php:309 #: actions/groupunblock.php:66 actions/imsettings.php:206 #: actions/invite.php:56 actions/login.php:135 actions/makeadmin.php:66 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80 @@ -698,19 +693,16 @@ msgstr "Zablokovat tohoto uživatele" msgid "Failed to save block information." msgstr "" -#: actions/blockedfromgroup.php:73 actions/editgroup.php:84 -#: actions/groupdesignsettings.php:84 actions/grouplogo.php:86 -#: actions/groupmembers.php:76 actions/joingroup.php:76 -#: actions/showgroup.php:121 -msgid "No nickname" -msgstr "Žádná pÅ™ezdÃvka" - #: actions/blockedfromgroup.php:80 actions/editgroup.php:96 +#: actions/foafgroup.php:44 actions/foafgroup.php:62 actions/groupblock.php:86 #: actions/groupbyid.php:83 actions/groupdesignsettings.php:97 #: actions/grouplogo.php:99 actions/groupmembers.php:83 -#: actions/joingroup.php:83 actions/showgroup.php:137 -msgid "No such group" -msgstr "Žádná taková skupina" +#: actions/grouprss.php:98 actions/groupunblock.php:86 +#: actions/joingroup.php:83 actions/leavegroup.php:83 actions/makeadmin.php:86 +#: actions/showgroup.php:137 lib/command.php:212 lib/command.php:263 +#, fuzzy +msgid "No such group." +msgstr "Žádné takové oznámenÃ." #: actions/blockedfromgroup.php:90 #, fuzzy, php-format @@ -719,7 +711,7 @@ msgstr "Uživatel nemá profil." #: actions/blockedfromgroup.php:93 #, fuzzy, php-format -msgid "%s blocked profiles, page %d" +msgid "%1$s blocked profiles, page %2$d" msgstr "%s a přátelé" #: actions/blockedfromgroup.php:108 @@ -834,10 +826,6 @@ msgstr "Žádné takové oznámenÃ." msgid "Delete this notice" msgstr "Odstranit toto oznámenÃ" -#: actions/deletenotice.php:157 -msgid "There was a problem with your session token. Try again, please." -msgstr "" - #: actions/deleteuser.php:67 #, fuzzy msgid "You cannot delete users." @@ -863,7 +851,7 @@ msgid "Delete this user" msgstr "Odstranit tohoto uživatele" #: actions/designadminpanel.php:62 lib/accountsettingsaction.php:124 -#: lib/adminpanelaction.php:302 lib/groupnav.php:119 +#: lib/adminpanelaction.php:316 lib/groupnav.php:119 msgid "Design" msgstr "Vzhled" @@ -1007,7 +995,7 @@ msgstr "" #: actions/editgroup.php:103 actions/editgroup.php:168 #: actions/groupdesignsettings.php:104 actions/grouplogo.php:106 -msgid "You must be an admin to edit the group" +msgid "You must be an admin to edit the group." msgstr "" #: actions/editgroup.php:154 @@ -1034,7 +1022,8 @@ msgid "Options saved." msgstr "Nastavenà uloženo." #: actions/emailsettings.php:60 -msgid "Email Settings" +#, fuzzy +msgid "Email settings" msgstr "Nastavenà E-mailu" #: actions/emailsettings.php:71 @@ -1069,8 +1058,9 @@ msgid "Cancel" msgstr "ZruÅ¡it" #: actions/emailsettings.php:121 -msgid "Email Address" -msgstr "" +#, fuzzy +msgid "Email address" +msgstr "Potvrzenà emailové adresy" #: actions/emailsettings.php:123 msgid "Email address, like \"UserName@example.org\"" @@ -1143,9 +1133,10 @@ msgstr "" msgid "Cannot normalize that email address" msgstr "" -#: actions/emailsettings.php:331 actions/siteadminpanel.php:157 -msgid "Not a valid email address" -msgstr "" +#: actions/emailsettings.php:331 actions/register.php:201 +#: actions/siteadminpanel.php:157 +msgid "Not a valid email address." +msgstr "Nenà platnou mailovou adresou." #: actions/emailsettings.php:334 msgid "That is already your email address." @@ -1328,20 +1319,12 @@ msgstr "Neznámá verze OMB protokolu." msgid "Error updating remote profile" msgstr "Chyba pÅ™i aktualizaci vzdáleného profilu" -#: actions/foafgroup.php:44 actions/foafgroup.php:62 actions/groupblock.php:86 -#: actions/grouprss.php:98 actions/groupunblock.php:86 -#: actions/leavegroup.php:83 actions/makeadmin.php:86 lib/command.php:212 -#: lib/command.php:263 -#, fuzzy -msgid "No such group." -msgstr "Žádné takové oznámenÃ." - -#: actions/getfile.php:75 +#: actions/getfile.php:79 #, fuzzy msgid "No such file." msgstr "Žádné takové oznámenÃ." -#: actions/getfile.php:79 +#: actions/getfile.php:83 #, fuzzy msgid "Cannot read file." msgstr "Žádné takové oznámenÃ." @@ -1354,7 +1337,7 @@ msgstr "" #: actions/groupblock.php:76 actions/groupunblock.php:76 #: actions/makeadmin.php:76 actions/subedit.php:53 actions/tagother.php:46 -#: lib/profileformaction.php:77 +#: actions/unsubscribe.php:84 lib/profileformaction.php:77 msgid "No profile with that ID." msgstr "" @@ -1385,9 +1368,9 @@ msgstr "Žádný takový uživatel." #: actions/groupblock.php:162 #, php-format msgid "" -"Are you sure you want to block user \"%s\" from the group \"%s\"? They will " -"be removed from the group, unable to post, and unable to subscribe to the " -"group in the future." +"Are you sure you want to block user \"%1$s\" from the group \"%2$s\"? They " +"will be removed from the group, unable to post, and unable to subscribe to " +"the group in the future." msgstr "" #: actions/groupblock.php:178 @@ -1404,9 +1387,10 @@ msgstr "Žádný takový uživatel." msgid "Database error blocking user from group." msgstr "" -#: actions/groupbyid.php:74 -msgid "No ID" -msgstr "" +#: actions/groupbyid.php:74 actions/userbyid.php:70 +#, fuzzy +msgid "No ID." +msgstr "Žádné id" #: actions/groupdesignsettings.php:68 msgid "You must be logged in to edit a group." @@ -1428,12 +1412,6 @@ msgstr "" msgid "Couldn't update your design." msgstr "Nelze aktualizovat uživatele" -#: actions/groupdesignsettings.php:287 actions/groupdesignsettings.php:297 -#: actions/userdesignsettings.php:210 actions/userdesignsettings.php:220 -#: actions/userdesignsettings.php:263 actions/userdesignsettings.php:273 -msgid "Unable to save your design settings!" -msgstr "" - #: actions/groupdesignsettings.php:308 actions/userdesignsettings.php:231 #, fuzzy msgid "Design preferences saved." @@ -1449,6 +1427,11 @@ msgid "" "You can upload a logo image for your group. The maximum file size is %s." msgstr "" +#: actions/grouplogo.php:178 +#, fuzzy +msgid "User without matching profile." +msgstr "Uživatel nemá profil." + #: actions/grouplogo.php:362 msgid "Pick a square area of the image to be the logo." msgstr "" @@ -1470,14 +1453,14 @@ msgstr "" #: actions/groupmembers.php:96 #, php-format -msgid "%s group members, page %d" +msgid "%1$s group members, page %2$d" msgstr "" #: actions/groupmembers.php:111 msgid "A list of the users in this group." msgstr "" -#: actions/groupmembers.php:175 lib/action.php:441 lib/groupnav.php:107 +#: actions/groupmembers.php:175 lib/action.php:442 lib/groupnav.php:107 msgid "Admin" msgstr "" @@ -1576,7 +1559,8 @@ msgid "Error removing the block." msgstr "Chyba pÅ™i ukládanà uživatele" #: actions/imsettings.php:59 -msgid "IM Settings" +#, fuzzy +msgid "IM settings" msgstr "IM nastavenÃ" #: actions/imsettings.php:70 @@ -1607,7 +1591,8 @@ msgstr "" "úÄtu. (PÅ™idal jste si %s do vaÅ¡ich kontaktů?)" #: actions/imsettings.php:124 -msgid "IM Address" +#, fuzzy +msgid "IM address" msgstr "IM adresa" #: actions/imsettings.php:126 @@ -1668,11 +1653,6 @@ msgstr "" msgid "That is not your Jabber ID." msgstr "Toto nenà váš Jabber" -#: actions/inbox.php:59 -#, php-format -msgid "Inbox for %s - page %d" -msgstr "" - #: actions/inbox.php:62 #, php-format msgid "Inbox for %s" @@ -1708,9 +1688,9 @@ msgstr "" msgid "You are already subscribed to these users:" msgstr "" -#: actions/invite.php:131 actions/invite.php:139 +#: actions/invite.php:131 actions/invite.php:139 lib/command.php:315 #, php-format -msgid "%s (%s)" +msgid "%1$s (%2$s)" msgstr "" #: actions/invite.php:136 @@ -1749,7 +1729,7 @@ msgstr "" msgid "Optionally add a personal message to the invitation." msgstr "" -#: actions/invite.php:197 lib/messageform.php:178 lib/noticeform.php:232 +#: actions/invite.php:197 lib/messageform.php:178 lib/noticeform.php:234 msgid "Send" msgstr "Odeslat" @@ -1793,19 +1773,9 @@ msgstr "" msgid "You must be logged in to join a group." msgstr "" -#: actions/joingroup.php:90 lib/command.php:217 -#, fuzzy -msgid "You are already a member of that group" -msgstr "Již jste pÅ™ihlášen" - -#: actions/joingroup.php:128 lib/command.php:234 -#, fuzzy, php-format -msgid "Could not join user %s to group %s" -msgstr "Nelze pÅ™esmÄ›rovat na server: %s" - #: actions/joingroup.php:135 lib/command.php:239 #, php-format -msgid "%s joined group %s" +msgid "%1$s joined group %2$s" msgstr "" #: actions/leavegroup.php:60 @@ -1821,15 +1791,10 @@ msgstr "Neodeslal jste nám profil" msgid "Could not find membership record." msgstr "" -#: actions/leavegroup.php:127 lib/command.php:284 -#, fuzzy, php-format -msgid "Could not remove user %s to group %s" -msgstr "Nelze vytvoÅ™it OpenID z: %s" - #: actions/leavegroup.php:134 lib/command.php:289 -#, php-format -msgid "%s left group %s" -msgstr "" +#, fuzzy, php-format +msgid "%1$s left group %2$s" +msgstr "%1 statusů na %2" #: actions/login.php:83 actions/register.php:137 msgid "Already logged in." @@ -1849,7 +1814,7 @@ msgstr "Neplatné jméno nebo heslo" msgid "Error setting user. You are probably not authorized." msgstr "Neautorizován." -#: actions/login.php:208 actions/login.php:261 lib/action.php:459 +#: actions/login.php:208 actions/login.php:261 lib/action.php:460 #: lib/logingroupnav.php:79 msgid "Login" msgstr "PÅ™ihlásit" @@ -1902,19 +1867,19 @@ msgid "Only an admin can make another user an admin." msgstr "" #: actions/makeadmin.php:95 -#, php-format -msgid "%s is already an admin for group \"%s\"." -msgstr "" +#, fuzzy, php-format +msgid "%1$s is already an admin for group \"%2$s\"." +msgstr "Uživatel nemá profil." #: actions/makeadmin.php:132 -#, php-format -msgid "Can't get membership record for %s in group %s" -msgstr "" +#, fuzzy, php-format +msgid "Can't get membership record for %1$s in group %2$s." +msgstr "Nelze vytvoÅ™it OpenID z: %s" #: actions/makeadmin.php:145 -#, php-format -msgid "Can't make %s an admin for group %s" -msgstr "" +#, fuzzy, php-format +msgid "Can't make %1$s an admin for group %2$s." +msgstr "Uživatel nemá profil." #: actions/microsummary.php:69 msgid "No current status" @@ -1956,7 +1921,7 @@ msgstr "" #: actions/newmessage.php:185 lib/command.php:376 #, php-format -msgid "Direct message to %s sent" +msgid "Direct message to %s sent." msgstr "" #: actions/newmessage.php:210 actions/newnotice.php:245 lib/channel.php:170 @@ -1987,7 +1952,7 @@ msgstr "Vyhledávánà textu" #: actions/noticesearch.php:91 #, fuzzy, php-format -msgid "Search results for \"%s\" on %s" +msgid "Search results for \"%1$s\" on %2$s" msgstr " Hledej \"%s\" ve Streamu" #: actions/noticesearch.php:121 @@ -2093,11 +2058,6 @@ msgstr "" msgid "URL shortening service is too long (max 50 chars)." msgstr "UmÃstÄ›nà pÅ™ÃliÅ¡ dlouhé (maximálnÄ› 255 znaků)" -#: actions/outbox.php:58 -#, php-format -msgid "Outbox for %s - page %d" -msgstr "" - #: actions/outbox.php:61 #, php-format msgid "Outbox for %s" @@ -2170,7 +2130,7 @@ msgstr "Nelze uložit nové heslo" msgid "Password saved." msgstr "Heslo uloženo" -#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:308 +#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:326 msgid "Paths" msgstr "" @@ -2203,7 +2163,7 @@ msgid "Invalid SSL server. The maximum length is 255 characters." msgstr "" #: actions/pathsadminpanel.php:217 actions/siteadminpanel.php:58 -#: lib/adminpanelaction.php:299 +#: lib/adminpanelaction.php:311 msgid "Site" msgstr "" @@ -2303,8 +2263,9 @@ msgid "When to use SSL" msgstr "" #: actions/pathsadminpanel.php:308 -msgid "SSL Server" -msgstr "" +#, fuzzy +msgid "SSL server" +msgstr "Obnovit" #: actions/pathsadminpanel.php:309 msgid "Server to direct SSL requests to" @@ -2334,9 +2295,9 @@ msgid "Not a valid people tag: %s" msgstr "Nenà platnou mailovou adresou." #: actions/peopletag.php:144 -#, php-format -msgid "Users self-tagged with %s - page %d" -msgstr "" +#, fuzzy, php-format +msgid "Users self-tagged with %1$s - page %2$d" +msgstr "Mikroblog od %s" #: actions/postnotice.php:84 msgid "Invalid notice content" @@ -2344,7 +2305,7 @@ msgstr "Neplatný obsah sdÄ›lenÃ" #: actions/postnotice.php:90 #, php-format -msgid "Notice license ‘%s’ is not compatible with site license ‘%s’." +msgid "Notice license ‘%1$s’ is not compatible with site license ‘%2$s’." msgstr "" #: actions/profilesettings.php:60 @@ -2464,21 +2425,21 @@ msgstr "Neplatná adresa '%s'" msgid "Couldn't update user for autosubscribe." msgstr "" -#: actions/profilesettings.php:354 +#: actions/profilesettings.php:359 #, fuzzy msgid "Couldn't save location prefs." msgstr "Nelze uložit profil" -#: actions/profilesettings.php:366 +#: actions/profilesettings.php:371 msgid "Couldn't save profile." msgstr "Nelze uložit profil" -#: actions/profilesettings.php:374 +#: actions/profilesettings.php:379 #, fuzzy msgid "Couldn't save tags." msgstr "Nelze uložit profil" -#: actions/profilesettings.php:382 lib/adminpanelaction.php:126 +#: actions/profilesettings.php:387 lib/adminpanelaction.php:137 msgid "Settings saved." msgstr "Nastavenà uloženo" @@ -2575,7 +2536,7 @@ msgid "" "one!" msgstr "" -#: actions/publictagcloud.php:135 +#: actions/publictagcloud.php:131 msgid "Tag cloud" msgstr "" @@ -2714,7 +2675,7 @@ msgstr "Chyba v ověřovacÃm kódu" msgid "Registration successful" msgstr "Registrace úspěšná" -#: actions/register.php:114 actions/register.php:502 lib/action.php:456 +#: actions/register.php:114 actions/register.php:502 lib/action.php:457 #: lib/logingroupnav.php:85 msgid "Register" msgstr "Registrovat" @@ -2727,10 +2688,6 @@ msgstr "" msgid "You can't register if you don't agree to the license." msgstr "Nemůžete se registrovat, pokud nesouhlasÃte s licencÃ." -#: actions/register.php:201 -msgid "Not a valid email address." -msgstr "Nenà platnou mailovou adresou." - #: actions/register.php:212 msgid "Email address already exists." msgstr "Emailová adresa již existuje" @@ -2790,10 +2747,10 @@ msgstr "" #: actions/register.php:537 #, php-format msgid "" -"Congratulations, %s! And welcome to %%%%site.name%%%%. From here, you may " +"Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may " "want to...\n" "\n" -"* Go to [your profile](%s) and post your first message.\n" +"* Go to [your profile](%2$s) and post your first message.\n" "* Add a [Jabber/GTalk address](%%%%action.imsettings%%%%) so you can send " "notices through instant messages.\n" "* [Search for people](%%%%action.peoplesearch%%%%) that you may know or that " @@ -2906,11 +2863,6 @@ msgstr "VytvoÅ™it" msgid "Replies to %s" msgstr "OdpovÄ›di na %s" -#: actions/replies.php:127 -#, fuzzy, php-format -msgid "Replies to %s, page %d" -msgstr "OdpovÄ›di na %s" - #: actions/replies.php:144 #, fuzzy, php-format msgid "Replies feed for %s (RSS 1.0)" @@ -2929,8 +2881,8 @@ msgstr "Feed sdÄ›lenà pro %s" #: actions/replies.php:198 #, php-format msgid "" -"This is the timeline showing replies to %s but %s hasn't received a notice " -"to his attention yet." +"This is the timeline showing replies to %1$s but %2$s hasn't received a " +"notice to his attention yet." msgstr "" #: actions/replies.php:203 @@ -2943,8 +2895,8 @@ msgstr "" #: actions/replies.php:205 #, php-format msgid "" -"You can try to [nudge %s](../%s) or [post something to his or her attention]" -"(%%%%action.newnotice%%%%?status_textarea=%s)." +"You can try to [nudge %1$s](../%2$s) or [post something to his or her " +"attention](%%%%action.newnotice%%%%?status_textarea=%3$s)." msgstr "" #: actions/repliesrss.php:72 @@ -2962,11 +2914,6 @@ msgstr "Neodeslal jste nám profil" msgid "User is already sandboxed." msgstr "Uživatel nemá profil." -#: actions/showfavorites.php:79 -#, fuzzy, php-format -msgid "%s's favorite notices, page %d" -msgstr "Žádné takové oznámenÃ." - #: actions/showfavorites.php:132 msgid "Could not retrieve favorite notices." msgstr "" @@ -3016,11 +2963,6 @@ msgstr "" msgid "%s group" msgstr "" -#: actions/showgroup.php:84 -#, php-format -msgid "%s group, page %d" -msgstr "" - #: actions/showgroup.php:218 #, fuzzy msgid "Group profile" @@ -3071,7 +3013,7 @@ msgstr "ÄŒlenem od" #: actions/showgroup.php:386 lib/profileaction.php:117 #: lib/profileaction.php:148 lib/profileaction.php:236 lib/section.php:95 -#: lib/tagcloudsection.php:71 +#: lib/subscriptionlist.php:126 lib/tagcloudsection.php:71 msgid "(None)" msgstr "" @@ -3139,14 +3081,9 @@ msgstr "SdÄ›lenÃ" msgid " tagged %s" msgstr "" -#: actions/showstream.php:79 -#, php-format -msgid "%s, page %d" -msgstr "" - #: actions/showstream.php:122 #, fuzzy, php-format -msgid "Notice feed for %s tagged %s (RSS 1.0)" +msgid "Notice feed for %1$s tagged %2$s (RSS 1.0)" msgstr "Feed sdÄ›lenà pro %s" #: actions/showstream.php:129 @@ -3171,7 +3108,7 @@ msgstr "" #: actions/showstream.php:191 #, php-format -msgid "This is the timeline for %s but %s hasn't posted anything yet." +msgid "This is the timeline for %1$s but %2$s hasn't posted anything yet." msgstr "" #: actions/showstream.php:196 @@ -3183,8 +3120,8 @@ msgstr "" #: actions/showstream.php:198 #, php-format msgid "" -"You can try to nudge %s or [post something to his or her attention](%%%%" -"action.newnotice%%%%?status_textarea=%s)." +"You can try to nudge %1$s or [post something to his or her attention](%%%%" +"action.newnotice%%%%?status_textarea=%2$s)." msgstr "" #: actions/showstream.php:234 @@ -3228,12 +3165,12 @@ msgstr "" #: actions/siteadminpanel.php:154 #, fuzzy -msgid "You must have a valid contact email address" +msgid "You must have a valid contact email address." msgstr "Nenà platnou mailovou adresou." #: actions/siteadminpanel.php:172 #, php-format -msgid "Unknown language \"%s\"" +msgid "Unknown language \"%s\"." msgstr "" #: actions/siteadminpanel.php:179 @@ -3421,8 +3358,9 @@ msgid "Save site settings" msgstr "NastavenÃ" #: actions/smssettings.php:58 -msgid "SMS Settings" -msgstr "" +#, fuzzy +msgid "SMS settings" +msgstr "IM nastavenÃ" #: actions/smssettings.php:69 #, php-format @@ -3451,8 +3389,9 @@ msgid "Enter the code you received on your phone." msgstr "" #: actions/smssettings.php:138 -msgid "SMS Phone number" -msgstr "" +#, fuzzy +msgid "SMS phone number" +msgstr "Žádné telefonnà ÄÃslo." #: actions/smssettings.php:140 msgid "Phone number, no punctuation or spaces, with area code" @@ -3540,9 +3479,9 @@ msgid "%s subscribers" msgstr "OdbÄ›ratelé" #: actions/subscribers.php:52 -#, php-format -msgid "%s subscribers, page %d" -msgstr "" +#, fuzzy, php-format +msgid "%1$s subscribers, page %2$d" +msgstr "VÅ¡echny odbÄ›ry" #: actions/subscribers.php:63 msgid "These are the people who listen to your notices." @@ -3578,7 +3517,7 @@ msgstr "VÅ¡echny odbÄ›ry" #: actions/subscriptions.php:54 #, fuzzy, php-format -msgid "%s subscriptions, page %d" +msgid "%1$s subscriptions, page %2$d" msgstr "VÅ¡echny odbÄ›ry" #: actions/subscriptions.php:65 @@ -3614,11 +3553,6 @@ msgstr "Žádné Jabber ID." msgid "SMS" msgstr "" -#: actions/tag.php:68 -#, fuzzy, php-format -msgid "Notices tagged with %s, page %d" -msgstr "Mikroblog od %s" - #: actions/tag.php:86 #, fuzzy, php-format msgid "Notice feed for tag %s (RSS 1.0)" @@ -3706,11 +3640,6 @@ msgstr "Uživatel nemá profil." msgid "No profile id in request." msgstr "Nebylo vráceno žádné URL profilu od servu." -#: actions/unsubscribe.php:84 -#, fuzzy -msgid "No profile with that id." -msgstr "Vzdálený profil s nesouhlasÃcÃm profilem" - #: actions/unsubscribe.php:98 #, fuzzy msgid "Unsubscribed" @@ -3718,10 +3647,11 @@ msgstr "Odhlásit" #: actions/updateprofile.php:62 actions/userauthorization.php:330 #, php-format -msgid "Listenee stream license ‘%s’ is not compatible with site license ‘%s’." +msgid "" +"Listenee stream license ‘%1$s’ is not compatible with site license ‘%2$s’." msgstr "" -#: actions/useradminpanel.php:58 lib/adminpanelaction.php:305 +#: actions/useradminpanel.php:58 lib/adminpanelaction.php:321 #: lib/personalgroupnav.php:115 msgid "User" msgstr "" @@ -3826,7 +3756,7 @@ msgstr "" "sdÄ›lenà tohoto uživatele. Pokud ne, ask to subscribe to somone's notices, " "kliknÄ›te na \"ZruÅ¡it\"" -#: actions/userauthorization.php:188 +#: actions/userauthorization.php:188 actions/version.php:165 msgid "License" msgstr "Licence" @@ -3884,7 +3814,7 @@ msgstr "" #: actions/userauthorization.php:296 #, php-format -msgid "Listener URI ‘%s’ not found here" +msgid "Listener URI ‘%s’ not found here." msgstr "" #: actions/userauthorization.php:301 @@ -3917,11 +3847,6 @@ msgstr "Nelze pÅ™eÄÃst adresu obrázku '%s'" msgid "Wrong image type for avatar URL ‘%s’." msgstr "Neplatný typ obrázku pro '%s'" -#: actions/userbyid.php:70 -#, fuzzy -msgid "No ID." -msgstr "Žádné id" - #: actions/userdesignsettings.php:76 lib/designsettings.php:65 #, fuzzy msgid "Profile design" @@ -3937,11 +3862,6 @@ msgstr "" msgid "Enjoy your hotdog!" msgstr "" -#: actions/usergroups.php:64 -#, php-format -msgid "%s groups, page %d" -msgstr "" - #: actions/usergroups.php:130 msgid "Search for more groups" msgstr "" @@ -3956,6 +3876,73 @@ msgstr "Neodeslal jste nám profil" msgid "Try [searching for groups](%%action.groupsearch%%) and joining them." msgstr "" +#: actions/version.php:73 +#, fuzzy, php-format +msgid "StatusNet %s" +msgstr "Statistiky" + +#: actions/version.php:153 +#, php-format +msgid "" +"This site is powered by %1$s version %2$s, Copyright 2008-2010 StatusNet, " +"Inc. and contributors." +msgstr "" + +#: actions/version.php:157 +#, fuzzy +msgid "StatusNet" +msgstr "Obrázek nahrán" + +#: actions/version.php:161 +msgid "Contributors" +msgstr "" + +#: actions/version.php:168 +msgid "" +"StatusNet is free software: you can redistribute it and/or modify it under " +"the terms of the GNU Affero General Public License as published by the Free " +"Software Foundation, either version 3 of the License, or (at your option) " +"any later version. " +msgstr "" + +#: actions/version.php:174 +msgid "" +"This program is distributed in the hope that it will be useful, but WITHOUT " +"ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or " +"FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License " +"for more details. " +msgstr "" + +#: actions/version.php:180 +#, php-format +msgid "" +"You should have received a copy of the GNU Affero General Public License " +"along with this program. If not, see %s." +msgstr "" + +#: actions/version.php:189 +msgid "Plugins" +msgstr "" + +#: actions/version.php:195 +#, fuzzy +msgid "Name" +msgstr "PÅ™ezdÃvka" + +#: actions/version.php:196 lib/action.php:741 +#, fuzzy +msgid "Version" +msgstr "OsobnÃ" + +#: actions/version.php:197 +msgid "Author(s)" +msgstr "" + +#: actions/version.php:198 lib/groupeditform.php:172 +#, fuzzy +msgid "Description" +msgstr "OdbÄ›ry" + #: classes/File.php:137 #, php-format msgid "" @@ -4024,7 +4011,7 @@ msgstr "Problém pÅ™i ukládánà sdÄ›lenÃ" msgid "DB error inserting reply: %s" msgstr "Chyba v DB pÅ™i vkládánà odpovÄ›di: %s" -#: classes/Notice.php:1361 +#: classes/Notice.php:1359 #, php-format msgid "RT @%1$s %2$s" msgstr "" @@ -4074,144 +4061,139 @@ msgstr "" msgid "Other options" msgstr "" -#: lib/action.php:144 -#, php-format -msgid "%s - %s" -msgstr "" - #: lib/action.php:159 msgid "Untitled page" msgstr "" -#: lib/action.php:426 +#: lib/action.php:427 msgid "Primary site navigation" msgstr "" -#: lib/action.php:432 +#: lib/action.php:433 msgid "Home" msgstr "Domů" -#: lib/action.php:432 +#: lib/action.php:433 msgid "Personal profile and friends timeline" msgstr "" -#: lib/action.php:434 +#: lib/action.php:435 #, fuzzy msgid "Account" msgstr "O nás" -#: lib/action.php:434 +#: lib/action.php:435 msgid "Change your email, avatar, password, profile" msgstr "" -#: lib/action.php:437 +#: lib/action.php:438 msgid "Connect" msgstr "PÅ™ipojit" -#: lib/action.php:437 +#: lib/action.php:438 #, fuzzy msgid "Connect to services" msgstr "Nelze pÅ™esmÄ›rovat na server: %s" -#: lib/action.php:441 +#: lib/action.php:442 #, fuzzy msgid "Change site configuration" msgstr "OdbÄ›ry" -#: lib/action.php:445 lib/subgroupnav.php:105 +#: lib/action.php:446 lib/subgroupnav.php:105 msgid "Invite" msgstr "" -#: lib/action.php:446 lib/subgroupnav.php:106 +#: lib/action.php:447 lib/subgroupnav.php:106 #, php-format msgid "Invite friends and colleagues to join you on %s" msgstr "" -#: lib/action.php:451 +#: lib/action.php:452 msgid "Logout" msgstr "Odhlásit" -#: lib/action.php:451 +#: lib/action.php:452 msgid "Logout from the site" msgstr "" -#: lib/action.php:456 +#: lib/action.php:457 #, fuzzy msgid "Create an account" msgstr "VytvoÅ™it nový úÄet" -#: lib/action.php:459 +#: lib/action.php:460 msgid "Login to the site" msgstr "" -#: lib/action.php:462 lib/action.php:725 +#: lib/action.php:463 lib/action.php:726 msgid "Help" msgstr "NápovÄ›da" -#: lib/action.php:462 +#: lib/action.php:463 msgid "Help me!" msgstr "Pomoci mi!" -#: lib/action.php:465 lib/searchaction.php:127 +#: lib/action.php:466 lib/searchaction.php:127 msgid "Search" msgstr "Hledat" -#: lib/action.php:465 +#: lib/action.php:466 msgid "Search for people or text" msgstr "" -#: lib/action.php:486 +#: lib/action.php:487 #, fuzzy msgid "Site notice" msgstr "Nové sdÄ›lenÃ" -#: lib/action.php:552 +#: lib/action.php:553 msgid "Local views" msgstr "" -#: lib/action.php:618 +#: lib/action.php:619 #, fuzzy msgid "Page notice" msgstr "Nové sdÄ›lenÃ" -#: lib/action.php:720 +#: lib/action.php:721 #, fuzzy msgid "Secondary site navigation" msgstr "OdbÄ›ry" -#: lib/action.php:727 +#: lib/action.php:728 msgid "About" msgstr "O nás" -#: lib/action.php:729 +#: lib/action.php:730 msgid "FAQ" msgstr "FAQ" -#: lib/action.php:733 +#: lib/action.php:734 msgid "TOS" msgstr "" -#: lib/action.php:736 +#: lib/action.php:737 msgid "Privacy" msgstr "SoukromÃ" -#: lib/action.php:738 +#: lib/action.php:739 msgid "Source" msgstr "Zdroj" -#: lib/action.php:740 +#: lib/action.php:743 msgid "Contact" msgstr "Kontakt" -#: lib/action.php:742 +#: lib/action.php:745 msgid "Badge" msgstr "" -#: lib/action.php:770 +#: lib/action.php:773 msgid "StatusNet software license" msgstr "" -#: lib/action.php:773 +#: lib/action.php:776 #, php-format msgid "" "**%%site.name%%** is a microblogging service brought to you by [%%site." @@ -4220,12 +4202,12 @@ msgstr "" "**%%site.name%%** je služba microblogů, kterou pro vás poskytuje [%%site." "broughtby%%](%%site.broughtbyurl%%). " -#: lib/action.php:775 +#: lib/action.php:778 #, php-format msgid "**%%site.name%%** is a microblogging service. " msgstr "**%%site.name%%** je služba mikroblogů." -#: lib/action.php:777 +#: lib/action.php:780 #, php-format msgid "" "It runs the [StatusNet](http://status.net/) microblogging software, version %" @@ -4236,34 +4218,34 @@ msgstr "" "dostupná pod [GNU Affero General Public License](http://www.fsf.org/" "licensing/licenses/agpl-3.0.html)." -#: lib/action.php:791 +#: lib/action.php:794 #, fuzzy msgid "Site content license" msgstr "Nové sdÄ›lenÃ" -#: lib/action.php:800 +#: lib/action.php:803 msgid "All " msgstr "" -#: lib/action.php:805 +#: lib/action.php:808 msgid "license." msgstr "" -#: lib/action.php:1099 +#: lib/action.php:1102 msgid "Pagination" msgstr "" -#: lib/action.php:1108 +#: lib/action.php:1111 #, fuzzy msgid "After" msgstr "« NovÄ›jÅ¡Ã" -#: lib/action.php:1116 +#: lib/action.php:1119 #, fuzzy msgid "Before" msgstr "Staršà »" -#: lib/action.php:1164 +#: lib/action.php:1167 msgid "There was a problem with your session token." msgstr "" @@ -4271,29 +4253,33 @@ msgstr "" msgid "You cannot make changes to this site." msgstr "" -#: lib/adminpanelaction.php:195 +#: lib/adminpanelaction.php:107 +msgid "Changes to that panel are not allowed." +msgstr "" + +#: lib/adminpanelaction.php:206 msgid "showForm() not implemented." msgstr "" -#: lib/adminpanelaction.php:224 +#: lib/adminpanelaction.php:235 msgid "saveSettings() not implemented." msgstr "" -#: lib/adminpanelaction.php:247 +#: lib/adminpanelaction.php:258 msgid "Unable to delete design setting." msgstr "" -#: lib/adminpanelaction.php:300 +#: lib/adminpanelaction.php:312 #, fuzzy msgid "Basic site configuration" msgstr "Potvrzenà emailové adresy" -#: lib/adminpanelaction.php:303 +#: lib/adminpanelaction.php:317 #, fuzzy msgid "Design configuration" msgstr "Potvrzenà emailové adresy" -#: lib/adminpanelaction.php:306 lib/adminpanelaction.php:309 +#: lib/adminpanelaction.php:322 lib/adminpanelaction.php:327 #, fuzzy msgid "Paths configuration" msgstr "Potvrzenà emailové adresy" @@ -4318,11 +4304,21 @@ msgstr "" msgid "Tags for this attachment" msgstr "" +#: lib/authenticationplugin.php:182 lib/authenticationplugin.php:187 +#, fuzzy +msgid "Password changing failed" +msgstr "Heslo uloženo" + +#: lib/authenticationplugin.php:197 +#, fuzzy +msgid "Password changing is not allowed" +msgstr "Heslo uloženo" + #: lib/channel.php:138 lib/channel.php:158 msgid "Command results" msgstr "" -#: lib/channel.php:210 +#: lib/channel.php:210 lib/mailhandler.php:142 msgid "Command complete" msgstr "" @@ -4335,8 +4331,8 @@ msgid "Sorry, this command is not yet implemented." msgstr "" #: lib/command.php:88 -#, php-format -msgid "Could not find a user with nickname %s" +#, fuzzy, php-format +msgid "Could not find a user with nickname %s." msgstr "Nelze aktualizovat uživatele" #: lib/command.php:92 @@ -4345,7 +4341,7 @@ msgstr "" #: lib/command.php:99 #, php-format -msgid "Nudge sent to %s" +msgid "Nudge sent to %s." msgstr "" #: lib/command.php:126 @@ -4357,34 +4353,36 @@ msgid "" msgstr "" #: lib/command.php:152 lib/command.php:399 lib/command.php:460 -msgid "Notice with that id does not exist" -msgstr "" +#, fuzzy +msgid "Notice with that id does not exist." +msgstr "Vzdálený profil s nesouhlasÃcÃm profilem" #: lib/command.php:168 lib/command.php:415 lib/command.php:476 #: lib/command.php:532 -msgid "User has no last notice" -msgstr "" +#, fuzzy +msgid "User has no last notice." +msgstr "Uživatel nemá profil." #: lib/command.php:190 msgid "Notice marked as fave." msgstr "" -#: lib/command.php:315 -#, php-format -msgid "%1$s (%2$s)" -msgstr "" +#: lib/command.php:284 +#, fuzzy, php-format +msgid "Could not remove user %1$s to group %2$s." +msgstr "Nelze vytvoÅ™it OpenID z: %s" #: lib/command.php:318 -#, php-format -msgid "Fullname: %s" -msgstr "" +#, fuzzy, php-format +msgid "Full name: %s" +msgstr "Celé jméno" -#: lib/command.php:321 +#: lib/command.php:321 lib/mail.php:254 #, php-format msgid "Location: %s" msgstr "" -#: lib/command.php:324 +#: lib/command.php:324 lib/mail.php:256 #, php-format msgid "Homepage: %s" msgstr "" @@ -4396,25 +4394,16 @@ msgstr "" #: lib/command.php:358 scripts/xmppdaemon.php:301 #, php-format -msgid "Message too long - maximum is %d characters, you sent %d" +msgid "Message too long - maximum is %1$d characters, you sent %2$d." msgstr "" #: lib/command.php:378 msgid "Error sending direct message." msgstr "" -#: lib/command.php:422 -msgid "Cannot repeat your own notice" -msgstr "" - -#: lib/command.php:427 -#, fuzzy -msgid "Already repeated that notice" -msgstr "Odstranit toto oznámenÃ" - #: lib/command.php:435 #, fuzzy, php-format -msgid "Notice from %s repeated" +msgid "Notice from %s repeated." msgstr "SdÄ›lenÃ" #: lib/command.php:437 @@ -4424,12 +4413,12 @@ msgstr "Problém pÅ™i ukládánà sdÄ›lenÃ" #: lib/command.php:491 #, php-format -msgid "Notice too long - maximum is %d characters, you sent %d" +msgid "Notice too long - maximum is %1$d characters, you sent %2$d." msgstr "" #: lib/command.php:500 #, fuzzy, php-format -msgid "Reply to %s sent" +msgid "Reply to %s sent." msgstr "OdpovÄ›di na %s" #: lib/command.php:502 @@ -4438,7 +4427,7 @@ msgid "Error saving notice." msgstr "Problém pÅ™i ukládánà sdÄ›lenÃ" #: lib/command.php:556 -msgid "Specify the name of the user to subscribe to" +msgid "Specify the name of the user to subscribe to." msgstr "" #: lib/command.php:563 @@ -4447,7 +4436,7 @@ msgid "Subscribed to %s" msgstr "" #: lib/command.php:584 -msgid "Specify the name of the user to unsubscribe from" +msgid "Specify the name of the user to unsubscribe from." msgstr "" #: lib/command.php:591 @@ -4476,17 +4465,17 @@ msgid "Can't turn on notification." msgstr "" #: lib/command.php:650 -msgid "Login command is disabled" +msgid "Login command is disabled." msgstr "" #: lib/command.php:664 #, fuzzy, php-format -msgid "Could not create login token for %s" +msgid "Could not create login token for %s." msgstr "Nelze uložin informace o obrázku" #: lib/command.php:669 #, php-format -msgid "This link is useable only once, and is good for only 2 minutes: %s" +msgid "This link is useable only once, and is good for only 2 minutes: %s." msgstr "" #: lib/command.php:685 @@ -4686,11 +4675,6 @@ msgstr "PopiÅ¡ sebe a své zájmy ve 140 znacÃch" msgid "Describe the group or topic in %d characters" msgstr "PopiÅ¡ sebe a své zájmy ve 140 znacÃch" -#: lib/groupeditform.php:172 -#, fuzzy -msgid "Description" -msgstr "OdbÄ›ry" - #: lib/groupeditform.php:179 #, fuzzy msgid "" @@ -4861,22 +4845,10 @@ msgstr "" "S úctou váš,\n" "%4$s.\n" -#: lib/mail.php:254 -#, php-format -msgid "Location: %s\n" -msgstr "UmÃstÄ›nÃ: %s\n" - -#: lib/mail.php:256 -#, fuzzy, php-format -msgid "Homepage: %s\n" -msgstr "Moje stránky: %s\n" - #: lib/mail.php:258 -#, php-format -msgid "" -"Bio: %s\n" -"\n" -msgstr "" +#, fuzzy, php-format +msgid "Bio: %s" +msgstr "O mÄ›" #: lib/mail.php:286 #, php-format @@ -5011,6 +4983,27 @@ msgstr "" msgid "from" msgstr " od " +#: lib/mailhandler.php:37 +msgid "Could not parse message." +msgstr "" + +#: lib/mailhandler.php:42 +msgid "Not a registered user." +msgstr "Nenà registrovaný uživatel." + +#: lib/mailhandler.php:46 +msgid "Sorry, that is not your incoming email address." +msgstr "" + +#: lib/mailhandler.php:50 +msgid "Sorry, no incoming email allowed." +msgstr "" + +#: lib/mailhandler.php:228 +#, fuzzy, php-format +msgid "Unsupported message type: %s" +msgstr "Nepodporovaný formát obrázku." + #: lib/mediafile.php:98 lib/mediafile.php:123 msgid "There was a database error while saving your file. Please try again." msgstr "" @@ -5042,7 +5035,7 @@ msgid "File upload stopped by extension." msgstr "" #: lib/mediafile.php:179 lib/mediafile.php:216 -msgid "File exceeds user's quota!" +msgid "File exceeds user's quota." msgstr "" #: lib/mediafile.php:196 lib/mediafile.php:233 @@ -5051,7 +5044,7 @@ msgstr "" #: lib/mediafile.php:201 lib/mediafile.php:237 #, fuzzy -msgid "Could not determine file's mime-type!" +msgid "Could not determine file's MIME type." msgstr "Nelze aktualizovat uživatele" #: lib/mediafile.php:270 @@ -5061,7 +5054,7 @@ msgstr "" #: lib/mediafile.php:275 #, php-format -msgid "%s is not a supported filetype on this server." +msgid "%s is not a supported file type on this server." msgstr "" #: lib/messageform.php:120 @@ -5096,7 +5089,17 @@ msgid "Attach a file" msgstr "" #: lib/noticeform.php:212 -msgid "Share your location" +#, fuzzy +msgid "Share my location." +msgstr "Nelze uložit profil" + +#: lib/noticeform.php:214 +#, fuzzy +msgid "Do not share my location." +msgstr "Nelze uložit profil" + +#: lib/noticeform.php:215 +msgid "Hide this info" msgstr "" #: lib/noticelist.php:428 @@ -5218,6 +5221,10 @@ msgstr "" msgid "Tags in %s's notices" msgstr "" +#: lib/plugin.php:114 +msgid "Unknown" +msgstr "" + #: lib/profileaction.php:109 lib/profileaction.php:192 lib/subgroupnav.php:82 msgid "Subscriptions" msgstr "OdbÄ›ry" @@ -5399,10 +5406,6 @@ msgstr "" msgid "People Tagcloud as tagged" msgstr "" -#: lib/subscriptionlist.php:126 -msgid "(none)" -msgstr "" - #: lib/tagcloudsection.php:56 msgid "None" msgstr "" @@ -5519,19 +5522,3 @@ msgstr "Stránka nenà platnou URL." #, php-format msgid "%s is not a valid color! Use 3 or 6 hex chars." msgstr "" - -#: scripts/maildaemon.php:48 -msgid "Could not parse message." -msgstr "" - -#: scripts/maildaemon.php:53 -msgid "Not a registered user." -msgstr "Nenà registrovaný uživatel." - -#: scripts/maildaemon.php:57 -msgid "Sorry, that is not your incoming email address." -msgstr "" - -#: scripts/maildaemon.php:61 -msgid "Sorry, no incoming email allowed." -msgstr "" diff --git a/locale/de/LC_MESSAGES/statusnet.po b/locale/de/LC_MESSAGES/statusnet.po index 01eeccdf9..c58b5aba0 100644 --- a/locale/de/LC_MESSAGES/statusnet.po +++ b/locale/de/LC_MESSAGES/statusnet.po @@ -3,6 +3,7 @@ # Author@translatewiki.net: Bavatar # Author@translatewiki.net: Lutzgh # Author@translatewiki.net: March +# Author@translatewiki.net: Pill # Author@translatewiki.net: Umherirrender # -- # This file is distributed under the same license as the StatusNet package. @@ -11,12 +12,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-01-03 10:37+0000\n" -"PO-Revision-Date: 2010-01-03 10:37:32+0000\n" +"POT-Creation-Date: 2010-01-10 11:27+0000\n" +"PO-Revision-Date: 2010-01-10 11:27:49+0000\n" "Language-Team: German\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha (r60575); Translate extension (2009-12-06)\n" +"X-Generator: MediaWiki 1.16alpha (r60888); Translate extension (2010-01-04)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: de\n" "X-Message-Group: out-statusnet\n" @@ -53,11 +54,6 @@ msgstr "Seite nicht vorhanden" msgid "No such user." msgstr "Unbekannter Benutzer." -#: actions/all.php:84 -#, php-format -msgid "%s and friends, page %d" -msgstr "%s und Freunde, Seite %d" - #: actions/all.php:86 actions/all.php:167 actions/allrss.php:115 #: actions/apitimelinefriends.php:115 actions/apitimelinehome.php:115 #: lib/personalgroupnav.php:100 @@ -98,10 +94,10 @@ msgstr "" "poste selber etwas." #: actions/all.php:134 -#, php-format +#, fuzzy, php-format msgid "" -"You can try to [nudge %s](../%s) from his profile or [post something to his " -"or her attention](%%%%action.newnotice%%%%?status_textarea=%s)." +"You can try to [nudge %1$s](../%2$s) from his profile or [post something to " +"his or her attention](%%%%action.newnotice%%%%?status_textarea=%3$s)." msgstr "" "Du kannst [%s in seinem Profil einen Stups geben](../%s) oder [ihm etwas " "posten](%%%%action.newnotice%%%%?status_textarea=%s) um seine Aufmerksamkeit " @@ -132,6 +128,23 @@ msgstr "Aktualisierungen von %1$s und Freunden auf %2$s!" #: actions/apiaccountupdateprofile.php:97 #: actions/apiaccountupdateprofilebackgroundimage.php:94 #: actions/apiaccountupdateprofilecolors.php:118 +#: actions/apidirectmessage.php:156 actions/apifavoritecreate.php:99 +#: actions/apifavoritedestroy.php:100 actions/apifriendshipscreate.php:100 +#: actions/apifriendshipsdestroy.php:100 actions/apifriendshipsshow.php:129 +#: actions/apigroupcreate.php:136 actions/apigroupismember.php:114 +#: actions/apigroupjoin.php:155 actions/apigroupleave.php:141 +#: actions/apigrouplist.php:132 actions/apigrouplistall.php:120 +#: actions/apigroupmembership.php:106 actions/apigroupshow.php:105 +#: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102 +#: actions/apistatusesretweets.php:112 actions/apistatusesshow.php:108 +#: actions/apistatusnetconfig.php:133 actions/apistatusnetversion.php:93 +#: actions/apisubscriptions.php:111 actions/apitimelinefavorites.php:146 +#: actions/apitimelinefriends.php:156 actions/apitimelinegroup.php:150 +#: actions/apitimelinehome.php:156 actions/apitimelinementions.php:151 +#: actions/apitimelinepublic.php:131 actions/apitimelineretweetedbyme.php:122 +#: actions/apitimelineretweetedtome.php:121 +#: actions/apitimelineretweetsofme.php:122 actions/apitimelinetag.php:141 +#: actions/apitimelineuser.php:165 actions/apiusershow.php:101 msgid "API method not found." msgstr "API-Methode nicht gefunden." @@ -187,6 +200,9 @@ msgstr "" #: actions/apiaccountupdateprofilebackgroundimage.php:146 #: actions/apiaccountupdateprofilecolors.php:164 #: actions/apiaccountupdateprofilecolors.php:174 +#: actions/groupdesignsettings.php:287 actions/groupdesignsettings.php:297 +#: actions/userdesignsettings.php:210 actions/userdesignsettings.php:220 +#: actions/userdesignsettings.php:263 actions/userdesignsettings.php:273 msgid "Unable to save your design settings." msgstr "Konnte Twitter-Einstellungen nicht speichern." @@ -196,9 +212,8 @@ msgid "Could not update your design." msgstr "Konnte Benutzerdesign nicht aktualisieren." #: actions/apiblockcreate.php:105 -#, fuzzy msgid "You cannot block yourself!" -msgstr "Du kannst dich nicht selbst entfolgen!" +msgstr "Du kannst dich nicht selbst sperren!" #: actions/apiblockcreate.php:126 msgid "Block user failed." @@ -228,26 +243,6 @@ msgstr "Direkte Nachricht an %s" msgid "All the direct messages sent to %s" msgstr "Alle an %s gesendeten direkten Nachrichten" -#: actions/apidirectmessage.php:156 actions/apifavoritecreate.php:99 -#: actions/apifavoritedestroy.php:100 actions/apifriendshipscreate.php:100 -#: actions/apifriendshipsdestroy.php:100 actions/apifriendshipsshow.php:129 -#: actions/apigroupcreate.php:136 actions/apigroupismember.php:114 -#: actions/apigroupjoin.php:155 actions/apigroupleave.php:141 -#: actions/apigrouplist.php:132 actions/apigrouplistall.php:120 -#: actions/apigroupmembership.php:106 actions/apigroupshow.php:105 -#: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102 -#: actions/apistatusesretweets.php:112 actions/apistatusesshow.php:108 -#: actions/apistatusnetconfig.php:133 actions/apistatusnetversion.php:93 -#: actions/apisubscriptions.php:111 actions/apitimelinefavorites.php:146 -#: actions/apitimelinefriends.php:156 actions/apitimelinegroup.php:150 -#: actions/apitimelinehome.php:156 actions/apitimelinementions.php:151 -#: actions/apitimelinepublic.php:131 actions/apitimelineretweetedbyme.php:122 -#: actions/apitimelineretweetedtome.php:121 -#: actions/apitimelineretweetsofme.php:122 actions/apitimelinetag.php:141 -#: actions/apitimelineuser.php:165 actions/apiusershow.php:101 -msgid "API method not found!" -msgstr "API-Methode nicht gefunden!" - #: actions/apidirectmessagenew.php:126 msgid "No message text!" msgstr "Fehlender Nachrichtentext!" @@ -274,7 +269,8 @@ msgid "No status found with that ID." msgstr "Keine Nachricht mit dieser ID gefunden." #: actions/apifavoritecreate.php:119 -msgid "This status is already a favorite!" +#, fuzzy +msgid "This status is already a favorite." msgstr "Diese Nachricht ist bereits ein Favorit!" #: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:176 @@ -282,7 +278,8 @@ msgid "Could not create favorite." msgstr "Konnte keinen Favoriten erstellen." #: actions/apifavoritedestroy.php:122 -msgid "That status is not a favorite!" +#, fuzzy +msgid "That status is not a favorite." msgstr "Diese Nachricht ist kein Favorit!" #: actions/apifavoritedestroy.php:134 actions/disfavor.php:87 @@ -291,7 +288,7 @@ msgstr "Konnte Favoriten nicht löschen." #: actions/apifriendshipscreate.php:109 msgid "Could not follow user: User not found." -msgstr "Kann Nutzer %s nicht folgen: Nutzer nicht gefunden" +msgstr "Konnte Nutzer nicht folgen: Nutzer nicht gefunden" #: actions/apifriendshipscreate.php:118 #, php-format @@ -303,7 +300,8 @@ msgid "Could not unfollow user: User not found." msgstr "Kann Benutzer nicht entfolgen: Benutzer nicht gefunden." #: actions/apifriendshipsdestroy.php:120 -msgid "You cannot unfollow yourself!" +#, fuzzy +msgid "You cannot unfollow yourself." msgstr "Du kannst dich nicht selbst entfolgen!" #: actions/apifriendshipsexists.php:94 @@ -383,7 +381,7 @@ msgstr "Nutzername „%s“ wird bereits verwendet. Suche dir einen anderen aus. #: actions/apigroupcreate.php:286 actions/editgroup.php:234 #: actions/newgroup.php:178 msgid "Alias can't be the same as nickname." -msgstr "" +msgstr "Alias kann nicht das gleiche wie der Spitznamen sein." #: actions/apigroupismember.php:95 actions/apigroupjoin.php:104 #: actions/apigroupleave.php:104 actions/apigroupmembership.php:91 @@ -391,7 +389,7 @@ msgstr "" msgid "Group not found!" msgstr "Gruppe nicht gefunden!" -#: actions/apigroupjoin.php:110 +#: actions/apigroupjoin.php:110 actions/joingroup.php:90 lib/command.php:217 msgid "You are already a member of that group." msgstr "Du bist bereits Mitglied dieser Gruppe" @@ -399,18 +397,18 @@ msgstr "Du bist bereits Mitglied dieser Gruppe" msgid "You have been blocked from that group by the admin." msgstr "Der Admin dieser Gruppe hat dich gesperrt." -#: actions/apigroupjoin.php:138 -#, php-format -msgid "Could not join user %s to group %s." +#: actions/apigroupjoin.php:138 actions/joingroup.php:128 lib/command.php:234 +#, fuzzy, php-format +msgid "Could not join user %1$s to group %2$s." msgstr "Konnte Benutzer %s nicht der Gruppe %s hinzufügen." #: actions/apigroupleave.php:114 msgid "You are not a member of this group." msgstr "Du bist kein Mitglied dieser Gruppe." -#: actions/apigroupleave.php:124 -#, php-format -msgid "Could not remove user %s to group %s." +#: actions/apigroupleave.php:124 actions/leavegroup.php:127 +#, fuzzy, php-format +msgid "Could not remove user %1$s from group %2$s." msgstr "Konnte Benutzer %s nicht aus der Gruppe %s entfernen." #: actions/apigrouplist.php:95 @@ -418,11 +416,6 @@ msgstr "Konnte Benutzer %s nicht aus der Gruppe %s entfernen." msgid "%s's groups" msgstr "%s’s Gruppen" -#: actions/apigrouplist.php:103 -#, php-format -msgid "Groups %s is a member of on %s." -msgstr "Gruppen %s sind ein Mitglied von %s." - #: actions/apigrouplistall.php:90 actions/usergroups.php:62 #, php-format msgid "%s groups" @@ -446,15 +439,13 @@ msgstr "Du kannst den Status eines anderen Benutzers nicht löschen." msgid "No such notice." msgstr "Unbekannte Nachricht." -#: actions/apistatusesretweet.php:83 -#, fuzzy +#: actions/apistatusesretweet.php:83 lib/command.php:422 msgid "Cannot repeat your own notice." -msgstr "Konnte Benachrichtigung nicht aktivieren." +msgstr "Du kannst deine eigenen Nachrichten nicht wiederholen." -#: actions/apistatusesretweet.php:91 -#, fuzzy +#: actions/apistatusesretweet.php:91 lib/command.php:427 msgid "Already repeated that notice." -msgstr "Nachricht löschen" +msgstr "Nachricht bereits wiederholt" #: actions/apistatusesshow.php:138 msgid "Status deleted." @@ -465,7 +456,7 @@ msgid "No status with that ID found." msgstr "Keine Nachricht mit dieser ID gefunden." #: actions/apistatusesupdate.php:157 actions/newnotice.php:155 -#: scripts/maildaemon.php:71 +#: lib/mailhandler.php:60 #, php-format msgid "That's too long. Max notice size is %d chars." msgstr "" @@ -487,13 +478,13 @@ msgid "Unsupported format." msgstr "Bildformat wird nicht unterstützt." #: actions/apitimelinefavorites.php:108 -#, php-format -msgid "%s / Favorites from %s" +#, fuzzy, php-format +msgid "%1$s / Favorites from %2$s" msgstr "%s / Favoriten von %s" #: actions/apitimelinefavorites.php:120 -#, php-format -msgid "%s updates favorited by %s / %s." +#, fuzzy, php-format +msgid "%1$s updates favorited by %2$s / %2$s." msgstr "%s Aktualisierung in den Favoriten von %s / %s." #: actions/apitimelinegroup.php:109 actions/apitimelineuser.php:118 @@ -531,7 +522,7 @@ msgstr "%s Nachrichten von allen!" #: actions/apitimelineretweetedbyme.php:112 #, php-format msgid "Repeated by %s" -msgstr "" +msgstr "Von %s wiederholt" #: actions/apitimelineretweetedtome.php:111 #, fuzzy, php-format @@ -561,8 +552,11 @@ msgstr "Nicht gefunden." msgid "No such attachment." msgstr "Kein solcher Anhang." -#: actions/avatarbynickname.php:59 actions/grouprss.php:91 -#: actions/leavegroup.php:76 +#: actions/avatarbynickname.php:59 actions/blockedfromgroup.php:73 +#: actions/editgroup.php:84 actions/groupdesignsettings.php:84 +#: actions/grouplogo.php:86 actions/groupmembers.php:76 +#: actions/grouprss.php:91 actions/joingroup.php:76 actions/leavegroup.php:76 +#: actions/showgroup.php:121 msgid "No nickname." msgstr "Kein Nutzername." @@ -586,8 +580,8 @@ msgstr "" "Du kannst dein persönliches Avatar hochladen. Die maximale Dateigröße ist %s." #: actions/avatarsettings.php:106 actions/avatarsettings.php:185 -#: actions/grouplogo.php:178 actions/remotesubscribe.php:191 -#: actions/userauthorization.php:72 actions/userrss.php:103 +#: actions/remotesubscribe.php:191 actions/userauthorization.php:72 +#: actions/userrss.php:103 msgid "User without matching profile" msgstr "Benutzer ohne passendes Profil" @@ -619,9 +613,9 @@ msgstr "Hochladen" msgid "Crop" msgstr "Zuschneiden" -#: actions/avatarsettings.php:268 actions/disfavor.php:74 -#: actions/emailsettings.php:238 actions/favor.php:75 actions/geocode.php:50 -#: actions/groupblock.php:66 actions/grouplogo.php:309 +#: actions/avatarsettings.php:268 actions/deletenotice.php:157 +#: actions/disfavor.php:74 actions/emailsettings.php:238 actions/favor.php:75 +#: actions/geocode.php:50 actions/groupblock.php:66 actions/grouplogo.php:309 #: actions/groupunblock.php:66 actions/imsettings.php:206 #: actions/invite.php:56 actions/login.php:135 actions/makeadmin.php:66 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80 @@ -701,19 +695,15 @@ msgstr "Diesen Benutzer blockieren" msgid "Failed to save block information." msgstr "Konnte Blockierungsdaten nicht speichern." -#: actions/blockedfromgroup.php:73 actions/editgroup.php:84 -#: actions/groupdesignsettings.php:84 actions/grouplogo.php:86 -#: actions/groupmembers.php:76 actions/joingroup.php:76 -#: actions/showgroup.php:121 -msgid "No nickname" -msgstr "Kein Benutzername" - #: actions/blockedfromgroup.php:80 actions/editgroup.php:96 +#: actions/foafgroup.php:44 actions/foafgroup.php:62 actions/groupblock.php:86 #: actions/groupbyid.php:83 actions/groupdesignsettings.php:97 #: actions/grouplogo.php:99 actions/groupmembers.php:83 -#: actions/joingroup.php:83 actions/showgroup.php:137 -msgid "No such group" -msgstr "Keine derartige Gruppe" +#: actions/grouprss.php:98 actions/groupunblock.php:86 +#: actions/joingroup.php:83 actions/leavegroup.php:83 actions/makeadmin.php:86 +#: actions/showgroup.php:137 lib/command.php:212 lib/command.php:263 +msgid "No such group." +msgstr "Keine derartige Gruppe." #: actions/blockedfromgroup.php:90 #, php-format @@ -721,8 +711,8 @@ msgid "%s blocked profiles" msgstr "%s blockierte Benutzerprofile" #: actions/blockedfromgroup.php:93 -#, php-format -msgid "%s blocked profiles, page %d" +#, fuzzy, php-format +msgid "%1$s blocked profiles, page %2$d" msgstr "%s blockierte Benutzerprofile, Seite %d" #: actions/blockedfromgroup.php:108 @@ -835,10 +825,6 @@ msgstr "Diese Nachricht nicht löschen" msgid "Delete this notice" msgstr "Nachricht löschen" -#: actions/deletenotice.php:157 -msgid "There was a problem with your session token. Try again, please." -msgstr "Es gab ein Problem mit deinem Sitzungstoken. Bitte versuche es erneut." - #: actions/deleteuser.php:67 msgid "You cannot delete users." msgstr "Du kannst keine Benutzer löschen." @@ -862,7 +848,7 @@ msgid "Delete this user" msgstr "Diesen Benutzer löschen" #: actions/designadminpanel.php:62 lib/accountsettingsaction.php:124 -#: lib/adminpanelaction.php:302 lib/groupnav.php:119 +#: lib/adminpanelaction.php:316 lib/groupnav.php:119 msgid "Design" msgstr "" @@ -1002,7 +988,8 @@ msgstr "Du musst angemeldet sein, um eine Gruppe zu erstellen." #: actions/editgroup.php:103 actions/editgroup.php:168 #: actions/groupdesignsettings.php:104 actions/grouplogo.php:106 -msgid "You must be an admin to edit the group" +#, fuzzy +msgid "You must be an admin to edit the group." msgstr "Du musst ein Administrator sein, um die Gruppe zu bearbeiten" #: actions/editgroup.php:154 @@ -1027,7 +1014,8 @@ msgid "Options saved." msgstr "Einstellungen gespeichert." #: actions/emailsettings.php:60 -msgid "Email Settings" +#, fuzzy +msgid "Email settings" msgstr "E-Mail-Einstellungen" #: actions/emailsettings.php:71 @@ -1064,8 +1052,9 @@ msgid "Cancel" msgstr "Abbrechen" #: actions/emailsettings.php:121 -msgid "Email Address" -msgstr "E-Mail-Adresse" +#, fuzzy +msgid "Email address" +msgstr "E-Mail-Adressen" #: actions/emailsettings.php:123 msgid "Email address, like \"UserName@example.org\"" @@ -1142,9 +1131,10 @@ msgstr "Keine E-Mail-Adresse." msgid "Cannot normalize that email address" msgstr "Konnte diese E-Mail-Adresse nicht normalisieren" -#: actions/emailsettings.php:331 actions/siteadminpanel.php:157 -msgid "Not a valid email address" -msgstr "Ungültige E-Mail-Adresse" +#: actions/emailsettings.php:331 actions/register.php:201 +#: actions/siteadminpanel.php:157 +msgid "Not a valid email address." +msgstr "Ungültige E-Mail-Adresse." #: actions/emailsettings.php:334 msgid "That is already your email address." @@ -1274,24 +1264,20 @@ msgid "A selection of some great users on %s" msgstr "Eine Auswahl der tollen Benutzer auf %s" #: actions/file.php:34 -#, fuzzy msgid "No notice ID." -msgstr "Keine Nachricht" +msgstr "Keine Nachrichten ID" #: actions/file.php:38 -#, fuzzy msgid "No notice." msgstr "Keine Nachricht" #: actions/file.php:42 -#, fuzzy msgid "No attachments." msgstr "Keine Anhänge vorhanden" #: actions/file.php:51 -#, fuzzy msgid "No uploaded attachments." -msgstr "Kein solcher Anhang." +msgstr "Kein Anhang geladen." #: actions/finishremotesubscribe.php:69 msgid "Not expecting this response!" @@ -1325,18 +1311,11 @@ msgstr "Service nutzt unbekannte OMB-Protokollversion." msgid "Error updating remote profile" msgstr "Fehler beim Aktualisieren des entfernten Profils" -#: actions/foafgroup.php:44 actions/foafgroup.php:62 actions/groupblock.php:86 -#: actions/grouprss.php:98 actions/groupunblock.php:86 -#: actions/leavegroup.php:83 actions/makeadmin.php:86 lib/command.php:212 -#: lib/command.php:263 -msgid "No such group." -msgstr "Keine derartige Gruppe." - -#: actions/getfile.php:75 +#: actions/getfile.php:79 msgid "No such file." msgstr "Datei nicht gefunden." -#: actions/getfile.php:79 +#: actions/getfile.php:83 msgid "Cannot read file." msgstr "Datei konnte nicht gelesen werden." @@ -1348,7 +1327,7 @@ msgstr "Kein Profil angegeben." #: actions/groupblock.php:76 actions/groupunblock.php:76 #: actions/makeadmin.php:76 actions/subedit.php:53 actions/tagother.php:46 -#: lib/profileformaction.php:77 +#: actions/unsubscribe.php:84 lib/profileformaction.php:77 msgid "No profile with that ID." msgstr "Kein Benutzer-Profil mit dieser ID." @@ -1376,9 +1355,9 @@ msgstr "Benutzerzugang zu der Gruppe blockieren" #: actions/groupblock.php:162 #, php-format msgid "" -"Are you sure you want to block user \"%s\" from the group \"%s\"? They will " -"be removed from the group, unable to post, and unable to subscribe to the " -"group in the future." +"Are you sure you want to block user \"%1$s\" from the group \"%2$s\"? They " +"will be removed from the group, unable to post, and unable to subscribe to " +"the group in the future." msgstr "" #: actions/groupblock.php:178 @@ -1393,8 +1372,9 @@ msgstr "Diesen Nutzer von der Gruppe sperren" msgid "Database error blocking user from group." msgstr "Datenbank Fehler beim Versuch den Nutzer aus der Gruppe zu blockieren." -#: actions/groupbyid.php:74 -msgid "No ID" +#: actions/groupbyid.php:74 actions/userbyid.php:70 +#, fuzzy +msgid "No ID." msgstr "Keine ID" #: actions/groupdesignsettings.php:68 @@ -1416,12 +1396,6 @@ msgstr "" msgid "Couldn't update your design." msgstr "Konnte dein Design nicht aktualisieren." -#: actions/groupdesignsettings.php:287 actions/groupdesignsettings.php:297 -#: actions/userdesignsettings.php:210 actions/userdesignsettings.php:220 -#: actions/userdesignsettings.php:263 actions/userdesignsettings.php:273 -msgid "Unable to save your design settings!" -msgstr "Konnte die Design-Einstellungen nicht speichern!" - #: actions/groupdesignsettings.php:308 actions/userdesignsettings.php:231 msgid "Design preferences saved." msgstr "Design-Einstellungen gespeichert." @@ -1438,6 +1412,11 @@ msgstr "" "Du kannst ein Logo für Deine Gruppe hochladen. Die maximale Dateigröße ist %" "s." +#: actions/grouplogo.php:178 +#, fuzzy +msgid "User without matching profile." +msgstr "Benutzer ohne passendes Profil" + #: actions/grouplogo.php:362 msgid "Pick a square area of the image to be the logo." msgstr "Wähle eine quadratische Fläche aus dem Bild, um das Logo zu speichern." @@ -1456,15 +1435,15 @@ msgid "%s group members" msgstr "%s Gruppen-Mitglieder" #: actions/groupmembers.php:96 -#, php-format -msgid "%s group members, page %d" +#, fuzzy, php-format +msgid "%1$s group members, page %2$d" msgstr "%s Gruppen-Mitglieder, Seite %d" #: actions/groupmembers.php:111 msgid "A list of the users in this group." msgstr "Liste der Benutzer in dieser Gruppe." -#: actions/groupmembers.php:175 lib/action.php:441 lib/groupnav.php:107 +#: actions/groupmembers.php:175 lib/action.php:442 lib/groupnav.php:107 msgid "Admin" msgstr "Admin" @@ -1563,7 +1542,8 @@ msgid "Error removing the block." msgstr "Fehler beim Freigeben des Benutzers." #: actions/imsettings.php:59 -msgid "IM Settings" +#, fuzzy +msgid "IM settings" msgstr "IM-Einstellungen" #: actions/imsettings.php:70 @@ -1594,7 +1574,8 @@ msgstr "" "Freundesliste hinzugefügt?)" #: actions/imsettings.php:124 -msgid "IM Address" +#, fuzzy +msgid "IM address" msgstr "IM-Adresse" #: actions/imsettings.php:126 @@ -1658,11 +1639,6 @@ msgstr "" msgid "That is not your Jabber ID." msgstr "Dies ist nicht deine JabberID." -#: actions/inbox.php:59 -#, php-format -msgid "Inbox for %s - page %d" -msgstr "Posteingang von %s - Seite %d" - #: actions/inbox.php:62 #, php-format msgid "Inbox for %s" @@ -1700,10 +1676,10 @@ msgstr "Lade neue Leute ein" msgid "You are already subscribed to these users:" msgstr "Du hast diese Benutzer bereits abonniert:" -#: actions/invite.php:131 actions/invite.php:139 +#: actions/invite.php:131 actions/invite.php:139 lib/command.php:315 #, php-format -msgid "%s (%s)" -msgstr "%s (%s)" +msgid "%1$s (%2$s)" +msgstr "%1$s (%2$s)" #: actions/invite.php:136 msgid "" @@ -1750,7 +1726,7 @@ msgstr "" "Wenn du möchtest kannst du zu der Einladung eine persönliche Nachricht " "anfügen." -#: actions/invite.php:197 lib/messageform.php:178 lib/noticeform.php:232 +#: actions/invite.php:197 lib/messageform.php:178 lib/noticeform.php:234 msgid "Send" msgstr "Senden" @@ -1819,18 +1795,9 @@ msgstr "" msgid "You must be logged in to join a group." msgstr "Du musst angemeldet sein, um Mitglied einer Gruppe zu werden." -#: actions/joingroup.php:90 lib/command.php:217 -msgid "You are already a member of that group" -msgstr "Du bist bereits Mitglied dieser Gruppe" - -#: actions/joingroup.php:128 lib/command.php:234 -#, php-format -msgid "Could not join user %s to group %s" -msgstr "Konnte Benutzer %s nicht der Gruppe %s hinzufügen" - #: actions/joingroup.php:135 lib/command.php:239 -#, php-format -msgid "%s joined group %s" +#, fuzzy, php-format +msgid "%1$s joined group %2$s" msgstr "%s ist der Gruppe %s beigetreten" #: actions/leavegroup.php:60 @@ -1845,14 +1812,9 @@ msgstr "Du bist kein Mitglied dieser Gruppe." msgid "Could not find membership record." msgstr "Konnte Mitgliedseintrag nicht finden." -#: actions/leavegroup.php:127 lib/command.php:284 -#, php-format -msgid "Could not remove user %s to group %s" -msgstr "Konnte Benutzer %s aus der Gruppe %s nicht entfernen" - #: actions/leavegroup.php:134 lib/command.php:289 -#, php-format -msgid "%s left group %s" +#, fuzzy, php-format +msgid "%1$s left group %2$s" msgstr "%s hat die Gruppe %s verlassen" #: actions/login.php:83 actions/register.php:137 @@ -1872,7 +1834,7 @@ msgid "Error setting user. You are probably not authorized." msgstr "" "Fehler beim setzen des Benutzers. Du bist vermutlich nicht autorisiert." -#: actions/login.php:208 actions/login.php:261 lib/action.php:459 +#: actions/login.php:208 actions/login.php:261 lib/action.php:460 #: lib/logingroupnav.php:79 msgid "Login" msgstr "Anmelden" @@ -1926,18 +1888,18 @@ msgid "Only an admin can make another user an admin." msgstr "Nur Administratoren können andere Nutzer zu Administratoren ernennen." #: actions/makeadmin.php:95 -#, php-format -msgid "%s is already an admin for group \"%s\"." +#, fuzzy, php-format +msgid "%1$s is already an admin for group \"%2$s\"." msgstr "%s ist bereits ein Administrator der Gruppe „%s“." #: actions/makeadmin.php:132 -#, php-format -msgid "Can't get membership record for %s in group %s" -msgstr "" +#, fuzzy, php-format +msgid "Can't get membership record for %1$s in group %2$s." +msgstr "Konnte Benutzer %s aus der Gruppe %s nicht entfernen" #: actions/makeadmin.php:145 -#, php-format -msgid "Can't make %s an admin for group %s" +#, fuzzy, php-format +msgid "Can't make %1$s an admin for group %2$s." msgstr "Konnte %s nicht zum Administrator der Gruppe %s machen" #: actions/microsummary.php:69 @@ -1980,8 +1942,8 @@ msgid "Message sent" msgstr "Nachricht gesendet" #: actions/newmessage.php:185 lib/command.php:376 -#, php-format -msgid "Direct message to %s sent" +#, fuzzy, php-format +msgid "Direct message to %s sent." msgstr "Direkte Nachricht an %s abgeschickt" #: actions/newmessage.php:210 actions/newnotice.php:245 lib/channel.php:170 @@ -2011,8 +1973,8 @@ msgid "Text search" msgstr "Volltextsuche" #: actions/noticesearch.php:91 -#, php-format -msgid "Search results for \"%s\" on %s" +#, fuzzy, php-format +msgid "Search results for \"%1$s\" on %2$s" msgstr "Suchergebnisse für „%s“ auf %s" #: actions/noticesearch.php:121 @@ -2116,11 +2078,6 @@ msgstr "" msgid "URL shortening service is too long (max 50 chars)." msgstr "URL-Auto-Kürzungs-Dienst ist zu lang (max. 50 Zeichen)." -#: actions/outbox.php:58 -#, php-format -msgid "Outbox for %s - page %d" -msgstr "Postausgang von %s - Seite %d" - #: actions/outbox.php:61 #, php-format msgid "Outbox for %s" @@ -2192,7 +2149,7 @@ msgstr "Konnte neues Passwort nicht speichern" msgid "Password saved." msgstr "Passwort gespeichert." -#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:308 +#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:326 msgid "Paths" msgstr "" @@ -2208,12 +2165,12 @@ msgstr "Theme-Verzeichnis nicht lesbar: %s" #: actions/pathsadminpanel.php:146 #, php-format msgid "Avatar directory not writable: %s" -msgstr "" +msgstr "Avatar-Verzeichnis ist nicht beschreibbar: %s" #: actions/pathsadminpanel.php:152 #, php-format msgid "Background directory not writable: %s" -msgstr "" +msgstr "Hintergrund Verzeichnis ist nicht beschreibbar: %s" #: actions/pathsadminpanel.php:160 #, php-format @@ -2225,13 +2182,13 @@ msgid "Invalid SSL server. The maximum length is 255 characters." msgstr "Ungültiger SSL-Server. Die maximale Länge ist 255 Zeichen." #: actions/pathsadminpanel.php:217 actions/siteadminpanel.php:58 -#: lib/adminpanelaction.php:299 +#: lib/adminpanelaction.php:311 msgid "Site" msgstr "Seite" #: actions/pathsadminpanel.php:221 msgid "Path" -msgstr "" +msgstr "Pfad" #: actions/pathsadminpanel.php:221 msgid "Site path" @@ -2259,7 +2216,7 @@ msgstr "" #: actions/pathsadminpanel.php:245 msgid "Theme directory" -msgstr "" +msgstr "Theme-Verzeichnis" #: actions/pathsadminpanel.php:252 msgid "Avatars" @@ -2291,7 +2248,7 @@ msgstr "" #: actions/pathsadminpanel.php:286 msgid "Background directory" -msgstr "" +msgstr "Hintergrund Verzeichnis" #: actions/pathsadminpanel.php:293 msgid "SSL" @@ -2316,15 +2273,16 @@ msgstr "SSL verwenden" #: actions/pathsadminpanel.php:303 msgid "When to use SSL" -msgstr "" +msgstr "Wann soll SSL verwendet werden" #: actions/pathsadminpanel.php:308 -msgid "SSL Server" +#, fuzzy +msgid "SSL server" msgstr "SSL-Server" #: actions/pathsadminpanel.php:309 msgid "Server to direct SSL requests to" -msgstr "" +msgstr "Server an den SSL Anfragen gerichtet werden sollen" #: actions/pathsadminpanel.php:325 msgid "Save paths" @@ -2350,8 +2308,8 @@ msgid "Not a valid people tag: %s" msgstr "Ungültiger Personen-Tag: %s" #: actions/peopletag.php:144 -#, php-format -msgid "Users self-tagged with %s - page %d" +#, fuzzy, php-format +msgid "Users self-tagged with %1$s - page %2$d" msgstr "Benutzer die sich selbst mit %s getagged haben - Seite %d" #: actions/postnotice.php:84 @@ -2359,9 +2317,11 @@ msgid "Invalid notice content" msgstr "Ungültiger Nachrichteninhalt" #: actions/postnotice.php:90 -#, php-format -msgid "Notice license ‘%s’ is not compatible with site license ‘%s’." +#, fuzzy, php-format +msgid "Notice license ‘%1$s’ is not compatible with site license ‘%2$s’." msgstr "" +"Die Nachrichtenlizenz '%s' ist nicht kompatibel mit der Lizenz der Seite '%" +"s'." #: actions/profilesettings.php:60 msgid "Profile settings" @@ -2484,20 +2444,20 @@ msgstr "Ungültiger Tag: „%s“" msgid "Couldn't update user for autosubscribe." msgstr "Autosubscribe konnte nicht aktiviert werden." -#: actions/profilesettings.php:354 +#: actions/profilesettings.php:359 #, fuzzy msgid "Couldn't save location prefs." msgstr "Konnte Tags nicht speichern." -#: actions/profilesettings.php:366 +#: actions/profilesettings.php:371 msgid "Couldn't save profile." msgstr "Konnte Profil nicht speichern." -#: actions/profilesettings.php:374 +#: actions/profilesettings.php:379 msgid "Couldn't save tags." msgstr "Konnte Tags nicht speichern." -#: actions/profilesettings.php:382 lib/adminpanelaction.php:126 +#: actions/profilesettings.php:387 lib/adminpanelaction.php:137 msgid "Settings saved." msgstr "Einstellungen gespeichert." @@ -2593,7 +2553,7 @@ msgid "" "one!" msgstr "" -#: actions/publictagcloud.php:135 +#: actions/publictagcloud.php:131 msgid "Tag cloud" msgstr "Tag-Wolke" @@ -2731,7 +2691,7 @@ msgstr "Entschuldigung, ungültiger Bestätigungscode." msgid "Registration successful" msgstr "Registrierung erfolgreich" -#: actions/register.php:114 actions/register.php:502 lib/action.php:456 +#: actions/register.php:114 actions/register.php:502 lib/action.php:457 #: lib/logingroupnav.php:85 msgid "Register" msgstr "Registrieren" @@ -2745,10 +2705,6 @@ msgid "You can't register if you don't agree to the license." msgstr "" "Du kannst dich nicht registrieren, wenn du die Lizenz nicht akzeptierst." -#: actions/register.php:201 -msgid "Not a valid email address." -msgstr "Ungültige E-Mail-Adresse." - #: actions/register.php:212 msgid "Email address already exists." msgstr "Diese E-Mail-Adresse existiert bereits." @@ -2809,12 +2765,12 @@ msgstr "" "Telefonnummer." #: actions/register.php:537 -#, php-format +#, fuzzy, php-format msgid "" -"Congratulations, %s! And welcome to %%%%site.name%%%%. From here, you may " +"Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may " "want to...\n" "\n" -"* Go to [your profile](%s) and post your first message.\n" +"* Go to [your profile](%2$s) and post your first message.\n" "* Add a [Jabber/GTalk address](%%%%action.imsettings%%%%) so you can send " "notices through instant messages.\n" "* [Search for people](%%%%action.peoplesearch%%%%) that you may know or that " @@ -2945,11 +2901,6 @@ msgstr "Erstellt" msgid "Replies to %s" msgstr "Antworten an %s" -#: actions/replies.php:127 -#, php-format -msgid "Replies to %s, page %d" -msgstr "Antworten an %s, Seite %d" - #: actions/replies.php:144 #, php-format msgid "Replies feed for %s (RSS 1.0)" @@ -2966,11 +2917,13 @@ msgid "Replies feed for %s (Atom)" msgstr "Feed der Nachrichten von %s (Atom)" #: actions/replies.php:198 -#, php-format +#, fuzzy, php-format msgid "" -"This is the timeline showing replies to %s but %s hasn't received a notice " -"to his attention yet." +"This is the timeline showing replies to %1$s but %2$s hasn't received a " +"notice to his attention yet." msgstr "" +"Dies ist die Zeitleiste für %s und Freunde aber bisher hat niemand etwas " +"gepostet." #: actions/replies.php:203 #, php-format @@ -2980,11 +2933,14 @@ msgid "" msgstr "" #: actions/replies.php:205 -#, php-format +#, fuzzy, php-format msgid "" -"You can try to [nudge %s](../%s) or [post something to his or her attention]" -"(%%%%action.newnotice%%%%?status_textarea=%s)." +"You can try to [nudge %1$s](../%2$s) or [post something to his or her " +"attention](%%%%action.newnotice%%%%?status_textarea=%3$s)." msgstr "" +"Du kannst [%s in seinem Profil einen Stups geben](../%s) oder [ihm etwas " +"posten](%%%%action.newnotice%%%%?status_textarea=%s) um seine Aufmerksamkeit " +"zu erregen." #: actions/repliesrss.php:72 #, php-format @@ -3001,11 +2957,6 @@ msgstr "Du kannst diesem Benutzer keine Nachricht schicken." msgid "User is already sandboxed." msgstr "Dieser Benutzer hat dich blockiert." -#: actions/showfavorites.php:79 -#, php-format -msgid "%s's favorite notices, page %d" -msgstr "Von %s als Favoriten markierte Nachrichten, Seite %d" - #: actions/showfavorites.php:132 msgid "Could not retrieve favorite notices." msgstr "Konnte Favoriten nicht abrufen." @@ -3055,11 +3006,6 @@ msgstr "" msgid "%s group" msgstr "%s Gruppe" -#: actions/showgroup.php:84 -#, php-format -msgid "%s group, page %d" -msgstr "%s Gruppe, Seite %d" - #: actions/showgroup.php:218 msgid "Group profile" msgstr "Gruppenprofil" @@ -3108,7 +3054,7 @@ msgstr "Mitglieder" #: actions/showgroup.php:386 lib/profileaction.php:117 #: lib/profileaction.php:148 lib/profileaction.php:236 lib/section.php:95 -#: lib/tagcloudsection.php:71 +#: lib/subscriptionlist.php:126 lib/tagcloudsection.php:71 msgid "(None)" msgstr "(Kein)" @@ -3178,14 +3124,9 @@ msgstr "Nachricht gelöscht." msgid " tagged %s" msgstr "Nachrichten, die mit %s getagt sind" -#: actions/showstream.php:79 -#, php-format -msgid "%s, page %d" -msgstr "%s, Seite %d" - #: actions/showstream.php:122 #, fuzzy, php-format -msgid "Notice feed for %s tagged %s (RSS 1.0)" +msgid "Notice feed for %1$s tagged %2$s (RSS 1.0)" msgstr "Nachrichtenfeed der Gruppe %s" #: actions/showstream.php:129 @@ -3209,9 +3150,11 @@ msgid "FOAF for %s" msgstr "FOAF von %s" #: actions/showstream.php:191 -#, php-format -msgid "This is the timeline for %s but %s hasn't posted anything yet." +#, fuzzy, php-format +msgid "This is the timeline for %1$s but %2$s hasn't posted anything yet." msgstr "" +"Dies ist die Zeitleiste für %s und Freunde aber bisher hat niemand etwas " +"gepostet." #: actions/showstream.php:196 msgid "" @@ -3220,11 +3163,14 @@ msgid "" msgstr "" #: actions/showstream.php:198 -#, php-format +#, fuzzy, php-format msgid "" -"You can try to nudge %s or [post something to his or her attention](%%%%" -"action.newnotice%%%%?status_textarea=%s)." +"You can try to nudge %1$s or [post something to his or her attention](%%%%" +"action.newnotice%%%%?status_textarea=%2$s)." msgstr "" +"Du kannst [%s in seinem Profil einen Stups geben](../%s) oder [ihm etwas " +"posten](%%%%action.newnotice%%%%?status_textarea=%s) um seine Aufmerksamkeit " +"zu erregen." #: actions/showstream.php:234 #, php-format @@ -3270,12 +3216,13 @@ msgid "Site name must have non-zero length." msgstr "" #: actions/siteadminpanel.php:154 -msgid "You must have a valid contact email address" +#, fuzzy +msgid "You must have a valid contact email address." msgstr "Du musst eine gültige E-Mail-Adresse haben" #: actions/siteadminpanel.php:172 -#, php-format -msgid "Unknown language \"%s\"" +#, fuzzy, php-format +msgid "Unknown language \"%s\"." msgstr "Unbekannte Sprache „%s“" #: actions/siteadminpanel.php:179 @@ -3464,7 +3411,8 @@ msgid "Save site settings" msgstr "Site-Einstellungen speichern" #: actions/smssettings.php:58 -msgid "SMS Settings" +#, fuzzy +msgid "SMS settings" msgstr "SMS-Einstellungen" #: actions/smssettings.php:69 @@ -3493,7 +3441,8 @@ msgid "Enter the code you received on your phone." msgstr "Gib den Code ein, den du auf deinem Handy via SMS bekommen hast." #: actions/smssettings.php:138 -msgid "SMS Phone number" +#, fuzzy +msgid "SMS phone number" msgstr "SMS-Telefonnummer" #: actions/smssettings.php:140 @@ -3586,8 +3535,8 @@ msgid "%s subscribers" msgstr "%s Abonnenten" #: actions/subscribers.php:52 -#, php-format -msgid "%s subscribers, page %d" +#, fuzzy, php-format +msgid "%1$s subscribers, page %2$d" msgstr "%s Abonnenten, Seite %d" #: actions/subscribers.php:63 @@ -3627,8 +3576,8 @@ msgid "%s subscriptions" msgstr "%s Abonnements" #: actions/subscriptions.php:54 -#, php-format -msgid "%s subscriptions, page %d" +#, fuzzy, php-format +msgid "%1$s subscriptions, page %2$d" msgstr "%s Abonnements, Seite %d" #: actions/subscriptions.php:65 @@ -3663,11 +3612,6 @@ msgstr "Jabber" msgid "SMS" msgstr "SMS" -#: actions/tag.php:68 -#, php-format -msgid "Notices tagged with %s, page %d" -msgstr "Nachrichten, die mit %s getagt sind, Seite %d" - #: actions/tag.php:86 #, fuzzy, php-format msgid "Notice feed for tag %s (RSS 1.0)" @@ -3756,20 +3700,19 @@ msgstr "Benutzer hat kein Profil." msgid "No profile id in request." msgstr "Keine Profil-ID in der Anfrage." -#: actions/unsubscribe.php:84 -msgid "No profile with that id." -msgstr "Kein Profil mit dieser ID." - #: actions/unsubscribe.php:98 msgid "Unsubscribed" msgstr "Abbestellt" #: actions/updateprofile.php:62 actions/userauthorization.php:330 -#, php-format -msgid "Listenee stream license ‘%s’ is not compatible with site license ‘%s’." +#, fuzzy, php-format +msgid "" +"Listenee stream license ‘%1$s’ is not compatible with site license ‘%2$s’." msgstr "" +"Die Nachrichtenlizenz '%s' ist nicht kompatibel mit der Lizenz der Seite '%" +"s'." -#: actions/useradminpanel.php:58 lib/adminpanelaction.php:305 +#: actions/useradminpanel.php:58 lib/adminpanelaction.php:321 #: lib/personalgroupnav.php:115 msgid "User" msgstr "Benutzer" @@ -3876,7 +3819,7 @@ msgstr "" "dieses Nutzers abonnieren möchtest. Wenn du das nicht wolltest, klicke auf " "„Abbrechen“." -#: actions/userauthorization.php:188 +#: actions/userauthorization.php:188 actions/version.php:165 msgid "License" msgstr "Lizenz" @@ -3935,7 +3878,7 @@ msgstr "" #: actions/userauthorization.php:296 #, php-format -msgid "Listener URI ‘%s’ not found here" +msgid "Listener URI ‘%s’ not found here." msgstr "" #: actions/userauthorization.php:301 @@ -3968,11 +3911,6 @@ msgstr "Konnte Avatar-URL nicht öffnen „%s“" msgid "Wrong image type for avatar URL ‘%s’." msgstr "Falscher Bildtyp für „%s“" -#: actions/userbyid.php:70 -#, fuzzy -msgid "No ID." -msgstr "Keine ID" - #: actions/userdesignsettings.php:76 lib/designsettings.php:65 msgid "Profile design" msgstr "Profil-Design-Einstellungen" @@ -3987,11 +3925,6 @@ msgstr "" msgid "Enjoy your hotdog!" msgstr "" -#: actions/usergroups.php:64 -#, php-format -msgid "%s groups, page %d" -msgstr "%s Gruppen, Seite %d" - #: actions/usergroups.php:130 msgid "Search for more groups" msgstr "Suche nach weiteren Gruppen" @@ -4006,6 +3939,73 @@ msgstr "%s ist in keiner Gruppe Mitglied." msgid "Try [searching for groups](%%action.groupsearch%%) and joining them." msgstr "" +#: actions/version.php:73 +#, fuzzy, php-format +msgid "StatusNet %s" +msgstr "Statistiken" + +#: actions/version.php:153 +#, php-format +msgid "" +"This site is powered by %1$s version %2$s, Copyright 2008-2010 StatusNet, " +"Inc. and contributors." +msgstr "" + +#: actions/version.php:157 +#, fuzzy +msgid "StatusNet" +msgstr "Status gelöscht." + +#: actions/version.php:161 +msgid "Contributors" +msgstr "" + +#: actions/version.php:168 +msgid "" +"StatusNet is free software: you can redistribute it and/or modify it under " +"the terms of the GNU Affero General Public License as published by the Free " +"Software Foundation, either version 3 of the License, or (at your option) " +"any later version. " +msgstr "" + +#: actions/version.php:174 +msgid "" +"This program is distributed in the hope that it will be useful, but WITHOUT " +"ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or " +"FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License " +"for more details. " +msgstr "" + +#: actions/version.php:180 +#, php-format +msgid "" +"You should have received a copy of the GNU Affero General Public License " +"along with this program. If not, see %s." +msgstr "" + +#: actions/version.php:189 +msgid "Plugins" +msgstr "" + +#: actions/version.php:195 +#, fuzzy +msgid "Name" +msgstr "Nutzername" + +#: actions/version.php:196 lib/action.php:741 +#, fuzzy +msgid "Version" +msgstr "Eigene" + +#: actions/version.php:197 +#, fuzzy +msgid "Author(s)" +msgstr "Autor" + +#: actions/version.php:198 lib/groupeditform.php:172 +msgid "Description" +msgstr "Beschreibung" + #: classes/File.php:137 #, php-format msgid "" @@ -4079,7 +4079,7 @@ msgstr "Problem bei Speichern der Nachricht." msgid "DB error inserting reply: %s" msgstr "Datenbankfehler beim Einfügen der Antwort: %s" -#: classes/Notice.php:1361 +#: classes/Notice.php:1359 #, fuzzy, php-format msgid "RT @%1$s %2$s" msgstr "%1$s (%2$s)" @@ -4126,140 +4126,135 @@ msgstr "Sonstige" msgid "Other options" msgstr "Sonstige Optionen" -#: lib/action.php:144 -#, php-format -msgid "%s - %s" -msgstr "%s - %s" - #: lib/action.php:159 msgid "Untitled page" msgstr "Seite ohne Titel" -#: lib/action.php:426 +#: lib/action.php:427 msgid "Primary site navigation" msgstr "Hauptnavigation" -#: lib/action.php:432 +#: lib/action.php:433 msgid "Home" msgstr "Startseite" -#: lib/action.php:432 +#: lib/action.php:433 msgid "Personal profile and friends timeline" msgstr "Persönliches Profil und Freundes-Zeitleiste" -#: lib/action.php:434 +#: lib/action.php:435 msgid "Account" msgstr "Konto" -#: lib/action.php:434 +#: lib/action.php:435 msgid "Change your email, avatar, password, profile" msgstr "Ändere deine E-Mail, dein Avatar, Passwort, Profil" -#: lib/action.php:437 +#: lib/action.php:438 msgid "Connect" msgstr "Verbinden" -#: lib/action.php:437 +#: lib/action.php:438 #, fuzzy msgid "Connect to services" msgstr "Konnte nicht zum Server umleiten: %s" -#: lib/action.php:441 +#: lib/action.php:442 #, fuzzy msgid "Change site configuration" msgstr "Hauptnavigation" -#: lib/action.php:445 lib/subgroupnav.php:105 +#: lib/action.php:446 lib/subgroupnav.php:105 msgid "Invite" msgstr "Einladen" -#: lib/action.php:446 lib/subgroupnav.php:106 +#: lib/action.php:447 lib/subgroupnav.php:106 #, php-format msgid "Invite friends and colleagues to join you on %s" msgstr "Lade Freunde und Kollegen ein dir auf %s zu folgen" -#: lib/action.php:451 +#: lib/action.php:452 msgid "Logout" msgstr "Abmelden" -#: lib/action.php:451 +#: lib/action.php:452 msgid "Logout from the site" msgstr "Von der Seite abmelden" -#: lib/action.php:456 +#: lib/action.php:457 msgid "Create an account" msgstr "Neues Konto erstellen" -#: lib/action.php:459 +#: lib/action.php:460 msgid "Login to the site" msgstr "Auf der Seite anmelden" -#: lib/action.php:462 lib/action.php:725 +#: lib/action.php:463 lib/action.php:726 msgid "Help" msgstr "Hilfe" -#: lib/action.php:462 +#: lib/action.php:463 msgid "Help me!" msgstr "Hilf mir!" -#: lib/action.php:465 lib/searchaction.php:127 +#: lib/action.php:466 lib/searchaction.php:127 msgid "Search" msgstr "Suchen" -#: lib/action.php:465 +#: lib/action.php:466 msgid "Search for people or text" msgstr "Suche nach Leuten oder Text" -#: lib/action.php:486 +#: lib/action.php:487 msgid "Site notice" msgstr "Seitennachricht" -#: lib/action.php:552 +#: lib/action.php:553 msgid "Local views" msgstr "Lokale Ansichten" -#: lib/action.php:618 +#: lib/action.php:619 msgid "Page notice" msgstr "Neue Nachricht" -#: lib/action.php:720 +#: lib/action.php:721 msgid "Secondary site navigation" msgstr "Unternavigation" -#: lib/action.php:727 +#: lib/action.php:728 msgid "About" msgstr "Ãœber" -#: lib/action.php:729 +#: lib/action.php:730 msgid "FAQ" msgstr "FAQ" -#: lib/action.php:733 +#: lib/action.php:734 msgid "TOS" msgstr "AGB" -#: lib/action.php:736 +#: lib/action.php:737 msgid "Privacy" msgstr "Privatsphäre" -#: lib/action.php:738 +#: lib/action.php:739 msgid "Source" msgstr "Quellcode" -#: lib/action.php:740 +#: lib/action.php:743 msgid "Contact" msgstr "Kontakt" -#: lib/action.php:742 +#: lib/action.php:745 #, fuzzy msgid "Badge" msgstr "Stups" -#: lib/action.php:770 +#: lib/action.php:773 msgid "StatusNet software license" msgstr "StatusNet-Software-Lizenz" -#: lib/action.php:773 +#: lib/action.php:776 #, php-format msgid "" "**%%site.name%%** is a microblogging service brought to you by [%%site." @@ -4268,12 +4263,12 @@ msgstr "" "**%%site.name%%** ist ein Microbloggingdienst von [%%site.broughtby%%](%%" "site.broughtbyurl%%)." -#: lib/action.php:775 +#: lib/action.php:778 #, php-format msgid "**%%site.name%%** is a microblogging service. " msgstr "**%%site.name%%** ist ein Microbloggingdienst." -#: lib/action.php:777 +#: lib/action.php:780 #, php-format msgid "" "It runs the [StatusNet](http://status.net/) microblogging software, version %" @@ -4284,32 +4279,32 @@ msgstr "" "(Version %s) betrieben, die unter der [GNU Affero General Public License]" "(http://www.fsf.org/licensing/licenses/agpl-3.0.html) erhältlich ist." -#: lib/action.php:791 +#: lib/action.php:794 msgid "Site content license" msgstr "StatusNet-Software-Lizenz" -#: lib/action.php:800 +#: lib/action.php:803 #, fuzzy msgid "All " msgstr "Alle " -#: lib/action.php:805 +#: lib/action.php:808 msgid "license." msgstr "Lizenz." -#: lib/action.php:1099 +#: lib/action.php:1102 msgid "Pagination" msgstr "Seitenerstellung" -#: lib/action.php:1108 +#: lib/action.php:1111 msgid "After" msgstr "Später" -#: lib/action.php:1116 +#: lib/action.php:1119 msgid "Before" msgstr "Vorher" -#: lib/action.php:1164 +#: lib/action.php:1167 msgid "There was a problem with your session token." msgstr "Es gab ein Problem mit deinem Sessiontoken." @@ -4318,29 +4313,34 @@ msgstr "Es gab ein Problem mit deinem Sessiontoken." msgid "You cannot make changes to this site." msgstr "Du kannst diesem Benutzer keine Nachricht schicken." -#: lib/adminpanelaction.php:195 +#: lib/adminpanelaction.php:107 +#, fuzzy +msgid "Changes to that panel are not allowed." +msgstr "Registrierung nicht gestattet" + +#: lib/adminpanelaction.php:206 msgid "showForm() not implemented." msgstr "showForm() noch nicht implementiert." -#: lib/adminpanelaction.php:224 +#: lib/adminpanelaction.php:235 msgid "saveSettings() not implemented." msgstr "saveSettings() noch nicht implementiert." -#: lib/adminpanelaction.php:247 +#: lib/adminpanelaction.php:258 msgid "Unable to delete design setting." msgstr "Konnte die Design Einstellungen nicht löschen." -#: lib/adminpanelaction.php:300 +#: lib/adminpanelaction.php:312 #, fuzzy msgid "Basic site configuration" msgstr "Bestätigung der E-Mail-Adresse" -#: lib/adminpanelaction.php:303 +#: lib/adminpanelaction.php:317 #, fuzzy msgid "Design configuration" msgstr "SMS-Konfiguration" -#: lib/adminpanelaction.php:306 lib/adminpanelaction.php:309 +#: lib/adminpanelaction.php:322 lib/adminpanelaction.php:327 #, fuzzy msgid "Paths configuration" msgstr "SMS-Konfiguration" @@ -4365,11 +4365,21 @@ msgstr "Nachrichten in denen dieser Anhang erscheint" msgid "Tags for this attachment" msgstr "Tags für diesen Anhang" +#: lib/authenticationplugin.php:182 lib/authenticationplugin.php:187 +#, fuzzy +msgid "Password changing failed" +msgstr "Passwort geändert" + +#: lib/authenticationplugin.php:197 +#, fuzzy +msgid "Password changing is not allowed" +msgstr "Passwort geändert" + #: lib/channel.php:138 lib/channel.php:158 msgid "Command results" msgstr "Befehl-Ergebnisse" -#: lib/channel.php:210 +#: lib/channel.php:210 lib/mailhandler.php:142 msgid "Command complete" msgstr "Befehl ausgeführt" @@ -4382,8 +4392,8 @@ msgid "Sorry, this command is not yet implemented." msgstr "Leider ist dieser Befehl noch nicht implementiert." #: lib/command.php:88 -#, php-format -msgid "Could not find a user with nickname %s" +#, fuzzy, php-format +msgid "Could not find a user with nickname %s." msgstr "Die bestätigte E-Mail-Adresse konnte nicht gespeichert werden." #: lib/command.php:92 @@ -4392,7 +4402,7 @@ msgstr "" #: lib/command.php:99 #, fuzzy, php-format -msgid "Nudge sent to %s" +msgid "Nudge sent to %s." msgstr "Stups abgeschickt" #: lib/command.php:126 @@ -4404,34 +4414,36 @@ msgid "" msgstr "" #: lib/command.php:152 lib/command.php:399 lib/command.php:460 -msgid "Notice with that id does not exist" +#, fuzzy +msgid "Notice with that id does not exist." msgstr "Nachricht mit dieser ID existiert nicht" #: lib/command.php:168 lib/command.php:415 lib/command.php:476 #: lib/command.php:532 -msgid "User has no last notice" +#, fuzzy +msgid "User has no last notice." msgstr "Benutzer hat keine letzte Nachricht" #: lib/command.php:190 msgid "Notice marked as fave." msgstr "Nachricht als Favorit markiert." -#: lib/command.php:315 -#, php-format -msgid "%1$s (%2$s)" -msgstr "%1$s (%2$s)" +#: lib/command.php:284 +#, fuzzy, php-format +msgid "Could not remove user %1$s to group %2$s." +msgstr "Konnte Benutzer %s aus der Gruppe %s nicht entfernen" #: lib/command.php:318 -#, php-format -msgid "Fullname: %s" +#, fuzzy, php-format +msgid "Full name: %s" msgstr "Vollständiger Name: %s" -#: lib/command.php:321 +#: lib/command.php:321 lib/mail.php:254 #, php-format msgid "Location: %s" msgstr "Standort: %s" -#: lib/command.php:324 +#: lib/command.php:324 lib/mail.php:256 #, php-format msgid "Homepage: %s" msgstr "Homepage: %s" @@ -4442,27 +4454,17 @@ msgid "About: %s" msgstr "Ãœber: %s" #: lib/command.php:358 scripts/xmppdaemon.php:301 -#, php-format -msgid "Message too long - maximum is %d characters, you sent %d" +#, fuzzy, php-format +msgid "Message too long - maximum is %1$d characters, you sent %2$d." msgstr "Nachricht zu lang - maximal %d Zeichen erlaubt, du hast %d gesendet" #: lib/command.php:378 msgid "Error sending direct message." msgstr "Fehler beim Senden der Nachricht" -#: lib/command.php:422 -#, fuzzy -msgid "Cannot repeat your own notice" -msgstr "Konnte Benachrichtigung nicht aktivieren." - -#: lib/command.php:427 -#, fuzzy -msgid "Already repeated that notice" -msgstr "Nachricht löschen" - #: lib/command.php:435 #, fuzzy, php-format -msgid "Notice from %s repeated" +msgid "Notice from %s repeated." msgstr "Nachricht hinzugefügt" #: lib/command.php:437 @@ -4472,12 +4474,12 @@ msgstr "Problem beim Speichern der Nachricht." #: lib/command.php:491 #, fuzzy, php-format -msgid "Notice too long - maximum is %d characters, you sent %d" +msgid "Notice too long - maximum is %1$d characters, you sent %2$d." msgstr "Nachricht zu lange - maximal 140 Zeichen erlaubt, du hast %s gesendet" #: lib/command.php:500 -#, php-format -msgid "Reply to %s sent" +#, fuzzy, php-format +msgid "Reply to %s sent." msgstr "Antwort an %s gesendet" #: lib/command.php:502 @@ -4485,7 +4487,8 @@ msgid "Error saving notice." msgstr "Problem beim Speichern der Nachricht." #: lib/command.php:556 -msgid "Specify the name of the user to subscribe to" +#, fuzzy +msgid "Specify the name of the user to subscribe to." msgstr "Gib den Namen des Benutzers an, den du abonnieren möchtest" #: lib/command.php:563 @@ -4494,7 +4497,8 @@ msgid "Subscribed to %s" msgstr "%s abonniert" #: lib/command.php:584 -msgid "Specify the name of the user to unsubscribe from" +#, fuzzy +msgid "Specify the name of the user to unsubscribe from." msgstr "Gib den Namen des Benutzers ein, den du nicht mehr abonnieren möchtest" #: lib/command.php:591 @@ -4523,17 +4527,17 @@ msgid "Can't turn on notification." msgstr "Konnte Benachrichtigung nicht aktivieren." #: lib/command.php:650 -msgid "Login command is disabled" +msgid "Login command is disabled." msgstr "" #: lib/command.php:664 #, fuzzy, php-format -msgid "Could not create login token for %s" +msgid "Could not create login token for %s." msgstr "Konnte keinen Favoriten erstellen." #: lib/command.php:669 #, php-format -msgid "This link is useable only once, and is good for only 2 minutes: %s" +msgid "This link is useable only once, and is good for only 2 minutes: %s." msgstr "" #: lib/command.php:685 @@ -4731,10 +4735,6 @@ msgstr "Beschreibe die Gruppe oder das Thema in 140 Zeichen" msgid "Describe the group or topic in %d characters" msgstr "Beschreibe die Gruppe oder das Thema in 140 Zeichen" -#: lib/groupeditform.php:172 -msgid "Description" -msgstr "Beschreibung" - #: lib/groupeditform.php:179 msgid "" "Location for the group, if any, like \"City, State (or Region), Country\"" @@ -4920,21 +4920,9 @@ msgstr "" "Du kannst Deine E-Mail-Adresse und die Benachrichtigungseinstellungen auf %8" "$s ändern.\n" -#: lib/mail.php:254 -#, php-format -msgid "Location: %s\n" -msgstr "Standort: %s\n" - -#: lib/mail.php:256 -#, php-format -msgid "Homepage: %s\n" -msgstr "Homepage: %s\n" - #: lib/mail.php:258 -#, php-format -msgid "" -"Bio: %s\n" -"\n" +#, fuzzy, php-format +msgid "Bio: %s" msgstr "" "Biografie: %s\n" "\n" @@ -5108,6 +5096,27 @@ msgstr "" msgid "from" msgstr "von" +#: lib/mailhandler.php:37 +msgid "Could not parse message." +msgstr "Konnte Nachricht nicht parsen." + +#: lib/mailhandler.php:42 +msgid "Not a registered user." +msgstr "Kein registrierter Nutzer." + +#: lib/mailhandler.php:46 +msgid "Sorry, that is not your incoming email address." +msgstr "Sorry, das ist nicht deine Adresse für eingehende E-Mails." + +#: lib/mailhandler.php:50 +msgid "Sorry, no incoming email allowed." +msgstr "Sorry, keinen eingehenden E-Mails gestattet." + +#: lib/mailhandler.php:228 +#, fuzzy, php-format +msgid "Unsupported message type: %s" +msgstr "Bildformat wird nicht unterstützt." + #: lib/mediafile.php:98 lib/mediafile.php:123 msgid "There was a database error while saving your file. Please try again." msgstr "" @@ -5139,7 +5148,7 @@ msgid "File upload stopped by extension." msgstr "" #: lib/mediafile.php:179 lib/mediafile.php:216 -msgid "File exceeds user's quota!" +msgid "File exceeds user's quota." msgstr "" #: lib/mediafile.php:196 lib/mediafile.php:233 @@ -5147,7 +5156,8 @@ msgid "File could not be moved to destination directory." msgstr "" #: lib/mediafile.php:201 lib/mediafile.php:237 -msgid "Could not determine file's mime-type!" +#, fuzzy +msgid "Could not determine file's MIME type." msgstr "Konnte öffentlichen Stream nicht abrufen." #: lib/mediafile.php:270 @@ -5157,7 +5167,7 @@ msgstr "" #: lib/mediafile.php:275 #, php-format -msgid "%s is not a supported filetype on this server." +msgid "%s is not a supported file type on this server." msgstr "" #: lib/messageform.php:120 @@ -5193,7 +5203,17 @@ msgid "Attach a file" msgstr "" #: lib/noticeform.php:212 -msgid "Share your location" +#, fuzzy +msgid "Share my location." +msgstr "Konnte Tags nicht speichern." + +#: lib/noticeform.php:214 +#, fuzzy +msgid "Do not share my location." +msgstr "Konnte Tags nicht speichern." + +#: lib/noticeform.php:215 +msgid "Hide this info" msgstr "" #: lib/noticelist.php:428 @@ -5315,6 +5335,11 @@ msgstr "Deine gesendeten Nachrichten" msgid "Tags in %s's notices" msgstr "Tags in %ss Nachrichten" +#: lib/plugin.php:114 +#, fuzzy +msgid "Unknown" +msgstr "Unbekannter Befehl" + #: lib/profileaction.php:109 lib/profileaction.php:192 lib/subgroupnav.php:82 msgid "Subscriptions" msgstr "Abonnements" @@ -5494,11 +5519,6 @@ msgstr "" msgid "People Tagcloud as tagged" msgstr "" -#: lib/subscriptionlist.php:126 -#, fuzzy -msgid "(none)" -msgstr "(leer)" - #: lib/tagcloudsection.php:56 msgid "None" msgstr "Nichts" @@ -5614,19 +5634,3 @@ msgstr "%s ist keine gültige Farbe!" #, php-format msgid "%s is not a valid color! Use 3 or 6 hex chars." msgstr "%s ist keine gültige Farbe! Verwenden Sie 3 oder 6 Hex-Zeichen." - -#: scripts/maildaemon.php:48 -msgid "Could not parse message." -msgstr "Konnte Nachricht nicht parsen." - -#: scripts/maildaemon.php:53 -msgid "Not a registered user." -msgstr "Kein registrierter Nutzer." - -#: scripts/maildaemon.php:57 -msgid "Sorry, that is not your incoming email address." -msgstr "Sorry, das ist nicht deine Adresse für eingehende E-Mails." - -#: scripts/maildaemon.php:61 -msgid "Sorry, no incoming email allowed." -msgstr "Sorry, keinen eingehenden E-Mails gestattet." diff --git a/locale/el/LC_MESSAGES/statusnet.po b/locale/el/LC_MESSAGES/statusnet.po index fb9f0f43e..74f505790 100644 --- a/locale/el/LC_MESSAGES/statusnet.po +++ b/locale/el/LC_MESSAGES/statusnet.po @@ -9,12 +9,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-01-03 10:37+0000\n" -"PO-Revision-Date: 2010-01-03 10:37:35+0000\n" +"POT-Creation-Date: 2010-01-10 11:27+0000\n" +"PO-Revision-Date: 2010-01-10 11:27:53+0000\n" "Language-Team: Greek\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha (r60575); Translate extension (2009-12-06)\n" +"X-Generator: MediaWiki 1.16alpha (r60888); Translate extension (2010-01-04)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: el\n" "X-Message-Group: out-statusnet\n" @@ -51,11 +51,6 @@ msgstr "Δεν υπάÏχει Ï„Îτοιο σελίδα." msgid "No such user." msgstr "ΚανÎνας Ï„Îτοιος χÏήστης." -#: actions/all.php:84 -#, php-format -msgid "%s and friends, page %d" -msgstr "%s και οι φίλοι του/της, σελίδα %d" - #: actions/all.php:86 actions/all.php:167 actions/allrss.php:115 #: actions/apitimelinefriends.php:115 actions/apitimelinehome.php:115 #: lib/personalgroupnav.php:100 @@ -94,8 +89,8 @@ msgstr "" #: actions/all.php:134 #, php-format msgid "" -"You can try to [nudge %s](../%s) from his profile or [post something to his " -"or her attention](%%%%action.newnotice%%%%?status_textarea=%s)." +"You can try to [nudge %1$s](../%2$s) from his profile or [post something to " +"his or her attention](%%%%action.newnotice%%%%?status_textarea=%3$s)." msgstr "" #: actions/all.php:137 actions/replies.php:209 actions/showstream.php:202 @@ -120,6 +115,23 @@ msgstr "" #: actions/apiaccountupdateprofile.php:97 #: actions/apiaccountupdateprofilebackgroundimage.php:94 #: actions/apiaccountupdateprofilecolors.php:118 +#: actions/apidirectmessage.php:156 actions/apifavoritecreate.php:99 +#: actions/apifavoritedestroy.php:100 actions/apifriendshipscreate.php:100 +#: actions/apifriendshipsdestroy.php:100 actions/apifriendshipsshow.php:129 +#: actions/apigroupcreate.php:136 actions/apigroupismember.php:114 +#: actions/apigroupjoin.php:155 actions/apigroupleave.php:141 +#: actions/apigrouplist.php:132 actions/apigrouplistall.php:120 +#: actions/apigroupmembership.php:106 actions/apigroupshow.php:105 +#: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102 +#: actions/apistatusesretweets.php:112 actions/apistatusesshow.php:108 +#: actions/apistatusnetconfig.php:133 actions/apistatusnetversion.php:93 +#: actions/apisubscriptions.php:111 actions/apitimelinefavorites.php:146 +#: actions/apitimelinefriends.php:156 actions/apitimelinegroup.php:150 +#: actions/apitimelinehome.php:156 actions/apitimelinementions.php:151 +#: actions/apitimelinepublic.php:131 actions/apitimelineretweetedbyme.php:122 +#: actions/apitimelineretweetedtome.php:121 +#: actions/apitimelineretweetsofme.php:122 actions/apitimelinetag.php:141 +#: actions/apitimelineuser.php:165 actions/apiusershow.php:101 #, fuzzy msgid "API method not found." msgstr "Η μÎθοδος του ΑΡΙ δε βÏÎθηκε!" @@ -178,6 +190,9 @@ msgstr "" #: actions/apiaccountupdateprofilebackgroundimage.php:146 #: actions/apiaccountupdateprofilecolors.php:164 #: actions/apiaccountupdateprofilecolors.php:174 +#: actions/groupdesignsettings.php:287 actions/groupdesignsettings.php:297 +#: actions/userdesignsettings.php:210 actions/userdesignsettings.php:220 +#: actions/userdesignsettings.php:263 actions/userdesignsettings.php:273 msgid "Unable to save your design settings." msgstr "" @@ -219,26 +234,6 @@ msgstr "" msgid "All the direct messages sent to %s" msgstr "" -#: actions/apidirectmessage.php:156 actions/apifavoritecreate.php:99 -#: actions/apifavoritedestroy.php:100 actions/apifriendshipscreate.php:100 -#: actions/apifriendshipsdestroy.php:100 actions/apifriendshipsshow.php:129 -#: actions/apigroupcreate.php:136 actions/apigroupismember.php:114 -#: actions/apigroupjoin.php:155 actions/apigroupleave.php:141 -#: actions/apigrouplist.php:132 actions/apigrouplistall.php:120 -#: actions/apigroupmembership.php:106 actions/apigroupshow.php:105 -#: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102 -#: actions/apistatusesretweets.php:112 actions/apistatusesshow.php:108 -#: actions/apistatusnetconfig.php:133 actions/apistatusnetversion.php:93 -#: actions/apisubscriptions.php:111 actions/apitimelinefavorites.php:146 -#: actions/apitimelinefriends.php:156 actions/apitimelinegroup.php:150 -#: actions/apitimelinehome.php:156 actions/apitimelinementions.php:151 -#: actions/apitimelinepublic.php:131 actions/apitimelineretweetedbyme.php:122 -#: actions/apitimelineretweetedtome.php:121 -#: actions/apitimelineretweetsofme.php:122 actions/apitimelinetag.php:141 -#: actions/apitimelineuser.php:165 actions/apiusershow.php:101 -msgid "API method not found!" -msgstr "Η μÎθοδος του ΑΡΙ δε βÏÎθηκε!" - #: actions/apidirectmessagenew.php:126 msgid "No message text!" msgstr "" @@ -262,7 +257,7 @@ msgid "No status found with that ID." msgstr "" #: actions/apifavoritecreate.php:119 -msgid "This status is already a favorite!" +msgid "This status is already a favorite." msgstr "" #: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:176 @@ -270,7 +265,7 @@ msgid "Could not create favorite." msgstr "" #: actions/apifavoritedestroy.php:122 -msgid "That status is not a favorite!" +msgid "That status is not a favorite." msgstr "" #: actions/apifavoritedestroy.php:134 actions/disfavor.php:87 @@ -293,8 +288,9 @@ msgid "Could not unfollow user: User not found." msgstr "Δε μποÏÏŽ να ακολουθήσω το χÏήστη: ο χÏήστης δε βÏÎθηκε." #: actions/apifriendshipsdestroy.php:120 -msgid "You cannot unfollow yourself!" -msgstr "" +#, fuzzy +msgid "You cannot unfollow yourself." +msgstr "Δεν μποÏείτε να εμποδίσετε τον εαυτό σας!" #: actions/apifriendshipsexists.php:94 msgid "Two user ids or screen_names must be supplied." @@ -380,7 +376,7 @@ msgstr "" msgid "Group not found!" msgstr "Ομάδα δεν βÏÎθηκε!" -#: actions/apigroupjoin.php:110 +#: actions/apigroupjoin.php:110 actions/joingroup.php:90 lib/command.php:217 msgid "You are already a member of that group." msgstr "" @@ -388,18 +384,18 @@ msgstr "" msgid "You have been blocked from that group by the admin." msgstr "" -#: actions/apigroupjoin.php:138 +#: actions/apigroupjoin.php:138 actions/joingroup.php:128 lib/command.php:234 #, fuzzy, php-format -msgid "Could not join user %s to group %s." +msgid "Could not join user %1$s to group %2$s." msgstr "ΑδÏνατη η αποθήκευση των νÎων πληÏοφοÏιών του Ï€Ïοφίλ" #: actions/apigroupleave.php:114 msgid "You are not a member of this group." msgstr "" -#: actions/apigroupleave.php:124 +#: actions/apigroupleave.php:124 actions/leavegroup.php:127 #, fuzzy, php-format -msgid "Could not remove user %s to group %s." +msgid "Could not remove user %1$s from group %2$s." msgstr "ΑδÏνατη η αποθήκευση του Ï€Ïοφίλ." #: actions/apigrouplist.php:95 @@ -407,11 +403,6 @@ msgstr "ΑδÏνατη η αποθήκευση του Ï€Ïοφίλ." msgid "%s's groups" msgstr "ομάδες των χÏηστών %s" -#: actions/apigrouplist.php:103 -#, fuzzy, php-format -msgid "Groups %s is a member of on %s." -msgstr "Ομάδες με τα πεÏισσότεÏα μÎλη" - #: actions/apigrouplistall.php:90 actions/usergroups.php:62 #, php-format msgid "%s groups" @@ -435,12 +426,12 @@ msgstr "" msgid "No such notice." msgstr "" -#: actions/apistatusesretweet.php:83 +#: actions/apistatusesretweet.php:83 lib/command.php:422 #, fuzzy msgid "Cannot repeat your own notice." msgstr "Αδυναμία διαγÏαφής Î±Ï…Ï„Î¿Ï Ï„Î¿Ï… μηνÏματος." -#: actions/apistatusesretweet.php:91 +#: actions/apistatusesretweet.php:91 lib/command.php:427 #, fuzzy msgid "Already repeated that notice." msgstr "Αδυναμία διαγÏαφής Î±Ï…Ï„Î¿Ï Ï„Î¿Ï… μηνÏματος." @@ -454,7 +445,7 @@ msgid "No status with that ID found." msgstr "" #: actions/apistatusesupdate.php:157 actions/newnotice.php:155 -#: scripts/maildaemon.php:71 +#: lib/mailhandler.php:60 #, php-format msgid "That's too long. Max notice size is %d chars." msgstr "" @@ -474,12 +465,12 @@ msgstr "" #: actions/apitimelinefavorites.php:108 #, php-format -msgid "%s / Favorites from %s" +msgid "%1$s / Favorites from %2$s" msgstr "" #: actions/apitimelinefavorites.php:120 #, php-format -msgid "%s updates favorited by %s / %s." +msgid "%1$s updates favorited by %2$s / %2$s." msgstr "" #: actions/apitimelinegroup.php:109 actions/apitimelineuser.php:118 @@ -547,8 +538,11 @@ msgstr "" msgid "No such attachment." msgstr "" -#: actions/avatarbynickname.php:59 actions/grouprss.php:91 -#: actions/leavegroup.php:76 +#: actions/avatarbynickname.php:59 actions/blockedfromgroup.php:73 +#: actions/editgroup.php:84 actions/groupdesignsettings.php:84 +#: actions/grouplogo.php:86 actions/groupmembers.php:76 +#: actions/grouprss.php:91 actions/joingroup.php:76 actions/leavegroup.php:76 +#: actions/showgroup.php:121 msgid "No nickname." msgstr "" @@ -571,8 +565,8 @@ msgid "You can upload your personal avatar. The maximum file size is %s." msgstr "" #: actions/avatarsettings.php:106 actions/avatarsettings.php:185 -#: actions/grouplogo.php:178 actions/remotesubscribe.php:191 -#: actions/userauthorization.php:72 actions/userrss.php:103 +#: actions/remotesubscribe.php:191 actions/userauthorization.php:72 +#: actions/userrss.php:103 msgid "User without matching profile" msgstr "" @@ -604,9 +598,9 @@ msgstr "" msgid "Crop" msgstr "" -#: actions/avatarsettings.php:268 actions/disfavor.php:74 -#: actions/emailsettings.php:238 actions/favor.php:75 actions/geocode.php:50 -#: actions/groupblock.php:66 actions/grouplogo.php:309 +#: actions/avatarsettings.php:268 actions/deletenotice.php:157 +#: actions/disfavor.php:74 actions/emailsettings.php:238 actions/favor.php:75 +#: actions/geocode.php:50 actions/groupblock.php:66 actions/grouplogo.php:309 #: actions/groupunblock.php:66 actions/imsettings.php:206 #: actions/invite.php:56 actions/login.php:135 actions/makeadmin.php:66 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80 @@ -688,19 +682,16 @@ msgstr "" msgid "Failed to save block information." msgstr "" -#: actions/blockedfromgroup.php:73 actions/editgroup.php:84 -#: actions/groupdesignsettings.php:84 actions/grouplogo.php:86 -#: actions/groupmembers.php:76 actions/joingroup.php:76 -#: actions/showgroup.php:121 -msgid "No nickname" -msgstr "ΚανÎνα ψευδώνυμο" - #: actions/blockedfromgroup.php:80 actions/editgroup.php:96 +#: actions/foafgroup.php:44 actions/foafgroup.php:62 actions/groupblock.php:86 #: actions/groupbyid.php:83 actions/groupdesignsettings.php:97 #: actions/grouplogo.php:99 actions/groupmembers.php:83 -#: actions/joingroup.php:83 actions/showgroup.php:137 -msgid "No such group" -msgstr "Δεν υπάÏχει Ï„Îτοιο ομάδα" +#: actions/grouprss.php:98 actions/groupunblock.php:86 +#: actions/joingroup.php:83 actions/leavegroup.php:83 actions/makeadmin.php:86 +#: actions/showgroup.php:137 lib/command.php:212 lib/command.php:263 +#, fuzzy +msgid "No such group." +msgstr "ΑδÏνατη η αποθήκευση του Ï€Ïοφίλ." #: actions/blockedfromgroup.php:90 #, fuzzy, php-format @@ -709,7 +700,7 @@ msgstr "ΑδÏνατη η αποθήκευση του Ï€Ïοφίλ." #: actions/blockedfromgroup.php:93 #, fuzzy, php-format -msgid "%s blocked profiles, page %d" +msgid "%1$s blocked profiles, page %2$d" msgstr "%s και οι φίλοι του/της" #: actions/blockedfromgroup.php:108 @@ -822,10 +813,6 @@ msgstr "Αδυναμία διαγÏαφής Î±Ï…Ï„Î¿Ï Ï„Î¿Ï… μηνÏματος msgid "Delete this notice" msgstr "" -#: actions/deletenotice.php:157 -msgid "There was a problem with your session token. Try again, please." -msgstr "" - #: actions/deleteuser.php:67 #, fuzzy msgid "You cannot delete users." @@ -850,7 +837,7 @@ msgid "Delete this user" msgstr "ΔιαγÏάψτε αυτόν τον χÏήστη" #: actions/designadminpanel.php:62 lib/accountsettingsaction.php:124 -#: lib/adminpanelaction.php:302 lib/groupnav.php:119 +#: lib/adminpanelaction.php:316 lib/groupnav.php:119 msgid "Design" msgstr "" @@ -991,7 +978,7 @@ msgstr "" #: actions/editgroup.php:103 actions/editgroup.php:168 #: actions/groupdesignsettings.php:104 actions/grouplogo.php:106 -msgid "You must be an admin to edit the group" +msgid "You must be an admin to edit the group." msgstr "" #: actions/editgroup.php:154 @@ -1018,7 +1005,8 @@ msgid "Options saved." msgstr "" #: actions/emailsettings.php:60 -msgid "Email Settings" +#, fuzzy +msgid "Email settings" msgstr "Ρυθμίσεις Email" #: actions/emailsettings.php:71 @@ -1056,8 +1044,9 @@ msgid "Cancel" msgstr "ΑκÏÏωση" #: actions/emailsettings.php:121 -msgid "Email Address" -msgstr "ΔιεÏθυνση Email" +#, fuzzy +msgid "Email address" +msgstr "ΔιευθÏνσεις email" #: actions/emailsettings.php:123 msgid "Email address, like \"UserName@example.org\"" @@ -1130,8 +1119,9 @@ msgstr "" msgid "Cannot normalize that email address" msgstr "Αδυναμία κανονικοποίησης αυτής της email διεÏθυνσης" -#: actions/emailsettings.php:331 actions/siteadminpanel.php:157 -msgid "Not a valid email address" +#: actions/emailsettings.php:331 actions/register.php:201 +#: actions/siteadminpanel.php:157 +msgid "Not a valid email address." msgstr "" #: actions/emailsettings.php:334 @@ -1312,20 +1302,12 @@ msgstr "" msgid "Error updating remote profile" msgstr "" -#: actions/foafgroup.php:44 actions/foafgroup.php:62 actions/groupblock.php:86 -#: actions/grouprss.php:98 actions/groupunblock.php:86 -#: actions/leavegroup.php:83 actions/makeadmin.php:86 lib/command.php:212 -#: lib/command.php:263 -#, fuzzy -msgid "No such group." -msgstr "ΑδÏνατη η αποθήκευση του Ï€Ïοφίλ." - -#: actions/getfile.php:75 +#: actions/getfile.php:79 #, fuzzy msgid "No such file." msgstr "ΑδÏνατη η αποθήκευση του Ï€Ïοφίλ." -#: actions/getfile.php:79 +#: actions/getfile.php:83 #, fuzzy msgid "Cannot read file." msgstr "ΑδÏνατη η αποθήκευση του Ï€Ïοφίλ." @@ -1338,7 +1320,7 @@ msgstr "" #: actions/groupblock.php:76 actions/groupunblock.php:76 #: actions/makeadmin.php:76 actions/subedit.php:53 actions/tagother.php:46 -#: lib/profileformaction.php:77 +#: actions/unsubscribe.php:84 lib/profileformaction.php:77 msgid "No profile with that ID." msgstr "" @@ -1366,9 +1348,9 @@ msgstr "" #: actions/groupblock.php:162 #, php-format msgid "" -"Are you sure you want to block user \"%s\" from the group \"%s\"? They will " -"be removed from the group, unable to post, and unable to subscribe to the " -"group in the future." +"Are you sure you want to block user \"%1$s\" from the group \"%2$s\"? They " +"will be removed from the group, unable to post, and unable to subscribe to " +"the group in the future." msgstr "" #: actions/groupblock.php:178 @@ -1383,8 +1365,8 @@ msgstr "" msgid "Database error blocking user from group." msgstr "" -#: actions/groupbyid.php:74 -msgid "No ID" +#: actions/groupbyid.php:74 actions/userbyid.php:70 +msgid "No ID." msgstr "" #: actions/groupdesignsettings.php:68 @@ -1407,12 +1389,6 @@ msgstr "" msgid "Couldn't update your design." msgstr "ΑπÎτυχε η ενημÎÏωση του χÏήστη." -#: actions/groupdesignsettings.php:287 actions/groupdesignsettings.php:297 -#: actions/userdesignsettings.php:210 actions/userdesignsettings.php:220 -#: actions/userdesignsettings.php:263 actions/userdesignsettings.php:273 -msgid "Unable to save your design settings!" -msgstr "" - #: actions/groupdesignsettings.php:308 actions/userdesignsettings.php:231 #, fuzzy msgid "Design preferences saved." @@ -1428,6 +1404,10 @@ msgid "" "You can upload a logo image for your group. The maximum file size is %s." msgstr "" +#: actions/grouplogo.php:178 +msgid "User without matching profile." +msgstr "" + #: actions/grouplogo.php:362 msgid "Pick a square area of the image to be the logo." msgstr "" @@ -1448,14 +1428,14 @@ msgstr "" #: actions/groupmembers.php:96 #, php-format -msgid "%s group members, page %d" +msgid "%1$s group members, page %2$d" msgstr "" #: actions/groupmembers.php:111 msgid "A list of the users in this group." msgstr "" -#: actions/groupmembers.php:175 lib/action.php:441 lib/groupnav.php:107 +#: actions/groupmembers.php:175 lib/action.php:442 lib/groupnav.php:107 msgid "Admin" msgstr "ΔιαχειÏιστής" @@ -1549,7 +1529,8 @@ msgid "Error removing the block." msgstr "" #: actions/imsettings.php:59 -msgid "IM Settings" +#, fuzzy +msgid "IM settings" msgstr "Ρυθμίσεις ΙΜ" #: actions/imsettings.php:70 @@ -1579,7 +1560,8 @@ msgstr "" "λίστα φίλων?)" #: actions/imsettings.php:124 -msgid "IM Address" +#, fuzzy +msgid "IM address" msgstr "ΔιεÏθυνση ΙΜ" #: actions/imsettings.php:126 @@ -1638,11 +1620,6 @@ msgstr "" msgid "That is not your Jabber ID." msgstr "" -#: actions/inbox.php:59 -#, php-format -msgid "Inbox for %s - page %d" -msgstr "" - #: actions/inbox.php:62 #, php-format msgid "Inbox for %s" @@ -1678,10 +1655,10 @@ msgstr "" msgid "You are already subscribed to these users:" msgstr "" -#: actions/invite.php:131 actions/invite.php:139 +#: actions/invite.php:131 actions/invite.php:139 lib/command.php:315 #, php-format -msgid "%s (%s)" -msgstr "%s (%s)" +msgid "%1$s (%2$s)" +msgstr "" #: actions/invite.php:136 msgid "" @@ -1719,7 +1696,7 @@ msgstr "" msgid "Optionally add a personal message to the invitation." msgstr "" -#: actions/invite.php:197 lib/messageform.php:178 lib/noticeform.php:232 +#: actions/invite.php:197 lib/messageform.php:178 lib/noticeform.php:234 msgid "Send" msgstr "" @@ -1763,18 +1740,9 @@ msgstr "" msgid "You must be logged in to join a group." msgstr "" -#: actions/joingroup.php:90 lib/command.php:217 -msgid "You are already a member of that group" -msgstr "" - -#: actions/joingroup.php:128 lib/command.php:234 -#, php-format -msgid "Could not join user %s to group %s" -msgstr "" - #: actions/joingroup.php:135 lib/command.php:239 #, php-format -msgid "%s joined group %s" +msgid "%1$s joined group %2$s" msgstr "" #: actions/leavegroup.php:60 @@ -1789,14 +1757,9 @@ msgstr "" msgid "Could not find membership record." msgstr "" -#: actions/leavegroup.php:127 lib/command.php:284 -#, php-format -msgid "Could not remove user %s to group %s" -msgstr "" - #: actions/leavegroup.php:134 lib/command.php:289 #, php-format -msgid "%s left group %s" +msgid "%1$s left group %2$s" msgstr "" #: actions/login.php:83 actions/register.php:137 @@ -1815,7 +1778,7 @@ msgstr "Λάθος όνομα χÏήστη ή κωδικός" msgid "Error setting user. You are probably not authorized." msgstr "" -#: actions/login.php:208 actions/login.php:261 lib/action.php:459 +#: actions/login.php:208 actions/login.php:261 lib/action.php:460 #: lib/logingroupnav.php:79 msgid "Login" msgstr "ΣÏνδεση" @@ -1871,18 +1834,18 @@ msgstr "" #: actions/makeadmin.php:95 #, php-format -msgid "%s is already an admin for group \"%s\"." +msgid "%1$s is already an admin for group \"%2$s\"." msgstr "" #: actions/makeadmin.php:132 -#, php-format -msgid "Can't get membership record for %s in group %s" -msgstr "" +#, fuzzy, php-format +msgid "Can't get membership record for %1$s in group %2$s." +msgstr "ΑδÏνατη η αποθήκευση του Ï€Ïοφίλ." #: actions/makeadmin.php:145 -#, php-format -msgid "Can't make %s an admin for group %s" -msgstr "" +#, fuzzy, php-format +msgid "Can't make %1$s an admin for group %2$s." +msgstr "ΑδÏνατη η αποθήκευση του Ï€Ïοφίλ." #: actions/microsummary.php:69 msgid "No current status" @@ -1924,7 +1887,7 @@ msgstr "" #: actions/newmessage.php:185 lib/command.php:376 #, php-format -msgid "Direct message to %s sent" +msgid "Direct message to %s sent." msgstr "" #: actions/newmessage.php:210 actions/newnotice.php:245 lib/channel.php:170 @@ -1952,7 +1915,7 @@ msgstr "" #: actions/noticesearch.php:91 #, fuzzy, php-format -msgid "Search results for \"%s\" on %s" +msgid "Search results for \"%1$s\" on %2$s" msgstr "Αναζήτηση Ïοής για \"%s\"" #: actions/noticesearch.php:121 @@ -2057,11 +2020,6 @@ msgstr "" msgid "URL shortening service is too long (max 50 chars)." msgstr "Η τοποθεσία είναι Ï€Î¿Î»Ï Î¼ÎµÎ³Î¬Î»Î· (μÎγιστο 255 χαÏακτ.)." -#: actions/outbox.php:58 -#, php-format -msgid "Outbox for %s - page %d" -msgstr "" - #: actions/outbox.php:61 #, php-format msgid "Outbox for %s" @@ -2134,7 +2092,7 @@ msgstr "ΑδÏνατη η αποθήκευση του νÎου κωδικοÏ" msgid "Password saved." msgstr "Ο κωδικός αποθηκεÏτηκε." -#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:308 +#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:326 msgid "Paths" msgstr "" @@ -2167,7 +2125,7 @@ msgid "Invalid SSL server. The maximum length is 255 characters." msgstr "" #: actions/pathsadminpanel.php:217 actions/siteadminpanel.php:58 -#: lib/adminpanelaction.php:299 +#: lib/adminpanelaction.php:311 msgid "Site" msgstr "" @@ -2265,8 +2223,9 @@ msgid "When to use SSL" msgstr "" #: actions/pathsadminpanel.php:308 -msgid "SSL Server" -msgstr "" +#, fuzzy +msgid "SSL server" +msgstr "ΑποχώÏηση" #: actions/pathsadminpanel.php:309 msgid "Server to direct SSL requests to" @@ -2294,7 +2253,7 @@ msgstr "" #: actions/peopletag.php:144 #, php-format -msgid "Users self-tagged with %s - page %d" +msgid "Users self-tagged with %1$s - page %2$d" msgstr "" #: actions/postnotice.php:84 @@ -2303,7 +2262,7 @@ msgstr "" #: actions/postnotice.php:90 #, php-format -msgid "Notice license ‘%s’ is not compatible with site license ‘%s’." +msgid "Notice license ‘%1$s’ is not compatible with site license ‘%2$s’." msgstr "" #: actions/profilesettings.php:60 @@ -2424,21 +2383,21 @@ msgstr "" msgid "Couldn't update user for autosubscribe." msgstr "ΑπÎτυχε η ενημÎÏωση του χÏήστη για την αυτόματη συνδÏομή." -#: actions/profilesettings.php:354 +#: actions/profilesettings.php:359 #, fuzzy msgid "Couldn't save location prefs." msgstr "ΑδÏνατη η αποθήκευση του Ï€Ïοφίλ." -#: actions/profilesettings.php:366 +#: actions/profilesettings.php:371 msgid "Couldn't save profile." msgstr "ΑπÎτυχε η αποθήκευση του Ï€Ïοφίλ." -#: actions/profilesettings.php:374 +#: actions/profilesettings.php:379 #, fuzzy msgid "Couldn't save tags." msgstr "ΑδÏνατη η αποθήκευση του Ï€Ïοφίλ." -#: actions/profilesettings.php:382 lib/adminpanelaction.php:126 +#: actions/profilesettings.php:387 lib/adminpanelaction.php:137 msgid "Settings saved." msgstr "" @@ -2532,7 +2491,7 @@ msgid "" "one!" msgstr "" -#: actions/publictagcloud.php:135 +#: actions/publictagcloud.php:131 msgid "Tag cloud" msgstr "" @@ -2670,7 +2629,7 @@ msgstr "" msgid "Registration successful" msgstr "" -#: actions/register.php:114 actions/register.php:502 lib/action.php:456 +#: actions/register.php:114 actions/register.php:502 lib/action.php:457 #: lib/logingroupnav.php:85 msgid "Register" msgstr "" @@ -2683,10 +2642,6 @@ msgstr "" msgid "You can't register if you don't agree to the license." msgstr "" -#: actions/register.php:201 -msgid "Not a valid email address." -msgstr "" - #: actions/register.php:212 msgid "Email address already exists." msgstr "Η διεÏθυνση email υπάÏχει ήδη." @@ -2746,10 +2701,10 @@ msgstr "" #: actions/register.php:537 #, fuzzy, php-format msgid "" -"Congratulations, %s! And welcome to %%%%site.name%%%%. From here, you may " +"Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may " "want to...\n" "\n" -"* Go to [your profile](%s) and post your first message.\n" +"* Go to [your profile](%2$s) and post your first message.\n" "* Add a [Jabber/GTalk address](%%%%action.imsettings%%%%) so you can send " "notices through instant messages.\n" "* [Search for people](%%%%action.peoplesearch%%%%) that you may know or that " @@ -2874,11 +2829,6 @@ msgstr "ΔημιουÏγία" msgid "Replies to %s" msgstr "" -#: actions/replies.php:127 -#, php-format -msgid "Replies to %s, page %d" -msgstr "" - #: actions/replies.php:144 #, fuzzy, php-format msgid "Replies feed for %s (RSS 1.0)" @@ -2897,8 +2847,8 @@ msgstr "Ροή φίλων του/της %s" #: actions/replies.php:198 #, php-format msgid "" -"This is the timeline showing replies to %s but %s hasn't received a notice " -"to his attention yet." +"This is the timeline showing replies to %1$s but %2$s hasn't received a " +"notice to his attention yet." msgstr "" #: actions/replies.php:203 @@ -2911,8 +2861,8 @@ msgstr "" #: actions/replies.php:205 #, php-format msgid "" -"You can try to [nudge %s](../%s) or [post something to his or her attention]" -"(%%%%action.newnotice%%%%?status_textarea=%s)." +"You can try to [nudge %1$s](../%2$s) or [post something to his or her " +"attention](%%%%action.newnotice%%%%?status_textarea=%3$s)." msgstr "" #: actions/repliesrss.php:72 @@ -2928,11 +2878,6 @@ msgstr "" msgid "User is already sandboxed." msgstr "" -#: actions/showfavorites.php:79 -#, fuzzy, php-format -msgid "%s's favorite notices, page %d" -msgstr "%s και οι φίλοι του/της" - #: actions/showfavorites.php:132 msgid "Could not retrieve favorite notices." msgstr "" @@ -2982,11 +2927,6 @@ msgstr "" msgid "%s group" msgstr "" -#: actions/showgroup.php:84 -#, php-format -msgid "%s group, page %d" -msgstr "" - #: actions/showgroup.php:218 #, fuzzy msgid "Group profile" @@ -3036,7 +2976,7 @@ msgstr "ÎœÎλη" #: actions/showgroup.php:386 lib/profileaction.php:117 #: lib/profileaction.php:148 lib/profileaction.php:236 lib/section.php:95 -#: lib/tagcloudsection.php:71 +#: lib/subscriptionlist.php:126 lib/tagcloudsection.php:71 msgid "(None)" msgstr "" @@ -3103,15 +3043,10 @@ msgstr "Ρυθμίσεις OpenID" msgid " tagged %s" msgstr "" -#: actions/showstream.php:79 -#, php-format -msgid "%s, page %d" -msgstr "" - #: actions/showstream.php:122 -#, php-format -msgid "Notice feed for %s tagged %s (RSS 1.0)" -msgstr "" +#, fuzzy, php-format +msgid "Notice feed for %1$s tagged %2$s (RSS 1.0)" +msgstr "Ροή φίλων του/της %s" #: actions/showstream.php:129 #, php-format @@ -3135,7 +3070,7 @@ msgstr "" #: actions/showstream.php:191 #, php-format -msgid "This is the timeline for %s but %s hasn't posted anything yet." +msgid "This is the timeline for %1$s but %2$s hasn't posted anything yet." msgstr "" #: actions/showstream.php:196 @@ -3147,8 +3082,8 @@ msgstr "" #: actions/showstream.php:198 #, php-format msgid "" -"You can try to nudge %s or [post something to his or her attention](%%%%" -"action.newnotice%%%%?status_textarea=%s)." +"You can try to nudge %1$s or [post something to his or her attention](%%%%" +"action.newnotice%%%%?status_textarea=%2$s)." msgstr "" #: actions/showstream.php:234 @@ -3191,12 +3126,12 @@ msgstr "" #: actions/siteadminpanel.php:154 #, fuzzy -msgid "You must have a valid contact email address" +msgid "You must have a valid contact email address." msgstr "Αδυναμία κανονικοποίησης αυτής της email διεÏθυνσης" #: actions/siteadminpanel.php:172 #, php-format -msgid "Unknown language \"%s\"" +msgid "Unknown language \"%s\"." msgstr "" #: actions/siteadminpanel.php:179 @@ -3379,8 +3314,9 @@ msgid "Save site settings" msgstr "Ρυθμίσεις OpenID" #: actions/smssettings.php:58 -msgid "SMS Settings" -msgstr "" +#, fuzzy +msgid "SMS settings" +msgstr "Ρυθμίσεις ΙΜ" #: actions/smssettings.php:69 #, php-format @@ -3409,7 +3345,7 @@ msgid "Enter the code you received on your phone." msgstr "" #: actions/smssettings.php:138 -msgid "SMS Phone number" +msgid "SMS phone number" msgstr "" #: actions/smssettings.php:140 @@ -3498,9 +3434,9 @@ msgid "%s subscribers" msgstr "" #: actions/subscribers.php:52 -#, php-format -msgid "%s subscribers, page %d" -msgstr "" +#, fuzzy, php-format +msgid "%1$s subscribers, page %2$d" +msgstr "%s και οι φίλοι του/της" #: actions/subscribers.php:63 msgid "These are the people who listen to your notices." @@ -3535,9 +3471,9 @@ msgid "%s subscriptions" msgstr "ΑδÏνατη η αποθήκευση των νÎων πληÏοφοÏιών του Ï€Ïοφίλ" #: actions/subscriptions.php:54 -#, php-format -msgid "%s subscriptions, page %d" -msgstr "" +#, fuzzy, php-format +msgid "%1$s subscriptions, page %2$d" +msgstr "ΑδÏνατη η αποθήκευση των νÎων πληÏοφοÏιών του Ï€Ïοφίλ" #: actions/subscriptions.php:65 msgid "These are the people whose notices you listen to." @@ -3571,11 +3507,6 @@ msgstr "" msgid "SMS" msgstr "" -#: actions/tag.php:68 -#, php-format -msgid "Notices tagged with %s, page %d" -msgstr "" - #: actions/tag.php:86 #, php-format msgid "Notice feed for tag %s (RSS 1.0)" @@ -3657,20 +3588,17 @@ msgstr "" msgid "No profile id in request." msgstr "" -#: actions/unsubscribe.php:84 -msgid "No profile with that id." -msgstr "" - #: actions/unsubscribe.php:98 msgid "Unsubscribed" msgstr "" #: actions/updateprofile.php:62 actions/userauthorization.php:330 #, php-format -msgid "Listenee stream license ‘%s’ is not compatible with site license ‘%s’." +msgid "" +"Listenee stream license ‘%1$s’ is not compatible with site license ‘%2$s’." msgstr "" -#: actions/useradminpanel.php:58 lib/adminpanelaction.php:305 +#: actions/useradminpanel.php:58 lib/adminpanelaction.php:321 #: lib/personalgroupnav.php:115 msgid "User" msgstr "" @@ -3772,7 +3700,7 @@ msgid "" "click “Rejectâ€." msgstr "" -#: actions/userauthorization.php:188 +#: actions/userauthorization.php:188 actions/version.php:165 msgid "License" msgstr "" @@ -3822,7 +3750,7 @@ msgstr "" #: actions/userauthorization.php:296 #, php-format -msgid "Listener URI ‘%s’ not found here" +msgid "Listener URI ‘%s’ not found here." msgstr "" #: actions/userauthorization.php:301 @@ -3855,10 +3783,6 @@ msgstr "" msgid "Wrong image type for avatar URL ‘%s’." msgstr "" -#: actions/userbyid.php:70 -msgid "No ID." -msgstr "" - #: actions/userdesignsettings.php:76 lib/designsettings.php:65 msgid "Profile design" msgstr "" @@ -3873,11 +3797,6 @@ msgstr "" msgid "Enjoy your hotdog!" msgstr "" -#: actions/usergroups.php:64 -#, php-format -msgid "%s groups, page %d" -msgstr "" - #: actions/usergroups.php:130 msgid "Search for more groups" msgstr "" @@ -3892,6 +3811,72 @@ msgstr "" msgid "Try [searching for groups](%%action.groupsearch%%) and joining them." msgstr "" +#: actions/version.php:73 +#, php-format +msgid "StatusNet %s" +msgstr "" + +#: actions/version.php:153 +#, php-format +msgid "" +"This site is powered by %1$s version %2$s, Copyright 2008-2010 StatusNet, " +"Inc. and contributors." +msgstr "" + +#: actions/version.php:157 +#, fuzzy +msgid "StatusNet" +msgstr "Η κατάσταση διαγÏάφεται." + +#: actions/version.php:161 +msgid "Contributors" +msgstr "" + +#: actions/version.php:168 +msgid "" +"StatusNet is free software: you can redistribute it and/or modify it under " +"the terms of the GNU Affero General Public License as published by the Free " +"Software Foundation, either version 3 of the License, or (at your option) " +"any later version. " +msgstr "" + +#: actions/version.php:174 +msgid "" +"This program is distributed in the hope that it will be useful, but WITHOUT " +"ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or " +"FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License " +"for more details. " +msgstr "" + +#: actions/version.php:180 +#, php-format +msgid "" +"You should have received a copy of the GNU Affero General Public License " +"along with this program. If not, see %s." +msgstr "" + +#: actions/version.php:189 +msgid "Plugins" +msgstr "" + +#: actions/version.php:195 +#, fuzzy +msgid "Name" +msgstr "Ψευδώνυμο" + +#: actions/version.php:196 lib/action.php:741 +#, fuzzy +msgid "Version" +msgstr "Î Ïοσωπικά" + +#: actions/version.php:197 +msgid "Author(s)" +msgstr "" + +#: actions/version.php:198 lib/groupeditform.php:172 +msgid "Description" +msgstr "ΠεÏιγÏαφή" + #: classes/File.php:137 #, php-format msgid "" @@ -3958,7 +3943,7 @@ msgstr "" msgid "DB error inserting reply: %s" msgstr "Σφάλμα βάσης δεδομÎνων κατά την εισαγωγή απάντησης: %s" -#: classes/Notice.php:1361 +#: classes/Notice.php:1359 #, php-format msgid "RT @%1$s %2$s" msgstr "" @@ -4005,138 +3990,133 @@ msgstr "" msgid "Other options" msgstr "" -#: lib/action.php:144 -#, php-format -msgid "%s - %s" -msgstr "" - #: lib/action.php:159 msgid "Untitled page" msgstr "" -#: lib/action.php:426 +#: lib/action.php:427 msgid "Primary site navigation" msgstr "" -#: lib/action.php:432 +#: lib/action.php:433 msgid "Home" msgstr "ΑÏχή" -#: lib/action.php:432 +#: lib/action.php:433 msgid "Personal profile and friends timeline" msgstr "" -#: lib/action.php:434 +#: lib/action.php:435 msgid "Account" msgstr "ΛογαÏιασμός" -#: lib/action.php:434 +#: lib/action.php:435 msgid "Change your email, avatar, password, profile" msgstr "" -#: lib/action.php:437 +#: lib/action.php:438 msgid "Connect" msgstr "ΣÏνδεση" -#: lib/action.php:437 +#: lib/action.php:438 #, fuzzy msgid "Connect to services" msgstr "Αδυναμία ανακατεÏθηνσης στο διακομιστή: %s" -#: lib/action.php:441 +#: lib/action.php:442 msgid "Change site configuration" msgstr "" -#: lib/action.php:445 lib/subgroupnav.php:105 +#: lib/action.php:446 lib/subgroupnav.php:105 msgid "Invite" msgstr "" -#: lib/action.php:446 lib/subgroupnav.php:106 +#: lib/action.php:447 lib/subgroupnav.php:106 #, php-format msgid "Invite friends and colleagues to join you on %s" msgstr "Î Ïοσκάλεσε φίλους και συναδÎλφους σου να γίνουν μÎλη στο %s" -#: lib/action.php:451 +#: lib/action.php:452 msgid "Logout" msgstr "ΑποσÏνδεση" -#: lib/action.php:451 +#: lib/action.php:452 msgid "Logout from the site" msgstr "" -#: lib/action.php:456 +#: lib/action.php:457 msgid "Create an account" msgstr "ΔημιουÏγία Îναν λογαÏιασμοÏ" -#: lib/action.php:459 +#: lib/action.php:460 msgid "Login to the site" msgstr "" -#: lib/action.php:462 lib/action.php:725 +#: lib/action.php:463 lib/action.php:726 msgid "Help" msgstr "Βοήθεια" -#: lib/action.php:462 +#: lib/action.php:463 msgid "Help me!" msgstr "Βοηθήστε με!" -#: lib/action.php:465 lib/searchaction.php:127 +#: lib/action.php:466 lib/searchaction.php:127 msgid "Search" msgstr "" -#: lib/action.php:465 +#: lib/action.php:466 msgid "Search for people or text" msgstr "" -#: lib/action.php:486 +#: lib/action.php:487 msgid "Site notice" msgstr "" -#: lib/action.php:552 +#: lib/action.php:553 msgid "Local views" msgstr "" -#: lib/action.php:618 +#: lib/action.php:619 msgid "Page notice" msgstr "" -#: lib/action.php:720 +#: lib/action.php:721 msgid "Secondary site navigation" msgstr "" -#: lib/action.php:727 +#: lib/action.php:728 msgid "About" msgstr "ΠεÏί" -#: lib/action.php:729 +#: lib/action.php:730 msgid "FAQ" msgstr "ΣυχνÎÏ‚ εÏωτήσεις" -#: lib/action.php:733 +#: lib/action.php:734 msgid "TOS" msgstr "" -#: lib/action.php:736 +#: lib/action.php:737 msgid "Privacy" msgstr "" -#: lib/action.php:738 +#: lib/action.php:739 msgid "Source" msgstr "" -#: lib/action.php:740 +#: lib/action.php:743 msgid "Contact" msgstr "Επικοινωνία" -#: lib/action.php:742 +#: lib/action.php:745 msgid "Badge" msgstr "" -#: lib/action.php:770 +#: lib/action.php:773 msgid "StatusNet software license" msgstr "" -#: lib/action.php:773 +#: lib/action.php:776 #, fuzzy, php-format msgid "" "**%%site.name%%** is a microblogging service brought to you by [%%site." @@ -4145,13 +4125,13 @@ msgstr "" "To **%%site.name%%** είναι μία υπηÏεσία microblogging (μικÏο-ιστολογίου) που " "ÎφεÏε κοντά σας το [%%site.broughtby%%](%%site.broughtbyurl%%). " -#: lib/action.php:775 +#: lib/action.php:778 #, fuzzy, php-format msgid "**%%site.name%%** is a microblogging service. " msgstr "" "Το **%%site.name%%** είναι μία υπηÏεσία microblogging (μικÏο-ιστολογίου). " -#: lib/action.php:777 +#: lib/action.php:780 #, php-format msgid "" "It runs the [StatusNet](http://status.net/) microblogging software, version %" @@ -4159,31 +4139,31 @@ msgid "" "org/licensing/licenses/agpl-3.0.html)." msgstr "" -#: lib/action.php:791 +#: lib/action.php:794 msgid "Site content license" msgstr "" -#: lib/action.php:800 +#: lib/action.php:803 msgid "All " msgstr "" -#: lib/action.php:805 +#: lib/action.php:808 msgid "license." msgstr "" -#: lib/action.php:1099 +#: lib/action.php:1102 msgid "Pagination" msgstr "" -#: lib/action.php:1108 +#: lib/action.php:1111 msgid "After" msgstr "" -#: lib/action.php:1116 +#: lib/action.php:1119 msgid "Before" msgstr "" -#: lib/action.php:1164 +#: lib/action.php:1167 msgid "There was a problem with your session token." msgstr "" @@ -4191,29 +4171,33 @@ msgstr "" msgid "You cannot make changes to this site." msgstr "" -#: lib/adminpanelaction.php:195 +#: lib/adminpanelaction.php:107 +msgid "Changes to that panel are not allowed." +msgstr "" + +#: lib/adminpanelaction.php:206 msgid "showForm() not implemented." msgstr "" -#: lib/adminpanelaction.php:224 +#: lib/adminpanelaction.php:235 msgid "saveSettings() not implemented." msgstr "" -#: lib/adminpanelaction.php:247 +#: lib/adminpanelaction.php:258 msgid "Unable to delete design setting." msgstr "" -#: lib/adminpanelaction.php:300 +#: lib/adminpanelaction.php:312 #, fuzzy msgid "Basic site configuration" msgstr "Επιβεβαίωση διεÏθυνσης email" -#: lib/adminpanelaction.php:303 +#: lib/adminpanelaction.php:317 #, fuzzy msgid "Design configuration" msgstr "Επιβεβαίωση διεÏθυνσης email" -#: lib/adminpanelaction.php:306 lib/adminpanelaction.php:309 +#: lib/adminpanelaction.php:322 lib/adminpanelaction.php:327 #, fuzzy msgid "Paths configuration" msgstr "Επιβεβαίωση διεÏθυνσης email" @@ -4238,11 +4222,21 @@ msgstr "" msgid "Tags for this attachment" msgstr "" +#: lib/authenticationplugin.php:182 lib/authenticationplugin.php:187 +#, fuzzy +msgid "Password changing failed" +msgstr "Ο κωδικός αποθηκεÏτηκε." + +#: lib/authenticationplugin.php:197 +#, fuzzy +msgid "Password changing is not allowed" +msgstr "Ο κωδικός αποθηκεÏτηκε." + #: lib/channel.php:138 lib/channel.php:158 msgid "Command results" msgstr "" -#: lib/channel.php:210 +#: lib/channel.php:210 lib/mailhandler.php:142 msgid "Command complete" msgstr "" @@ -4256,7 +4250,7 @@ msgstr "" #: lib/command.php:88 #, fuzzy, php-format -msgid "Could not find a user with nickname %s" +msgid "Could not find a user with nickname %s." msgstr "ΑπÎτυχε η ενημÎÏωση χÏήστη μÎσω επιβεβαιωμÎνης email διεÏθυνσης." #: lib/command.php:92 @@ -4265,7 +4259,7 @@ msgstr "" #: lib/command.php:99 #, php-format -msgid "Nudge sent to %s" +msgid "Nudge sent to %s." msgstr "" #: lib/command.php:126 @@ -4277,34 +4271,34 @@ msgid "" msgstr "" #: lib/command.php:152 lib/command.php:399 lib/command.php:460 -msgid "Notice with that id does not exist" +msgid "Notice with that id does not exist." msgstr "" #: lib/command.php:168 lib/command.php:415 lib/command.php:476 #: lib/command.php:532 -msgid "User has no last notice" +msgid "User has no last notice." msgstr "" #: lib/command.php:190 msgid "Notice marked as fave." msgstr "" -#: lib/command.php:315 -#, php-format -msgid "%1$s (%2$s)" -msgstr "" +#: lib/command.php:284 +#, fuzzy, php-format +msgid "Could not remove user %1$s to group %2$s." +msgstr "ΑδÏνατη η αποθήκευση του Ï€Ïοφίλ." #: lib/command.php:318 -#, php-format -msgid "Fullname: %s" -msgstr "" +#, fuzzy, php-format +msgid "Full name: %s" +msgstr "Ονοματεπώνυμο" -#: lib/command.php:321 +#: lib/command.php:321 lib/mail.php:254 #, php-format msgid "Location: %s" msgstr "" -#: lib/command.php:324 +#: lib/command.php:324 lib/mail.php:256 #, php-format msgid "Homepage: %s" msgstr "" @@ -4316,25 +4310,16 @@ msgstr "" #: lib/command.php:358 scripts/xmppdaemon.php:301 #, php-format -msgid "Message too long - maximum is %d characters, you sent %d" +msgid "Message too long - maximum is %1$d characters, you sent %2$d." msgstr "" #: lib/command.php:378 msgid "Error sending direct message." msgstr "" -#: lib/command.php:422 -msgid "Cannot repeat your own notice" -msgstr "" - -#: lib/command.php:427 -#, fuzzy -msgid "Already repeated that notice" -msgstr "Αδυναμία διαγÏαφής Î±Ï…Ï„Î¿Ï Ï„Î¿Ï… μηνÏματος." - #: lib/command.php:435 #, fuzzy, php-format -msgid "Notice from %s repeated" +msgid "Notice from %s repeated." msgstr "Ρυθμίσεις OpenID" #: lib/command.php:437 @@ -4343,12 +4328,12 @@ msgstr "" #: lib/command.php:491 #, php-format -msgid "Notice too long - maximum is %d characters, you sent %d" +msgid "Notice too long - maximum is %1$d characters, you sent %2$d." msgstr "" #: lib/command.php:500 #, php-format -msgid "Reply to %s sent" +msgid "Reply to %s sent." msgstr "" #: lib/command.php:502 @@ -4356,7 +4341,7 @@ msgid "Error saving notice." msgstr "" #: lib/command.php:556 -msgid "Specify the name of the user to subscribe to" +msgid "Specify the name of the user to subscribe to." msgstr "" #: lib/command.php:563 @@ -4365,7 +4350,7 @@ msgid "Subscribed to %s" msgstr "" #: lib/command.php:584 -msgid "Specify the name of the user to unsubscribe from" +msgid "Specify the name of the user to unsubscribe from." msgstr "" #: lib/command.php:591 @@ -4394,17 +4379,17 @@ msgid "Can't turn on notification." msgstr "" #: lib/command.php:650 -msgid "Login command is disabled" +msgid "Login command is disabled." msgstr "" #: lib/command.php:664 #, fuzzy, php-format -msgid "Could not create login token for %s" +msgid "Could not create login token for %s." msgstr "ΑδÏνατη η αποθήκευση του Ï€Ïοφίλ." #: lib/command.php:669 #, php-format -msgid "This link is useable only once, and is good for only 2 minutes: %s" +msgid "This link is useable only once, and is good for only 2 minutes: %s." msgstr "" #: lib/command.php:685 @@ -4596,10 +4581,6 @@ msgstr "ΠεÏιγÏάψτε την ομάδα ή το θÎμα" msgid "Describe the group or topic in %d characters" msgstr "ΠεÏιγÏάψτε την ομάδα ή το θÎμα μÎχÏι %d χαÏακτήÏες" -#: lib/groupeditform.php:172 -msgid "Description" -msgstr "ΠεÏιγÏαφή" - #: lib/groupeditform.php:179 msgid "" "Location for the group, if any, like \"City, State (or Region), Country\"" @@ -4759,21 +4740,9 @@ msgid "" "Change your email address or notification options at %8$s\n" msgstr "" -#: lib/mail.php:254 -#, php-format -msgid "Location: %s\n" -msgstr "Τοποθεσία: %s\n" - -#: lib/mail.php:256 -#, php-format -msgid "Homepage: %s\n" -msgstr "ΑÏχική σελίδα: %s\n" - #: lib/mail.php:258 -#, php-format -msgid "" -"Bio: %s\n" -"\n" +#, fuzzy, php-format +msgid "Bio: %s" msgstr "" "ΒιογÏαφικό: %s\n" "\n" @@ -4910,6 +4879,27 @@ msgstr "" msgid "from" msgstr "από" +#: lib/mailhandler.php:37 +msgid "Could not parse message." +msgstr "" + +#: lib/mailhandler.php:42 +msgid "Not a registered user." +msgstr "" + +#: lib/mailhandler.php:46 +msgid "Sorry, that is not your incoming email address." +msgstr "" + +#: lib/mailhandler.php:50 +msgid "Sorry, no incoming email allowed." +msgstr "" + +#: lib/mailhandler.php:228 +#, php-format +msgid "Unsupported message type: %s" +msgstr "" + #: lib/mediafile.php:98 lib/mediafile.php:123 msgid "There was a database error while saving your file. Please try again." msgstr "" @@ -4941,7 +4931,7 @@ msgid "File upload stopped by extension." msgstr "" #: lib/mediafile.php:179 lib/mediafile.php:216 -msgid "File exceeds user's quota!" +msgid "File exceeds user's quota." msgstr "" #: lib/mediafile.php:196 lib/mediafile.php:233 @@ -4950,7 +4940,7 @@ msgstr "" #: lib/mediafile.php:201 lib/mediafile.php:237 #, fuzzy -msgid "Could not determine file's mime-type!" +msgid "Could not determine file's MIME type." msgstr "ΑπÎτυχε η ενημÎÏωση του χÏήστη." #: lib/mediafile.php:270 @@ -4960,7 +4950,7 @@ msgstr "" #: lib/mediafile.php:275 #, php-format -msgid "%s is not a supported filetype on this server." +msgid "%s is not a supported file type on this server." msgstr "" #: lib/messageform.php:120 @@ -4993,7 +4983,17 @@ msgid "Attach a file" msgstr "" #: lib/noticeform.php:212 -msgid "Share your location" +#, fuzzy +msgid "Share my location." +msgstr "ΑδÏνατη η αποθήκευση του Ï€Ïοφίλ." + +#: lib/noticeform.php:214 +#, fuzzy +msgid "Do not share my location." +msgstr "ΑδÏνατη η αποθήκευση του Ï€Ïοφίλ." + +#: lib/noticeform.php:215 +msgid "Hide this info" msgstr "" #: lib/noticelist.php:428 @@ -5112,6 +5112,10 @@ msgstr "" msgid "Tags in %s's notices" msgstr "" +#: lib/plugin.php:114 +msgid "Unknown" +msgstr "" + #: lib/profileaction.php:109 lib/profileaction.php:192 lib/subgroupnav.php:82 msgid "Subscriptions" msgstr "" @@ -5287,10 +5291,6 @@ msgstr "" msgid "People Tagcloud as tagged" msgstr "" -#: lib/subscriptionlist.php:126 -msgid "(none)" -msgstr "(κανÎνα)" - #: lib/tagcloudsection.php:56 msgid "None" msgstr "ΚανÎνα" @@ -5406,19 +5406,3 @@ msgstr "%s δεν είναι Îνα ÎγκυÏο χÏώμα!" #, php-format msgid "%s is not a valid color! Use 3 or 6 hex chars." msgstr "" - -#: scripts/maildaemon.php:48 -msgid "Could not parse message." -msgstr "" - -#: scripts/maildaemon.php:53 -msgid "Not a registered user." -msgstr "" - -#: scripts/maildaemon.php:57 -msgid "Sorry, that is not your incoming email address." -msgstr "" - -#: scripts/maildaemon.php:61 -msgid "Sorry, no incoming email allowed." -msgstr "" diff --git a/locale/en_GB/LC_MESSAGES/statusnet.po b/locale/en_GB/LC_MESSAGES/statusnet.po index d8f729fcd..58b8129f6 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-01-03 10:37+0000\n" -"PO-Revision-Date: 2010-01-03 10:37:38+0000\n" +"POT-Creation-Date: 2010-01-10 11:27+0000\n" +"PO-Revision-Date: 2010-01-10 11:27:56+0000\n" "Language-Team: British English\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha (r60575); Translate extension (2009-12-06)\n" +"X-Generator: MediaWiki 1.16alpha (r60888); Translate extension (2010-01-04)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: en-gb\n" "X-Message-Group: out-statusnet\n" @@ -52,11 +52,6 @@ msgstr "No such page" msgid "No such user." msgstr "No such user." -#: actions/all.php:84 -#, php-format -msgid "%s and friends, page %d" -msgstr "%s and friends, page %d" - #: actions/all.php:86 actions/all.php:167 actions/allrss.php:115 #: actions/apitimelinefriends.php:115 actions/apitimelinehome.php:115 #: lib/personalgroupnav.php:100 @@ -96,10 +91,10 @@ msgstr "" "something yourself." #: actions/all.php:134 -#, php-format +#, fuzzy, php-format msgid "" -"You can try to [nudge %s](../%s) from his profile or [post something to his " -"or her attention](%%%%action.newnotice%%%%?status_textarea=%s)." +"You can try to [nudge %1$s](../%2$s) from his profile or [post something to " +"his or her attention](%%%%action.newnotice%%%%?status_textarea=%3$s)." msgstr "" "You can try to [nudge %s](../%s) from his profile or [post something to his " "or her attention](%%%%action.newnotice%%%%?status_textarea=%s)." @@ -128,6 +123,23 @@ msgstr "Updates from %1$s and friends on %2$s!" #: actions/apiaccountupdateprofile.php:97 #: actions/apiaccountupdateprofilebackgroundimage.php:94 #: actions/apiaccountupdateprofilecolors.php:118 +#: actions/apidirectmessage.php:156 actions/apifavoritecreate.php:99 +#: actions/apifavoritedestroy.php:100 actions/apifriendshipscreate.php:100 +#: actions/apifriendshipsdestroy.php:100 actions/apifriendshipsshow.php:129 +#: actions/apigroupcreate.php:136 actions/apigroupismember.php:114 +#: actions/apigroupjoin.php:155 actions/apigroupleave.php:141 +#: actions/apigrouplist.php:132 actions/apigrouplistall.php:120 +#: actions/apigroupmembership.php:106 actions/apigroupshow.php:105 +#: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102 +#: actions/apistatusesretweets.php:112 actions/apistatusesshow.php:108 +#: actions/apistatusnetconfig.php:133 actions/apistatusnetversion.php:93 +#: actions/apisubscriptions.php:111 actions/apitimelinefavorites.php:146 +#: actions/apitimelinefriends.php:156 actions/apitimelinegroup.php:150 +#: actions/apitimelinehome.php:156 actions/apitimelinementions.php:151 +#: actions/apitimelinepublic.php:131 actions/apitimelineretweetedbyme.php:122 +#: actions/apitimelineretweetedtome.php:121 +#: actions/apitimelineretweetsofme.php:122 actions/apitimelinetag.php:141 +#: actions/apitimelineuser.php:165 actions/apiusershow.php:101 msgid "API method not found." msgstr "API method not found." @@ -189,6 +201,9 @@ msgstr "" #: actions/apiaccountupdateprofilebackgroundimage.php:146 #: actions/apiaccountupdateprofilecolors.php:164 #: actions/apiaccountupdateprofilecolors.php:174 +#: actions/groupdesignsettings.php:287 actions/groupdesignsettings.php:297 +#: actions/userdesignsettings.php:210 actions/userdesignsettings.php:220 +#: actions/userdesignsettings.php:263 actions/userdesignsettings.php:273 msgid "Unable to save your design settings." msgstr "Unable to save your design settings!" @@ -229,26 +244,6 @@ msgstr "Direct messages to %s" msgid "All the direct messages sent to %s" msgstr "All the direct messages sent to %s" -#: actions/apidirectmessage.php:156 actions/apifavoritecreate.php:99 -#: actions/apifavoritedestroy.php:100 actions/apifriendshipscreate.php:100 -#: actions/apifriendshipsdestroy.php:100 actions/apifriendshipsshow.php:129 -#: actions/apigroupcreate.php:136 actions/apigroupismember.php:114 -#: actions/apigroupjoin.php:155 actions/apigroupleave.php:141 -#: actions/apigrouplist.php:132 actions/apigrouplistall.php:120 -#: actions/apigroupmembership.php:106 actions/apigroupshow.php:105 -#: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102 -#: actions/apistatusesretweets.php:112 actions/apistatusesshow.php:108 -#: actions/apistatusnetconfig.php:133 actions/apistatusnetversion.php:93 -#: actions/apisubscriptions.php:111 actions/apitimelinefavorites.php:146 -#: actions/apitimelinefriends.php:156 actions/apitimelinegroup.php:150 -#: actions/apitimelinehome.php:156 actions/apitimelinementions.php:151 -#: actions/apitimelinepublic.php:131 actions/apitimelineretweetedbyme.php:122 -#: actions/apitimelineretweetedtome.php:121 -#: actions/apitimelineretweetsofme.php:122 actions/apitimelinetag.php:141 -#: actions/apitimelineuser.php:165 actions/apiusershow.php:101 -msgid "API method not found!" -msgstr "API method not found!" - #: actions/apidirectmessagenew.php:126 msgid "No message text!" msgstr "No message text!" @@ -272,7 +267,8 @@ msgid "No status found with that ID." msgstr "No status found with that ID." #: actions/apifavoritecreate.php:119 -msgid "This status is already a favorite!" +#, fuzzy +msgid "This status is already a favorite." msgstr "This status is already a favourite!" #: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:176 @@ -280,7 +276,8 @@ msgid "Could not create favorite." msgstr "Could not create favourite." #: actions/apifavoritedestroy.php:122 -msgid "That status is not a favorite!" +#, fuzzy +msgid "That status is not a favorite." msgstr "That status is not a favourite!" #: actions/apifavoritedestroy.php:134 actions/disfavor.php:87 @@ -301,7 +298,8 @@ msgid "Could not unfollow user: User not found." msgstr "Could not unfollow user: User not found." #: actions/apifriendshipsdestroy.php:120 -msgid "You cannot unfollow yourself!" +#, fuzzy +msgid "You cannot unfollow yourself." msgstr "You cannot unfollow yourself!" #: actions/apifriendshipsexists.php:94 @@ -386,7 +384,7 @@ msgstr "Alias can't be the same as nickname." msgid "Group not found!" msgstr "Group not found!" -#: actions/apigroupjoin.php:110 +#: actions/apigroupjoin.php:110 actions/joingroup.php:90 lib/command.php:217 msgid "You are already a member of that group." msgstr "You are already a member of that group." @@ -394,18 +392,18 @@ msgstr "You are already a member of that group." msgid "You have been blocked from that group by the admin." msgstr "You have been blocked from that group by the admin." -#: actions/apigroupjoin.php:138 -#, php-format -msgid "Could not join user %s to group %s." +#: actions/apigroupjoin.php:138 actions/joingroup.php:128 lib/command.php:234 +#, fuzzy, php-format +msgid "Could not join user %1$s to group %2$s." msgstr "Could not join user %s to group %s." #: actions/apigroupleave.php:114 msgid "You are not a member of this group." msgstr "You are not a member of this group." -#: actions/apigroupleave.php:124 -#, php-format -msgid "Could not remove user %s to group %s." +#: actions/apigroupleave.php:124 actions/leavegroup.php:127 +#, fuzzy, php-format +msgid "Could not remove user %1$s from group %2$s." msgstr "Could not remove user %s to group %s." #: actions/apigrouplist.php:95 @@ -413,11 +411,6 @@ msgstr "Could not remove user %s to group %s." msgid "%s's groups" msgstr "%s's groups" -#: actions/apigrouplist.php:103 -#, php-format -msgid "Groups %s is a member of on %s." -msgstr "Groups %s is a member of on %s." - #: actions/apigrouplistall.php:90 actions/usergroups.php:62 #, php-format msgid "%s groups" @@ -441,11 +434,11 @@ msgstr "You may not delete another user's status." msgid "No such notice." msgstr "No such notice." -#: actions/apistatusesretweet.php:83 +#: actions/apistatusesretweet.php:83 lib/command.php:422 msgid "Cannot repeat your own notice." msgstr "Cannot repeat your own notice." -#: actions/apistatusesretweet.php:91 +#: actions/apistatusesretweet.php:91 lib/command.php:427 msgid "Already repeated that notice." msgstr "Already repeated that notice." @@ -458,7 +451,7 @@ msgid "No status with that ID found." msgstr "No status with that ID found." #: actions/apistatusesupdate.php:157 actions/newnotice.php:155 -#: scripts/maildaemon.php:71 +#: lib/mailhandler.php:60 #, php-format msgid "That's too long. Max notice size is %d chars." msgstr "That's too long. Max notice size is %d chars." @@ -477,13 +470,13 @@ msgid "Unsupported format." msgstr "Unsupported format." #: actions/apitimelinefavorites.php:108 -#, php-format -msgid "%s / Favorites from %s" +#, fuzzy, php-format +msgid "%1$s / Favorites from %2$s" msgstr "%s / Favourites from %s" #: actions/apitimelinefavorites.php:120 -#, php-format -msgid "%s updates favorited by %s / %s." +#, fuzzy, php-format +msgid "%1$s updates favorited by %2$s / %2$s." msgstr "%s updates favourited by %s / %s." #: actions/apitimelinegroup.php:109 actions/apitimelineuser.php:118 @@ -551,8 +544,11 @@ msgstr "Not found." msgid "No such attachment." msgstr "No such attachment." -#: actions/avatarbynickname.php:59 actions/grouprss.php:91 -#: actions/leavegroup.php:76 +#: actions/avatarbynickname.php:59 actions/blockedfromgroup.php:73 +#: actions/editgroup.php:84 actions/groupdesignsettings.php:84 +#: actions/grouplogo.php:86 actions/groupmembers.php:76 +#: actions/grouprss.php:91 actions/joingroup.php:76 actions/leavegroup.php:76 +#: actions/showgroup.php:121 msgid "No nickname." msgstr "No nickname." @@ -575,8 +571,8 @@ msgid "You can upload your personal avatar. The maximum file size is %s." msgstr "You can upload your personal avatar. The maximum file size is %s." #: actions/avatarsettings.php:106 actions/avatarsettings.php:185 -#: actions/grouplogo.php:178 actions/remotesubscribe.php:191 -#: actions/userauthorization.php:72 actions/userrss.php:103 +#: actions/remotesubscribe.php:191 actions/userauthorization.php:72 +#: actions/userrss.php:103 msgid "User without matching profile" msgstr "User without matching profile" @@ -608,9 +604,9 @@ msgstr "Upload" msgid "Crop" msgstr "Crop" -#: actions/avatarsettings.php:268 actions/disfavor.php:74 -#: actions/emailsettings.php:238 actions/favor.php:75 actions/geocode.php:50 -#: actions/groupblock.php:66 actions/grouplogo.php:309 +#: actions/avatarsettings.php:268 actions/deletenotice.php:157 +#: actions/disfavor.php:74 actions/emailsettings.php:238 actions/favor.php:75 +#: actions/geocode.php:50 actions/groupblock.php:66 actions/grouplogo.php:309 #: actions/groupunblock.php:66 actions/imsettings.php:206 #: actions/invite.php:56 actions/login.php:135 actions/makeadmin.php:66 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80 @@ -692,19 +688,15 @@ msgstr "Block this user" msgid "Failed to save block information." msgstr "Failed to save block information." -#: actions/blockedfromgroup.php:73 actions/editgroup.php:84 -#: actions/groupdesignsettings.php:84 actions/grouplogo.php:86 -#: actions/groupmembers.php:76 actions/joingroup.php:76 -#: actions/showgroup.php:121 -msgid "No nickname" -msgstr "No nickname" - #: actions/blockedfromgroup.php:80 actions/editgroup.php:96 +#: actions/foafgroup.php:44 actions/foafgroup.php:62 actions/groupblock.php:86 #: actions/groupbyid.php:83 actions/groupdesignsettings.php:97 #: actions/grouplogo.php:99 actions/groupmembers.php:83 -#: actions/joingroup.php:83 actions/showgroup.php:137 -msgid "No such group" -msgstr "No such group" +#: actions/grouprss.php:98 actions/groupunblock.php:86 +#: actions/joingroup.php:83 actions/leavegroup.php:83 actions/makeadmin.php:86 +#: actions/showgroup.php:137 lib/command.php:212 lib/command.php:263 +msgid "No such group." +msgstr "No such group." #: actions/blockedfromgroup.php:90 #, php-format @@ -712,8 +704,8 @@ msgid "%s blocked profiles" msgstr "%s blocked profiles" #: actions/blockedfromgroup.php:93 -#, php-format -msgid "%s blocked profiles, page %d" +#, fuzzy, php-format +msgid "%1$s blocked profiles, page %2$d" msgstr "%s blocked profiles, page %d" #: actions/blockedfromgroup.php:108 @@ -826,10 +818,6 @@ msgstr "Do not delete this notice" msgid "Delete this notice" msgstr "Delete this notice" -#: actions/deletenotice.php:157 -msgid "There was a problem with your session token. Try again, please." -msgstr "There was a problem with your session token. Try again, please." - #: actions/deleteuser.php:67 msgid "You cannot delete users." msgstr "You cannot delete users." @@ -855,7 +843,7 @@ msgid "Delete this user" msgstr "Delete this user" #: actions/designadminpanel.php:62 lib/accountsettingsaction.php:124 -#: lib/adminpanelaction.php:302 lib/groupnav.php:119 +#: lib/adminpanelaction.php:316 lib/groupnav.php:119 msgid "Design" msgstr "Design" @@ -997,7 +985,8 @@ msgstr "You must be logged in to create a group." #: actions/editgroup.php:103 actions/editgroup.php:168 #: actions/groupdesignsettings.php:104 actions/grouplogo.php:106 -msgid "You must be an admin to edit the group" +#, fuzzy +msgid "You must be an admin to edit the group." msgstr "You must be an admin to edit the group" #: actions/editgroup.php:154 @@ -1022,7 +1011,8 @@ msgid "Options saved." msgstr "Options saved." #: actions/emailsettings.php:60 -msgid "Email Settings" +#, fuzzy +msgid "Email settings" msgstr "E-mail Settings" #: actions/emailsettings.php:71 @@ -1059,8 +1049,9 @@ msgid "Cancel" msgstr "Cancel" #: actions/emailsettings.php:121 -msgid "Email Address" -msgstr "E-mail Address" +#, fuzzy +msgid "Email address" +msgstr "E-mail addresses" #: actions/emailsettings.php:123 msgid "Email address, like \"UserName@example.org\"" @@ -1133,8 +1124,9 @@ msgstr "No e-mail address." msgid "Cannot normalize that email address" msgstr "Cannot normalise that e-mail address" -#: actions/emailsettings.php:331 actions/siteadminpanel.php:157 -msgid "Not a valid email address" +#: actions/emailsettings.php:331 actions/register.php:201 +#: actions/siteadminpanel.php:157 +msgid "Not a valid email address." msgstr "Not a valid e-mail address." #: actions/emailsettings.php:334 @@ -1321,19 +1313,12 @@ msgstr "Unknown version of OMB protocol." msgid "Error updating remote profile" msgstr "Error updating remote profile." -#: actions/foafgroup.php:44 actions/foafgroup.php:62 actions/groupblock.php:86 -#: actions/grouprss.php:98 actions/groupunblock.php:86 -#: actions/leavegroup.php:83 actions/makeadmin.php:86 lib/command.php:212 -#: lib/command.php:263 -msgid "No such group." -msgstr "No such group." - -#: actions/getfile.php:75 +#: actions/getfile.php:79 #, fuzzy msgid "No such file." msgstr "No such notice." -#: actions/getfile.php:79 +#: actions/getfile.php:83 #, fuzzy msgid "Cannot read file." msgstr "Lost our file." @@ -1346,7 +1331,7 @@ msgstr "No profile specified." #: actions/groupblock.php:76 actions/groupunblock.php:76 #: actions/makeadmin.php:76 actions/subedit.php:53 actions/tagother.php:46 -#: lib/profileformaction.php:77 +#: actions/unsubscribe.php:84 lib/profileformaction.php:77 msgid "No profile with that ID." msgstr "No profile with that ID." @@ -1374,11 +1359,11 @@ msgid "Block user from group" msgstr "Block user" #: actions/groupblock.php:162 -#, php-format +#, fuzzy, php-format msgid "" -"Are you sure you want to block user \"%s\" from the group \"%s\"? They will " -"be removed from the group, unable to post, and unable to subscribe to the " -"group in the future." +"Are you sure you want to block user \"%1$s\" from the group \"%2$s\"? They " +"will be removed from the group, unable to post, and unable to subscribe to " +"the group in the future." msgstr "" "Are you sure you want to block user \"%s\" from the group \"%s\"? They will " "be removed from the group, unable to post, and unable to subscribe to the " @@ -1396,8 +1381,9 @@ msgstr "Block this user from this group" msgid "Database error blocking user from group." msgstr "Database error blocking user from group." -#: actions/groupbyid.php:74 -msgid "No ID" +#: actions/groupbyid.php:74 actions/userbyid.php:70 +#, fuzzy +msgid "No ID." msgstr "No ID" #: actions/groupdesignsettings.php:68 @@ -1424,13 +1410,6 @@ msgstr "" msgid "Couldn't update your design." msgstr "Couldn't update user." -#: actions/groupdesignsettings.php:287 actions/groupdesignsettings.php:297 -#: actions/userdesignsettings.php:210 actions/userdesignsettings.php:220 -#: actions/userdesignsettings.php:263 actions/userdesignsettings.php:273 -#, fuzzy -msgid "Unable to save your design settings!" -msgstr "Unable to save your Twitter settings!" - #: actions/groupdesignsettings.php:308 actions/userdesignsettings.php:231 #, fuzzy msgid "Design preferences saved." @@ -1446,6 +1425,11 @@ msgid "" "You can upload a logo image for your group. The maximum file size is %s." msgstr "You can upload a logo image for your group." +#: actions/grouplogo.php:178 +#, fuzzy +msgid "User without matching profile." +msgstr "User without matching profile" + #: actions/grouplogo.php:362 #, fuzzy msgid "Pick a square area of the image to be the logo." @@ -1465,15 +1449,15 @@ msgid "%s group members" msgstr "%s group members" #: actions/groupmembers.php:96 -#, php-format -msgid "%s group members, page %d" +#, fuzzy, php-format +msgid "%1$s group members, page %2$d" msgstr "%s group members, page %d" #: actions/groupmembers.php:111 msgid "A list of the users in this group." msgstr "A list of the users in this group." -#: actions/groupmembers.php:175 lib/action.php:441 lib/groupnav.php:107 +#: actions/groupmembers.php:175 lib/action.php:442 lib/groupnav.php:107 msgid "Admin" msgstr "Admin" @@ -1570,7 +1554,8 @@ msgid "Error removing the block." msgstr "Error removing the block." #: actions/imsettings.php:59 -msgid "IM Settings" +#, fuzzy +msgid "IM settings" msgstr "I.M. Settings" #: actions/imsettings.php:70 @@ -1600,7 +1585,8 @@ msgstr "" "message with further instructions. (Did you add %s to your buddy list?)" #: actions/imsettings.php:124 -msgid "IM Address" +#, fuzzy +msgid "IM address" msgstr "I.M. Address" #: actions/imsettings.php:126 @@ -1662,11 +1648,6 @@ msgstr "" msgid "That is not your Jabber ID." msgstr "That is not your Jabber ID." -#: actions/inbox.php:59 -#, php-format -msgid "Inbox for %s - page %d" -msgstr "Inbox for %s - page %d" - #: actions/inbox.php:62 #, php-format msgid "Inbox for %s" @@ -1702,10 +1683,10 @@ msgstr "Invite new users" msgid "You are already subscribed to these users:" msgstr "You are already subscribed to these users:" -#: actions/invite.php:131 actions/invite.php:139 +#: actions/invite.php:131 actions/invite.php:139 lib/command.php:315 #, php-format -msgid "%s (%s)" -msgstr "%s (%s)" +msgid "%1$s (%2$s)" +msgstr "%1$s (%2$s)" #: actions/invite.php:136 msgid "" @@ -1747,7 +1728,7 @@ msgstr "Personal message" msgid "Optionally add a personal message to the invitation." msgstr "Optionally add a personal message to the invitation." -#: actions/invite.php:197 lib/messageform.php:178 lib/noticeform.php:232 +#: actions/invite.php:197 lib/messageform.php:178 lib/noticeform.php:234 msgid "Send" msgstr "Send" @@ -1817,18 +1798,9 @@ msgstr "" msgid "You must be logged in to join a group." msgstr "You must be logged in to join a group." -#: actions/joingroup.php:90 lib/command.php:217 -msgid "You are already a member of that group" -msgstr "You are already a member of that group" - -#: actions/joingroup.php:128 lib/command.php:234 -#, php-format -msgid "Could not join user %s to group %s" -msgstr "Could not join user %s to group %s" - #: actions/joingroup.php:135 lib/command.php:239 -#, php-format -msgid "%s joined group %s" +#, fuzzy, php-format +msgid "%1$s joined group %2$s" msgstr "%s joined group %s" #: actions/leavegroup.php:60 @@ -1843,14 +1815,9 @@ msgstr "You are not a member of that group." msgid "Could not find membership record." msgstr "Could not find membership record." -#: actions/leavegroup.php:127 lib/command.php:284 -#, php-format -msgid "Could not remove user %s to group %s" -msgstr "Could not remove user %s to group %s" - #: actions/leavegroup.php:134 lib/command.php:289 -#, php-format -msgid "%s left group %s" +#, fuzzy, php-format +msgid "%1$s left group %2$s" msgstr "%s left group %s" #: actions/login.php:83 actions/register.php:137 @@ -1871,7 +1838,7 @@ msgstr "Incorrect username or password." msgid "Error setting user. You are probably not authorized." msgstr "You are not authorised." -#: actions/login.php:208 actions/login.php:261 lib/action.php:459 +#: actions/login.php:208 actions/login.php:261 lib/action.php:460 #: lib/logingroupnav.php:79 msgid "Login" msgstr "Login" @@ -1925,19 +1892,19 @@ msgid "Only an admin can make another user an admin." msgstr "" #: actions/makeadmin.php:95 -#, php-format -msgid "%s is already an admin for group \"%s\"." -msgstr "" +#, fuzzy, php-format +msgid "%1$s is already an admin for group \"%2$s\"." +msgstr "User is already blocked from group." #: actions/makeadmin.php:132 -#, php-format -msgid "Can't get membership record for %s in group %s" -msgstr "" +#, fuzzy, php-format +msgid "Can't get membership record for %1$s in group %2$s." +msgstr "Could not remove user %s to group %s" #: actions/makeadmin.php:145 -#, php-format -msgid "Can't make %s an admin for group %s" -msgstr "" +#, fuzzy, php-format +msgid "Can't make %1$s an admin for group %2$s." +msgstr "You must be an admin to edit the group" #: actions/microsummary.php:69 msgid "No current status" @@ -1979,8 +1946,8 @@ msgid "Message sent" msgstr "Message sent" #: actions/newmessage.php:185 lib/command.php:376 -#, php-format -msgid "Direct message to %s sent" +#, fuzzy, php-format +msgid "Direct message to %s sent." msgstr "Direct message to %s sent" #: actions/newmessage.php:210 actions/newnotice.php:245 lib/channel.php:170 @@ -2009,8 +1976,8 @@ msgid "Text search" msgstr "Text search" #: actions/noticesearch.php:91 -#, php-format -msgid "Search results for \"%s\" on %s" +#, fuzzy, php-format +msgid "Search results for \"%1$s\" on %2$s" msgstr "Search results for \"%s\" on %s" #: actions/noticesearch.php:121 @@ -2115,11 +2082,6 @@ msgstr "" msgid "URL shortening service is too long (max 50 chars)." msgstr "URL shortening service is too long (max 50 chars)." -#: actions/outbox.php:58 -#, php-format -msgid "Outbox for %s - page %d" -msgstr "Outbox for %s - page %d" - #: actions/outbox.php:61 #, php-format msgid "Outbox for %s" @@ -2190,7 +2152,7 @@ msgstr "Can't save new password." msgid "Password saved." msgstr "Password saved." -#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:308 +#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:326 msgid "Paths" msgstr "" @@ -2223,7 +2185,7 @@ msgid "Invalid SSL server. The maximum length is 255 characters." msgstr "" #: actions/pathsadminpanel.php:217 actions/siteadminpanel.php:58 -#: lib/adminpanelaction.php:299 +#: lib/adminpanelaction.php:311 #, fuzzy msgid "Site" msgstr "Invite" @@ -2321,8 +2283,9 @@ msgid "When to use SSL" msgstr "" #: actions/pathsadminpanel.php:308 -msgid "SSL Server" -msgstr "" +#, fuzzy +msgid "SSL server" +msgstr "Server" #: actions/pathsadminpanel.php:309 msgid "Server to direct SSL requests to" @@ -2351,8 +2314,8 @@ msgid "Not a valid people tag: %s" msgstr "Not a valid people tag: %s" #: actions/peopletag.php:144 -#, php-format -msgid "Users self-tagged with %s - page %d" +#, fuzzy, php-format +msgid "Users self-tagged with %1$s - page %2$d" msgstr "Users self-tagged with %s - page %d" #: actions/postnotice.php:84 @@ -2360,8 +2323,8 @@ msgid "Invalid notice content" msgstr "Invalid notice content" #: actions/postnotice.php:90 -#, php-format -msgid "Notice license ‘%s’ is not compatible with site license ‘%s’." +#, fuzzy, php-format +msgid "Notice license ‘%1$s’ is not compatible with site license ‘%2$s’." msgstr "Notice licence ‘%s’ is not compatible with site licence ‘%s’." #: actions/profilesettings.php:60 @@ -2481,20 +2444,20 @@ msgstr "Invalid tag: \"%s\"" msgid "Couldn't update user for autosubscribe." msgstr "Couldn't update user for autosubscribe." -#: actions/profilesettings.php:354 +#: actions/profilesettings.php:359 #, fuzzy msgid "Couldn't save location prefs." msgstr "Couldn't save tags." -#: actions/profilesettings.php:366 +#: actions/profilesettings.php:371 msgid "Couldn't save profile." msgstr "Couldn't save profile." -#: actions/profilesettings.php:374 +#: actions/profilesettings.php:379 msgid "Couldn't save tags." msgstr "Couldn't save tags." -#: actions/profilesettings.php:382 lib/adminpanelaction.php:126 +#: actions/profilesettings.php:387 lib/adminpanelaction.php:137 msgid "Settings saved." msgstr "Settings saved." @@ -2597,7 +2560,7 @@ msgid "" "one!" msgstr "" -#: actions/publictagcloud.php:135 +#: actions/publictagcloud.php:131 msgid "Tag cloud" msgstr "Tag cloud" @@ -2736,7 +2699,7 @@ msgstr "Error with confirmation code." msgid "Registration successful" msgstr "Registration successful" -#: actions/register.php:114 actions/register.php:502 lib/action.php:456 +#: actions/register.php:114 actions/register.php:502 lib/action.php:457 #: lib/logingroupnav.php:85 msgid "Register" msgstr "Register" @@ -2749,10 +2712,6 @@ msgstr "Registration not allowed." msgid "You can't register if you don't agree to the license." msgstr "You can't register if you don't agree to the licence." -#: actions/register.php:201 -msgid "Not a valid email address." -msgstr "Not a valid e-mail address." - #: actions/register.php:212 msgid "Email address already exists." msgstr "E-mail address already exists." @@ -2810,12 +2769,12 @@ msgstr "" "number." #: actions/register.php:537 -#, php-format +#, fuzzy, php-format msgid "" -"Congratulations, %s! And welcome to %%%%site.name%%%%. From here, you may " +"Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may " "want to...\n" "\n" -"* Go to [your profile](%s) and post your first message.\n" +"* Go to [your profile](%2$s) and post your first message.\n" "* Add a [Jabber/GTalk address](%%%%action.imsettings%%%%) so you can send " "notices through instant messages.\n" "* [Search for people](%%%%action.peoplesearch%%%%) that you may know or that " @@ -2945,11 +2904,6 @@ msgstr "Created" msgid "Replies to %s" msgstr "Replies to %s" -#: actions/replies.php:127 -#, php-format -msgid "Replies to %s, page %d" -msgstr "Replies to %s, page %d" - #: actions/replies.php:144 #, php-format msgid "Replies feed for %s (RSS 1.0)" @@ -2966,11 +2920,12 @@ msgid "Replies feed for %s (Atom)" msgstr "Notice feed for %s" #: actions/replies.php:198 -#, php-format +#, fuzzy, php-format msgid "" -"This is the timeline showing replies to %s but %s hasn't received a notice " -"to his attention yet." +"This is the timeline showing replies to %1$s but %2$s hasn't received a " +"notice to his attention yet." msgstr "" +"This is the timeline for %s and friends but no one has posted anything yet." #: actions/replies.php:203 #, php-format @@ -2980,11 +2935,13 @@ msgid "" msgstr "" #: actions/replies.php:205 -#, php-format +#, fuzzy, php-format msgid "" -"You can try to [nudge %s](../%s) or [post something to his or her attention]" -"(%%%%action.newnotice%%%%?status_textarea=%s)." +"You can try to [nudge %1$s](../%2$s) or [post something to his or her " +"attention](%%%%action.newnotice%%%%?status_textarea=%3$s)." msgstr "" +"You can try to [nudge %s](../%s) from his profile or [post something to his " +"or her attention](%%%%action.newnotice%%%%?status_textarea=%s)." #: actions/repliesrss.php:72 #, php-format @@ -2999,11 +2956,6 @@ msgstr "You cannot sandbox users on this site." msgid "User is already sandboxed." msgstr "User is already sandboxed." -#: actions/showfavorites.php:79 -#, php-format -msgid "%s's favorite notices, page %d" -msgstr "%s's favourite notices, page %d" - #: actions/showfavorites.php:132 msgid "Could not retrieve favorite notices." msgstr "Could not retrieve favourite notices." @@ -3053,11 +3005,6 @@ msgstr "" msgid "%s group" msgstr "%s group" -#: actions/showgroup.php:84 -#, php-format -msgid "%s group, page %d" -msgstr "%s group, page %d" - #: actions/showgroup.php:218 msgid "Group profile" msgstr "Group profile" @@ -3106,7 +3053,7 @@ msgstr "Members" #: actions/showgroup.php:386 lib/profileaction.php:117 #: lib/profileaction.php:148 lib/profileaction.php:236 lib/section.php:95 -#: lib/tagcloudsection.php:71 +#: lib/subscriptionlist.php:126 lib/tagcloudsection.php:71 msgid "(None)" msgstr "(None)" @@ -3175,14 +3122,9 @@ msgstr "Notice deleted." msgid " tagged %s" msgstr " tagged %s" -#: actions/showstream.php:79 -#, php-format -msgid "%s, page %d" -msgstr "%s, page %d" - #: actions/showstream.php:122 -#, php-format -msgid "Notice feed for %s tagged %s (RSS 1.0)" +#, fuzzy, php-format +msgid "Notice feed for %1$s tagged %2$s (RSS 1.0)" msgstr "Notice feed for %s tagged %s (RSS 1.0)" #: actions/showstream.php:129 @@ -3206,9 +3148,10 @@ msgid "FOAF for %s" msgstr "FOAF for %s" #: actions/showstream.php:191 -#, php-format -msgid "This is the timeline for %s but %s hasn't posted anything yet." +#, fuzzy, php-format +msgid "This is the timeline for %1$s but %2$s hasn't posted anything yet." msgstr "" +"This is the timeline for %s and friends but no one has posted anything yet." #: actions/showstream.php:196 msgid "" @@ -3217,11 +3160,13 @@ msgid "" msgstr "" #: actions/showstream.php:198 -#, php-format +#, fuzzy, php-format msgid "" -"You can try to nudge %s or [post something to his or her attention](%%%%" -"action.newnotice%%%%?status_textarea=%s)." +"You can try to nudge %1$s or [post something to his or her attention](%%%%" +"action.newnotice%%%%?status_textarea=%2$s)." msgstr "" +"You can try to [nudge %s](../%s) from his profile or [post something to his " +"or her attention](%%%%action.newnotice%%%%?status_textarea=%s)." #: actions/showstream.php:234 #, php-format @@ -3268,12 +3213,12 @@ msgstr "" #: actions/siteadminpanel.php:154 #, fuzzy -msgid "You must have a valid contact email address" +msgid "You must have a valid contact email address." msgstr "Not a valid e-mail address." #: actions/siteadminpanel.php:172 #, php-format -msgid "Unknown language \"%s\"" +msgid "Unknown language \"%s\"." msgstr "" #: actions/siteadminpanel.php:179 @@ -3455,7 +3400,8 @@ msgid "Save site settings" msgstr "Save site settings" #: actions/smssettings.php:58 -msgid "SMS Settings" +#, fuzzy +msgid "SMS settings" msgstr "SMS Settings" #: actions/smssettings.php:69 @@ -3485,7 +3431,8 @@ msgid "Enter the code you received on your phone." msgstr "Enter the code you received on your phone." #: actions/smssettings.php:138 -msgid "SMS Phone number" +#, fuzzy +msgid "SMS phone number" msgstr "SMS Phone number" #: actions/smssettings.php:140 @@ -3580,8 +3527,8 @@ msgid "%s subscribers" msgstr "%s subscribers" #: actions/subscribers.php:52 -#, php-format -msgid "%s subscribers, page %d" +#, fuzzy, php-format +msgid "%1$s subscribers, page %2$d" msgstr "%s subscribers, page %d" #: actions/subscribers.php:63 @@ -3617,8 +3564,8 @@ msgid "%s subscriptions" msgstr "%s subscriptions" #: actions/subscriptions.php:54 -#, php-format -msgid "%s subscriptions, page %d" +#, fuzzy, php-format +msgid "%1$s subscriptions, page %2$d" msgstr "%s subscriptions, page %d" #: actions/subscriptions.php:65 @@ -3653,11 +3600,6 @@ msgstr "Jabber" msgid "SMS" msgstr "SMS" -#: actions/tag.php:68 -#, php-format -msgid "Notices tagged with %s, page %d" -msgstr "Notices tagged with %s, page %d" - #: actions/tag.php:86 #, fuzzy, php-format msgid "Notice feed for tag %s (RSS 1.0)" @@ -3744,20 +3686,17 @@ msgstr "User has no profile." msgid "No profile id in request." msgstr "No profile id in request." -#: actions/unsubscribe.php:84 -msgid "No profile with that id." -msgstr "No profile with that id." - #: actions/unsubscribe.php:98 msgid "Unsubscribed" msgstr "Unsubscribed" #: actions/updateprofile.php:62 actions/userauthorization.php:330 -#, php-format -msgid "Listenee stream license ‘%s’ is not compatible with site license ‘%s’." -msgstr "" +#, fuzzy, php-format +msgid "" +"Listenee stream license ‘%1$s’ is not compatible with site license ‘%2$s’." +msgstr "Notice licence ‘%s’ is not compatible with site licence ‘%s’." -#: actions/useradminpanel.php:58 lib/adminpanelaction.php:305 +#: actions/useradminpanel.php:58 lib/adminpanelaction.php:321 #: lib/personalgroupnav.php:115 msgid "User" msgstr "User" @@ -3863,7 +3802,7 @@ msgstr "" "user's notices. If you didn't just ask to subscribe to someone's notices, " "click \"Cancel\"." -#: actions/userauthorization.php:188 +#: actions/userauthorization.php:188 actions/version.php:165 msgid "License" msgstr "License" @@ -3920,7 +3859,7 @@ msgstr "" #: actions/userauthorization.php:296 #, php-format -msgid "Listener URI ‘%s’ not found here" +msgid "Listener URI ‘%s’ not found here." msgstr "" #: actions/userauthorization.php:301 @@ -3953,11 +3892,6 @@ msgstr "Can't read avatar URL '%s'" msgid "Wrong image type for avatar URL ‘%s’." msgstr "Wrong image type for '%s'" -#: actions/userbyid.php:70 -#, fuzzy -msgid "No ID." -msgstr "No ID" - #: actions/userdesignsettings.php:76 lib/designsettings.php:65 #, fuzzy msgid "Profile design" @@ -3973,11 +3907,6 @@ msgstr "" msgid "Enjoy your hotdog!" msgstr "" -#: actions/usergroups.php:64 -#, php-format -msgid "%s groups, page %d" -msgstr "%s groups, page %d" - #: actions/usergroups.php:130 #, fuzzy msgid "Search for more groups" @@ -3993,6 +3922,72 @@ msgstr "You are not a member of that group." msgid "Try [searching for groups](%%action.groupsearch%%) and joining them." msgstr "" +#: actions/version.php:73 +#, fuzzy, php-format +msgid "StatusNet %s" +msgstr "Statistics" + +#: actions/version.php:153 +#, php-format +msgid "" +"This site is powered by %1$s version %2$s, Copyright 2008-2010 StatusNet, " +"Inc. and contributors." +msgstr "" + +#: actions/version.php:157 +#, fuzzy +msgid "StatusNet" +msgstr "Status deleted." + +#: actions/version.php:161 +msgid "Contributors" +msgstr "" + +#: actions/version.php:168 +msgid "" +"StatusNet is free software: you can redistribute it and/or modify it under " +"the terms of the GNU Affero General Public License as published by the Free " +"Software Foundation, either version 3 of the License, or (at your option) " +"any later version. " +msgstr "" + +#: actions/version.php:174 +msgid "" +"This program is distributed in the hope that it will be useful, but WITHOUT " +"ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or " +"FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License " +"for more details. " +msgstr "" + +#: actions/version.php:180 +#, php-format +msgid "" +"You should have received a copy of the GNU Affero General Public License " +"along with this program. If not, see %s." +msgstr "" + +#: actions/version.php:189 +msgid "Plugins" +msgstr "" + +#: actions/version.php:195 +#, fuzzy +msgid "Name" +msgstr "Nickname" + +#: actions/version.php:196 lib/action.php:741 +#, fuzzy +msgid "Version" +msgstr "Personal" + +#: actions/version.php:197 +msgid "Author(s)" +msgstr "" + +#: actions/version.php:198 lib/groupeditform.php:172 +msgid "Description" +msgstr "Description" + #: classes/File.php:137 #, php-format msgid "" @@ -4064,7 +4059,7 @@ msgstr "Problem saving notice." msgid "DB error inserting reply: %s" msgstr "DB error inserting reply: %s" -#: classes/Notice.php:1361 +#: classes/Notice.php:1359 #, fuzzy, php-format msgid "RT @%1$s %2$s" msgstr "%1$s (%2$s)" @@ -4110,139 +4105,134 @@ msgstr "Other" msgid "Other options" msgstr "Other options" -#: lib/action.php:144 -#, php-format -msgid "%s - %s" -msgstr "%s - %s" - #: lib/action.php:159 msgid "Untitled page" msgstr "Untitled page" -#: lib/action.php:426 +#: lib/action.php:427 msgid "Primary site navigation" msgstr "Primary site navigation" -#: lib/action.php:432 +#: lib/action.php:433 msgid "Home" msgstr "Home" -#: lib/action.php:432 +#: lib/action.php:433 msgid "Personal profile and friends timeline" msgstr "Personal profile and friends timeline" -#: lib/action.php:434 +#: lib/action.php:435 msgid "Account" msgstr "Account" -#: lib/action.php:434 +#: lib/action.php:435 msgid "Change your email, avatar, password, profile" msgstr "Change your e-mail, avatar, password, profile" -#: lib/action.php:437 +#: lib/action.php:438 msgid "Connect" msgstr "Connect" -#: lib/action.php:437 +#: lib/action.php:438 #, fuzzy msgid "Connect to services" msgstr "Could not redirect to server: %s" -#: lib/action.php:441 +#: lib/action.php:442 #, fuzzy msgid "Change site configuration" msgstr "Primary site navigation" -#: lib/action.php:445 lib/subgroupnav.php:105 +#: lib/action.php:446 lib/subgroupnav.php:105 msgid "Invite" msgstr "Invite" -#: lib/action.php:446 lib/subgroupnav.php:106 +#: lib/action.php:447 lib/subgroupnav.php:106 #, php-format msgid "Invite friends and colleagues to join you on %s" msgstr "Invite friends and colleagues to join you on %s" -#: lib/action.php:451 +#: lib/action.php:452 msgid "Logout" msgstr "Logout" -#: lib/action.php:451 +#: lib/action.php:452 msgid "Logout from the site" msgstr "Logout from the site" -#: lib/action.php:456 +#: lib/action.php:457 msgid "Create an account" msgstr "Create an account" -#: lib/action.php:459 +#: lib/action.php:460 msgid "Login to the site" msgstr "Login to the site" -#: lib/action.php:462 lib/action.php:725 +#: lib/action.php:463 lib/action.php:726 msgid "Help" msgstr "Help" -#: lib/action.php:462 +#: lib/action.php:463 msgid "Help me!" msgstr "Help me!" -#: lib/action.php:465 lib/searchaction.php:127 +#: lib/action.php:466 lib/searchaction.php:127 msgid "Search" msgstr "Search" -#: lib/action.php:465 +#: lib/action.php:466 msgid "Search for people or text" msgstr "Search for people or text" -#: lib/action.php:486 +#: lib/action.php:487 msgid "Site notice" msgstr "Site notice" -#: lib/action.php:552 +#: lib/action.php:553 msgid "Local views" msgstr "Local views" -#: lib/action.php:618 +#: lib/action.php:619 msgid "Page notice" msgstr "Page notice" -#: lib/action.php:720 +#: lib/action.php:721 msgid "Secondary site navigation" msgstr "Secondary site navigation" -#: lib/action.php:727 +#: lib/action.php:728 msgid "About" msgstr "About" -#: lib/action.php:729 +#: lib/action.php:730 msgid "FAQ" msgstr "F.A.Q." -#: lib/action.php:733 +#: lib/action.php:734 msgid "TOS" msgstr "" -#: lib/action.php:736 +#: lib/action.php:737 msgid "Privacy" msgstr "Privacy" -#: lib/action.php:738 +#: lib/action.php:739 msgid "Source" msgstr "Source" -#: lib/action.php:740 +#: lib/action.php:743 msgid "Contact" msgstr "Contact" -#: lib/action.php:742 +#: lib/action.php:745 msgid "Badge" msgstr "Badge" -#: lib/action.php:770 +#: lib/action.php:773 msgid "StatusNet software license" msgstr "StatusNet software licence" -#: lib/action.php:773 +#: lib/action.php:776 #, php-format msgid "" "**%%site.name%%** is a microblogging service brought to you by [%%site." @@ -4251,12 +4241,12 @@ msgstr "" "**%%site.name%%** is a microblogging service brought to you by [%%site." "broughtby%%](%%site.broughtbyurl%%)." -#: lib/action.php:775 +#: lib/action.php:778 #, php-format msgid "**%%site.name%%** is a microblogging service. " msgstr "**%%site.name%%** is a microblogging service." -#: lib/action.php:777 +#: lib/action.php:780 #, php-format msgid "" "It runs the [StatusNet](http://status.net/) microblogging software, version %" @@ -4267,31 +4257,31 @@ msgstr "" "s, available under the [GNU Affero General Public Licence](http://www.fsf." "org/licensing/licenses/agpl-3.0.html)." -#: lib/action.php:791 +#: lib/action.php:794 msgid "Site content license" msgstr "Site content license" -#: lib/action.php:800 +#: lib/action.php:803 msgid "All " msgstr "All " -#: lib/action.php:805 +#: lib/action.php:808 msgid "license." msgstr "licence." -#: lib/action.php:1099 +#: lib/action.php:1102 msgid "Pagination" msgstr "Pagination" -#: lib/action.php:1108 +#: lib/action.php:1111 msgid "After" msgstr "After" -#: lib/action.php:1116 +#: lib/action.php:1119 msgid "Before" msgstr "Before" -#: lib/action.php:1164 +#: lib/action.php:1167 msgid "There was a problem with your session token." msgstr "There was a problem with your session token." @@ -4300,31 +4290,36 @@ msgstr "There was a problem with your session token." msgid "You cannot make changes to this site." msgstr "You can't send a message to this user." -#: lib/adminpanelaction.php:195 +#: lib/adminpanelaction.php:107 +#, fuzzy +msgid "Changes to that panel are not allowed." +msgstr "Registration not allowed." + +#: lib/adminpanelaction.php:206 #, fuzzy msgid "showForm() not implemented." msgstr "Command not yet implemented." -#: lib/adminpanelaction.php:224 +#: lib/adminpanelaction.php:235 #, fuzzy msgid "saveSettings() not implemented." msgstr "Command not yet implemented." -#: lib/adminpanelaction.php:247 +#: lib/adminpanelaction.php:258 #, fuzzy msgid "Unable to delete design setting." msgstr "Unable to save your design settings!" -#: lib/adminpanelaction.php:300 +#: lib/adminpanelaction.php:312 #, fuzzy msgid "Basic site configuration" msgstr "E-mail address confirmation" -#: lib/adminpanelaction.php:303 +#: lib/adminpanelaction.php:317 msgid "Design configuration" msgstr "Design configuration" -#: lib/adminpanelaction.php:306 lib/adminpanelaction.php:309 +#: lib/adminpanelaction.php:322 lib/adminpanelaction.php:327 #, fuzzy msgid "Paths configuration" msgstr "SMS confirmation" @@ -4350,11 +4345,21 @@ msgstr "" msgid "Tags for this attachment" msgstr "" +#: lib/authenticationplugin.php:182 lib/authenticationplugin.php:187 +#, fuzzy +msgid "Password changing failed" +msgstr "Password change" + +#: lib/authenticationplugin.php:197 +#, fuzzy +msgid "Password changing is not allowed" +msgstr "Password change" + #: lib/channel.php:138 lib/channel.php:158 msgid "Command results" msgstr "Command results" -#: lib/channel.php:210 +#: lib/channel.php:210 lib/mailhandler.php:142 msgid "Command complete" msgstr "Command complete" @@ -4367,8 +4372,8 @@ msgid "Sorry, this command is not yet implemented." msgstr "Sorry, this command is not yet implemented." #: lib/command.php:88 -#, php-format -msgid "Could not find a user with nickname %s" +#, fuzzy, php-format +msgid "Could not find a user with nickname %s." msgstr "Could not find a user with nickname %s" #: lib/command.php:92 @@ -4376,8 +4381,8 @@ msgid "It does not make a lot of sense to nudge yourself!" msgstr "" #: lib/command.php:99 -#, php-format -msgid "Nudge sent to %s" +#, fuzzy, php-format +msgid "Nudge sent to %s." msgstr "Nudge sent to %s" #: lib/command.php:126 @@ -4389,34 +4394,36 @@ msgid "" msgstr "" #: lib/command.php:152 lib/command.php:399 lib/command.php:460 -msgid "Notice with that id does not exist" -msgstr "" +#, fuzzy +msgid "Notice with that id does not exist." +msgstr "No profile with that id." #: lib/command.php:168 lib/command.php:415 lib/command.php:476 #: lib/command.php:532 -msgid "User has no last notice" +#, fuzzy +msgid "User has no last notice." msgstr "User has no last notice" #: lib/command.php:190 msgid "Notice marked as fave." msgstr "Notice marked as fave." -#: lib/command.php:315 -#, php-format -msgid "%1$s (%2$s)" -msgstr "%1$s (%2$s)" +#: lib/command.php:284 +#, fuzzy, php-format +msgid "Could not remove user %1$s to group %2$s." +msgstr "Could not remove user %s to group %s" #: lib/command.php:318 -#, php-format -msgid "Fullname: %s" +#, fuzzy, php-format +msgid "Full name: %s" msgstr "Fullname: %s" -#: lib/command.php:321 +#: lib/command.php:321 lib/mail.php:254 #, php-format msgid "Location: %s" msgstr "Location: %s" -#: lib/command.php:324 +#: lib/command.php:324 lib/mail.php:256 #, php-format msgid "Homepage: %s" msgstr "Homepage: %s" @@ -4427,27 +4434,17 @@ msgid "About: %s" msgstr "About: %s" #: lib/command.php:358 scripts/xmppdaemon.php:301 -#, php-format -msgid "Message too long - maximum is %d characters, you sent %d" +#, fuzzy, php-format +msgid "Message too long - maximum is %1$d characters, you sent %2$d." msgstr "Message too long - maximum is %d characters, you sent %d" #: lib/command.php:378 msgid "Error sending direct message." msgstr "Error sending direct message." -#: lib/command.php:422 -#, fuzzy -msgid "Cannot repeat your own notice" -msgstr "Can't turn on notification." - -#: lib/command.php:427 -#, fuzzy -msgid "Already repeated that notice" -msgstr "Delete this notice" - #: lib/command.php:435 #, fuzzy, php-format -msgid "Notice from %s repeated" +msgid "Notice from %s repeated." msgstr "Notice posted" #: lib/command.php:437 @@ -4456,13 +4453,13 @@ msgid "Error repeating notice." msgstr "Error saving notice." #: lib/command.php:491 -#, php-format -msgid "Notice too long - maximum is %d characters, you sent %d" +#, fuzzy, php-format +msgid "Notice too long - maximum is %1$d characters, you sent %2$d." msgstr "Notice too long - maximum is %d characters, you sent %d" #: lib/command.php:500 -#, php-format -msgid "Reply to %s sent" +#, fuzzy, php-format +msgid "Reply to %s sent." msgstr "Reply to %s sent" #: lib/command.php:502 @@ -4470,7 +4467,8 @@ msgid "Error saving notice." msgstr "Error saving notice." #: lib/command.php:556 -msgid "Specify the name of the user to subscribe to" +#, fuzzy +msgid "Specify the name of the user to subscribe to." msgstr "Specify the name of the user to subscribe to" #: lib/command.php:563 @@ -4479,7 +4477,8 @@ msgid "Subscribed to %s" msgstr "Subscribed to %s" #: lib/command.php:584 -msgid "Specify the name of the user to unsubscribe from" +#, fuzzy +msgid "Specify the name of the user to unsubscribe from." msgstr "Specify the name of the user to unsubscribe from" #: lib/command.php:591 @@ -4508,17 +4507,17 @@ msgid "Can't turn on notification." msgstr "Can't turn on notification." #: lib/command.php:650 -msgid "Login command is disabled" +msgid "Login command is disabled." msgstr "" #: lib/command.php:664 #, fuzzy, php-format -msgid "Could not create login token for %s" +msgid "Could not create login token for %s." msgstr "Could not create aliases" #: lib/command.php:669 #, php-format -msgid "This link is useable only once, and is good for only 2 minutes: %s" +msgid "This link is useable only once, and is good for only 2 minutes: %s." msgstr "" #: lib/command.php:685 @@ -4711,10 +4710,6 @@ msgstr "Describe the group or topic" msgid "Describe the group or topic in %d characters" msgstr "Describe the group or topic in %d characters" -#: lib/groupeditform.php:172 -msgid "Description" -msgstr "Description" - #: lib/groupeditform.php:179 msgid "" "Location for the group, if any, like \"City, State (or Region), Country\"" @@ -4884,21 +4879,9 @@ msgstr "" "----\n" "Change your email address or notification options at %8$s\n" -#: lib/mail.php:254 -#, php-format -msgid "Location: %s\n" -msgstr "Location: %s\n" - -#: lib/mail.php:256 -#, php-format -msgid "Homepage: %s\n" -msgstr "Homepage: %s\n" - #: lib/mail.php:258 -#, php-format -msgid "" -"Bio: %s\n" -"\n" +#, fuzzy, php-format +msgid "Bio: %s" msgstr "" "Bio: %s\n" "\n" @@ -5044,6 +5027,27 @@ msgstr "" msgid "from" msgstr "from" +#: lib/mailhandler.php:37 +msgid "Could not parse message." +msgstr "Could not parse message." + +#: lib/mailhandler.php:42 +msgid "Not a registered user." +msgstr "Not a registered user." + +#: lib/mailhandler.php:46 +msgid "Sorry, that is not your incoming email address." +msgstr "Sorry, that is not your incoming e-mail address." + +#: lib/mailhandler.php:50 +msgid "Sorry, no incoming email allowed." +msgstr "Sorry, no incoming e-mail allowed." + +#: lib/mailhandler.php:228 +#, fuzzy, php-format +msgid "Unsupported message type: %s" +msgstr "Unsupported image file format." + #: lib/mediafile.php:98 lib/mediafile.php:123 msgid "There was a database error while saving your file. Please try again." msgstr "" @@ -5075,7 +5079,7 @@ msgid "File upload stopped by extension." msgstr "" #: lib/mediafile.php:179 lib/mediafile.php:216 -msgid "File exceeds user's quota!" +msgid "File exceeds user's quota." msgstr "" #: lib/mediafile.php:196 lib/mediafile.php:233 @@ -5083,7 +5087,8 @@ msgid "File could not be moved to destination directory." msgstr "" #: lib/mediafile.php:201 lib/mediafile.php:237 -msgid "Could not determine file's mime-type!" +#, fuzzy +msgid "Could not determine file's MIME type." msgstr "Could not retrieve public stream." #: lib/mediafile.php:270 @@ -5093,7 +5098,7 @@ msgstr "" #: lib/mediafile.php:275 #, php-format -msgid "%s is not a supported filetype on this server." +msgid "%s is not a supported file type on this server." msgstr "" #: lib/messageform.php:120 @@ -5126,7 +5131,17 @@ msgid "Attach a file" msgstr "" #: lib/noticeform.php:212 -msgid "Share your location" +#, fuzzy +msgid "Share my location." +msgstr "Couldn't save tags." + +#: lib/noticeform.php:214 +#, fuzzy +msgid "Do not share my location." +msgstr "Couldn't save tags." + +#: lib/noticeform.php:215 +msgid "Hide this info" msgstr "" #: lib/noticelist.php:428 @@ -5246,6 +5261,11 @@ msgstr "Your sent messages" msgid "Tags in %s's notices" msgstr "Tags in %s's notices" +#: lib/plugin.php:114 +#, fuzzy +msgid "Unknown" +msgstr "Unknown action" + #: lib/profileaction.php:109 lib/profileaction.php:192 lib/subgroupnav.php:82 msgid "Subscriptions" msgstr "Subscriptions" @@ -5421,10 +5441,6 @@ msgstr "" msgid "People Tagcloud as tagged" msgstr "" -#: lib/subscriptionlist.php:126 -msgid "(none)" -msgstr "(none)" - #: lib/tagcloudsection.php:56 msgid "None" msgstr "None" @@ -5538,19 +5554,3 @@ msgstr "%s is not a valid colour!" #, php-format msgid "%s is not a valid color! Use 3 or 6 hex chars." msgstr "%s is not a valid colour! Use 3 or 6 hex chars." - -#: scripts/maildaemon.php:48 -msgid "Could not parse message." -msgstr "Could not parse message." - -#: scripts/maildaemon.php:53 -msgid "Not a registered user." -msgstr "Not a registered user." - -#: scripts/maildaemon.php:57 -msgid "Sorry, that is not your incoming email address." -msgstr "Sorry, that is not your incoming e-mail address." - -#: scripts/maildaemon.php:61 -msgid "Sorry, no incoming email allowed." -msgstr "Sorry, no incoming e-mail allowed." diff --git a/locale/es/LC_MESSAGES/statusnet.po b/locale/es/LC_MESSAGES/statusnet.po index 96c6fac13..e2aea134f 100644 --- a/locale/es/LC_MESSAGES/statusnet.po +++ b/locale/es/LC_MESSAGES/statusnet.po @@ -11,12 +11,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-01-03 10:37+0000\n" -"PO-Revision-Date: 2010-01-03 10:37:41+0000\n" +"POT-Creation-Date: 2010-01-10 11:27+0000\n" +"PO-Revision-Date: 2010-01-10 11:28:00+0000\n" "Language-Team: Spanish\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha (r60575); Translate extension (2009-12-06)\n" +"X-Generator: MediaWiki 1.16alpha (r60888); Translate extension (2010-01-04)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: es\n" "X-Message-Group: out-statusnet\n" @@ -53,11 +53,6 @@ msgstr "No existe tal página" msgid "No such user." msgstr "No existe ese usuario." -#: actions/all.php:84 -#, php-format -msgid "%s and friends, page %d" -msgstr "%s y amigos, página %d" - #: actions/all.php:86 actions/all.php:167 actions/allrss.php:115 #: actions/apitimelinefriends.php:115 actions/apitimelinehome.php:115 #: lib/personalgroupnav.php:100 @@ -96,8 +91,8 @@ msgstr "" #: actions/all.php:134 #, php-format msgid "" -"You can try to [nudge %s](../%s) from his profile or [post something to his " -"or her attention](%%%%action.newnotice%%%%?status_textarea=%s)." +"You can try to [nudge %1$s](../%2$s) from his profile or [post something to " +"his or her attention](%%%%action.newnotice%%%%?status_textarea=%3$s)." msgstr "" #: actions/all.php:137 actions/replies.php:209 actions/showstream.php:202 @@ -122,6 +117,23 @@ msgstr "¡Actualizaciones de %1$s y amigos en %2$s!" #: actions/apiaccountupdateprofile.php:97 #: actions/apiaccountupdateprofilebackgroundimage.php:94 #: actions/apiaccountupdateprofilecolors.php:118 +#: actions/apidirectmessage.php:156 actions/apifavoritecreate.php:99 +#: actions/apifavoritedestroy.php:100 actions/apifriendshipscreate.php:100 +#: actions/apifriendshipsdestroy.php:100 actions/apifriendshipsshow.php:129 +#: actions/apigroupcreate.php:136 actions/apigroupismember.php:114 +#: actions/apigroupjoin.php:155 actions/apigroupleave.php:141 +#: actions/apigrouplist.php:132 actions/apigrouplistall.php:120 +#: actions/apigroupmembership.php:106 actions/apigroupshow.php:105 +#: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102 +#: actions/apistatusesretweets.php:112 actions/apistatusesshow.php:108 +#: actions/apistatusnetconfig.php:133 actions/apistatusnetversion.php:93 +#: actions/apisubscriptions.php:111 actions/apitimelinefavorites.php:146 +#: actions/apitimelinefriends.php:156 actions/apitimelinegroup.php:150 +#: actions/apitimelinehome.php:156 actions/apitimelinementions.php:151 +#: actions/apitimelinepublic.php:131 actions/apitimelineretweetedbyme.php:122 +#: actions/apitimelineretweetedtome.php:121 +#: actions/apitimelineretweetsofme.php:122 actions/apitimelinetag.php:141 +#: actions/apitimelineuser.php:165 actions/apiusershow.php:101 #, fuzzy msgid "API method not found." msgstr "¡No se encontró el método de la API!" @@ -182,6 +194,9 @@ msgstr "" #: actions/apiaccountupdateprofilebackgroundimage.php:146 #: actions/apiaccountupdateprofilecolors.php:164 #: actions/apiaccountupdateprofilecolors.php:174 +#: actions/groupdesignsettings.php:287 actions/groupdesignsettings.php:297 +#: actions/userdesignsettings.php:210 actions/userdesignsettings.php:220 +#: actions/userdesignsettings.php:263 actions/userdesignsettings.php:273 #, fuzzy msgid "Unable to save your design settings." msgstr "¡No se pudo guardar tu configuración de Twitter!" @@ -224,26 +239,6 @@ msgstr "Mensajes directos a %s" msgid "All the direct messages sent to %s" msgstr "Todos los mensajes directos enviados a %s" -#: actions/apidirectmessage.php:156 actions/apifavoritecreate.php:99 -#: actions/apifavoritedestroy.php:100 actions/apifriendshipscreate.php:100 -#: actions/apifriendshipsdestroy.php:100 actions/apifriendshipsshow.php:129 -#: actions/apigroupcreate.php:136 actions/apigroupismember.php:114 -#: actions/apigroupjoin.php:155 actions/apigroupleave.php:141 -#: actions/apigrouplist.php:132 actions/apigrouplistall.php:120 -#: actions/apigroupmembership.php:106 actions/apigroupshow.php:105 -#: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102 -#: actions/apistatusesretweets.php:112 actions/apistatusesshow.php:108 -#: actions/apistatusnetconfig.php:133 actions/apistatusnetversion.php:93 -#: actions/apisubscriptions.php:111 actions/apitimelinefavorites.php:146 -#: actions/apitimelinefriends.php:156 actions/apitimelinegroup.php:150 -#: actions/apitimelinehome.php:156 actions/apitimelinementions.php:151 -#: actions/apitimelinepublic.php:131 actions/apitimelineretweetedbyme.php:122 -#: actions/apitimelineretweetedtome.php:121 -#: actions/apitimelineretweetsofme.php:122 actions/apitimelinetag.php:141 -#: actions/apitimelineuser.php:165 actions/apiusershow.php:101 -msgid "API method not found!" -msgstr "¡No se encontró el método de la API!" - #: actions/apidirectmessagenew.php:126 msgid "No message text!" msgstr "¡Sin texto de mensaje!" @@ -267,7 +262,8 @@ msgid "No status found with that ID." msgstr "No se encontró estado para ese ID" #: actions/apifavoritecreate.php:119 -msgid "This status is already a favorite!" +#, fuzzy +msgid "This status is already a favorite." msgstr "¡Este status ya está en favoritos!" #: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:176 @@ -275,7 +271,8 @@ msgid "Could not create favorite." msgstr "No se pudo crear favorito." #: actions/apifavoritedestroy.php:122 -msgid "That status is not a favorite!" +#, fuzzy +msgid "That status is not a favorite." msgstr "¡Este status no es un favorito!" #: actions/apifavoritedestroy.php:134 actions/disfavor.php:87 @@ -296,7 +293,8 @@ msgid "Could not unfollow user: User not found." msgstr "No se pudo dejar de seguir al usuario. Usuario no encontrado" #: actions/apifriendshipsdestroy.php:120 -msgid "You cannot unfollow yourself!" +#, fuzzy +msgid "You cannot unfollow yourself." msgstr "¡No puedes dejar de seguirte a ti mismo!" #: actions/apifriendshipsexists.php:94 @@ -384,7 +382,7 @@ msgstr "" msgid "Group not found!" msgstr "¡No se encontró el método de la API!" -#: actions/apigroupjoin.php:110 +#: actions/apigroupjoin.php:110 actions/joingroup.php:90 lib/command.php:217 msgid "You are already a member of that group." msgstr "Ya eres miembro de ese grupo" @@ -392,18 +390,18 @@ msgstr "Ya eres miembro de ese grupo" msgid "You have been blocked from that group by the admin." msgstr "" -#: actions/apigroupjoin.php:138 +#: actions/apigroupjoin.php:138 actions/joingroup.php:128 lib/command.php:234 #, fuzzy, php-format -msgid "Could not join user %s to group %s." +msgid "Could not join user %1$s to group %2$s." msgstr "No se puede unir usuario %s a grupo %s" #: actions/apigroupleave.php:114 msgid "You are not a member of this group." msgstr "No eres miembro de este grupo." -#: actions/apigroupleave.php:124 +#: actions/apigroupleave.php:124 actions/leavegroup.php:127 #, fuzzy, php-format -msgid "Could not remove user %s to group %s." +msgid "Could not remove user %1$s from group %2$s." msgstr "No se pudo eliminar a usuario %s de grupo %s" #: actions/apigrouplist.php:95 @@ -411,11 +409,6 @@ msgstr "No se pudo eliminar a usuario %s de grupo %s" msgid "%s's groups" msgstr "Grupos de %s" -#: actions/apigrouplist.php:103 -#, fuzzy, php-format -msgid "Groups %s is a member of on %s." -msgstr "%s es miembro de los grupos" - #: actions/apigrouplistall.php:90 actions/usergroups.php:62 #, php-format msgid "%s groups" @@ -439,12 +432,12 @@ msgstr "No puedes borrar el estado de otro usuario." msgid "No such notice." msgstr "No existe ese aviso." -#: actions/apistatusesretweet.php:83 +#: actions/apistatusesretweet.php:83 lib/command.php:422 #, fuzzy msgid "Cannot repeat your own notice." msgstr "No se puede activar notificación." -#: actions/apistatusesretweet.php:91 +#: actions/apistatusesretweet.php:91 lib/command.php:427 #, fuzzy msgid "Already repeated that notice." msgstr "Borrar este aviso" @@ -458,7 +451,7 @@ msgid "No status with that ID found." msgstr "No hay estado para ese ID" #: actions/apistatusesupdate.php:157 actions/newnotice.php:155 -#: scripts/maildaemon.php:71 +#: lib/mailhandler.php:60 #, fuzzy, php-format msgid "That's too long. Max notice size is %d chars." msgstr "Demasiado largo. La longitud máxima es de 140 caracteres. " @@ -477,13 +470,13 @@ msgid "Unsupported format." msgstr "Formato no soportado." #: actions/apitimelinefavorites.php:108 -#, php-format -msgid "%s / Favorites from %s" +#, fuzzy, php-format +msgid "%1$s / Favorites from %2$s" msgstr "%s / Favoritos desde %s" #: actions/apitimelinefavorites.php:120 -#, php-format -msgid "%s updates favorited by %s / %s." +#, fuzzy, php-format +msgid "%1$s updates favorited by %2$s / %2$s." msgstr "%s actualizaciones favoritas por %s / %s." #: actions/apitimelinegroup.php:109 actions/apitimelineuser.php:118 @@ -553,8 +546,11 @@ msgstr "No se encontró." msgid "No such attachment." msgstr "No existe ese documento." -#: actions/avatarbynickname.php:59 actions/grouprss.php:91 -#: actions/leavegroup.php:76 +#: actions/avatarbynickname.php:59 actions/blockedfromgroup.php:73 +#: actions/editgroup.php:84 actions/groupdesignsettings.php:84 +#: actions/grouplogo.php:86 actions/groupmembers.php:76 +#: actions/grouprss.php:91 actions/joingroup.php:76 actions/leavegroup.php:76 +#: actions/showgroup.php:121 msgid "No nickname." msgstr "Ningún apodo." @@ -577,8 +573,8 @@ msgid "You can upload your personal avatar. The maximum file size is %s." msgstr "Puedes cargar tu avatar personal." #: actions/avatarsettings.php:106 actions/avatarsettings.php:185 -#: actions/grouplogo.php:178 actions/remotesubscribe.php:191 -#: actions/userauthorization.php:72 actions/userrss.php:103 +#: actions/remotesubscribe.php:191 actions/userauthorization.php:72 +#: actions/userrss.php:103 msgid "User without matching profile" msgstr "Usuario sin perfil equivalente" @@ -610,9 +606,9 @@ msgstr "Cargar" msgid "Crop" msgstr "Cortar" -#: actions/avatarsettings.php:268 actions/disfavor.php:74 -#: actions/emailsettings.php:238 actions/favor.php:75 actions/geocode.php:50 -#: actions/groupblock.php:66 actions/grouplogo.php:309 +#: actions/avatarsettings.php:268 actions/deletenotice.php:157 +#: actions/disfavor.php:74 actions/emailsettings.php:238 actions/favor.php:75 +#: actions/geocode.php:50 actions/groupblock.php:66 actions/grouplogo.php:309 #: actions/groupunblock.php:66 actions/imsettings.php:206 #: actions/invite.php:56 actions/login.php:135 actions/makeadmin.php:66 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80 @@ -695,19 +691,15 @@ msgstr "Bloquear este usuario." msgid "Failed to save block information." msgstr "No se guardó información de bloqueo." -#: actions/blockedfromgroup.php:73 actions/editgroup.php:84 -#: actions/groupdesignsettings.php:84 actions/grouplogo.php:86 -#: actions/groupmembers.php:76 actions/joingroup.php:76 -#: actions/showgroup.php:121 -msgid "No nickname" -msgstr "Ningún apodo." - #: actions/blockedfromgroup.php:80 actions/editgroup.php:96 +#: actions/foafgroup.php:44 actions/foafgroup.php:62 actions/groupblock.php:86 #: actions/groupbyid.php:83 actions/groupdesignsettings.php:97 #: actions/grouplogo.php:99 actions/groupmembers.php:83 -#: actions/joingroup.php:83 actions/showgroup.php:137 -msgid "No such group" -msgstr "No existe ese grupo" +#: actions/grouprss.php:98 actions/groupunblock.php:86 +#: actions/joingroup.php:83 actions/leavegroup.php:83 actions/makeadmin.php:86 +#: actions/showgroup.php:137 lib/command.php:212 lib/command.php:263 +msgid "No such group." +msgstr "No existe ese grupo." #: actions/blockedfromgroup.php:90 #, fuzzy, php-format @@ -716,7 +708,7 @@ msgstr "Perfil de usuario" #: actions/blockedfromgroup.php:93 #, fuzzy, php-format -msgid "%s blocked profiles, page %d" +msgid "%1$s blocked profiles, page %2$d" msgstr "%s y amigos, página %d" #: actions/blockedfromgroup.php:108 @@ -832,12 +824,6 @@ msgstr "No se puede eliminar este aviso." msgid "Delete this notice" msgstr "Borrar este aviso" -#: actions/deletenotice.php:157 -#, fuzzy -msgid "There was a problem with your session token. Try again, please." -msgstr "" -"Hubo un problema con tu clave de sesión. Por favor, intenta nuevamente." - #: actions/deleteuser.php:67 msgid "You cannot delete users." msgstr "No puedes borrar usuarios." @@ -862,7 +848,7 @@ msgid "Delete this user" msgstr "Borrar este usuario" #: actions/designadminpanel.php:62 lib/accountsettingsaction.php:124 -#: lib/adminpanelaction.php:302 lib/groupnav.php:119 +#: lib/adminpanelaction.php:316 lib/groupnav.php:119 msgid "Design" msgstr "" @@ -1006,7 +992,8 @@ msgstr "Debes estar conectado para crear un grupo" #: actions/editgroup.php:103 actions/editgroup.php:168 #: actions/groupdesignsettings.php:104 actions/grouplogo.php:106 -msgid "You must be an admin to edit the group" +#, fuzzy +msgid "You must be an admin to edit the group." msgstr "Debes ser un admin para editar el grupo" #: actions/editgroup.php:154 @@ -1032,7 +1019,8 @@ msgid "Options saved." msgstr "Se guardó Opciones." #: actions/emailsettings.php:60 -msgid "Email Settings" +#, fuzzy +msgid "Email settings" msgstr "Opciones de Email" #: actions/emailsettings.php:71 @@ -1069,8 +1057,9 @@ msgid "Cancel" msgstr "Cancelar" #: actions/emailsettings.php:121 -msgid "Email Address" -msgstr "Correo Electrónico" +#, fuzzy +msgid "Email address" +msgstr "Direcciones de correo electrónico" #: actions/emailsettings.php:123 msgid "Email address, like \"UserName@example.org\"" @@ -1147,9 +1136,10 @@ msgstr "Sin dirección de correo electrónico" msgid "Cannot normalize that email address" msgstr "No se puede normalizar esta dirección de correo electrónico." -#: actions/emailsettings.php:331 actions/siteadminpanel.php:157 -msgid "Not a valid email address" -msgstr "No es una dirección de correo electrónico válida" +#: actions/emailsettings.php:331 actions/register.php:201 +#: actions/siteadminpanel.php:157 +msgid "Not a valid email address." +msgstr "Correo electrónico no válido" #: actions/emailsettings.php:334 msgid "That is already your email address." @@ -1331,18 +1321,11 @@ msgstr "Versión desconocida del protocolo OMB." msgid "Error updating remote profile" msgstr "Error al actualizar el perfil remoto" -#: actions/foafgroup.php:44 actions/foafgroup.php:62 actions/groupblock.php:86 -#: actions/grouprss.php:98 actions/groupunblock.php:86 -#: actions/leavegroup.php:83 actions/makeadmin.php:86 lib/command.php:212 -#: lib/command.php:263 -msgid "No such group." -msgstr "No existe ese grupo." - -#: actions/getfile.php:75 +#: actions/getfile.php:79 msgid "No such file." msgstr "No existe tal archivo." -#: actions/getfile.php:79 +#: actions/getfile.php:83 msgid "Cannot read file." msgstr "No se puede leer archivo." @@ -1354,7 +1337,7 @@ msgstr "No se especificó perfil." #: actions/groupblock.php:76 actions/groupunblock.php:76 #: actions/makeadmin.php:76 actions/subedit.php:53 actions/tagother.php:46 -#: lib/profileformaction.php:77 +#: actions/unsubscribe.php:84 lib/profileformaction.php:77 msgid "No profile with that ID." msgstr "No existe perfil con ese ID" @@ -1382,9 +1365,9 @@ msgstr "Bloquear usuario de grupo" #: actions/groupblock.php:162 #, php-format msgid "" -"Are you sure you want to block user \"%s\" from the group \"%s\"? They will " -"be removed from the group, unable to post, and unable to subscribe to the " -"group in the future." +"Are you sure you want to block user \"%1$s\" from the group \"%2$s\"? They " +"will be removed from the group, unable to post, and unable to subscribe to " +"the group in the future." msgstr "" #: actions/groupblock.php:178 @@ -1399,9 +1382,9 @@ msgstr "Bloquear este usuario de este grupo" msgid "Database error blocking user from group." msgstr "" -#: actions/groupbyid.php:74 -msgid "No ID" -msgstr "Sin ID" +#: actions/groupbyid.php:74 actions/userbyid.php:70 +msgid "No ID." +msgstr "Sin ID." #: actions/groupdesignsettings.php:68 msgid "You must be logged in to edit a group." @@ -1424,13 +1407,6 @@ msgstr "" msgid "Couldn't update your design." msgstr "No se pudo actualizar el usuario." -#: actions/groupdesignsettings.php:287 actions/groupdesignsettings.php:297 -#: actions/userdesignsettings.php:210 actions/userdesignsettings.php:220 -#: actions/userdesignsettings.php:263 actions/userdesignsettings.php:273 -#, fuzzy -msgid "Unable to save your design settings!" -msgstr "¡No se pudo guardar tu configuración de Twitter!" - #: actions/groupdesignsettings.php:308 actions/userdesignsettings.php:231 #, fuzzy msgid "Design preferences saved." @@ -1446,6 +1422,11 @@ msgid "" "You can upload a logo image for your group. The maximum file size is %s." msgstr "Puedes cargar una imagen de logo para tu grupo." +#: actions/grouplogo.php:178 +#, fuzzy +msgid "User without matching profile." +msgstr "Usuario sin perfil equivalente" + #: actions/grouplogo.php:362 #, fuzzy msgid "Pick a square area of the image to be the logo." @@ -1467,15 +1448,15 @@ msgid "%s group members" msgstr "Miembros del grupo %s" #: actions/groupmembers.php:96 -#, php-format -msgid "%s group members, page %d" +#, fuzzy, php-format +msgid "%1$s group members, page %2$d" msgstr "Miembros del grupo %s, página %d" #: actions/groupmembers.php:111 msgid "A list of the users in this group." msgstr "Lista de los usuarios en este grupo." -#: actions/groupmembers.php:175 lib/action.php:441 lib/groupnav.php:107 +#: actions/groupmembers.php:175 lib/action.php:442 lib/groupnav.php:107 msgid "Admin" msgstr "Admin" @@ -1575,7 +1556,8 @@ msgid "Error removing the block." msgstr "Error al sacar bloqueo." #: actions/imsettings.php:59 -msgid "IM Settings" +#, fuzzy +msgid "IM settings" msgstr "Configuración de mensajerÃa instantánea" #: actions/imsettings.php:70 @@ -1607,7 +1589,8 @@ msgstr "" "de amigos?)" #: actions/imsettings.php:124 -msgid "IM Address" +#, fuzzy +msgid "IM address" msgstr "Dirección de mensajerÃa instantánea" #: actions/imsettings.php:126 @@ -1671,11 +1654,6 @@ msgstr "" msgid "That is not your Jabber ID." msgstr "Ese no es tu Jabber ID." -#: actions/inbox.php:59 -#, php-format -msgid "Inbox for %s - page %d" -msgstr "Bandeja de entrada para %s - página %d" - #: actions/inbox.php:62 #, php-format msgid "Inbox for %s" @@ -1712,10 +1690,10 @@ msgstr "Invitar nuevos usuarios:" msgid "You are already subscribed to these users:" msgstr "Ya estás suscrito a estos usuarios:" -#: actions/invite.php:131 actions/invite.php:139 +#: actions/invite.php:131 actions/invite.php:139 lib/command.php:315 #, php-format -msgid "%s (%s)" -msgstr "%s (%s)" +msgid "%1$s (%2$s)" +msgstr "%1$s (%2$s)" #: actions/invite.php:136 msgid "" @@ -1757,7 +1735,7 @@ msgstr "Mensaje Personal" msgid "Optionally add a personal message to the invitation." msgstr "Opcionalmente añada un mensaje personalizado a su invitación." -#: actions/invite.php:197 lib/messageform.php:178 lib/noticeform.php:232 +#: actions/invite.php:197 lib/messageform.php:178 lib/noticeform.php:234 msgid "Send" msgstr "Enviar" @@ -1827,19 +1805,9 @@ msgstr "" msgid "You must be logged in to join a group." msgstr "Debes estar conectado para unirte a un grupo." -#: actions/joingroup.php:90 lib/command.php:217 -#, fuzzy -msgid "You are already a member of that group" -msgstr "Ya eres miembro de ese grupo" - -#: actions/joingroup.php:128 lib/command.php:234 -#, fuzzy, php-format -msgid "Could not join user %s to group %s" -msgstr "No se puede unir usuario %s a grupo %s" - #: actions/joingroup.php:135 lib/command.php:239 -#, php-format -msgid "%s joined group %s" +#, fuzzy, php-format +msgid "%1$s joined group %2$s" msgstr "%s se unió a grupo %s" #: actions/leavegroup.php:60 @@ -1856,14 +1824,9 @@ msgstr "No eres miembro de ese grupo" msgid "Could not find membership record." msgstr "No se pudo encontrar registro de miembro" -#: actions/leavegroup.php:127 lib/command.php:284 -#, fuzzy, php-format -msgid "Could not remove user %s to group %s" -msgstr "No se pudo eliminar a usuario %s de grupo %s" - #: actions/leavegroup.php:134 lib/command.php:289 -#, php-format -msgid "%s left group %s" +#, fuzzy, php-format +msgid "%1$s left group %2$s" msgstr "%s dejó grupo %s" #: actions/login.php:83 actions/register.php:137 @@ -1884,7 +1847,7 @@ msgstr "Nombre de usuario o contraseña incorrectos." msgid "Error setting user. You are probably not authorized." msgstr "No autorizado." -#: actions/login.php:208 actions/login.php:261 lib/action.php:459 +#: actions/login.php:208 actions/login.php:261 lib/action.php:460 #: lib/logingroupnav.php:79 msgid "Login" msgstr "Inicio de sesión" @@ -1941,19 +1904,19 @@ msgid "Only an admin can make another user an admin." msgstr "" #: actions/makeadmin.php:95 -#, php-format -msgid "%s is already an admin for group \"%s\"." -msgstr "" +#, fuzzy, php-format +msgid "%1$s is already an admin for group \"%2$s\"." +msgstr "Usuario ya está bloqueado del grupo." #: actions/makeadmin.php:132 -#, php-format -msgid "Can't get membership record for %s in group %s" -msgstr "" +#, fuzzy, php-format +msgid "Can't get membership record for %1$s in group %2$s." +msgstr "No se pudo eliminar a usuario %s de grupo %s" #: actions/makeadmin.php:145 -#, php-format -msgid "Can't make %s an admin for group %s" -msgstr "" +#, fuzzy, php-format +msgid "Can't make %1$s an admin for group %2$s." +msgstr "Debes ser un admin para editar el grupo" #: actions/microsummary.php:69 msgid "No current status" @@ -1995,8 +1958,8 @@ msgid "Message sent" msgstr "Mensaje" #: actions/newmessage.php:185 lib/command.php:376 -#, php-format -msgid "Direct message to %s sent" +#, fuzzy, php-format +msgid "Direct message to %s sent." msgstr "Se envió mensaje directo a %s" #: actions/newmessage.php:210 actions/newnotice.php:245 lib/channel.php:170 @@ -2027,7 +1990,7 @@ msgstr "Búsqueda de texto" #: actions/noticesearch.php:91 #, fuzzy, php-format -msgid "Search results for \"%s\" on %s" +msgid "Search results for \"%1$s\" on %2$s" msgstr "Busca \"%s\" en la Corriente" #: actions/noticesearch.php:121 @@ -2136,11 +2099,6 @@ msgstr "" msgid "URL shortening service is too long (max 50 chars)." msgstr "Servicio de acorte de URL demasiado largo (máx. 50 caracteres)." -#: actions/outbox.php:58 -#, php-format -msgid "Outbox for %s - page %d" -msgstr "Bandeja de salida para %s - página %d" - #: actions/outbox.php:61 #, php-format msgid "Outbox for %s" @@ -2214,7 +2172,7 @@ msgstr "No se puede guardar la nueva contraseña." msgid "Password saved." msgstr "Se guardó Contraseña." -#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:308 +#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:326 msgid "Paths" msgstr "" @@ -2247,7 +2205,7 @@ msgid "Invalid SSL server. The maximum length is 255 characters." msgstr "" #: actions/pathsadminpanel.php:217 actions/siteadminpanel.php:58 -#: lib/adminpanelaction.php:299 +#: lib/adminpanelaction.php:311 #, fuzzy msgid "Site" msgstr "Invitar" @@ -2349,8 +2307,9 @@ msgid "When to use SSL" msgstr "" #: actions/pathsadminpanel.php:308 -msgid "SSL Server" -msgstr "" +#, fuzzy +msgid "SSL server" +msgstr "Recuperar" #: actions/pathsadminpanel.php:309 msgid "Server to direct SSL requests to" @@ -2380,8 +2339,8 @@ msgid "Not a valid people tag: %s" msgstr "No es un tag de personas válido: %s" #: actions/peopletag.php:144 -#, php-format -msgid "Users self-tagged with %s - page %d" +#, fuzzy, php-format +msgid "Users self-tagged with %1$s - page %2$d" msgstr "Usuarios auto marcados con %s - página %d" #: actions/postnotice.php:84 @@ -2390,7 +2349,7 @@ msgstr "El contenido del aviso es inválido" #: actions/postnotice.php:90 #, php-format -msgid "Notice license ‘%s’ is not compatible with site license ‘%s’." +msgid "Notice license ‘%1$s’ is not compatible with site license ‘%2$s’." msgstr "" #: actions/profilesettings.php:60 @@ -2514,21 +2473,21 @@ msgstr "Tag no válido: '%s' " msgid "Couldn't update user for autosubscribe." msgstr "No se pudo actualizar el usuario para autosuscribirse." -#: actions/profilesettings.php:354 +#: actions/profilesettings.php:359 #, fuzzy msgid "Couldn't save location prefs." msgstr "No se pudo guardar tags." -#: actions/profilesettings.php:366 +#: actions/profilesettings.php:371 msgid "Couldn't save profile." msgstr "No se pudo guardar el perfil." -#: actions/profilesettings.php:374 +#: actions/profilesettings.php:379 #, fuzzy msgid "Couldn't save tags." msgstr "No se pudo guardar tags." -#: actions/profilesettings.php:382 lib/adminpanelaction.php:126 +#: actions/profilesettings.php:387 lib/adminpanelaction.php:137 msgid "Settings saved." msgstr "Se guardó configuración." @@ -2627,7 +2586,7 @@ msgid "" "one!" msgstr "" -#: actions/publictagcloud.php:135 +#: actions/publictagcloud.php:131 msgid "Tag cloud" msgstr "Nube de tags" @@ -2770,7 +2729,7 @@ msgstr "Error con el código de confirmación." msgid "Registration successful" msgstr "Registro exitoso." -#: actions/register.php:114 actions/register.php:502 lib/action.php:456 +#: actions/register.php:114 actions/register.php:502 lib/action.php:457 #: lib/logingroupnav.php:85 msgid "Register" msgstr "Registrarse" @@ -2783,10 +2742,6 @@ msgstr "Registro de usuario no permitido." msgid "You can't register if you don't agree to the license." msgstr "No puedes registrarte si no estás de acuerdo con la licencia." -#: actions/register.php:201 -msgid "Not a valid email address." -msgstr "Correo electrónico no válido" - #: actions/register.php:212 msgid "Email address already exists." msgstr "La dirección de correo electrónico ya existe." @@ -2847,12 +2802,12 @@ msgstr "" "electrónico, dirección de mensajerÃa instantánea, número de teléfono." #: actions/register.php:537 -#, php-format +#, fuzzy, php-format msgid "" -"Congratulations, %s! And welcome to %%%%site.name%%%%. From here, you may " +"Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may " "want to...\n" "\n" -"* Go to [your profile](%s) and post your first message.\n" +"* Go to [your profile](%2$s) and post your first message.\n" "* Add a [Jabber/GTalk address](%%%%action.imsettings%%%%) so you can send " "notices through instant messages.\n" "* [Search for people](%%%%action.peoplesearch%%%%) that you may know or that " @@ -2984,11 +2939,6 @@ msgstr "Crear" msgid "Replies to %s" msgstr "Respuestas a %s" -#: actions/replies.php:127 -#, fuzzy, php-format -msgid "Replies to %s, page %d" -msgstr "Respuestas a %s, página %d" - #: actions/replies.php:144 #, fuzzy, php-format msgid "Replies feed for %s (RSS 1.0)" @@ -3007,8 +2957,8 @@ msgstr "Feed de avisos de %s" #: actions/replies.php:198 #, php-format msgid "" -"This is the timeline showing replies to %s but %s hasn't received a notice " -"to his attention yet." +"This is the timeline showing replies to %1$s but %2$s hasn't received a " +"notice to his attention yet." msgstr "" #: actions/replies.php:203 @@ -3021,8 +2971,8 @@ msgstr "" #: actions/replies.php:205 #, php-format msgid "" -"You can try to [nudge %s](../%s) or [post something to his or her attention]" -"(%%%%action.newnotice%%%%?status_textarea=%s)." +"You can try to [nudge %1$s](../%2$s) or [post something to his or her " +"attention](%%%%action.newnotice%%%%?status_textarea=%3$s)." msgstr "" #: actions/repliesrss.php:72 @@ -3040,11 +2990,6 @@ msgstr "No puedes enviar mensaje a este usuario." msgid "User is already sandboxed." msgstr "El usuario te ha bloqueado." -#: actions/showfavorites.php:79 -#, fuzzy, php-format -msgid "%s's favorite notices, page %d" -msgstr "%s avisos favoritos, página %d" - #: actions/showfavorites.php:132 msgid "Could not retrieve favorite notices." msgstr "No se pudo recibir avisos favoritos." @@ -3094,11 +3039,6 @@ msgstr "" msgid "%s group" msgstr "Grupo %s" -#: actions/showgroup.php:84 -#, php-format -msgid "%s group, page %d" -msgstr "Grupo %s, página %d" - #: actions/showgroup.php:218 #, fuzzy msgid "Group profile" @@ -3150,7 +3090,7 @@ msgstr "Miembros" #: actions/showgroup.php:386 lib/profileaction.php:117 #: lib/profileaction.php:148 lib/profileaction.php:236 lib/section.php:95 -#: lib/tagcloudsection.php:71 +#: lib/subscriptionlist.php:126 lib/tagcloudsection.php:71 msgid "(None)" msgstr "(Ninguno)" @@ -3220,14 +3160,9 @@ msgstr "Aviso borrado" msgid " tagged %s" msgstr "Avisos marcados con %s" -#: actions/showstream.php:79 -#, php-format -msgid "%s, page %d" -msgstr "%s, página %d" - #: actions/showstream.php:122 #, fuzzy, php-format -msgid "Notice feed for %s tagged %s (RSS 1.0)" +msgid "Notice feed for %1$s tagged %2$s (RSS 1.0)" msgstr "Feed de avisos de grupo %s" #: actions/showstream.php:129 @@ -3252,7 +3187,7 @@ msgstr "Bandeja de salida para %s" #: actions/showstream.php:191 #, php-format -msgid "This is the timeline for %s but %s hasn't posted anything yet." +msgid "This is the timeline for %1$s but %2$s hasn't posted anything yet." msgstr "" #: actions/showstream.php:196 @@ -3264,8 +3199,8 @@ msgstr "" #: actions/showstream.php:198 #, php-format msgid "" -"You can try to nudge %s or [post something to his or her attention](%%%%" -"action.newnotice%%%%?status_textarea=%s)." +"You can try to nudge %1$s or [post something to his or her attention](%%%%" +"action.newnotice%%%%?status_textarea=%2$s)." msgstr "" #: actions/showstream.php:234 @@ -3312,12 +3247,12 @@ msgstr "" #: actions/siteadminpanel.php:154 #, fuzzy -msgid "You must have a valid contact email address" +msgid "You must have a valid contact email address." msgstr "No es una dirección de correo electrónico válida" #: actions/siteadminpanel.php:172 #, php-format -msgid "Unknown language \"%s\"" +msgid "Unknown language \"%s\"." msgstr "" #: actions/siteadminpanel.php:179 @@ -3508,7 +3443,8 @@ msgid "Save site settings" msgstr "Configuración de Avatar" #: actions/smssettings.php:58 -msgid "SMS Settings" +#, fuzzy +msgid "SMS settings" msgstr "Preferencias SMS" #: actions/smssettings.php:69 @@ -3538,7 +3474,8 @@ msgid "Enter the code you received on your phone." msgstr "Ingrese el código recibido en su teléfono" #: actions/smssettings.php:138 -msgid "SMS Phone number" +#, fuzzy +msgid "SMS phone number" msgstr "Número telefónico para sms" #: actions/smssettings.php:140 @@ -3636,8 +3573,8 @@ msgid "%s subscribers" msgstr "Suscriptores %s" #: actions/subscribers.php:52 -#, php-format -msgid "%s subscribers, page %d" +#, fuzzy, php-format +msgid "%1$s subscribers, page %2$d" msgstr "Suscriptores, página %d" #: actions/subscribers.php:63 @@ -3674,7 +3611,7 @@ msgstr "Suscripciones %s" #: actions/subscriptions.php:54 #, fuzzy, php-format -msgid "%s subscriptions, page %d" +msgid "%1$s subscriptions, page %2$d" msgstr "%s suscripciones, página %d" #: actions/subscriptions.php:65 @@ -3710,11 +3647,6 @@ msgstr "Jabber " msgid "SMS" msgstr "SMS" -#: actions/tag.php:68 -#, fuzzy, php-format -msgid "Notices tagged with %s, page %d" -msgstr "Avisos marcados con %s, página %d" - #: actions/tag.php:86 #, fuzzy, php-format msgid "Notice feed for tag %s (RSS 1.0)" @@ -3804,20 +3736,17 @@ msgstr "El usuario no tiene un perfil." msgid "No profile id in request." msgstr "Ningún perfil de Id en solicitud." -#: actions/unsubscribe.php:84 -msgid "No profile with that id." -msgstr "Ningún perfil con ese ID." - #: actions/unsubscribe.php:98 msgid "Unsubscribed" msgstr "Desuscrito" #: actions/updateprofile.php:62 actions/userauthorization.php:330 #, php-format -msgid "Listenee stream license ‘%s’ is not compatible with site license ‘%s’." +msgid "" +"Listenee stream license ‘%1$s’ is not compatible with site license ‘%2$s’." msgstr "" -#: actions/useradminpanel.php:58 lib/adminpanelaction.php:305 +#: actions/useradminpanel.php:58 lib/adminpanelaction.php:321 #: lib/personalgroupnav.php:115 msgid "User" msgstr "Usuario" @@ -3923,7 +3852,7 @@ msgstr "" "avisos de este usuario. Si no pediste suscribirte a los avisos de alguien, " "haz clic en \"Cancelar\"." -#: actions/userauthorization.php:188 +#: actions/userauthorization.php:188 actions/version.php:165 msgid "License" msgstr "Licencia" @@ -3981,7 +3910,7 @@ msgstr "" #: actions/userauthorization.php:296 #, php-format -msgid "Listener URI ‘%s’ not found here" +msgid "Listener URI ‘%s’ not found here." msgstr "" #: actions/userauthorization.php:301 @@ -4014,10 +3943,6 @@ msgstr "No se puede leer el URL del avatar '%s'" msgid "Wrong image type for avatar URL ‘%s’." msgstr "Tipo de imagen incorrecto para '%s'" -#: actions/userbyid.php:70 -msgid "No ID." -msgstr "Sin ID." - #: actions/userdesignsettings.php:76 lib/designsettings.php:65 #, fuzzy msgid "Profile design" @@ -4033,11 +3958,6 @@ msgstr "" msgid "Enjoy your hotdog!" msgstr "" -#: actions/usergroups.php:64 -#, php-format -msgid "%s groups, page %d" -msgstr "Grupos %s, página %d" - #: actions/usergroups.php:130 #, fuzzy msgid "Search for more groups" @@ -4053,6 +3973,72 @@ msgstr "No eres miembro de ese grupo" msgid "Try [searching for groups](%%action.groupsearch%%) and joining them." msgstr "" +#: actions/version.php:73 +#, fuzzy, php-format +msgid "StatusNet %s" +msgstr "EstadÃsticas" + +#: actions/version.php:153 +#, php-format +msgid "" +"This site is powered by %1$s version %2$s, Copyright 2008-2010 StatusNet, " +"Inc. and contributors." +msgstr "" + +#: actions/version.php:157 +#, fuzzy +msgid "StatusNet" +msgstr "Status borrado." + +#: actions/version.php:161 +msgid "Contributors" +msgstr "" + +#: actions/version.php:168 +msgid "" +"StatusNet is free software: you can redistribute it and/or modify it under " +"the terms of the GNU Affero General Public License as published by the Free " +"Software Foundation, either version 3 of the License, or (at your option) " +"any later version. " +msgstr "" + +#: actions/version.php:174 +msgid "" +"This program is distributed in the hope that it will be useful, but WITHOUT " +"ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or " +"FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License " +"for more details. " +msgstr "" + +#: actions/version.php:180 +#, php-format +msgid "" +"You should have received a copy of the GNU Affero General Public License " +"along with this program. If not, see %s." +msgstr "" + +#: actions/version.php:189 +msgid "Plugins" +msgstr "" + +#: actions/version.php:195 +#, fuzzy +msgid "Name" +msgstr "Apodo" + +#: actions/version.php:196 lib/action.php:741 +#, fuzzy +msgid "Version" +msgstr "Sesiones" + +#: actions/version.php:197 +msgid "Author(s)" +msgstr "" + +#: actions/version.php:198 lib/groupeditform.php:172 +msgid "Description" +msgstr "Descripción" + #: classes/File.php:137 #, php-format msgid "" @@ -4127,7 +4113,7 @@ msgstr "Hubo un problema al guardar el aviso." msgid "DB error inserting reply: %s" msgstr "Error de BD al insertar respuesta: %s" -#: classes/Notice.php:1361 +#: classes/Notice.php:1359 #, php-format msgid "RT @%1$s %2$s" msgstr "RT @%1$s %2$s" @@ -4174,138 +4160,133 @@ msgstr "Otro" msgid "Other options" msgstr "Otras opciones" -#: lib/action.php:144 -#, php-format -msgid "%s - %s" -msgstr "%s - %s" - #: lib/action.php:159 msgid "Untitled page" msgstr "Página sin tÃtulo" -#: lib/action.php:426 +#: lib/action.php:427 msgid "Primary site navigation" msgstr "Navegación de sitio primario" -#: lib/action.php:432 +#: lib/action.php:433 msgid "Home" msgstr "Inicio" -#: lib/action.php:432 +#: lib/action.php:433 msgid "Personal profile and friends timeline" msgstr "Perfil personal y lÃnea de tiempo de amigos" -#: lib/action.php:434 +#: lib/action.php:435 msgid "Account" msgstr "Cuenta" -#: lib/action.php:434 +#: lib/action.php:435 msgid "Change your email, avatar, password, profile" msgstr "Cambia tu correo electrónico, avatar, contraseña, perfil" -#: lib/action.php:437 +#: lib/action.php:438 msgid "Connect" msgstr "Conectarse" -#: lib/action.php:437 +#: lib/action.php:438 msgid "Connect to services" msgstr "Conectar a los servicios" -#: lib/action.php:441 +#: lib/action.php:442 #, fuzzy msgid "Change site configuration" msgstr "Navegación de sitio primario" -#: lib/action.php:445 lib/subgroupnav.php:105 +#: lib/action.php:446 lib/subgroupnav.php:105 msgid "Invite" msgstr "Invitar" -#: lib/action.php:446 lib/subgroupnav.php:106 +#: lib/action.php:447 lib/subgroupnav.php:106 #, php-format msgid "Invite friends and colleagues to join you on %s" msgstr "Invita a amigos y colegas a unirse a %s" -#: lib/action.php:451 +#: lib/action.php:452 msgid "Logout" msgstr "Salir" -#: lib/action.php:451 +#: lib/action.php:452 msgid "Logout from the site" msgstr "Salir de sitio" -#: lib/action.php:456 +#: lib/action.php:457 msgid "Create an account" msgstr "Crear una cuenta" -#: lib/action.php:459 +#: lib/action.php:460 msgid "Login to the site" msgstr "Ingresar a sitio" -#: lib/action.php:462 lib/action.php:725 +#: lib/action.php:463 lib/action.php:726 msgid "Help" msgstr "Ayuda" -#: lib/action.php:462 +#: lib/action.php:463 msgid "Help me!" msgstr "Ayúdame!" -#: lib/action.php:465 lib/searchaction.php:127 +#: lib/action.php:466 lib/searchaction.php:127 msgid "Search" msgstr "Buscar" -#: lib/action.php:465 +#: lib/action.php:466 msgid "Search for people or text" msgstr "Buscar personas o texto" -#: lib/action.php:486 +#: lib/action.php:487 msgid "Site notice" msgstr "Aviso de sitio" -#: lib/action.php:552 +#: lib/action.php:553 msgid "Local views" msgstr "Vistas locales" -#: lib/action.php:618 +#: lib/action.php:619 msgid "Page notice" msgstr "Aviso de página" -#: lib/action.php:720 +#: lib/action.php:721 msgid "Secondary site navigation" msgstr "Navegación de sitio secundario" -#: lib/action.php:727 +#: lib/action.php:728 msgid "About" msgstr "Acerca de" -#: lib/action.php:729 +#: lib/action.php:730 msgid "FAQ" msgstr "Preguntas Frecuentes" -#: lib/action.php:733 +#: lib/action.php:734 msgid "TOS" msgstr "" -#: lib/action.php:736 +#: lib/action.php:737 msgid "Privacy" msgstr "Privacidad" -#: lib/action.php:738 +#: lib/action.php:739 msgid "Source" msgstr "Fuente" -#: lib/action.php:740 +#: lib/action.php:743 msgid "Contact" msgstr "Ponerse en contacto" -#: lib/action.php:742 +#: lib/action.php:745 msgid "Badge" msgstr "Insignia" -#: lib/action.php:770 +#: lib/action.php:773 msgid "StatusNet software license" msgstr "Licencia de software de StatusNet" -#: lib/action.php:773 +#: lib/action.php:776 #, php-format msgid "" "**%%site.name%%** is a microblogging service brought to you by [%%site." @@ -4314,12 +4295,12 @@ msgstr "" "**%%site.name%%** es un servicio de microblogueo de [%%site.broughtby%%**](%%" "site.broughtbyurl%%)." -#: lib/action.php:775 +#: lib/action.php:778 #, php-format msgid "**%%site.name%%** is a microblogging service. " msgstr "**%%site.name%%** es un servicio de microblogueo." -#: lib/action.php:777 +#: lib/action.php:780 #, php-format msgid "" "It runs the [StatusNet](http://status.net/) microblogging software, version %" @@ -4330,31 +4311,31 @@ msgstr "" "disponible bajo la [GNU Affero General Public License](http://www.fsf.org/" "licensing/licenses/agpl-3.0.html)." -#: lib/action.php:791 +#: lib/action.php:794 msgid "Site content license" msgstr "Licencia de contenido del sitio" -#: lib/action.php:800 +#: lib/action.php:803 msgid "All " msgstr "Todo" -#: lib/action.php:805 +#: lib/action.php:808 msgid "license." msgstr "Licencia." -#: lib/action.php:1099 +#: lib/action.php:1102 msgid "Pagination" msgstr "Paginación" -#: lib/action.php:1108 +#: lib/action.php:1111 msgid "After" msgstr "Después" -#: lib/action.php:1116 +#: lib/action.php:1119 msgid "Before" msgstr "Antes" -#: lib/action.php:1164 +#: lib/action.php:1167 msgid "There was a problem with your session token." msgstr "Hubo problemas con tu clave de sesión." @@ -4363,32 +4344,37 @@ msgstr "Hubo problemas con tu clave de sesión." msgid "You cannot make changes to this site." msgstr "No puedes enviar mensaje a este usuario." -#: lib/adminpanelaction.php:195 +#: lib/adminpanelaction.php:107 +#, fuzzy +msgid "Changes to that panel are not allowed." +msgstr "Registro de usuario no permitido." + +#: lib/adminpanelaction.php:206 #, fuzzy msgid "showForm() not implemented." msgstr "TodavÃa no se implementa comando." -#: lib/adminpanelaction.php:224 +#: lib/adminpanelaction.php:235 #, fuzzy msgid "saveSettings() not implemented." msgstr "TodavÃa no se implementa comando." -#: lib/adminpanelaction.php:247 +#: lib/adminpanelaction.php:258 #, fuzzy msgid "Unable to delete design setting." msgstr "¡No se pudo guardar tu configuración de Twitter!" -#: lib/adminpanelaction.php:300 +#: lib/adminpanelaction.php:312 #, fuzzy msgid "Basic site configuration" msgstr "Confirmación de correo electrónico" -#: lib/adminpanelaction.php:303 +#: lib/adminpanelaction.php:317 #, fuzzy msgid "Design configuration" msgstr "SMS confirmación" -#: lib/adminpanelaction.php:306 lib/adminpanelaction.php:309 +#: lib/adminpanelaction.php:322 lib/adminpanelaction.php:327 #, fuzzy msgid "Paths configuration" msgstr "SMS confirmación" @@ -4413,11 +4399,21 @@ msgstr "" msgid "Tags for this attachment" msgstr "" +#: lib/authenticationplugin.php:182 lib/authenticationplugin.php:187 +#, fuzzy +msgid "Password changing failed" +msgstr "Cambio de contraseña " + +#: lib/authenticationplugin.php:197 +#, fuzzy +msgid "Password changing is not allowed" +msgstr "Cambio de contraseña " + #: lib/channel.php:138 lib/channel.php:158 msgid "Command results" msgstr "Resultados de comando" -#: lib/channel.php:210 +#: lib/channel.php:210 lib/mailhandler.php:142 msgid "Command complete" msgstr "Comando completo" @@ -4431,7 +4427,7 @@ msgstr "Disculpa, todavÃa no se implementa este comando." #: lib/command.php:88 #, fuzzy, php-format -msgid "Could not find a user with nickname %s" +msgid "Could not find a user with nickname %s." msgstr "" "No se pudo actualizar el usuario con la dirección de correo confirmada." @@ -4440,8 +4436,8 @@ msgid "It does not make a lot of sense to nudge yourself!" msgstr "" #: lib/command.php:99 -#, php-format -msgid "Nudge sent to %s" +#, fuzzy, php-format +msgid "Nudge sent to %s." msgstr "zumbido enviado a %s" #: lib/command.php:126 @@ -4453,34 +4449,36 @@ msgid "" msgstr "" #: lib/command.php:152 lib/command.php:399 lib/command.php:460 -msgid "Notice with that id does not exist" -msgstr "" +#, fuzzy +msgid "Notice with that id does not exist." +msgstr "Ningún perfil con ese ID." #: lib/command.php:168 lib/command.php:415 lib/command.php:476 #: lib/command.php:532 -msgid "User has no last notice" +#, fuzzy +msgid "User has no last notice." msgstr "Usuario no tiene último aviso" #: lib/command.php:190 msgid "Notice marked as fave." msgstr "Aviso marcado como favorito." -#: lib/command.php:315 -#, php-format -msgid "%1$s (%2$s)" -msgstr "%1$s (%2$s)" +#: lib/command.php:284 +#, fuzzy, php-format +msgid "Could not remove user %1$s to group %2$s." +msgstr "No se pudo eliminar a usuario %s de grupo %s" #: lib/command.php:318 -#, php-format -msgid "Fullname: %s" +#, fuzzy, php-format +msgid "Full name: %s" msgstr "Nombre completo: %s" -#: lib/command.php:321 +#: lib/command.php:321 lib/mail.php:254 #, php-format msgid "Location: %s" msgstr "Lugar: %s" -#: lib/command.php:324 +#: lib/command.php:324 lib/mail.php:256 #, php-format msgid "Homepage: %s" msgstr "Página de inicio: %s" @@ -4492,26 +4490,16 @@ msgstr "Sobre: %s" #: lib/command.php:358 scripts/xmppdaemon.php:301 #, fuzzy, php-format -msgid "Message too long - maximum is %d characters, you sent %d" +msgid "Message too long - maximum is %1$d characters, you sent %2$d." msgstr "Mensaje muy largo - máximo 140 caracteres, enviaste %d" #: lib/command.php:378 msgid "Error sending direct message." msgstr "Error al enviar mensaje directo." -#: lib/command.php:422 -#, fuzzy -msgid "Cannot repeat your own notice" -msgstr "No se puede activar notificación." - -#: lib/command.php:427 -#, fuzzy -msgid "Already repeated that notice" -msgstr "Borrar este aviso" - #: lib/command.php:435 #, fuzzy, php-format -msgid "Notice from %s repeated" +msgid "Notice from %s repeated." msgstr "Aviso publicado" #: lib/command.php:437 @@ -4521,12 +4509,12 @@ msgstr "Hubo un problema al guardar el aviso." #: lib/command.php:491 #, fuzzy, php-format -msgid "Notice too long - maximum is %d characters, you sent %d" +msgid "Notice too long - maximum is %1$d characters, you sent %2$d." msgstr "Mensaje muy largo - máximo 140 caracteres, enviaste %d" #: lib/command.php:500 #, fuzzy, php-format -msgid "Reply to %s sent" +msgid "Reply to %s sent." msgstr "Responder este aviso." #: lib/command.php:502 @@ -4535,7 +4523,8 @@ msgid "Error saving notice." msgstr "Hubo un problema al guardar el aviso." #: lib/command.php:556 -msgid "Specify the name of the user to subscribe to" +#, fuzzy +msgid "Specify the name of the user to subscribe to." msgstr "Especificar el nombre del usuario a suscribir" #: lib/command.php:563 @@ -4544,7 +4533,8 @@ msgid "Subscribed to %s" msgstr "Suscrito a %s" #: lib/command.php:584 -msgid "Specify the name of the user to unsubscribe from" +#, fuzzy +msgid "Specify the name of the user to unsubscribe from." msgstr "Especificar el nombre del usuario para desuscribirse de" #: lib/command.php:591 @@ -4573,17 +4563,17 @@ msgid "Can't turn on notification." msgstr "No se puede activar notificación." #: lib/command.php:650 -msgid "Login command is disabled" +msgid "Login command is disabled." msgstr "" #: lib/command.php:664 #, fuzzy, php-format -msgid "Could not create login token for %s" +msgid "Could not create login token for %s." msgstr "No se pudo crear favorito." #: lib/command.php:669 #, php-format -msgid "This link is useable only once, and is good for only 2 minutes: %s" +msgid "This link is useable only once, and is good for only 2 minutes: %s." msgstr "" #: lib/command.php:685 @@ -4774,10 +4764,6 @@ msgstr "Describir al grupo o tema" msgid "Describe the group or topic in %d characters" msgstr "Describir al grupo o tema en %d caracteres" -#: lib/groupeditform.php:172 -msgid "Description" -msgstr "Descripción" - #: lib/groupeditform.php:179 msgid "" "Location for the group, if any, like \"City, State (or Region), Country\"" @@ -4944,21 +4930,9 @@ msgstr "" "Atentamente,\n" "%4$s.\n" -#: lib/mail.php:254 -#, php-format -msgid "Location: %s\n" -msgstr "Ubicación: %s\n" - -#: lib/mail.php:256 -#, php-format -msgid "Homepage: %s\n" -msgstr "Página de inicio: %s\n" - #: lib/mail.php:258 -#, php-format -msgid "" -"Bio: %s\n" -"\n" +#, fuzzy, php-format +msgid "Bio: %s" msgstr "" "Bio: %s\n" "\n" @@ -5103,6 +5077,27 @@ msgstr "" msgid "from" msgstr "desde" +#: lib/mailhandler.php:37 +msgid "Could not parse message." +msgstr "No se pudo analizar sintácticamente mensaje." + +#: lib/mailhandler.php:42 +msgid "Not a registered user." +msgstr "No es un usuario registrado" + +#: lib/mailhandler.php:46 +msgid "Sorry, that is not your incoming email address." +msgstr "Lo sentimos, pero este no es su dirección de correo entrante." + +#: lib/mailhandler.php:50 +msgid "Sorry, no incoming email allowed." +msgstr "Lo sentimos, pero no se permite correos entrantes" + +#: lib/mailhandler.php:228 +#, fuzzy, php-format +msgid "Unsupported message type: %s" +msgstr "Formato de imagen no soportado." + #: lib/mediafile.php:98 lib/mediafile.php:123 msgid "There was a database error while saving your file. Please try again." msgstr "" @@ -5134,7 +5129,7 @@ msgid "File upload stopped by extension." msgstr "" #: lib/mediafile.php:179 lib/mediafile.php:216 -msgid "File exceeds user's quota!" +msgid "File exceeds user's quota." msgstr "" #: lib/mediafile.php:196 lib/mediafile.php:233 @@ -5142,7 +5137,8 @@ msgid "File could not be moved to destination directory." msgstr "" #: lib/mediafile.php:201 lib/mediafile.php:237 -msgid "Could not determine file's mime-type!" +#, fuzzy +msgid "Could not determine file's MIME type." msgstr "No se pudo acceder a corriente pública." #: lib/mediafile.php:270 @@ -5152,7 +5148,7 @@ msgstr "" #: lib/mediafile.php:275 #, php-format -msgid "%s is not a supported filetype on this server." +msgid "%s is not a supported file type on this server." msgstr "" #: lib/messageform.php:120 @@ -5187,7 +5183,17 @@ msgid "Attach a file" msgstr "" #: lib/noticeform.php:212 -msgid "Share your location" +#, fuzzy +msgid "Share my location." +msgstr "No se pudo guardar tags." + +#: lib/noticeform.php:214 +#, fuzzy +msgid "Do not share my location." +msgstr "No se pudo guardar tags." + +#: lib/noticeform.php:215 +msgid "Hide this info" msgstr "" #: lib/noticelist.php:428 @@ -5306,6 +5312,11 @@ msgstr "Mensajes enviados" msgid "Tags in %s's notices" msgstr "Tags en avisos de %s" +#: lib/plugin.php:114 +#, fuzzy +msgid "Unknown" +msgstr "Acción desconocida" + #: lib/profileaction.php:109 lib/profileaction.php:192 lib/subgroupnav.php:82 msgid "Subscriptions" msgstr "Suscripciones" @@ -5486,10 +5497,6 @@ msgstr "" msgid "People Tagcloud as tagged" msgstr "" -#: lib/subscriptionlist.php:126 -msgid "(none)" -msgstr "(ninguno)" - #: lib/tagcloudsection.php:56 msgid "None" msgstr "Ninguno" @@ -5605,19 +5612,3 @@ msgstr "" #, php-format msgid "%s is not a valid color! Use 3 or 6 hex chars." msgstr "" - -#: scripts/maildaemon.php:48 -msgid "Could not parse message." -msgstr "No se pudo analizar sintácticamente mensaje." - -#: scripts/maildaemon.php:53 -msgid "Not a registered user." -msgstr "No es un usuario registrado" - -#: scripts/maildaemon.php:57 -msgid "Sorry, that is not your incoming email address." -msgstr "Lo sentimos, pero este no es su dirección de correo entrante." - -#: scripts/maildaemon.php:61 -msgid "Sorry, no incoming email allowed." -msgstr "Lo sentimos, pero no se permite correos entrantes" diff --git a/locale/fa/LC_MESSAGES/statusnet.po b/locale/fa/LC_MESSAGES/statusnet.po index 3deef9f2e..a1c6eb42f 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-01-03 10:37+0000\n" -"PO-Revision-Date: 2010-01-03 10:37:48+0000\n" +"POT-Creation-Date: 2010-01-10 11:27+0000\n" +"PO-Revision-Date: 2010-01-10 11:28:06+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.16alpha (r60575); Translate extension (2009-12-06)\n" +"X-Generator: MediaWiki 1.16alpha (r60888); Translate extension (2010-01-04)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" #: actions/all.php:63 actions/public.php:97 actions/replies.php:92 @@ -54,11 +54,6 @@ msgstr "چنین صÙØه‌ای وجود ندارد" msgid "No such user." msgstr "چنین کاربری وجود ندارد." -#: actions/all.php:84 -#, php-format -msgid "%s and friends, page %d" -msgstr "%s Ùˆ دوستان، صÙØÙ‡Ù” %d" - #: actions/all.php:86 actions/all.php:167 actions/allrss.php:115 #: actions/apitimelinefriends.php:115 actions/apitimelinehome.php:115 #: lib/personalgroupnav.php:100 @@ -97,11 +92,13 @@ msgstr "" "چیزی را ارسال کنید." #: actions/all.php:134 -#, php-format +#, fuzzy, php-format msgid "" -"You can try to [nudge %s](../%s) from his profile or [post something to his " -"or her attention](%%%%action.newnotice%%%%?status_textarea=%s)." +"You can try to [nudge %1$s](../%2$s) from his profile or [post something to " +"his or her attention](%%%%action.newnotice%%%%?status_textarea=%3$s)." msgstr "" +"اولین کسی باشید Ú©Ù‡ در [این موضوع](%%%%action.newnotice%%%%?status_textarea=%" +"s) پیام می‌Ùرستد." #: actions/all.php:137 actions/replies.php:209 actions/showstream.php:202 #, php-format @@ -127,6 +124,23 @@ msgstr "به روز رسانی از %1$ Ùˆ دوستان در %2$" #: actions/apiaccountupdateprofile.php:97 #: actions/apiaccountupdateprofilebackgroundimage.php:94 #: actions/apiaccountupdateprofilecolors.php:118 +#: actions/apidirectmessage.php:156 actions/apifavoritecreate.php:99 +#: actions/apifavoritedestroy.php:100 actions/apifriendshipscreate.php:100 +#: actions/apifriendshipsdestroy.php:100 actions/apifriendshipsshow.php:129 +#: actions/apigroupcreate.php:136 actions/apigroupismember.php:114 +#: actions/apigroupjoin.php:155 actions/apigroupleave.php:141 +#: actions/apigrouplist.php:132 actions/apigrouplistall.php:120 +#: actions/apigroupmembership.php:106 actions/apigroupshow.php:105 +#: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102 +#: actions/apistatusesretweets.php:112 actions/apistatusesshow.php:108 +#: actions/apistatusnetconfig.php:133 actions/apistatusnetversion.php:93 +#: actions/apisubscriptions.php:111 actions/apitimelinefavorites.php:146 +#: actions/apitimelinefriends.php:156 actions/apitimelinegroup.php:150 +#: actions/apitimelinehome.php:156 actions/apitimelinementions.php:151 +#: actions/apitimelinepublic.php:131 actions/apitimelineretweetedbyme.php:122 +#: actions/apitimelineretweetedtome.php:121 +#: actions/apitimelineretweetsofme.php:122 actions/apitimelinetag.php:141 +#: actions/apitimelineuser.php:165 actions/apiusershow.php:101 msgid "API method not found." msgstr "رابط مورد نظر پیدا نشد." @@ -183,6 +197,9 @@ msgstr "" #: actions/apiaccountupdateprofilebackgroundimage.php:146 #: actions/apiaccountupdateprofilecolors.php:164 #: actions/apiaccountupdateprofilecolors.php:174 +#: actions/groupdesignsettings.php:287 actions/groupdesignsettings.php:297 +#: actions/userdesignsettings.php:210 actions/userdesignsettings.php:220 +#: actions/userdesignsettings.php:263 actions/userdesignsettings.php:273 msgid "Unable to save your design settings." msgstr "نمی‌توان تنظیمات طرØ‌تان را ذخیره کرد." @@ -223,26 +240,6 @@ msgstr "پیام‌های مستقیم به %s" msgid "All the direct messages sent to %s" msgstr "تمام پیام‌های مستقیم Ùرستاده‌شده به %s" -#: actions/apidirectmessage.php:156 actions/apifavoritecreate.php:99 -#: actions/apifavoritedestroy.php:100 actions/apifriendshipscreate.php:100 -#: actions/apifriendshipsdestroy.php:100 actions/apifriendshipsshow.php:129 -#: actions/apigroupcreate.php:136 actions/apigroupismember.php:114 -#: actions/apigroupjoin.php:155 actions/apigroupleave.php:141 -#: actions/apigrouplist.php:132 actions/apigrouplistall.php:120 -#: actions/apigroupmembership.php:106 actions/apigroupshow.php:105 -#: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102 -#: actions/apistatusesretweets.php:112 actions/apistatusesshow.php:108 -#: actions/apistatusnetconfig.php:133 actions/apistatusnetversion.php:93 -#: actions/apisubscriptions.php:111 actions/apitimelinefavorites.php:146 -#: actions/apitimelinefriends.php:156 actions/apitimelinegroup.php:150 -#: actions/apitimelinehome.php:156 actions/apitimelinementions.php:151 -#: actions/apitimelinepublic.php:131 actions/apitimelineretweetedbyme.php:122 -#: actions/apitimelineretweetedtome.php:121 -#: actions/apitimelineretweetsofme.php:122 actions/apitimelinetag.php:141 -#: actions/apitimelineuser.php:165 actions/apiusershow.php:101 -msgid "API method not found!" -msgstr "رابط پیدا نشد!" - #: actions/apidirectmessagenew.php:126 msgid "No message text!" msgstr "هیچ پیام متنی وجود ندارد!" @@ -266,7 +263,8 @@ msgid "No status found with that ID." msgstr "هیچ وضعیتی با آن شناسه پیدا نشد." #: actions/apifavoritecreate.php:119 -msgid "This status is already a favorite!" +#, fuzzy +msgid "This status is already a favorite." msgstr "این وضعیت درØال Øاضر یک وضعیت مورد علاقه است!" #: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:176 @@ -274,7 +272,8 @@ msgid "Could not create favorite." msgstr "نمی‌توان وضعیت را موردعلاقه کرد." #: actions/apifavoritedestroy.php:122 -msgid "That status is not a favorite!" +#, fuzzy +msgid "That status is not a favorite." msgstr "این وضعیت یک وضعیت موردعلاقه نیست!" #: actions/apifavoritedestroy.php:134 actions/disfavor.php:87 @@ -295,7 +294,8 @@ msgid "Could not unfollow user: User not found." msgstr "نمی‌توان کاربر را دنبال نکرد: کاربر یاÙت نشد." #: actions/apifriendshipsdestroy.php:120 -msgid "You cannot unfollow yourself!" +#, fuzzy +msgid "You cannot unfollow yourself." msgstr "نمی‌توانید خودتان را دنبال نکنید!" #: actions/apifriendshipsexists.php:94 @@ -380,7 +380,7 @@ msgstr "نام Ùˆ نام مستعار شما نمی تواند یکی باشد . msgid "Group not found!" msgstr "گروه یاÙت نشد!" -#: actions/apigroupjoin.php:110 +#: actions/apigroupjoin.php:110 actions/joingroup.php:90 lib/command.php:217 msgid "You are already a member of that group." msgstr "شما از پیش یک عضو این گروه هستید." @@ -388,18 +388,18 @@ msgstr "شما از پیش یک عضو این گروه هستید." msgid "You have been blocked from that group by the admin." msgstr "دسترسی شما به گروه توسط مدیر آن Ù…Øدود شده است." -#: actions/apigroupjoin.php:138 -#, php-format -msgid "Could not join user %s to group %s." +#: actions/apigroupjoin.php:138 actions/joingroup.php:128 lib/command.php:234 +#, fuzzy, php-format +msgid "Could not join user %1$s to group %2$s." msgstr "عضویت %s در گروه %s نا موÙÙ‚ بود." #: actions/apigroupleave.php:114 msgid "You are not a member of this group." msgstr "شما یک عضو این گروه نیستید." -#: actions/apigroupleave.php:124 -#, php-format -msgid "Could not remove user %s to group %s." +#: actions/apigroupleave.php:124 actions/leavegroup.php:127 +#, fuzzy, php-format +msgid "Could not remove user %1$s from group %2$s." msgstr "خارج شدن %s از گروه %s نا موÙÙ‚ بود" #: actions/apigrouplist.php:95 @@ -407,11 +407,6 @@ msgstr "خارج شدن %s از گروه %s نا موÙÙ‚ بود" msgid "%s's groups" msgstr "گروه‌های %s" -#: actions/apigrouplist.php:103 -#, php-format -msgid "Groups %s is a member of on %s." -msgstr "" - #: actions/apigrouplistall.php:90 actions/usergroups.php:62 #, php-format msgid "%s groups" @@ -435,11 +430,11 @@ msgstr "شما توانایی Øذ٠وضعیت کاربر دیگری را Ù†Ø¯Ø msgid "No such notice." msgstr "چنین پیامی وجود ندارد." -#: actions/apistatusesretweet.php:83 +#: actions/apistatusesretweet.php:83 lib/command.php:422 msgid "Cannot repeat your own notice." msgstr "نمی توانید خبر خود را تکرار کنید." -#: actions/apistatusesretweet.php:91 +#: actions/apistatusesretweet.php:91 lib/command.php:427 msgid "Already repeated that notice." msgstr "ابن خبر قبلا Ùرستاده شده" @@ -452,7 +447,7 @@ msgid "No status with that ID found." msgstr "هیچ وضعیتی با آن شناسه یاÙت نشد." #: actions/apistatusesupdate.php:157 actions/newnotice.php:155 -#: scripts/maildaemon.php:71 +#: lib/mailhandler.php:60 #, php-format msgid "That's too long. Max notice size is %d chars." msgstr "خیلی طولانی است. Øداکثر طول مجاز پیام %d Øر٠است." @@ -471,13 +466,13 @@ msgid "Unsupported format." msgstr "قالب پشتیبانی نشده." #: actions/apitimelinefavorites.php:108 -#, php-format -msgid "%s / Favorites from %s" +#, fuzzy, php-format +msgid "%1$s / Favorites from %2$s" msgstr "%s / دوست داشتنی از %s" #: actions/apitimelinefavorites.php:120 -#, php-format -msgid "%s updates favorited by %s / %s." +#, fuzzy, php-format +msgid "%1$s updates favorited by %2$s / %2$s." msgstr "%s به روز رسانی های دوست داشتنی %s / %s" #: actions/apitimelinegroup.php:109 actions/apitimelineuser.php:118 @@ -515,7 +510,7 @@ msgstr "%s به روز رسانی های عموم" #: actions/apitimelineretweetedbyme.php:112 #, php-format msgid "Repeated by %s" -msgstr "" +msgstr "%s تکرار کرد" #: actions/apitimelineretweetedtome.php:111 #, php-format @@ -525,7 +520,7 @@ msgstr "" #: actions/apitimelineretweetsofme.php:112 #, php-format msgid "Repeats of %s" -msgstr "" +msgstr "تکرار %s" #: actions/apitimelinetag.php:102 actions/tag.php:66 #, php-format @@ -545,8 +540,11 @@ msgstr "یاÙت نشد." msgid "No such attachment." msgstr "چنین پیوستی وجود ندارد." -#: actions/avatarbynickname.php:59 actions/grouprss.php:91 -#: actions/leavegroup.php:76 +#: actions/avatarbynickname.php:59 actions/blockedfromgroup.php:73 +#: actions/editgroup.php:84 actions/groupdesignsettings.php:84 +#: actions/grouplogo.php:86 actions/groupmembers.php:76 +#: actions/grouprss.php:91 actions/joingroup.php:76 actions/leavegroup.php:76 +#: actions/showgroup.php:121 msgid "No nickname." msgstr "بدون لقب." @@ -570,8 +568,8 @@ msgstr "" "شما می‌توانید چهرهٔ شخصی خود را بارگذاری کنید. Øداکثر اندازه پرونده %s است." #: actions/avatarsettings.php:106 actions/avatarsettings.php:185 -#: actions/grouplogo.php:178 actions/remotesubscribe.php:191 -#: actions/userauthorization.php:72 actions/userrss.php:103 +#: actions/remotesubscribe.php:191 actions/userauthorization.php:72 +#: actions/userrss.php:103 msgid "User without matching profile" msgstr "کاربر بدون مشخصات" @@ -603,9 +601,9 @@ msgstr "پایین‌گذاری" msgid "Crop" msgstr "برش" -#: actions/avatarsettings.php:268 actions/disfavor.php:74 -#: actions/emailsettings.php:238 actions/favor.php:75 actions/geocode.php:50 -#: actions/groupblock.php:66 actions/grouplogo.php:309 +#: actions/avatarsettings.php:268 actions/deletenotice.php:157 +#: actions/disfavor.php:74 actions/emailsettings.php:238 actions/favor.php:75 +#: actions/geocode.php:50 actions/groupblock.php:66 actions/grouplogo.php:309 #: actions/groupunblock.php:66 actions/imsettings.php:206 #: actions/invite.php:56 actions/login.php:135 actions/makeadmin.php:66 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80 @@ -688,19 +686,15 @@ msgstr "کاربر را مسدود Ú©Ù†" msgid "Failed to save block information." msgstr "" -#: actions/blockedfromgroup.php:73 actions/editgroup.php:84 -#: actions/groupdesignsettings.php:84 actions/grouplogo.php:86 -#: actions/groupmembers.php:76 actions/joingroup.php:76 -#: actions/showgroup.php:121 -msgid "No nickname" -msgstr "بدون لقب" - #: actions/blockedfromgroup.php:80 actions/editgroup.php:96 +#: actions/foafgroup.php:44 actions/foafgroup.php:62 actions/groupblock.php:86 #: actions/groupbyid.php:83 actions/groupdesignsettings.php:97 #: actions/grouplogo.php:99 actions/groupmembers.php:83 -#: actions/joingroup.php:83 actions/showgroup.php:137 -msgid "No such group" -msgstr "چنین گروهی وجود ندارد" +#: actions/grouprss.php:98 actions/groupunblock.php:86 +#: actions/joingroup.php:83 actions/leavegroup.php:83 actions/makeadmin.php:86 +#: actions/showgroup.php:137 lib/command.php:212 lib/command.php:263 +msgid "No such group." +msgstr "چنین گروهی وجود ندارد." #: actions/blockedfromgroup.php:90 #, php-format @@ -708,8 +702,8 @@ msgid "%s blocked profiles" msgstr "%s کاربران مسدود شده" #: actions/blockedfromgroup.php:93 -#, php-format -msgid "%s blocked profiles, page %d" +#, fuzzy, php-format +msgid "%1$s blocked profiles, page %2$d" msgstr "%s کاربران مسدود شده، صÙØه‌ی %d" #: actions/blockedfromgroup.php:108 @@ -822,10 +816,6 @@ msgstr "این پیام را پاک Ù†Ú©Ù†" msgid "Delete this notice" msgstr "این پیام را پاک Ú©Ù†" -#: actions/deletenotice.php:157 -msgid "There was a problem with your session token. Try again, please." -msgstr "مشکلی در دریاÙت جلسه‌ی شما وجود دارد. لطÙا بعدا سعی کنید." - #: actions/deleteuser.php:67 msgid "You cannot delete users." msgstr "شما نمی‌توانید کاربران را پاک کنید." @@ -851,7 +841,7 @@ msgid "Delete this user" msgstr "Øذ٠این کاربر" #: actions/designadminpanel.php:62 lib/accountsettingsaction.php:124 -#: lib/adminpanelaction.php:302 lib/groupnav.php:119 +#: lib/adminpanelaction.php:316 lib/groupnav.php:119 msgid "Design" msgstr "طرØ" @@ -991,7 +981,8 @@ msgstr "برای ساخت یک گروه، باید وارد شده باشید." #: actions/editgroup.php:103 actions/editgroup.php:168 #: actions/groupdesignsettings.php:104 actions/grouplogo.php:106 -msgid "You must be an admin to edit the group" +#, fuzzy +msgid "You must be an admin to edit the group." msgstr "برای ویرایش گروه، باید یک مدیر باشید." #: actions/editgroup.php:154 @@ -1016,7 +1007,8 @@ msgid "Options saved." msgstr "گزینه‌ها ذخیره شدند." #: actions/emailsettings.php:60 -msgid "Email Settings" +#, fuzzy +msgid "Email settings" msgstr "تنظیمات پست الکترونیک" #: actions/emailsettings.php:71 @@ -1051,8 +1043,9 @@ msgid "Cancel" msgstr "انصراÙ" #: actions/emailsettings.php:121 -msgid "Email Address" -msgstr "نشانی پست الکترونیکی" +#, fuzzy +msgid "Email address" +msgstr "نشانی‌های پست الکترونیکی" #: actions/emailsettings.php:123 msgid "Email address, like \"UserName@example.org\"" @@ -1126,9 +1119,10 @@ msgstr "پست الکترونیک وجود ندارد." msgid "Cannot normalize that email address" msgstr "نمی‌توان نشانی را قانونی کرد" -#: actions/emailsettings.php:331 actions/siteadminpanel.php:157 -msgid "Not a valid email address" -msgstr "این یک نشانی صØÛŒØ Ù†ÛŒØ³Øª" +#: actions/emailsettings.php:331 actions/register.php:201 +#: actions/siteadminpanel.php:157 +msgid "Not a valid email address." +msgstr "یک آدرس ایمیل معتبر نیست." #: actions/emailsettings.php:334 msgid "That is already your email address." @@ -1308,18 +1302,11 @@ msgstr "خدمات مورد نظر از نسخه‌ی نا Ù…Ùهومی از Ù‚Ø msgid "Error updating remote profile" msgstr "اشکال در به روز کردن کاربر دوردست." -#: actions/foafgroup.php:44 actions/foafgroup.php:62 actions/groupblock.php:86 -#: actions/grouprss.php:98 actions/groupunblock.php:86 -#: actions/leavegroup.php:83 actions/makeadmin.php:86 lib/command.php:212 -#: lib/command.php:263 -msgid "No such group." -msgstr "چنین گروهی وجود ندارد." - -#: actions/getfile.php:75 +#: actions/getfile.php:79 msgid "No such file." msgstr "چنین پرونده‌ای وجود ندارد." -#: actions/getfile.php:79 +#: actions/getfile.php:83 msgid "Cannot read file." msgstr "نمی‌توان پرونده را خواند." @@ -1331,7 +1318,7 @@ msgstr "کاربری مشخص نشده است." #: actions/groupblock.php:76 actions/groupunblock.php:76 #: actions/makeadmin.php:76 actions/subedit.php:53 actions/tagother.php:46 -#: lib/profileformaction.php:77 +#: actions/unsubscribe.php:84 lib/profileformaction.php:77 msgid "No profile with that ID." msgstr "کاربری با چنین شناسه‌ای وجود ندارد." @@ -1357,11 +1344,11 @@ msgid "Block user from group" msgstr "دسترسی کاربر به گروه را مسدود Ú©Ù†" #: actions/groupblock.php:162 -#, php-format +#, fuzzy, php-format msgid "" -"Are you sure you want to block user \"%s\" from the group \"%s\"? They will " -"be removed from the group, unable to post, and unable to subscribe to the " -"group in the future." +"Are you sure you want to block user \"%1$s\" from the group \"%2$s\"? They " +"will be removed from the group, unable to post, and unable to subscribe to " +"the group in the future." msgstr "آیا مطمئن هستید می‌خواهید دسترسی »%s« را به گروه »%s« مسدود کنید؟" #: actions/groupblock.php:178 @@ -1376,9 +1363,9 @@ msgstr "دسترسی کاربر را به گروه مسدود Ú©Ù†" msgid "Database error blocking user from group." msgstr "اشکال پایگاه داده در مسدود کردن کاربر" -#: actions/groupbyid.php:74 -msgid "No ID" -msgstr "شناسه وجود ندارد" +#: actions/groupbyid.php:74 actions/userbyid.php:70 +msgid "No ID." +msgstr "" #: actions/groupdesignsettings.php:68 msgid "You must be logged in to edit a group." @@ -1399,12 +1386,6 @@ msgstr "ظاهر گروه را تغییر دهید تا شما را راضی Ú©Ù msgid "Couldn't update your design." msgstr "نمی‌توان ظاهر را به روز کرد." -#: actions/groupdesignsettings.php:287 actions/groupdesignsettings.php:297 -#: actions/userdesignsettings.php:210 actions/userdesignsettings.php:220 -#: actions/userdesignsettings.php:263 actions/userdesignsettings.php:273 -msgid "Unable to save your design settings!" -msgstr "نمی‌توان تنظیمات شما را ذخیره کرد!" - #: actions/groupdesignsettings.php:308 actions/userdesignsettings.php:231 msgid "Design preferences saved." msgstr "ترجیØات Ø·Ø±Ø Ø°Ø®ÛŒØ±Ù‡ شد." @@ -1419,6 +1400,11 @@ msgid "" "You can upload a logo image for your group. The maximum file size is %s." msgstr "شما می‌توانید یک نشان برای گروه خود با بیشینه Øجم %s بÙرستید." +#: actions/grouplogo.php:178 +#, fuzzy +msgid "User without matching profile." +msgstr "کاربر بدون مشخصات" + #: actions/grouplogo.php:362 msgid "Pick a square area of the image to be the logo." msgstr "یک ناØیه‌ی مربع از تصویر را انتخاب کنید تا به عنوان نشان باشد." @@ -1437,15 +1423,15 @@ msgid "%s group members" msgstr "اعضای گروه %s" #: actions/groupmembers.php:96 -#, php-format -msgid "%s group members, page %d" +#, fuzzy, php-format +msgid "%1$s group members, page %2$d" msgstr "اعضای گروه %sØŒ صÙØÙ‡Ù” %d" #: actions/groupmembers.php:111 msgid "A list of the users in this group." msgstr "یک Ùهرست از کاربران در این گروه" -#: actions/groupmembers.php:175 lib/action.php:441 lib/groupnav.php:107 +#: actions/groupmembers.php:175 lib/action.php:442 lib/groupnav.php:107 msgid "Admin" msgstr "مدیر" @@ -1546,7 +1532,8 @@ msgid "Error removing the block." msgstr "اشکال در پاکسازی" #: actions/imsettings.php:59 -msgid "IM Settings" +#, fuzzy +msgid "IM settings" msgstr "تنظیمات پیام‌رسان Ùوری" #: actions/imsettings.php:70 @@ -1576,7 +1563,8 @@ msgstr "" "بیش‌تر بررسی کنید. (آیا %s را به Ùهرست خود اضاÙÙ‡ کرده اید؟) " #: actions/imsettings.php:124 -msgid "IM Address" +#, fuzzy +msgid "IM address" msgstr "نشانی پیام‌رسان Ùوری" #: actions/imsettings.php:126 @@ -1638,11 +1626,6 @@ msgstr "" msgid "That is not your Jabber ID." msgstr "این شناسه‌ی Jabber شما نیست." -#: actions/inbox.php:59 -#, php-format -msgid "Inbox for %s - page %d" -msgstr "ورودی‌های %s - صÙØه‌ی %d" - #: actions/inbox.php:62 #, php-format msgid "Inbox for %s" @@ -1678,10 +1661,10 @@ msgstr "دعوت کردن کاربران تازه" msgid "You are already subscribed to these users:" msgstr "هم اکنون شما این کاربران را دنبال می‌کنید: " -#: actions/invite.php:131 actions/invite.php:139 +#: actions/invite.php:131 actions/invite.php:139 lib/command.php:315 #, php-format -msgid "%s (%s)" -msgstr "%s )%s(" +msgid "%1$s (%2$s)" +msgstr "" #: actions/invite.php:136 msgid "" @@ -1722,7 +1705,7 @@ msgstr "پیام خصوصی" msgid "Optionally add a personal message to the invitation." msgstr "اگر دوست دارید می‌توانید یک پیام به همراه دعوت نامه ارسال کنید." -#: actions/invite.php:197 lib/messageform.php:178 lib/noticeform.php:232 +#: actions/invite.php:197 lib/messageform.php:178 lib/noticeform.php:234 msgid "Send" msgstr "Ùرستادن" @@ -1766,18 +1749,9 @@ msgstr "" msgid "You must be logged in to join a group." msgstr "برای پیوستن به یک گروه، باید وارد شده باشید." -#: actions/joingroup.php:90 lib/command.php:217 -msgid "You are already a member of that group" -msgstr "شما یک کاربر این گروه هستید." - -#: actions/joingroup.php:128 lib/command.php:234 -#, php-format -msgid "Could not join user %s to group %s" -msgstr "نمی‌توان کاربر %s را به گروه %s پیوند داد." - #: actions/joingroup.php:135 lib/command.php:239 -#, php-format -msgid "%s joined group %s" +#, fuzzy, php-format +msgid "%1$s joined group %2$s" msgstr "ملØÙ‚ شدن به گروه" #: actions/leavegroup.php:60 @@ -1792,14 +1766,9 @@ msgstr "شما یک کاربر این گروه نیستید." msgid "Could not find membership record." msgstr "عضویت ثبت شده پیدا نشد." -#: actions/leavegroup.php:127 lib/command.php:284 -#, php-format -msgid "Could not remove user %s to group %s" -msgstr "" - #: actions/leavegroup.php:134 lib/command.php:289 -#, php-format -msgid "%s left group %s" +#, fuzzy, php-format +msgid "%1$s left group %2$s" msgstr "%s گروه %s را ترک کرد." #: actions/login.php:83 actions/register.php:137 @@ -1818,7 +1787,7 @@ msgstr "نام کاربری یا رمز عبور نادرست." msgid "Error setting user. You are probably not authorized." msgstr "خطا در تنظیم کاربر. شما اØتمالا اجازه ÛŒ این کار را ندارید." -#: actions/login.php:208 actions/login.php:261 lib/action.php:459 +#: actions/login.php:208 actions/login.php:261 lib/action.php:460 #: lib/logingroupnav.php:79 msgid "Login" msgstr "ورود" @@ -1872,18 +1841,18 @@ msgid "Only an admin can make another user an admin." msgstr "Ùقط یک مدیر می‌تواند کاربر دیگری را مدیر کند." #: actions/makeadmin.php:95 -#, php-format -msgid "%s is already an admin for group \"%s\"." +#, fuzzy, php-format +msgid "%1$s is already an admin for group \"%2$s\"." msgstr "%s از قبل مدیر گروه %s بود." #: actions/makeadmin.php:132 -#, php-format -msgid "Can't get membership record for %s in group %s" +#, fuzzy, php-format +msgid "Can't get membership record for %1$s in group %2$s." msgstr "نمی‌توان اطلاعات عضویت %s را در گروه %s به دست آورد." #: actions/makeadmin.php:145 -#, php-format -msgid "Can't make %s an admin for group %s" +#, fuzzy, php-format +msgid "Can't make %1$s an admin for group %2$s." msgstr "نمی‌توان %s را مدیر گروه %s کرد." #: actions/microsummary.php:69 @@ -1925,8 +1894,8 @@ msgid "Message sent" msgstr "پیام Ùرستاده‌شد" #: actions/newmessage.php:185 lib/command.php:376 -#, php-format -msgid "Direct message to %s sent" +#, fuzzy, php-format +msgid "Direct message to %s sent." msgstr "پیام مستقیم به %s Ùرستاده شد." #: actions/newmessage.php:210 actions/newnotice.php:245 lib/channel.php:170 @@ -1955,8 +1924,8 @@ msgid "Text search" msgstr "جست‌وجوی متن" #: actions/noticesearch.php:91 -#, php-format -msgid "Search results for \"%s\" on %s" +#, fuzzy, php-format +msgid "Search results for \"%1$s\" on %2$s" msgstr "نتایج جست‌و‌جو برای %s در %s" #: actions/noticesearch.php:121 @@ -2064,11 +2033,6 @@ msgstr "نمایش یا عدم‌نمایش طراØی‌های کاربران." msgid "URL shortening service is too long (max 50 chars)." msgstr "کوتاه کننده‌ی نشانی بسیار طولانی است (بیش‌تر از ÛµÛ° ØرÙ)." -#: actions/outbox.php:58 -#, php-format -msgid "Outbox for %s - page %d" -msgstr "Ùرستاده‌های %s - صÙØه‌ی %d" - #: actions/outbox.php:61 #, php-format msgid "Outbox for %s" @@ -2141,7 +2105,7 @@ msgstr "نمی‌توان گذرواژه جدید را ذخیره کرد." msgid "Password saved." msgstr "گذرواژه ذخیره شد." -#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:308 +#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:326 msgid "Paths" msgstr "مسیر ها" @@ -2174,7 +2138,7 @@ msgid "Invalid SSL server. The maximum length is 255 characters." msgstr "" #: actions/pathsadminpanel.php:217 actions/siteadminpanel.php:58 -#: lib/adminpanelaction.php:299 +#: lib/adminpanelaction.php:311 msgid "Site" msgstr "سایت" @@ -2267,8 +2231,9 @@ msgid "When to use SSL" msgstr "" #: actions/pathsadminpanel.php:308 -msgid "SSL Server" -msgstr "" +#, fuzzy +msgid "SSL server" +msgstr "کارگزار" #: actions/pathsadminpanel.php:309 msgid "Server to direct SSL requests to" @@ -2297,8 +2262,8 @@ msgid "Not a valid people tag: %s" msgstr "یک برچسب کاربری معتبر نیست: %s" #: actions/peopletag.php:144 -#, php-format -msgid "Users self-tagged with %s - page %d" +#, fuzzy, php-format +msgid "Users self-tagged with %1$s - page %2$d" msgstr "کاربران خود برچسب‌گذاری شده با %s - صÙØÙ‡Ù” %d" #: actions/postnotice.php:84 @@ -2307,7 +2272,7 @@ msgstr "Ù…Øتوای Ø¢Ú¯Ù‡ÛŒ نامعتبر" #: actions/postnotice.php:90 #, php-format -msgid "Notice license ‘%s’ is not compatible with site license ‘%s’." +msgid "Notice license ‘%1$s’ is not compatible with site license ‘%2$s’." msgstr "" #: actions/profilesettings.php:60 @@ -2426,20 +2391,19 @@ msgstr "نشان نادرست »%s«" msgid "Couldn't update user for autosubscribe." msgstr "" -#: actions/profilesettings.php:354 -#, fuzzy +#: actions/profilesettings.php:359 msgid "Couldn't save location prefs." -msgstr "نمی‌توان نشان را ذخیره کرد." +msgstr "نمی‌توان تنظیمات مکانی را تنظیم کرد." -#: actions/profilesettings.php:366 +#: actions/profilesettings.php:371 msgid "Couldn't save profile." msgstr "نمی‌توان شناسه را ذخیره کرد." -#: actions/profilesettings.php:374 +#: actions/profilesettings.php:379 msgid "Couldn't save tags." msgstr "نمی‌توان نشان را ذخیره کرد." -#: actions/profilesettings.php:382 lib/adminpanelaction.php:126 +#: actions/profilesettings.php:387 lib/adminpanelaction.php:137 msgid "Settings saved." msgstr "تنظیمات ذخیره شد." @@ -2532,7 +2496,7 @@ msgid "" "one!" msgstr "" -#: actions/publictagcloud.php:135 +#: actions/publictagcloud.php:131 msgid "Tag cloud" msgstr "" @@ -2672,7 +2636,7 @@ msgstr "با عرض تاسÙØŒ کد دعوت نا معتبر است." msgid "Registration successful" msgstr "ثبت نام با موÙقیت انجام شد." -#: actions/register.php:114 actions/register.php:502 lib/action.php:456 +#: actions/register.php:114 actions/register.php:502 lib/action.php:457 #: lib/logingroupnav.php:85 msgid "Register" msgstr "ثبت نام" @@ -2685,10 +2649,6 @@ msgstr "اجازه‌ی ثبت نام داده نشده است." msgid "You can't register if you don't agree to the license." msgstr "شما نمی توانید ثبت نام کنید اگر با لیسانس( جواز ) مواÙقت نکنید." -#: actions/register.php:201 -msgid "Not a valid email address." -msgstr "یک آدرس ایمیل معتبر نیست." - #: actions/register.php:212 msgid "Email address already exists." msgstr "آدرس ایمیل از قبل وجود دارد." @@ -2747,10 +2707,10 @@ msgstr "" #: actions/register.php:537 #, php-format msgid "" -"Congratulations, %s! And welcome to %%%%site.name%%%%. From here, you may " +"Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may " "want to...\n" "\n" -"* Go to [your profile](%s) and post your first message.\n" +"* Go to [your profile](%2$s) and post your first message.\n" "* Add a [Jabber/GTalk address](%%%%action.imsettings%%%%) so you can send " "notices through instant messages.\n" "* [Search for people](%%%%action.peoplesearch%%%%) that you may know or that " @@ -2854,11 +2814,6 @@ msgstr "" msgid "Replies to %s" msgstr "پاسخ‌های به %s" -#: actions/replies.php:127 -#, php-format -msgid "Replies to %s, page %d" -msgstr "پاسخ‌های به %sØŒ صÙØÙ‡Ù” %d" - #: actions/replies.php:144 #, php-format msgid "Replies feed for %s (RSS 1.0)" @@ -2875,11 +2830,11 @@ msgid "Replies feed for %s (Atom)" msgstr "خوراک پاسخ‌ها برای %s (Atom)" #: actions/replies.php:198 -#, php-format +#, fuzzy, php-format msgid "" -"This is the timeline showing replies to %s but %s hasn't received a notice " -"to his attention yet." -msgstr "" +"This is the timeline showing replies to %1$s but %2$s hasn't received a " +"notice to his attention yet." +msgstr "این خط‌زمانی %s Ùˆ دوستانش است، اما هیچ‌یک تاکنون چیزی پست نکرده‌اند." #: actions/replies.php:203 #, php-format @@ -2889,11 +2844,13 @@ msgid "" msgstr "" #: actions/replies.php:205 -#, php-format +#, fuzzy, php-format msgid "" -"You can try to [nudge %s](../%s) or [post something to his or her attention]" -"(%%%%action.newnotice%%%%?status_textarea=%s)." +"You can try to [nudge %1$s](../%2$s) or [post something to his or her " +"attention](%%%%action.newnotice%%%%?status_textarea=%3$s)." msgstr "" +"اولین کسی باشید Ú©Ù‡ در [این موضوع](%%%%action.newnotice%%%%?status_textarea=%" +"s) پیام می‌Ùرستد." #: actions/repliesrss.php:72 #, php-format @@ -2908,11 +2865,6 @@ msgstr "" msgid "User is already sandboxed." msgstr "" -#: actions/showfavorites.php:79 -#, php-format -msgid "%s's favorite notices, page %d" -msgstr "" - #: actions/showfavorites.php:132 msgid "Could not retrieve favorite notices." msgstr "ناتوان در بازیابی Ø¢Ú¯Ù‡ÛŒ های Ù…Øبوب." @@ -2962,11 +2914,6 @@ msgstr "این یک راه است برای به اشتراک گذاشتن آنچ msgid "%s group" msgstr "" -#: actions/showgroup.php:84 -#, php-format -msgid "%s group, page %d" -msgstr "" - #: actions/showgroup.php:218 msgid "Group profile" msgstr "" @@ -3015,7 +2962,7 @@ msgstr "اعضا" #: actions/showgroup.php:386 lib/profileaction.php:117 #: lib/profileaction.php:148 lib/profileaction.php:236 lib/section.php:95 -#: lib/tagcloudsection.php:71 +#: lib/subscriptionlist.php:126 lib/tagcloudsection.php:71 msgid "(None)" msgstr "هیچ" @@ -3081,15 +3028,10 @@ msgstr "" msgid " tagged %s" msgstr "" -#: actions/showstream.php:79 -#, php-format -msgid "%s, page %d" -msgstr "" - #: actions/showstream.php:122 -#, php-format -msgid "Notice feed for %s tagged %s (RSS 1.0)" -msgstr "" +#, fuzzy, php-format +msgid "Notice feed for %1$s tagged %2$s (RSS 1.0)" +msgstr "خوراک پاسخ‌ها برای %s (RSS 1.0)" #: actions/showstream.php:129 #, php-format @@ -3112,9 +3054,9 @@ msgid "FOAF for %s" msgstr "" #: actions/showstream.php:191 -#, php-format -msgid "This is the timeline for %s but %s hasn't posted anything yet." -msgstr "" +#, fuzzy, php-format +msgid "This is the timeline for %1$s but %2$s hasn't posted anything yet." +msgstr "این خط‌زمانی %s Ùˆ دوستانش است، اما هیچ‌یک تاکنون چیزی پست نکرده‌اند." #: actions/showstream.php:196 msgid "" @@ -3125,11 +3067,13 @@ msgstr "" "تواند زمان خوبی برای شروع باشد :)" #: actions/showstream.php:198 -#, php-format +#, fuzzy, php-format msgid "" -"You can try to nudge %s or [post something to his or her attention](%%%%" -"action.newnotice%%%%?status_textarea=%s)." +"You can try to nudge %1$s or [post something to his or her attention](%%%%" +"action.newnotice%%%%?status_textarea=%2$s)." msgstr "" +"اولین کسی باشید Ú©Ù‡ در [این موضوع](%%%%action.newnotice%%%%?status_textarea=%" +"s) پیام می‌Ùرستد." #: actions/showstream.php:234 #, php-format @@ -3170,12 +3114,13 @@ msgid "Site name must have non-zero length." msgstr "نام سایت باید طولی غیر صÙر داشته باشد." #: actions/siteadminpanel.php:154 -msgid "You must have a valid contact email address" +#, fuzzy +msgid "You must have a valid contact email address." msgstr "شما باید یک آدرس ایمیل قابل قبول برای ارتباط داشته باشید" #: actions/siteadminpanel.php:172 #, php-format -msgid "Unknown language \"%s\"" +msgid "Unknown language \"%s\"." msgstr "" #: actions/siteadminpanel.php:179 @@ -3357,8 +3302,9 @@ msgid "Save site settings" msgstr "" #: actions/smssettings.php:58 -msgid "SMS Settings" -msgstr "" +#, fuzzy +msgid "SMS settings" +msgstr "تنظیمات پیام‌رسان Ùوری" #: actions/smssettings.php:69 #, php-format @@ -3386,7 +3332,8 @@ msgid "Enter the code you received on your phone." msgstr "کدی را Ú©Ù‡ در گوشیتان گرÙتید وارد کنید." #: actions/smssettings.php:138 -msgid "SMS Phone number" +#, fuzzy +msgid "SMS phone number" msgstr "شماره تماس پیامک" #: actions/smssettings.php:140 @@ -3472,9 +3419,9 @@ msgid "%s subscribers" msgstr "" #: actions/subscribers.php:52 -#, php-format -msgid "%s subscribers, page %d" -msgstr "" +#, fuzzy, php-format +msgid "%1$s subscribers, page %2$d" +msgstr "%s کاربران مسدود شده، صÙØه‌ی %d" #: actions/subscribers.php:63 msgid "These are the people who listen to your notices." @@ -3509,9 +3456,9 @@ msgid "%s subscriptions" msgstr "" #: actions/subscriptions.php:54 -#, php-format -msgid "%s subscriptions, page %d" -msgstr "" +#, fuzzy, php-format +msgid "%1$s subscriptions, page %2$d" +msgstr "%d گروه , صÙØÙ‡ %S" #: actions/subscriptions.php:65 msgid "These are the people whose notices you listen to." @@ -3545,11 +3492,6 @@ msgstr "" msgid "SMS" msgstr "" -#: actions/tag.php:68 -#, php-format -msgid "Notices tagged with %s, page %d" -msgstr "" - #: actions/tag.php:86 #, php-format msgid "Notice feed for tag %s (RSS 1.0)" @@ -3629,20 +3571,17 @@ msgstr "کاربر ساکت نشده است." msgid "No profile id in request." msgstr "" -#: actions/unsubscribe.php:84 -msgid "No profile with that id." -msgstr "" - #: actions/unsubscribe.php:98 msgid "Unsubscribed" msgstr "" #: actions/updateprofile.php:62 actions/userauthorization.php:330 #, php-format -msgid "Listenee stream license ‘%s’ is not compatible with site license ‘%s’." +msgid "" +"Listenee stream license ‘%1$s’ is not compatible with site license ‘%2$s’." msgstr "" -#: actions/useradminpanel.php:58 lib/adminpanelaction.php:305 +#: actions/useradminpanel.php:58 lib/adminpanelaction.php:321 #: lib/personalgroupnav.php:115 msgid "User" msgstr "کاربر" @@ -3740,7 +3679,7 @@ msgid "" "click “Rejectâ€." msgstr "" -#: actions/userauthorization.php:188 +#: actions/userauthorization.php:188 actions/version.php:165 msgid "License" msgstr "لیسانس" @@ -3789,7 +3728,7 @@ msgstr "" #: actions/userauthorization.php:296 #, php-format -msgid "Listener URI ‘%s’ not found here" +msgid "Listener URI ‘%s’ not found here." msgstr "" #: actions/userauthorization.php:301 @@ -3822,10 +3761,6 @@ msgstr "" msgid "Wrong image type for avatar URL ‘%s’." msgstr "" -#: actions/userbyid.php:70 -msgid "No ID." -msgstr "" - #: actions/userdesignsettings.php:76 lib/designsettings.php:65 msgid "Profile design" msgstr "طراØÛŒ پروÙیل" @@ -3840,11 +3775,6 @@ msgstr "" msgid "Enjoy your hotdog!" msgstr "از هات داگ خود لذت ببرید!" -#: actions/usergroups.php:64 -#, php-format -msgid "%s groups, page %d" -msgstr "%d گروه , صÙØÙ‡ %S" - #: actions/usergroups.php:130 msgid "Search for more groups" msgstr "جستجو برای گروه های بیشتر" @@ -3859,6 +3789,73 @@ msgstr "" msgid "Try [searching for groups](%%action.groupsearch%%) and joining them." msgstr "" +#: actions/version.php:73 +#, fuzzy, php-format +msgid "StatusNet %s" +msgstr "آمار" + +#: actions/version.php:153 +#, php-format +msgid "" +"This site is powered by %1$s version %2$s, Copyright 2008-2010 StatusNet, " +"Inc. and contributors." +msgstr "" + +#: actions/version.php:157 +#, fuzzy +msgid "StatusNet" +msgstr "وضعیت Øذ٠شد." + +#: actions/version.php:161 +msgid "Contributors" +msgstr "" + +#: actions/version.php:168 +msgid "" +"StatusNet is free software: you can redistribute it and/or modify it under " +"the terms of the GNU Affero General Public License as published by the Free " +"Software Foundation, either version 3 of the License, or (at your option) " +"any later version. " +msgstr "" + +#: actions/version.php:174 +msgid "" +"This program is distributed in the hope that it will be useful, but WITHOUT " +"ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or " +"FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License " +"for more details. " +msgstr "" + +#: actions/version.php:180 +#, php-format +msgid "" +"You should have received a copy of the GNU Affero General Public License " +"along with this program. If not, see %s." +msgstr "" + +#: actions/version.php:189 +msgid "Plugins" +msgstr "" + +#: actions/version.php:195 +#, fuzzy +msgid "Name" +msgstr "نام کاربری" + +#: actions/version.php:196 lib/action.php:741 +#, fuzzy +msgid "Version" +msgstr "شخصی" + +#: actions/version.php:197 +#, fuzzy +msgid "Author(s)" +msgstr "مؤلÙ" + +#: actions/version.php:198 lib/groupeditform.php:172 +msgid "Description" +msgstr "" + #: classes/File.php:137 #, php-format msgid "" @@ -3929,7 +3926,7 @@ msgstr "مشکل در ذخیره کردن Ø¢Ú¯Ù‡ÛŒ." msgid "DB error inserting reply: %s" msgstr "" -#: classes/Notice.php:1361 +#: classes/Notice.php:1359 #, php-format msgid "RT @%1$s %2$s" msgstr "" @@ -3975,149 +3972,144 @@ msgstr "دیگر" msgid "Other options" msgstr "انتخابات دیگر" -#: lib/action.php:144 -#, php-format -msgid "%s - %s" -msgstr "" - #: lib/action.php:159 msgid "Untitled page" msgstr "صÙØÙ‡ ÛŒ بدون عنوان" -#: lib/action.php:426 +#: lib/action.php:427 msgid "Primary site navigation" msgstr "" -#: lib/action.php:432 +#: lib/action.php:433 msgid "Home" msgstr "خانه" -#: lib/action.php:432 +#: lib/action.php:433 msgid "Personal profile and friends timeline" msgstr "" -#: lib/action.php:434 +#: lib/action.php:435 msgid "Account" msgstr "Øساب کاربری" -#: lib/action.php:434 +#: lib/action.php:435 msgid "Change your email, avatar, password, profile" msgstr "آدرس ایمیل، آواتار، کلمه ÛŒ عبور، پروÙایل خود را تغییر دهید" -#: lib/action.php:437 +#: lib/action.php:438 msgid "Connect" msgstr "وصل‌شدن" -#: lib/action.php:437 +#: lib/action.php:438 msgid "Connect to services" msgstr "متصل شدن به خدمات" -#: lib/action.php:441 +#: lib/action.php:442 msgid "Change site configuration" msgstr "تغییر پیکربندی سایت" -#: lib/action.php:445 lib/subgroupnav.php:105 +#: lib/action.php:446 lib/subgroupnav.php:105 msgid "Invite" msgstr "دعوت‌کردن" -#: lib/action.php:446 lib/subgroupnav.php:106 +#: lib/action.php:447 lib/subgroupnav.php:106 #, php-format msgid "Invite friends and colleagues to join you on %s" msgstr " به شما ملØÙ‚ شوند %s دوستان Ùˆ همکاران را دعوت کنید تا در" -#: lib/action.php:451 +#: lib/action.php:452 msgid "Logout" msgstr "خروج" -#: lib/action.php:451 +#: lib/action.php:452 msgid "Logout from the site" msgstr "خارج شدن از سایت ." -#: lib/action.php:456 +#: lib/action.php:457 msgid "Create an account" msgstr "یک Øساب کاربری بسازید" -#: lib/action.php:459 +#: lib/action.php:460 msgid "Login to the site" msgstr "ورود به وب‌گاه" -#: lib/action.php:462 lib/action.php:725 +#: lib/action.php:463 lib/action.php:726 msgid "Help" msgstr "Ú©Ù…Ú©" -#: lib/action.php:462 +#: lib/action.php:463 msgid "Help me!" msgstr "به من Ú©Ù…Ú© کنید!" -#: lib/action.php:465 lib/searchaction.php:127 +#: lib/action.php:466 lib/searchaction.php:127 msgid "Search" msgstr "جست‌وجو" -#: lib/action.php:465 +#: lib/action.php:466 msgid "Search for people or text" msgstr "جستجو برای شخص با متن" -#: lib/action.php:486 +#: lib/action.php:487 msgid "Site notice" msgstr "خبر سایت" -#: lib/action.php:552 +#: lib/action.php:553 msgid "Local views" msgstr "دید Ù…ØÙ„ÛŒ" -#: lib/action.php:618 +#: lib/action.php:619 msgid "Page notice" msgstr "خبر صÙØÙ‡" -#: lib/action.php:720 +#: lib/action.php:721 msgid "Secondary site navigation" msgstr "" -#: lib/action.php:727 +#: lib/action.php:728 msgid "About" msgstr "دربارهٔ" -#: lib/action.php:729 +#: lib/action.php:730 msgid "FAQ" msgstr "سوال‌های رایج" -#: lib/action.php:733 +#: lib/action.php:734 msgid "TOS" msgstr "" -#: lib/action.php:736 +#: lib/action.php:737 msgid "Privacy" msgstr "خصوصی" -#: lib/action.php:738 +#: lib/action.php:739 msgid "Source" msgstr "منبع" -#: lib/action.php:740 +#: lib/action.php:743 msgid "Contact" msgstr "تماس" -#: lib/action.php:742 +#: lib/action.php:745 msgid "Badge" msgstr "" -#: lib/action.php:770 +#: lib/action.php:773 msgid "StatusNet software license" msgstr "StatusNet مجوز نرم اÙزار" -#: lib/action.php:773 +#: lib/action.php:776 #, php-format msgid "" "**%%site.name%%** is a microblogging service brought to you by [%%site." "broughtby%%](%%site.broughtbyurl%%). " msgstr "" -#: lib/action.php:775 +#: lib/action.php:778 #, php-format msgid "**%%site.name%%** is a microblogging service. " msgstr "" -#: lib/action.php:777 +#: lib/action.php:780 #, php-format msgid "" "It runs the [StatusNet](http://status.net/) microblogging software, version %" @@ -4125,31 +4117,31 @@ msgid "" "org/licensing/licenses/agpl-3.0.html)." msgstr "" -#: lib/action.php:791 +#: lib/action.php:794 msgid "Site content license" msgstr "مجوز Ù…Øتویات سایت" -#: lib/action.php:800 +#: lib/action.php:803 msgid "All " msgstr "همه " -#: lib/action.php:805 +#: lib/action.php:808 msgid "license." msgstr "مجوز." -#: lib/action.php:1099 +#: lib/action.php:1102 msgid "Pagination" msgstr "صÙØÙ‡ بندى" -#: lib/action.php:1108 +#: lib/action.php:1111 msgid "After" msgstr "بعد از" -#: lib/action.php:1116 +#: lib/action.php:1119 msgid "Before" msgstr "قبل از" -#: lib/action.php:1164 +#: lib/action.php:1167 msgid "There was a problem with your session token." msgstr "" @@ -4157,27 +4149,32 @@ msgstr "" msgid "You cannot make changes to this site." msgstr "شما نمی توانید در این سایت تغیری ایجاد کنید" -#: lib/adminpanelaction.php:195 +#: lib/adminpanelaction.php:107 +#, fuzzy +msgid "Changes to that panel are not allowed." +msgstr "اجازه‌ی ثبت نام داده نشده است." + +#: lib/adminpanelaction.php:206 msgid "showForm() not implemented." msgstr "" -#: lib/adminpanelaction.php:224 +#: lib/adminpanelaction.php:235 msgid "saveSettings() not implemented." msgstr "" -#: lib/adminpanelaction.php:247 +#: lib/adminpanelaction.php:258 msgid "Unable to delete design setting." msgstr "نمی توان تنظیمات طراØÛŒ شده را پاک کرد ." -#: lib/adminpanelaction.php:300 +#: lib/adminpanelaction.php:312 msgid "Basic site configuration" msgstr "پیکره بندی اصلی سایت" -#: lib/adminpanelaction.php:303 +#: lib/adminpanelaction.php:317 msgid "Design configuration" msgstr "" -#: lib/adminpanelaction.php:306 lib/adminpanelaction.php:309 +#: lib/adminpanelaction.php:322 lib/adminpanelaction.php:327 msgid "Paths configuration" msgstr "" @@ -4201,11 +4198,21 @@ msgstr "" msgid "Tags for this attachment" msgstr "" +#: lib/authenticationplugin.php:182 lib/authenticationplugin.php:187 +#, fuzzy +msgid "Password changing failed" +msgstr "تغییر گذرواژه" + +#: lib/authenticationplugin.php:197 +#, fuzzy +msgid "Password changing is not allowed" +msgstr "تغییر گذرواژه" + #: lib/channel.php:138 lib/channel.php:158 msgid "Command results" msgstr "نتیجه دستور" -#: lib/channel.php:210 +#: lib/channel.php:210 lib/mailhandler.php:142 msgid "Command complete" msgstr "دستور انجام شد" @@ -4218,8 +4225,8 @@ msgid "Sorry, this command is not yet implemented." msgstr "متاسÙانه این دستور هنوز اجرا نشده." #: lib/command.php:88 -#, php-format -msgid "Could not find a user with nickname %s" +#, fuzzy, php-format +msgid "Could not find a user with nickname %s." msgstr "پیدا نشد %s کاریری یا نام مستعار" #: lib/command.php:92 @@ -4227,9 +4234,9 @@ msgid "It does not make a lot of sense to nudge yourself!" msgstr "" #: lib/command.php:99 -#, php-format -msgid "Nudge sent to %s" -msgstr "" +#, fuzzy, php-format +msgid "Nudge sent to %s." +msgstr "Ùرتادن اژیر" #: lib/command.php:126 #, php-format @@ -4243,34 +4250,36 @@ msgstr "" "خبر : %3$s" #: lib/command.php:152 lib/command.php:399 lib/command.php:460 -msgid "Notice with that id does not exist" +#, fuzzy +msgid "Notice with that id does not exist." msgstr "خبری با این مشخصه ایجاد نشد" #: lib/command.php:168 lib/command.php:415 lib/command.php:476 #: lib/command.php:532 -msgid "User has no last notice" +#, fuzzy +msgid "User has no last notice." msgstr "کاربر Ø¢Ú¯Ù‡ÛŒ آخر ندارد" #: lib/command.php:190 msgid "Notice marked as fave." msgstr "" -#: lib/command.php:315 -#, php-format -msgid "%1$s (%2$s)" -msgstr "" +#: lib/command.php:284 +#, fuzzy, php-format +msgid "Could not remove user %1$s to group %2$s." +msgstr "خارج شدن %s از گروه %s نا موÙÙ‚ بود" #: lib/command.php:318 -#, php-format -msgid "Fullname: %s" +#, fuzzy, php-format +msgid "Full name: %s" msgstr "نام کامل : %s" -#: lib/command.php:321 +#: lib/command.php:321 lib/mail.php:254 #, php-format msgid "Location: %s" msgstr "موقعیت : %s" -#: lib/command.php:324 +#: lib/command.php:324 lib/mail.php:256 #, php-format msgid "Homepage: %s" msgstr "صÙØÙ‡ خانگی : %s" @@ -4281,8 +4290,8 @@ msgid "About: %s" msgstr "درباره ÛŒ : %s" #: lib/command.php:358 scripts/xmppdaemon.php:301 -#, php-format -msgid "Message too long - maximum is %d characters, you sent %d" +#, fuzzy, php-format +msgid "Message too long - maximum is %1$d characters, you sent %2$d." msgstr "" "پیغام بسیار طولانی است - بیشترین اندازه امکان پذیر %d کاراکتر است , شما %d " "تا Ùرستادید" @@ -4291,39 +4300,33 @@ msgstr "" msgid "Error sending direct message." msgstr "خطا در Ùرستادن پیام مستقیم." -#: lib/command.php:422 -msgid "Cannot repeat your own notice" -msgstr "نمی توان Ø¢Ú¯Ù‡ÛŒ خودتان را تکرار کرد" - -#: lib/command.php:427 -msgid "Already repeated that notice" -msgstr "آن Ø¢Ú¯Ù‡ÛŒ قبلا تکرار شده است." - #: lib/command.php:435 -#, php-format -msgid "Notice from %s repeated" -msgstr "" +#, fuzzy, php-format +msgid "Notice from %s repeated." +msgstr "Ø¢Ú¯Ù‡ÛŒ تکرار شد" #: lib/command.php:437 msgid "Error repeating notice." msgstr "خطا هنگام تکرار Ø¢Ú¯Ù‡ÛŒ." #: lib/command.php:491 -#, php-format -msgid "Notice too long - maximum is %d characters, you sent %d" +#, fuzzy, php-format +msgid "Notice too long - maximum is %1$d characters, you sent %2$d." msgstr "" +"پیغام بسیار طولانی است - بیشترین اندازه امکان پذیر %d کاراکتر است , شما %d " +"تا Ùرستادید" #: lib/command.php:500 -#, php-format -msgid "Reply to %s sent" -msgstr "" +#, fuzzy, php-format +msgid "Reply to %s sent." +msgstr "به این Ø¢Ú¯Ù‡ÛŒ جواب دهید" #: lib/command.php:502 msgid "Error saving notice." msgstr "خطا هنگام ذخیره ÛŒ Ø¢Ú¯Ù‡ÛŒ" #: lib/command.php:556 -msgid "Specify the name of the user to subscribe to" +msgid "Specify the name of the user to subscribe to." msgstr "" #: lib/command.php:563 @@ -4332,7 +4335,7 @@ msgid "Subscribed to %s" msgstr "" #: lib/command.php:584 -msgid "Specify the name of the user to unsubscribe from" +msgid "Specify the name of the user to unsubscribe from." msgstr "" #: lib/command.php:591 @@ -4361,17 +4364,18 @@ msgid "Can't turn on notification." msgstr "ناتوان در روشن کردن آگاه سازی." #: lib/command.php:650 -msgid "Login command is disabled" +#, fuzzy +msgid "Login command is disabled." msgstr "Ùرمان ورود از کار اÙتاده است" #: lib/command.php:664 -#, php-format -msgid "Could not create login token for %s" -msgstr "" +#, fuzzy, php-format +msgid "Could not create login token for %s." +msgstr "نمی‌توان نام‌های مستعار را ساخت." #: lib/command.php:669 #, php-format -msgid "This link is useable only once, and is good for only 2 minutes: %s" +msgid "This link is useable only once, and is good for only 2 minutes: %s." msgstr "" #: lib/command.php:685 @@ -4556,10 +4560,6 @@ msgstr "" msgid "Describe the group or topic in %d characters" msgstr "" -#: lib/groupeditform.php:172 -msgid "Description" -msgstr "" - #: lib/groupeditform.php:179 msgid "" "Location for the group, if any, like \"City, State (or Region), Country\"" @@ -4719,22 +4719,10 @@ msgid "" "Change your email address or notification options at %8$s\n" msgstr "" -#: lib/mail.php:254 -#, php-format -msgid "Location: %s\n" -msgstr "موقعیت : %s\n" - -#: lib/mail.php:256 -#, php-format -msgid "Homepage: %s\n" -msgstr "صÙØÙ‡ خانگی : %s\n" - #: lib/mail.php:258 -#, php-format -msgid "" -"Bio: %s\n" -"\n" -msgstr "" +#, fuzzy, php-format +msgid "Bio: %s" +msgstr "موقعیت : %s" #: lib/mail.php:286 #, php-format @@ -4874,6 +4862,27 @@ msgstr "" msgid "from" msgstr "از" +#: lib/mailhandler.php:37 +msgid "Could not parse message." +msgstr "نمی‌توان پیام را تجزیه کرد." + +#: lib/mailhandler.php:42 +msgid "Not a registered user." +msgstr "یک کاربر ثبت نام شده نیستید" + +#: lib/mailhandler.php:46 +msgid "Sorry, that is not your incoming email address." +msgstr "با عرض پوزش، این پست الکترونیک شما نیست." + +#: lib/mailhandler.php:50 +msgid "Sorry, no incoming email allowed." +msgstr "با عرض پوزش، اجازه‌ی ورودی پست الکترونیک وجود ندارد" + +#: lib/mailhandler.php:228 +#, fuzzy, php-format +msgid "Unsupported message type: %s" +msgstr "Ùرمت(Ùایل) عکس پشتیبانی نشده." + #: lib/mediafile.php:98 lib/mediafile.php:123 msgid "There was a database error while saving your file. Please try again." msgstr "" @@ -4906,7 +4915,7 @@ msgid "File upload stopped by extension." msgstr "" #: lib/mediafile.php:179 lib/mediafile.php:216 -msgid "File exceeds user's quota!" +msgid "File exceeds user's quota." msgstr "" #: lib/mediafile.php:196 lib/mediafile.php:233 @@ -4914,8 +4923,9 @@ msgid "File could not be moved to destination directory." msgstr "Ùایل نتوانست به دایرکتوری مقصد منتقل شود." #: lib/mediafile.php:201 lib/mediafile.php:237 -msgid "Could not determine file's mime-type!" -msgstr "" +#, fuzzy +msgid "Could not determine file's MIME type." +msgstr "نمی‌توان کاربر منبع را تعیین کرد." #: lib/mediafile.php:270 #, php-format @@ -4924,7 +4934,7 @@ msgstr "تلاش برای امتØان نوع دیگر %s" #: lib/mediafile.php:275 #, php-format -msgid "%s is not a supported filetype on this server." +msgid "%s is not a supported file type on this server." msgstr "" #: lib/messageform.php:120 @@ -4957,7 +4967,17 @@ msgid "Attach a file" msgstr "یک Ùایل ضمیمه کنید" #: lib/noticeform.php:212 -msgid "Share your location" +#, fuzzy +msgid "Share my location." +msgstr "نمی‌توان تنظیمات مکانی را تنظیم کرد." + +#: lib/noticeform.php:214 +#, fuzzy +msgid "Do not share my location." +msgstr "نمی‌توان تنظیمات مکانی را تنظیم کرد." + +#: lib/noticeform.php:215 +msgid "Hide this info" msgstr "" #: lib/noticelist.php:428 @@ -5074,6 +5094,10 @@ msgstr "پیام های Ùرستاده شده به وسیله ÛŒ شما" msgid "Tags in %s's notices" msgstr "" +#: lib/plugin.php:114 +msgid "Unknown" +msgstr "" + #: lib/profileaction.php:109 lib/profileaction.php:192 lib/subgroupnav.php:82 msgid "Subscriptions" msgstr "اشتراک‌ها" @@ -5244,10 +5268,6 @@ msgstr "" msgid "People Tagcloud as tagged" msgstr "" -#: lib/subscriptionlist.php:126 -msgid "(none)" -msgstr "(هیج)" - #: lib/tagcloudsection.php:56 msgid "None" msgstr "هیچ" @@ -5361,19 +5381,3 @@ msgstr "%s یک رنگ صØÛŒØ Ù†ÛŒØ³Øª!" #, php-format msgid "%s is not a valid color! Use 3 or 6 hex chars." msgstr "%s یک رنگ صØÛŒØ Ù†ÛŒØ³Øª! از Û³ یا Û¶ Øر٠مبنای شانزده استÙاده کنید" - -#: scripts/maildaemon.php:48 -msgid "Could not parse message." -msgstr "نمی‌توان پیام را تجزیه کرد." - -#: scripts/maildaemon.php:53 -msgid "Not a registered user." -msgstr "یک کاربر ثبت نام شده نیستید" - -#: scripts/maildaemon.php:57 -msgid "Sorry, that is not your incoming email address." -msgstr "با عرض پوزش، این پست الکترونیک شما نیست." - -#: scripts/maildaemon.php:61 -msgid "Sorry, no incoming email allowed." -msgstr "با عرض پوزش، اجازه‌ی ورودی پست الکترونیک وجود ندارد" diff --git a/locale/fi/LC_MESSAGES/statusnet.po b/locale/fi/LC_MESSAGES/statusnet.po index d65283943..783946114 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-01-03 10:37+0000\n" -"PO-Revision-Date: 2010-01-03 10:37:45+0000\n" +"POT-Creation-Date: 2010-01-10 11:27+0000\n" +"PO-Revision-Date: 2010-01-10 11:28:03+0000\n" "Language-Team: Finnish\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha (r60575); Translate extension (2009-12-06)\n" +"X-Generator: MediaWiki 1.16alpha (r60888); Translate extension (2010-01-04)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: fi\n" "X-Message-Group: out-statusnet\n" @@ -52,11 +52,6 @@ msgstr "Sivua ei ole." msgid "No such user." msgstr "Käyttäjää ei ole." -#: actions/all.php:84 -#, php-format -msgid "%s and friends, page %d" -msgstr "%s ja kaverit, sivu %d" - #: actions/all.php:86 actions/all.php:167 actions/allrss.php:115 #: actions/apitimelinefriends.php:115 actions/apitimelinehome.php:115 #: lib/personalgroupnav.php:100 @@ -97,11 +92,13 @@ msgstr "" "tai lähetä päivitys itse." #: actions/all.php:134 -#, php-format +#, fuzzy, php-format msgid "" -"You can try to [nudge %s](../%s) from his profile or [post something to his " -"or her attention](%%%%action.newnotice%%%%?status_textarea=%s)." +"You can try to [nudge %1$s](../%2$s) from his profile or [post something to " +"his or her attention](%%%%action.newnotice%%%%?status_textarea=%3$s)." msgstr "" +"Ole ensimmäinen joka [lähettää päivityksen tästä aiheesta] (%%%%action." +"newnotice%%%%?status_textarea=%s)!" #: actions/all.php:137 actions/replies.php:209 actions/showstream.php:202 #, php-format @@ -125,6 +122,23 @@ msgstr "Käyttäjän %1$s ja kavereiden päivitykset palvelussa %2$s!" #: actions/apiaccountupdateprofile.php:97 #: actions/apiaccountupdateprofilebackgroundimage.php:94 #: actions/apiaccountupdateprofilecolors.php:118 +#: actions/apidirectmessage.php:156 actions/apifavoritecreate.php:99 +#: actions/apifavoritedestroy.php:100 actions/apifriendshipscreate.php:100 +#: actions/apifriendshipsdestroy.php:100 actions/apifriendshipsshow.php:129 +#: actions/apigroupcreate.php:136 actions/apigroupismember.php:114 +#: actions/apigroupjoin.php:155 actions/apigroupleave.php:141 +#: actions/apigrouplist.php:132 actions/apigrouplistall.php:120 +#: actions/apigroupmembership.php:106 actions/apigroupshow.php:105 +#: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102 +#: actions/apistatusesretweets.php:112 actions/apistatusesshow.php:108 +#: actions/apistatusnetconfig.php:133 actions/apistatusnetversion.php:93 +#: actions/apisubscriptions.php:111 actions/apitimelinefavorites.php:146 +#: actions/apitimelinefriends.php:156 actions/apitimelinegroup.php:150 +#: actions/apitimelinehome.php:156 actions/apitimelinementions.php:151 +#: actions/apitimelinepublic.php:131 actions/apitimelineretweetedbyme.php:122 +#: actions/apitimelineretweetedtome.php:121 +#: actions/apitimelineretweetsofme.php:122 actions/apitimelinetag.php:141 +#: actions/apitimelineuser.php:165 actions/apiusershow.php:101 #, fuzzy msgid "API method not found." msgstr "API-metodia ei löytynyt!" @@ -183,6 +197,9 @@ msgstr "" #: actions/apiaccountupdateprofilebackgroundimage.php:146 #: actions/apiaccountupdateprofilecolors.php:164 #: actions/apiaccountupdateprofilecolors.php:174 +#: actions/groupdesignsettings.php:287 actions/groupdesignsettings.php:297 +#: actions/userdesignsettings.php:210 actions/userdesignsettings.php:220 +#: actions/userdesignsettings.php:263 actions/userdesignsettings.php:273 #, fuzzy msgid "Unable to save your design settings." msgstr "Twitter-asetuksia ei voitu tallentaa!" @@ -226,26 +243,6 @@ msgstr "Suorat viestit käyttäjälle %s" msgid "All the direct messages sent to %s" msgstr "Kaikki suorat viestit käyttäjälle %s" -#: actions/apidirectmessage.php:156 actions/apifavoritecreate.php:99 -#: actions/apifavoritedestroy.php:100 actions/apifriendshipscreate.php:100 -#: actions/apifriendshipsdestroy.php:100 actions/apifriendshipsshow.php:129 -#: actions/apigroupcreate.php:136 actions/apigroupismember.php:114 -#: actions/apigroupjoin.php:155 actions/apigroupleave.php:141 -#: actions/apigrouplist.php:132 actions/apigrouplistall.php:120 -#: actions/apigroupmembership.php:106 actions/apigroupshow.php:105 -#: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102 -#: actions/apistatusesretweets.php:112 actions/apistatusesshow.php:108 -#: actions/apistatusnetconfig.php:133 actions/apistatusnetversion.php:93 -#: actions/apisubscriptions.php:111 actions/apitimelinefavorites.php:146 -#: actions/apitimelinefriends.php:156 actions/apitimelinegroup.php:150 -#: actions/apitimelinehome.php:156 actions/apitimelinementions.php:151 -#: actions/apitimelinepublic.php:131 actions/apitimelineretweetedbyme.php:122 -#: actions/apitimelineretweetedtome.php:121 -#: actions/apitimelineretweetsofme.php:122 actions/apitimelinetag.php:141 -#: actions/apitimelineuser.php:165 actions/apiusershow.php:101 -msgid "API method not found!" -msgstr "API-metodia ei löytynyt!" - #: actions/apidirectmessagenew.php:126 msgid "No message text!" msgstr "Viestissä ei ole tekstiä!" @@ -270,7 +267,8 @@ msgid "No status found with that ID." msgstr "Käyttäjätunnukselle ei löytynyt statusviestiä." #: actions/apifavoritecreate.php:119 -msgid "This status is already a favorite!" +#, fuzzy +msgid "This status is already a favorite." msgstr "Tämä päivitys on jo suosikki!" #: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:176 @@ -278,7 +276,8 @@ msgid "Could not create favorite." msgstr "Ei voitu lisätä suosikiksi." #: actions/apifavoritedestroy.php:122 -msgid "That status is not a favorite!" +#, fuzzy +msgid "That status is not a favorite." msgstr "Tämä päivitys ei ole suosikki!" #: actions/apifavoritedestroy.php:134 actions/disfavor.php:87 @@ -299,7 +298,8 @@ msgid "Could not unfollow user: User not found." msgstr "Ei voitu lopettaa tilausta: Käyttäjää ei löytynyt." #: actions/apifriendshipsdestroy.php:120 -msgid "You cannot unfollow yourself!" +#, fuzzy +msgid "You cannot unfollow yourself." msgstr "Et voi lopettaa itsesi tilausta!" #: actions/apifriendshipsexists.php:94 @@ -388,7 +388,7 @@ msgstr "Alias ei voi olla sama kuin ryhmätunnus." msgid "Group not found!" msgstr "Ryhmää ei löytynyt!" -#: actions/apigroupjoin.php:110 +#: actions/apigroupjoin.php:110 actions/joingroup.php:90 lib/command.php:217 msgid "You are already a member of that group." msgstr "Sinä kuulut jo tähän ryhmään." @@ -396,18 +396,18 @@ msgstr "Sinä kuulut jo tähän ryhmään." msgid "You have been blocked from that group by the admin." msgstr "Sinut on estetty osallistumasta tähän ryhmään ylläpitäjän toimesta." -#: actions/apigroupjoin.php:138 -#, php-format -msgid "Could not join user %s to group %s." +#: actions/apigroupjoin.php:138 actions/joingroup.php:128 lib/command.php:234 +#, fuzzy, php-format +msgid "Could not join user %1$s to group %2$s." msgstr "Käyttäjä %s ei voinut liittyä ryhmään %s." #: actions/apigroupleave.php:114 msgid "You are not a member of this group." msgstr "Sinä et kuulu tähän ryhmään." -#: actions/apigroupleave.php:124 -#, php-format -msgid "Could not remove user %s to group %s." +#: actions/apigroupleave.php:124 actions/leavegroup.php:127 +#, fuzzy, php-format +msgid "Could not remove user %1$s from group %2$s." msgstr "Ei voitu poistaa käyttäjää %s ryhmästä %s" #: actions/apigrouplist.php:95 @@ -415,11 +415,6 @@ msgstr "Ei voitu poistaa käyttäjää %s ryhmästä %s" msgid "%s's groups" msgstr "Käyttäjän %s ryhmät" -#: actions/apigrouplist.php:103 -#, fuzzy, php-format -msgid "Groups %s is a member of on %s." -msgstr "Ryhmät, joiden jäsen %s on" - #: actions/apigrouplistall.php:90 actions/usergroups.php:62 #, php-format msgid "%s groups" @@ -443,12 +438,12 @@ msgstr "Et voi poistaa toisen käyttäjän päivitystä." msgid "No such notice." msgstr "Päivitystä ei ole." -#: actions/apistatusesretweet.php:83 +#: actions/apistatusesretweet.php:83 lib/command.php:422 #, fuzzy msgid "Cannot repeat your own notice." msgstr "Ilmoituksia ei voi pistää päälle." -#: actions/apistatusesretweet.php:91 +#: actions/apistatusesretweet.php:91 lib/command.php:427 #, fuzzy msgid "Already repeated that notice." msgstr "Poista tämä päivitys" @@ -462,7 +457,7 @@ msgid "No status with that ID found." msgstr "Käyttäjätunnukselle ei löytynyt statusviestiä." #: actions/apistatusesupdate.php:157 actions/newnotice.php:155 -#: scripts/maildaemon.php:71 +#: lib/mailhandler.php:60 #, php-format msgid "That's too long. Max notice size is %d chars." msgstr "Päivitys on liian pitkä. Maksimipituus on %d merkkiä." @@ -481,13 +476,13 @@ msgid "Unsupported format." msgstr "Formaattia ei ole tuettu." #: actions/apitimelinefavorites.php:108 -#, php-format -msgid "%s / Favorites from %s" +#, fuzzy, php-format +msgid "%1$s / Favorites from %2$s" msgstr "%s / Käyttäjän %s suosikit" #: actions/apitimelinefavorites.php:120 -#, php-format -msgid "%s updates favorited by %s / %s." +#, fuzzy, php-format +msgid "%1$s updates favorited by %2$s / %2$s." msgstr " Palvelun %s päivitykset, jotka %s / %s on merkinnyt suosikikseen." #: actions/apitimelinegroup.php:109 actions/apitimelineuser.php:118 @@ -556,8 +551,11 @@ msgstr "Ei löytynyt." msgid "No such attachment." msgstr "Liitettä ei ole." -#: actions/avatarbynickname.php:59 actions/grouprss.php:91 -#: actions/leavegroup.php:76 +#: actions/avatarbynickname.php:59 actions/blockedfromgroup.php:73 +#: actions/editgroup.php:84 actions/groupdesignsettings.php:84 +#: actions/grouplogo.php:86 actions/groupmembers.php:76 +#: actions/grouprss.php:91 actions/joingroup.php:76 actions/leavegroup.php:76 +#: actions/showgroup.php:121 msgid "No nickname." msgstr "Tunnusta ei ole." @@ -580,8 +578,8 @@ msgid "You can upload your personal avatar. The maximum file size is %s." msgstr "Voit ladata oman profiilikuvasi. Maksimikoko on %s." #: actions/avatarsettings.php:106 actions/avatarsettings.php:185 -#: actions/grouplogo.php:178 actions/remotesubscribe.php:191 -#: actions/userauthorization.php:72 actions/userrss.php:103 +#: actions/remotesubscribe.php:191 actions/userauthorization.php:72 +#: actions/userrss.php:103 msgid "User without matching profile" msgstr "Käyttäjälle ei löydy profiilia" @@ -613,9 +611,9 @@ msgstr "Lataa" msgid "Crop" msgstr "Rajaa" -#: actions/avatarsettings.php:268 actions/disfavor.php:74 -#: actions/emailsettings.php:238 actions/favor.php:75 actions/geocode.php:50 -#: actions/groupblock.php:66 actions/grouplogo.php:309 +#: actions/avatarsettings.php:268 actions/deletenotice.php:157 +#: actions/disfavor.php:74 actions/emailsettings.php:238 actions/favor.php:75 +#: actions/geocode.php:50 actions/groupblock.php:66 actions/grouplogo.php:309 #: actions/groupunblock.php:66 actions/imsettings.php:206 #: actions/invite.php:56 actions/login.php:135 actions/makeadmin.php:66 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80 @@ -697,18 +695,14 @@ msgstr "Estä tämä käyttäjä" msgid "Failed to save block information." msgstr "Käyttäjän estotiedon tallennus epäonnistui." -#: actions/blockedfromgroup.php:73 actions/editgroup.php:84 -#: actions/groupdesignsettings.php:84 actions/grouplogo.php:86 -#: actions/groupmembers.php:76 actions/joingroup.php:76 -#: actions/showgroup.php:121 -msgid "No nickname" -msgstr "Tunnusta ei ole." - #: actions/blockedfromgroup.php:80 actions/editgroup.php:96 +#: actions/foafgroup.php:44 actions/foafgroup.php:62 actions/groupblock.php:86 #: actions/groupbyid.php:83 actions/groupdesignsettings.php:97 #: actions/grouplogo.php:99 actions/groupmembers.php:83 -#: actions/joingroup.php:83 actions/showgroup.php:137 -msgid "No such group" +#: actions/grouprss.php:98 actions/groupunblock.php:86 +#: actions/joingroup.php:83 actions/leavegroup.php:83 actions/makeadmin.php:86 +#: actions/showgroup.php:137 lib/command.php:212 lib/command.php:263 +msgid "No such group." msgstr "Tuota ryhmää ei ole." #: actions/blockedfromgroup.php:90 @@ -718,7 +712,7 @@ msgstr "Käyttäjän profiili" #: actions/blockedfromgroup.php:93 #, fuzzy, php-format -msgid "%s blocked profiles, page %d" +msgid "%1$s blocked profiles, page %2$d" msgstr "%s ja kaverit, sivu %d" #: actions/blockedfromgroup.php:108 @@ -832,12 +826,6 @@ msgstr "Älä poista tätä päivitystä" msgid "Delete this notice" msgstr "Poista tämä päivitys" -#: actions/deletenotice.php:157 -msgid "There was a problem with your session token. Try again, please." -msgstr "" -"Istuntosi avaimen kanssa oli ongelmia. Olisitko ystävällinen ja kokeilisit " -"uudelleen." - #: actions/deleteuser.php:67 msgid "You cannot delete users." msgstr "Sinä et voi poistaa käyttäjiä." @@ -863,7 +851,7 @@ msgid "Delete this user" msgstr "Poista tämä päivitys" #: actions/designadminpanel.php:62 lib/accountsettingsaction.php:124 -#: lib/adminpanelaction.php:302 lib/groupnav.php:119 +#: lib/adminpanelaction.php:316 lib/groupnav.php:119 msgid "Design" msgstr "Ulkoasu" @@ -1008,7 +996,8 @@ msgstr "Sinun pitää olla kirjautunut sisään jotta voit luoda ryhmän." #: actions/editgroup.php:103 actions/editgroup.php:168 #: actions/groupdesignsettings.php:104 actions/grouplogo.php:106 -msgid "You must be an admin to edit the group" +#, fuzzy +msgid "You must be an admin to edit the group." msgstr "Sinun pitää olla ylläpitäjä, jotta voit muokata ryhmää" #: actions/editgroup.php:154 @@ -1033,7 +1022,8 @@ msgid "Options saved." msgstr "Asetukset tallennettu." #: actions/emailsettings.php:60 -msgid "Email Settings" +#, fuzzy +msgid "Email settings" msgstr "Sähköpostiasetukset" #: actions/emailsettings.php:71 @@ -1071,8 +1061,9 @@ msgid "Cancel" msgstr "Peruuta" #: actions/emailsettings.php:121 -msgid "Email Address" -msgstr "Sähköpostiosoite" +#, fuzzy +msgid "Email address" +msgstr "Sähköpostiosoitteet" #: actions/emailsettings.php:123 msgid "Email address, like \"UserName@example.org\"" @@ -1147,9 +1138,10 @@ msgstr "Sähköpostiosoitetta ei ole." msgid "Cannot normalize that email address" msgstr "Ei voida normalisoida sähköpostiosoitetta" -#: actions/emailsettings.php:331 actions/siteadminpanel.php:157 -msgid "Not a valid email address" -msgstr "Tuo ei ole kelvollinen sähköpostiosoite" +#: actions/emailsettings.php:331 actions/register.php:201 +#: actions/siteadminpanel.php:157 +msgid "Not a valid email address." +msgstr "Tuo ei ole kelvollinen sähköpostiosoite." #: actions/emailsettings.php:334 msgid "That is already your email address." @@ -1333,18 +1325,11 @@ msgstr "Tuntematon OMB-protokollan versio." msgid "Error updating remote profile" msgstr "Virhe tapahtui etäprofiilin päivittämisessä" -#: actions/foafgroup.php:44 actions/foafgroup.php:62 actions/groupblock.php:86 -#: actions/grouprss.php:98 actions/groupunblock.php:86 -#: actions/leavegroup.php:83 actions/makeadmin.php:86 lib/command.php:212 -#: lib/command.php:263 -msgid "No such group." -msgstr "Tuota ryhmää ei ole." - -#: actions/getfile.php:75 +#: actions/getfile.php:79 msgid "No such file." msgstr "Tiedostoa ei ole." -#: actions/getfile.php:79 +#: actions/getfile.php:83 msgid "Cannot read file." msgstr "Tiedostoa ei voi lukea." @@ -1356,7 +1341,7 @@ msgstr "Profiilia ei ole määritelty." #: actions/groupblock.php:76 actions/groupunblock.php:76 #: actions/makeadmin.php:76 actions/subedit.php:53 actions/tagother.php:46 -#: lib/profileformaction.php:77 +#: actions/unsubscribe.php:84 lib/profileformaction.php:77 msgid "No profile with that ID." msgstr "Ei profiilia tuolle ID:lle." @@ -1385,9 +1370,9 @@ msgstr "Estä käyttäjä ryhmästä" #: actions/groupblock.php:162 #, php-format msgid "" -"Are you sure you want to block user \"%s\" from the group \"%s\"? They will " -"be removed from the group, unable to post, and unable to subscribe to the " -"group in the future." +"Are you sure you want to block user \"%1$s\" from the group \"%2$s\"? They " +"will be removed from the group, unable to post, and unable to subscribe to " +"the group in the future." msgstr "" #: actions/groupblock.php:178 @@ -1402,8 +1387,9 @@ msgstr "Estä tätä käyttäjää osallistumassa tähän ryhmään" msgid "Database error blocking user from group." msgstr "" -#: actions/groupbyid.php:74 -msgid "No ID" +#: actions/groupbyid.php:74 actions/userbyid.php:70 +#, fuzzy +msgid "No ID." msgstr "ID-tunnusta ei ole" #: actions/groupdesignsettings.php:68 @@ -1426,12 +1412,6 @@ msgstr "" msgid "Couldn't update your design." msgstr "Ei voitu päivittää sinun sivusi ulkoasua." -#: actions/groupdesignsettings.php:287 actions/groupdesignsettings.php:297 -#: actions/userdesignsettings.php:210 actions/userdesignsettings.php:220 -#: actions/userdesignsettings.php:263 actions/userdesignsettings.php:273 -msgid "Unable to save your design settings!" -msgstr "Ei voitu tallentaa sinun ulkoasuasetuksia!" - #: actions/groupdesignsettings.php:308 actions/userdesignsettings.php:231 msgid "Design preferences saved." msgstr "Ulkoasuasetukset tallennettu." @@ -1446,6 +1426,11 @@ msgid "" "You can upload a logo image for your group. The maximum file size is %s." msgstr "Voit ladata ryhmälle logokuvan. Maksimikoko on %s." +#: actions/grouplogo.php:178 +#, fuzzy +msgid "User without matching profile." +msgstr "Käyttäjälle ei löydy profiilia" + #: actions/grouplogo.php:362 msgid "Pick a square area of the image to be the logo." msgstr "Valitse neliön muotoinen alue kuvasta logokuvaksi" @@ -1464,15 +1449,15 @@ msgid "%s group members" msgstr "Ryhmän %s jäsenet" #: actions/groupmembers.php:96 -#, php-format -msgid "%s group members, page %d" +#, fuzzy, php-format +msgid "%1$s group members, page %2$d" msgstr "Ryhmän %s jäsenet, sivu %d" #: actions/groupmembers.php:111 msgid "A list of the users in this group." msgstr "Lista ryhmän käyttäjistä." -#: actions/groupmembers.php:175 lib/action.php:441 lib/groupnav.php:107 +#: actions/groupmembers.php:175 lib/action.php:442 lib/groupnav.php:107 msgid "Admin" msgstr "Ylläpito" @@ -1567,7 +1552,8 @@ msgid "Error removing the block." msgstr "Tapahtui virhe, kun estoa poistettiin." #: actions/imsettings.php:59 -msgid "IM Settings" +#, fuzzy +msgid "IM settings" msgstr "Pikaviestiasetukset" #: actions/imsettings.php:70 @@ -1598,7 +1584,8 @@ msgstr "" "ystävälistaasi?)" #: actions/imsettings.php:124 -msgid "IM Address" +#, fuzzy +msgid "IM address" msgstr "Pikaviestiosoite" #: actions/imsettings.php:126 @@ -1662,11 +1649,6 @@ msgstr "" msgid "That is not your Jabber ID." msgstr "Tämä ei ole Jabber ID-tunnuksesi." -#: actions/inbox.php:59 -#, php-format -msgid "Inbox for %s - page %d" -msgstr "Saapuneet viestit käyttäjälle %s - sivu %d" - #: actions/inbox.php:62 #, php-format msgid "Inbox for %s" @@ -1704,10 +1686,10 @@ msgstr "Kutsu uusia käyttäjiä" msgid "You are already subscribed to these users:" msgstr "Olet jos tilannut seuraavien käyttäjien päivitykset:" -#: actions/invite.php:131 actions/invite.php:139 +#: actions/invite.php:131 actions/invite.php:139 lib/command.php:315 #, php-format -msgid "%s (%s)" -msgstr "%s (%s)" +msgid "%1$s (%2$s)" +msgstr "%1$s (%2$s)" #: actions/invite.php:136 msgid "" @@ -1751,7 +1733,7 @@ msgstr "Henkilökohtainen viesti" msgid "Optionally add a personal message to the invitation." msgstr "Voit myös lisätä oman viestisi kutsuun" -#: actions/invite.php:197 lib/messageform.php:178 lib/noticeform.php:232 +#: actions/invite.php:197 lib/messageform.php:178 lib/noticeform.php:234 msgid "Send" msgstr "Lähetä" @@ -1820,18 +1802,9 @@ msgstr "" msgid "You must be logged in to join a group." msgstr "Sinun pitää olla kirjautunut sisään, jos haluat liittyä ryhmään." -#: actions/joingroup.php:90 lib/command.php:217 -msgid "You are already a member of that group" -msgstr "Sinä kuulut jo tähän ryhmään " - -#: actions/joingroup.php:128 lib/command.php:234 -#, php-format -msgid "Could not join user %s to group %s" -msgstr "Käyttäjää %s ei voinut liittää ryhmään %s" - #: actions/joingroup.php:135 lib/command.php:239 -#, php-format -msgid "%s joined group %s" +#, fuzzy, php-format +msgid "%1$s joined group %2$s" msgstr "%s liittyi ryhmään %s" #: actions/leavegroup.php:60 @@ -1846,14 +1819,9 @@ msgstr "Sinä et kuulu tähän ryhmään." msgid "Could not find membership record." msgstr "Ei löydetty käyttäjän jäsenyystietoja." -#: actions/leavegroup.php:127 lib/command.php:284 -#, php-format -msgid "Could not remove user %s to group %s" -msgstr "Ei voitu poistaa käyttäjää %s ryhmästä %s" - #: actions/leavegroup.php:134 lib/command.php:289 -#, php-format -msgid "%s left group %s" +#, fuzzy, php-format +msgid "%1$s left group %2$s" msgstr "%s erosi ryhmästä %s" #: actions/login.php:83 actions/register.php:137 @@ -1874,7 +1842,7 @@ msgstr "Väärä käyttäjätunnus tai salasana" msgid "Error setting user. You are probably not authorized." msgstr "Sinulla ei ole valtuutusta tähän." -#: actions/login.php:208 actions/login.php:261 lib/action.php:459 +#: actions/login.php:208 actions/login.php:261 lib/action.php:460 #: lib/logingroupnav.php:79 msgid "Login" msgstr "Kirjaudu sisään" @@ -1931,18 +1899,18 @@ msgid "Only an admin can make another user an admin." msgstr "Vain ylläpitäjä voi tehdä toisesta käyttäjästä ylläpitäjän." #: actions/makeadmin.php:95 -#, php-format -msgid "%s is already an admin for group \"%s\"." +#, fuzzy, php-format +msgid "%1$s is already an admin for group \"%2$s\"." msgstr "%s on jo ryhmän \"%s\" ylläpitäjä." #: actions/makeadmin.php:132 -#, php-format -msgid "Can't get membership record for %s in group %s" +#, fuzzy, php-format +msgid "Can't get membership record for %1$s in group %2$s." msgstr "Ei saatu käyttäjän %s jäsenyystietoja ryhmästä %s" #: actions/makeadmin.php:145 -#, php-format -msgid "Can't make %s an admin for group %s" +#, fuzzy, php-format +msgid "Can't make %1$s an admin for group %2$s." msgstr "Ei voitu tehdä käyttäjästä %s ylläpitäjää ryhmään %s" #: actions/microsummary.php:69 @@ -1984,8 +1952,8 @@ msgid "Message sent" msgstr "Viesti lähetetty" #: actions/newmessage.php:185 lib/command.php:376 -#, php-format -msgid "Direct message to %s sent" +#, fuzzy, php-format +msgid "Direct message to %s sent." msgstr "Suora viesti käyttäjälle %s lähetetty" #: actions/newmessage.php:210 actions/newnotice.php:245 lib/channel.php:170 @@ -2015,7 +1983,7 @@ msgstr "Tekstihaku" #: actions/noticesearch.php:91 #, fuzzy, php-format -msgid "Search results for \"%s\" on %s" +msgid "Search results for \"%1$s\" on %2$s" msgstr " Hakusyöte haulle \"%s\"" #: actions/noticesearch.php:121 @@ -2123,11 +2091,6 @@ msgstr "Näytä tai piillota profiilin ulkoasu." msgid "URL shortening service is too long (max 50 chars)." msgstr "URL-lyhennyspalvelun nimi on liian pitkä (max 50 merkkiä)." -#: actions/outbox.php:58 -#, php-format -msgid "Outbox for %s - page %d" -msgstr "Käyttäjän %s lähetetyt viestit - sivu %d" - #: actions/outbox.php:61 #, php-format msgid "Outbox for %s" @@ -2198,7 +2161,7 @@ msgstr "Uutta salasanaa ei voida tallentaa." msgid "Password saved." msgstr "Salasana tallennettu." -#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:308 +#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:326 msgid "Paths" msgstr "Polut" @@ -2231,7 +2194,7 @@ msgid "Invalid SSL server. The maximum length is 255 characters." msgstr "" #: actions/pathsadminpanel.php:217 actions/siteadminpanel.php:58 -#: lib/adminpanelaction.php:299 +#: lib/adminpanelaction.php:311 #, fuzzy msgid "Site" msgstr "Kutsu" @@ -2334,8 +2297,9 @@ msgid "When to use SSL" msgstr "" #: actions/pathsadminpanel.php:308 -msgid "SSL Server" -msgstr "" +#, fuzzy +msgid "SSL server" +msgstr "Palauta" #: actions/pathsadminpanel.php:309 msgid "Server to direct SSL requests to" @@ -2366,8 +2330,8 @@ msgid "Not a valid people tag: %s" msgstr "Ei sallittu henkilötagi: %s" #: actions/peopletag.php:144 -#, php-format -msgid "Users self-tagged with %s - page %d" +#, fuzzy, php-format +msgid "Users self-tagged with %1$s - page %2$d" msgstr "Käyttäjät joilla henkilötagi %s - sivu %d" #: actions/postnotice.php:84 @@ -2376,7 +2340,7 @@ msgstr "Päivityksen sisältö ei kelpaa" #: actions/postnotice.php:90 #, php-format -msgid "Notice license ‘%s’ is not compatible with site license ‘%s’." +msgid "Notice license ‘%1$s’ is not compatible with site license ‘%2$s’." msgstr "" #: actions/profilesettings.php:60 @@ -2501,20 +2465,20 @@ msgstr "Virheellinen tagi: \"%s\"" msgid "Couldn't update user for autosubscribe." msgstr "Ei voitu asettaa käyttäjälle automaattista tilausta." -#: actions/profilesettings.php:354 +#: actions/profilesettings.php:359 #, fuzzy msgid "Couldn't save location prefs." msgstr "Tageja ei voitu tallentaa." -#: actions/profilesettings.php:366 +#: actions/profilesettings.php:371 msgid "Couldn't save profile." msgstr "Ei voitu tallentaa profiilia." -#: actions/profilesettings.php:374 +#: actions/profilesettings.php:379 msgid "Couldn't save tags." msgstr "Tageja ei voitu tallentaa." -#: actions/profilesettings.php:382 lib/adminpanelaction.php:126 +#: actions/profilesettings.php:387 lib/adminpanelaction.php:137 msgid "Settings saved." msgstr "Asetukset tallennettu." @@ -2611,7 +2575,7 @@ msgid "" "one!" msgstr "" -#: actions/publictagcloud.php:135 +#: actions/publictagcloud.php:131 msgid "Tag cloud" msgstr "Tagipilvi" @@ -2751,7 +2715,7 @@ msgstr "Virheellinen kutsukoodin." msgid "Registration successful" msgstr "Rekisteröityminen onnistui" -#: actions/register.php:114 actions/register.php:502 lib/action.php:456 +#: actions/register.php:114 actions/register.php:502 lib/action.php:457 #: lib/logingroupnav.php:85 msgid "Register" msgstr "Rekisteröidy" @@ -2764,10 +2728,6 @@ msgstr "Rekisteröityminen ei ole sallittu." msgid "You can't register if you don't agree to the license." msgstr "Et voi rekisteröityä, jos et hyväksy lisenssiehtoja." -#: actions/register.php:201 -msgid "Not a valid email address." -msgstr "Tuo ei ole kelvollinen sähköpostiosoite." - #: actions/register.php:212 msgid "Email address already exists." msgstr "Sähköpostiosoite on jo käytössä." @@ -2830,12 +2790,12 @@ msgstr "" "puhelinnumero." #: actions/register.php:537 -#, php-format +#, fuzzy, php-format msgid "" -"Congratulations, %s! And welcome to %%%%site.name%%%%. From here, you may " +"Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may " "want to...\n" "\n" -"* Go to [your profile](%s) and post your first message.\n" +"* Go to [your profile](%2$s) and post your first message.\n" "* Add a [Jabber/GTalk address](%%%%action.imsettings%%%%) so you can send " "notices through instant messages.\n" "* [Search for people](%%%%action.peoplesearch%%%%) that you may know or that " @@ -2967,11 +2927,6 @@ msgstr "Luotu" msgid "Replies to %s" msgstr "Vastaukset käyttäjälle %s" -#: actions/replies.php:127 -#, php-format -msgid "Replies to %s, page %d" -msgstr "Vastaukset käyttäjälle %s, sivu %d" - #: actions/replies.php:144 #, fuzzy, php-format msgid "Replies feed for %s (RSS 1.0)" @@ -2988,11 +2943,13 @@ msgid "Replies feed for %s (Atom)" msgstr "Päivityksien syöte käyttäjälle %s" #: actions/replies.php:198 -#, php-format +#, fuzzy, php-format msgid "" -"This is the timeline showing replies to %s but %s hasn't received a notice " -"to his attention yet." +"This is the timeline showing replies to %1$s but %2$s hasn't received a " +"notice to his attention yet." msgstr "" +"Tämä on käyttäjän %s aikajana, mutta %s ei ole lähettänyt vielä yhtään " +"päivitystä." #: actions/replies.php:203 #, php-format @@ -3002,11 +2959,13 @@ msgid "" msgstr "" #: actions/replies.php:205 -#, php-format +#, fuzzy, php-format msgid "" -"You can try to [nudge %s](../%s) or [post something to his or her attention]" -"(%%%%action.newnotice%%%%?status_textarea=%s)." +"You can try to [nudge %1$s](../%2$s) or [post something to his or her " +"attention](%%%%action.newnotice%%%%?status_textarea=%3$s)." msgstr "" +"Ole ensimmäinen joka [lähettää päivityksen tästä aiheesta] (%%%%action." +"newnotice%%%%?status_textarea=%s)!" #: actions/repliesrss.php:72 #, fuzzy, php-format @@ -3023,11 +2982,6 @@ msgstr "Et voi lähettää viestiä tälle käyttäjälle." msgid "User is already sandboxed." msgstr "Käyttäjä on asettanut eston sinulle." -#: actions/showfavorites.php:79 -#, fuzzy, php-format -msgid "%s's favorite notices, page %d" -msgstr "Käyttäjän %s suosikkipäivitykset, sivu %d" - #: actions/showfavorites.php:132 msgid "Could not retrieve favorite notices." msgstr "Ei saatu haettua suosikkipäivityksiä." @@ -3077,11 +3031,6 @@ msgstr "" msgid "%s group" msgstr "Ryhmä %s" -#: actions/showgroup.php:84 -#, php-format -msgid "%s group, page %d" -msgstr "Ryhmä %s, sivu %d" - #: actions/showgroup.php:218 msgid "Group profile" msgstr "Ryhmän profiili" @@ -3130,7 +3079,7 @@ msgstr "Jäsenet" #: actions/showgroup.php:386 lib/profileaction.php:117 #: lib/profileaction.php:148 lib/profileaction.php:236 lib/section.php:95 -#: lib/tagcloudsection.php:71 +#: lib/subscriptionlist.php:126 lib/tagcloudsection.php:71 msgid "(None)" msgstr "(Tyhjä)" @@ -3198,14 +3147,9 @@ msgstr "Päivitys on poistettu." msgid " tagged %s" msgstr "Päivitykset joilla on tagi %s" -#: actions/showstream.php:79 -#, php-format -msgid "%s, page %d" -msgstr "%s, sivu %d" - #: actions/showstream.php:122 #, fuzzy, php-format -msgid "Notice feed for %s tagged %s (RSS 1.0)" +msgid "Notice feed for %1$s tagged %2$s (RSS 1.0)" msgstr "Päivityssyöte ryhmälle %s" #: actions/showstream.php:129 @@ -3229,8 +3173,8 @@ msgid "FOAF for %s" msgstr "Käyttäjän %s lähetetyt viestit" #: actions/showstream.php:191 -#, php-format -msgid "This is the timeline for %s but %s hasn't posted anything yet." +#, fuzzy, php-format +msgid "This is the timeline for %1$s but %2$s hasn't posted anything yet." msgstr "" "Tämä on käyttäjän %s aikajana, mutta %s ei ole lähettänyt vielä yhtään " "päivitystä." @@ -3242,11 +3186,13 @@ msgid "" msgstr "" #: actions/showstream.php:198 -#, php-format +#, fuzzy, php-format msgid "" -"You can try to nudge %s or [post something to his or her attention](%%%%" -"action.newnotice%%%%?status_textarea=%s)." +"You can try to nudge %1$s or [post something to his or her attention](%%%%" +"action.newnotice%%%%?status_textarea=%2$s)." msgstr "" +"Ole ensimmäinen joka [lähettää päivityksen tästä aiheesta] (%%%%action." +"newnotice%%%%?status_textarea=%s)!" #: actions/showstream.php:234 #, php-format @@ -3292,12 +3238,12 @@ msgstr "" #: actions/siteadminpanel.php:154 #, fuzzy -msgid "You must have a valid contact email address" +msgid "You must have a valid contact email address." msgstr "Tuo ei ole kelvollinen sähköpostiosoite" #: actions/siteadminpanel.php:172 #, php-format -msgid "Unknown language \"%s\"" +msgid "Unknown language \"%s\"." msgstr "" #: actions/siteadminpanel.php:179 @@ -3488,7 +3434,8 @@ msgid "Save site settings" msgstr "Profiilikuva-asetukset" #: actions/smssettings.php:58 -msgid "SMS Settings" +#, fuzzy +msgid "SMS settings" msgstr "SMS-asetukset" #: actions/smssettings.php:69 @@ -3518,7 +3465,8 @@ msgid "Enter the code you received on your phone." msgstr "Syötä koodi jonka sait puhelimeesi." #: actions/smssettings.php:138 -msgid "SMS Phone number" +#, fuzzy +msgid "SMS phone number" msgstr "SMS puhelinnumero" #: actions/smssettings.php:140 @@ -3609,8 +3557,8 @@ msgid "%s subscribers" msgstr "Käyttäjän %s tilaajat" #: actions/subscribers.php:52 -#, php-format -msgid "%s subscribers, page %d" +#, fuzzy, php-format +msgid "%1$s subscribers, page %2$d" msgstr "Käyttäjän %s tilaajat, sivu %d" #: actions/subscribers.php:63 @@ -3646,8 +3594,8 @@ msgid "%s subscriptions" msgstr "Käyttäjän %s tilaukset" #: actions/subscriptions.php:54 -#, php-format -msgid "%s subscriptions, page %d" +#, fuzzy, php-format +msgid "%1$s subscriptions, page %2$d" msgstr "Käyttäjän %s tilaukset, sivu %d" #: actions/subscriptions.php:65 @@ -3682,11 +3630,6 @@ msgstr "Jabber" msgid "SMS" msgstr "SMS" -#: actions/tag.php:68 -#, php-format -msgid "Notices tagged with %s, page %d" -msgstr "Päivitykset joissa on tagi %s, sivu %d" - #: actions/tag.php:86 #, fuzzy, php-format msgid "Notice feed for tag %s (RSS 1.0)" @@ -3776,20 +3719,17 @@ msgstr "Käyttäjällä ei ole profiilia." msgid "No profile id in request." msgstr "Ei profiili id:tä kyselyssä." -#: actions/unsubscribe.php:84 -msgid "No profile with that id." -msgstr "Ei profiilia tuolla id:llä." - #: actions/unsubscribe.php:98 msgid "Unsubscribed" msgstr "Tilaus lopetettu" #: actions/updateprofile.php:62 actions/userauthorization.php:330 #, php-format -msgid "Listenee stream license ‘%s’ is not compatible with site license ‘%s’." +msgid "" +"Listenee stream license ‘%1$s’ is not compatible with site license ‘%2$s’." msgstr "" -#: actions/useradminpanel.php:58 lib/adminpanelaction.php:305 +#: actions/useradminpanel.php:58 lib/adminpanelaction.php:321 #: lib/personalgroupnav.php:115 msgid "User" msgstr "Käyttäjä" @@ -3898,7 +3838,7 @@ msgstr "" "päivitykset. Jos et valinnut haluavasi tilata jonkin käyttäjän päivityksiä, " "paina \"Peruuta\"." -#: actions/userauthorization.php:188 +#: actions/userauthorization.php:188 actions/version.php:165 msgid "License" msgstr "Lisenssi" @@ -3955,7 +3895,7 @@ msgstr "" #: actions/userauthorization.php:296 #, php-format -msgid "Listener URI ‘%s’ not found here" +msgid "Listener URI ‘%s’ not found here." msgstr "" #: actions/userauthorization.php:301 @@ -3988,11 +3928,6 @@ msgstr "Kuvan URL-osoitetta '%s' ei voi avata." msgid "Wrong image type for avatar URL ‘%s’." msgstr "Kuvan '%s' tyyppi on väärä" -#: actions/userbyid.php:70 -#, fuzzy -msgid "No ID." -msgstr "ID-tunnusta ei ole" - #: actions/userdesignsettings.php:76 lib/designsettings.php:65 #, fuzzy msgid "Profile design" @@ -4008,11 +3943,6 @@ msgstr "" msgid "Enjoy your hotdog!" msgstr "" -#: actions/usergroups.php:64 -#, php-format -msgid "%s groups, page %d" -msgstr "Käyttäjän %s ryhmät, sivu %d" - #: actions/usergroups.php:130 msgid "Search for more groups" msgstr "Hae lisää ryhmiä" @@ -4027,6 +3957,72 @@ msgstr "Sinä et kuulu tähän ryhmään." msgid "Try [searching for groups](%%action.groupsearch%%) and joining them." msgstr "" +#: actions/version.php:73 +#, fuzzy, php-format +msgid "StatusNet %s" +msgstr "Tilastot" + +#: actions/version.php:153 +#, php-format +msgid "" +"This site is powered by %1$s version %2$s, Copyright 2008-2010 StatusNet, " +"Inc. and contributors." +msgstr "" + +#: actions/version.php:157 +#, fuzzy +msgid "StatusNet" +msgstr "Päivitys poistettu." + +#: actions/version.php:161 +msgid "Contributors" +msgstr "" + +#: actions/version.php:168 +msgid "" +"StatusNet is free software: you can redistribute it and/or modify it under " +"the terms of the GNU Affero General Public License as published by the Free " +"Software Foundation, either version 3 of the License, or (at your option) " +"any later version. " +msgstr "" + +#: actions/version.php:174 +msgid "" +"This program is distributed in the hope that it will be useful, but WITHOUT " +"ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or " +"FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License " +"for more details. " +msgstr "" + +#: actions/version.php:180 +#, php-format +msgid "" +"You should have received a copy of the GNU Affero General Public License " +"along with this program. If not, see %s." +msgstr "" + +#: actions/version.php:189 +msgid "Plugins" +msgstr "" + +#: actions/version.php:195 +#, fuzzy +msgid "Name" +msgstr "Tunnus" + +#: actions/version.php:196 lib/action.php:741 +#, fuzzy +msgid "Version" +msgstr "Omat" + +#: actions/version.php:197 +msgid "Author(s)" +msgstr "" + +#: actions/version.php:198 lib/groupeditform.php:172 +msgid "Description" +msgstr "Kuvaus" + #: classes/File.php:137 #, php-format msgid "" @@ -4099,7 +4095,7 @@ msgstr "Ongelma päivityksen tallentamisessa." msgid "DB error inserting reply: %s" msgstr "Tietokantavirhe tallennettaessa vastausta: %s" -#: classes/Notice.php:1361 +#: classes/Notice.php:1359 #, fuzzy, php-format msgid "RT @%1$s %2$s" msgstr "%1$s (%2$s)" @@ -4146,140 +4142,135 @@ msgstr "Muut" msgid "Other options" msgstr "Muita asetuksia" -#: lib/action.php:144 -#, php-format -msgid "%s - %s" -msgstr "%s - %s" - #: lib/action.php:159 msgid "Untitled page" msgstr "Nimetön sivu" -#: lib/action.php:426 +#: lib/action.php:427 msgid "Primary site navigation" msgstr "Ensisijainen sivunavigointi" -#: lib/action.php:432 +#: lib/action.php:433 msgid "Home" msgstr "Koti" -#: lib/action.php:432 +#: lib/action.php:433 msgid "Personal profile and friends timeline" msgstr "Henkilökohtainen profiili ja kavereiden aikajana" -#: lib/action.php:434 +#: lib/action.php:435 msgid "Account" msgstr "Käyttäjätili" -#: lib/action.php:434 +#: lib/action.php:435 msgid "Change your email, avatar, password, profile" msgstr "Muuta sähköpostiosoitettasi, kuvaasi, salasanaasi, profiiliasi" -#: lib/action.php:437 +#: lib/action.php:438 msgid "Connect" msgstr "Yhdistä" -#: lib/action.php:437 +#: lib/action.php:438 #, fuzzy msgid "Connect to services" msgstr "Ei voitu uudelleenohjata palvelimelle: %s" -#: lib/action.php:441 +#: lib/action.php:442 #, fuzzy msgid "Change site configuration" msgstr "Ensisijainen sivunavigointi" -#: lib/action.php:445 lib/subgroupnav.php:105 +#: lib/action.php:446 lib/subgroupnav.php:105 msgid "Invite" msgstr "Kutsu" -#: lib/action.php:446 lib/subgroupnav.php:106 +#: lib/action.php:447 lib/subgroupnav.php:106 #, php-format msgid "Invite friends and colleagues to join you on %s" msgstr "Kutsu kavereita ja työkavereita liittymään palveluun %s" -#: lib/action.php:451 +#: lib/action.php:452 msgid "Logout" msgstr "Kirjaudu ulos" -#: lib/action.php:451 +#: lib/action.php:452 msgid "Logout from the site" msgstr "Kirjaudu ulos palvelusta" -#: lib/action.php:456 +#: lib/action.php:457 msgid "Create an account" msgstr "Luo uusi käyttäjätili" -#: lib/action.php:459 +#: lib/action.php:460 msgid "Login to the site" msgstr "Kirjaudu sisään palveluun" -#: lib/action.php:462 lib/action.php:725 +#: lib/action.php:463 lib/action.php:726 msgid "Help" msgstr "Ohjeet" -#: lib/action.php:462 +#: lib/action.php:463 msgid "Help me!" msgstr "Auta minua!" -#: lib/action.php:465 lib/searchaction.php:127 +#: lib/action.php:466 lib/searchaction.php:127 msgid "Search" msgstr "Haku" -#: lib/action.php:465 +#: lib/action.php:466 msgid "Search for people or text" msgstr "Hae ihmisiä tai tekstiä" -#: lib/action.php:486 +#: lib/action.php:487 msgid "Site notice" msgstr "Palvelun ilmoitus" -#: lib/action.php:552 +#: lib/action.php:553 msgid "Local views" msgstr "Paikalliset näkymät" -#: lib/action.php:618 +#: lib/action.php:619 msgid "Page notice" msgstr "Sivuilmoitus" -#: lib/action.php:720 +#: lib/action.php:721 msgid "Secondary site navigation" msgstr "Toissijainen sivunavigointi" -#: lib/action.php:727 +#: lib/action.php:728 msgid "About" msgstr "Tietoa" -#: lib/action.php:729 +#: lib/action.php:730 msgid "FAQ" msgstr "UKK" -#: lib/action.php:733 +#: lib/action.php:734 msgid "TOS" msgstr "" -#: lib/action.php:736 +#: lib/action.php:737 msgid "Privacy" msgstr "Yksityisyys" -#: lib/action.php:738 +#: lib/action.php:739 msgid "Source" msgstr "Lähdekoodi" -#: lib/action.php:740 +#: lib/action.php:743 msgid "Contact" msgstr "Ota yhteyttä" -#: lib/action.php:742 +#: lib/action.php:745 #, fuzzy msgid "Badge" msgstr "Tönäise" -#: lib/action.php:770 +#: lib/action.php:773 msgid "StatusNet software license" msgstr "StatusNet-ohjelmiston lisenssi" -#: lib/action.php:773 +#: lib/action.php:776 #, php-format msgid "" "**%%site.name%%** is a microblogging service brought to you by [%%site." @@ -4288,12 +4279,12 @@ msgstr "" "**%%site.name%%** on mikroblogipalvelu, jonka tarjoaa [%%site.broughtby%%](%%" "site.broughtbyurl%%). " -#: lib/action.php:775 +#: lib/action.php:778 #, php-format msgid "**%%site.name%%** is a microblogging service. " msgstr "**%%site.name%%** on mikroblogipalvelu. " -#: lib/action.php:777 +#: lib/action.php:780 #, php-format msgid "" "It runs the [StatusNet](http://status.net/) microblogging software, version %" @@ -4304,32 +4295,32 @@ msgstr "" "versio %s, saatavilla lisenssillä [GNU Affero General Public License](http://" "www.fsf.org/licensing/licenses/agpl-3.0.html)." -#: lib/action.php:791 +#: lib/action.php:794 #, fuzzy msgid "Site content license" msgstr "StatusNet-ohjelmiston lisenssi" -#: lib/action.php:800 +#: lib/action.php:803 msgid "All " msgstr "Kaikki " -#: lib/action.php:805 +#: lib/action.php:808 msgid "license." msgstr "lisenssi." -#: lib/action.php:1099 +#: lib/action.php:1102 msgid "Pagination" msgstr "Sivutus" -#: lib/action.php:1108 +#: lib/action.php:1111 msgid "After" msgstr "Myöhemmin" -#: lib/action.php:1116 +#: lib/action.php:1119 msgid "Before" msgstr "Aiemmin" -#: lib/action.php:1164 +#: lib/action.php:1167 msgid "There was a problem with your session token." msgstr "Istuntoavaimesi kanssa oli ongelma." @@ -4338,32 +4329,37 @@ msgstr "Istuntoavaimesi kanssa oli ongelma." msgid "You cannot make changes to this site." msgstr "Et voi lähettää viestiä tälle käyttäjälle." -#: lib/adminpanelaction.php:195 +#: lib/adminpanelaction.php:107 +#, fuzzy +msgid "Changes to that panel are not allowed." +msgstr "Rekisteröityminen ei ole sallittu." + +#: lib/adminpanelaction.php:206 #, fuzzy msgid "showForm() not implemented." msgstr "Komentoa ei ole vielä toteutettu." -#: lib/adminpanelaction.php:224 +#: lib/adminpanelaction.php:235 #, fuzzy msgid "saveSettings() not implemented." msgstr "Komentoa ei ole vielä toteutettu." -#: lib/adminpanelaction.php:247 +#: lib/adminpanelaction.php:258 #, fuzzy msgid "Unable to delete design setting." msgstr "Twitter-asetuksia ei voitu tallentaa!" -#: lib/adminpanelaction.php:300 +#: lib/adminpanelaction.php:312 #, fuzzy msgid "Basic site configuration" msgstr "Sähköpostiosoitteen vahvistus" -#: lib/adminpanelaction.php:303 +#: lib/adminpanelaction.php:317 #, fuzzy msgid "Design configuration" msgstr "SMS vahvistus" -#: lib/adminpanelaction.php:306 lib/adminpanelaction.php:309 +#: lib/adminpanelaction.php:322 lib/adminpanelaction.php:327 #, fuzzy msgid "Paths configuration" msgstr "SMS vahvistus" @@ -4389,11 +4385,21 @@ msgstr "" msgid "Tags for this attachment" msgstr "" +#: lib/authenticationplugin.php:182 lib/authenticationplugin.php:187 +#, fuzzy +msgid "Password changing failed" +msgstr "Salasanan vaihto" + +#: lib/authenticationplugin.php:197 +#, fuzzy +msgid "Password changing is not allowed" +msgstr "Salasanan vaihto" + #: lib/channel.php:138 lib/channel.php:158 msgid "Command results" msgstr "Komennon tulos" -#: lib/channel.php:210 +#: lib/channel.php:210 lib/mailhandler.php:142 msgid "Command complete" msgstr "Komento suoritettu" @@ -4407,7 +4413,7 @@ msgstr "Valitettavasti tätä komentoa ei ole vielä toteutettu." #: lib/command.php:88 #, fuzzy, php-format -msgid "Could not find a user with nickname %s" +msgid "Could not find a user with nickname %s." msgstr "Ei voitu päivittää käyttäjälle vahvistettua sähköpostiosoitetta." #: lib/command.php:92 @@ -4416,7 +4422,7 @@ msgstr "" #: lib/command.php:99 #, fuzzy, php-format -msgid "Nudge sent to %s" +msgid "Nudge sent to %s." msgstr "Tönäisy lähetetty" #: lib/command.php:126 @@ -4428,34 +4434,36 @@ msgid "" msgstr "" #: lib/command.php:152 lib/command.php:399 lib/command.php:460 -msgid "Notice with that id does not exist" -msgstr "" +#, fuzzy +msgid "Notice with that id does not exist." +msgstr "Ei profiilia tuolla id:llä." #: lib/command.php:168 lib/command.php:415 lib/command.php:476 #: lib/command.php:532 -msgid "User has no last notice" +#, fuzzy +msgid "User has no last notice." msgstr "Käyttäjällä ei ole viimeistä päivitystä" #: lib/command.php:190 msgid "Notice marked as fave." msgstr "Päivitys on merkitty suosikiksi." -#: lib/command.php:315 -#, php-format -msgid "%1$s (%2$s)" -msgstr "%1$s (%2$s)" +#: lib/command.php:284 +#, fuzzy, php-format +msgid "Could not remove user %1$s to group %2$s." +msgstr "Ei voitu poistaa käyttäjää %s ryhmästä %s" #: lib/command.php:318 -#, php-format -msgid "Fullname: %s" +#, fuzzy, php-format +msgid "Full name: %s" msgstr "Koko nimi: %s" -#: lib/command.php:321 +#: lib/command.php:321 lib/mail.php:254 #, php-format msgid "Location: %s" msgstr "Kotipaikka: %s" -#: lib/command.php:324 +#: lib/command.php:324 lib/mail.php:256 #, php-format msgid "Homepage: %s" msgstr "Kotisivu: %s" @@ -4467,26 +4475,16 @@ msgstr "Tietoa: %s" #: lib/command.php:358 scripts/xmppdaemon.php:301 #, fuzzy, php-format -msgid "Message too long - maximum is %d characters, you sent %d" +msgid "Message too long - maximum is %1$d characters, you sent %2$d." msgstr "Viesti oli liian pitkä - maksimikoko on 140 merkkiä, lähetit %d" #: lib/command.php:378 msgid "Error sending direct message." msgstr "Tapahtui virhe suoran viestin lähetyksessä." -#: lib/command.php:422 -#, fuzzy -msgid "Cannot repeat your own notice" -msgstr "Ilmoituksia ei voi pistää päälle." - -#: lib/command.php:427 -#, fuzzy -msgid "Already repeated that notice" -msgstr "Poista tämä päivitys" - #: lib/command.php:435 #, fuzzy, php-format -msgid "Notice from %s repeated" +msgid "Notice from %s repeated." msgstr "Päivitys lähetetty" #: lib/command.php:437 @@ -4496,12 +4494,12 @@ msgstr "Ongelma päivityksen tallentamisessa." #: lib/command.php:491 #, fuzzy, php-format -msgid "Notice too long - maximum is %d characters, you sent %d" +msgid "Notice too long - maximum is %1$d characters, you sent %2$d." msgstr "Viesti oli liian pitkä - maksimikoko on 140 merkkiä, lähetit %d" #: lib/command.php:500 #, fuzzy, php-format -msgid "Reply to %s sent" +msgid "Reply to %s sent." msgstr "Vastaa tähän päivitykseen" #: lib/command.php:502 @@ -4510,7 +4508,8 @@ msgid "Error saving notice." msgstr "Ongelma päivityksen tallentamisessa." #: lib/command.php:556 -msgid "Specify the name of the user to subscribe to" +#, fuzzy +msgid "Specify the name of the user to subscribe to." msgstr "Anna käyttäjätunnus, jonka päivitykset haluat tilata" #: lib/command.php:563 @@ -4519,7 +4518,8 @@ msgid "Subscribed to %s" msgstr "Käyttäjän %s päivitykset tilattu" #: lib/command.php:584 -msgid "Specify the name of the user to unsubscribe from" +#, fuzzy +msgid "Specify the name of the user to unsubscribe from." msgstr "Anna käyttäjätunnus, jonka päivityksien tilauksen haluat lopettaa" #: lib/command.php:591 @@ -4548,17 +4548,17 @@ msgid "Can't turn on notification." msgstr "Ilmoituksia ei voi pistää päälle." #: lib/command.php:650 -msgid "Login command is disabled" +msgid "Login command is disabled." msgstr "" #: lib/command.php:664 #, fuzzy, php-format -msgid "Could not create login token for %s" +msgid "Could not create login token for %s." msgstr "Ei voitu lisätä aliasta." #: lib/command.php:669 #, php-format -msgid "This link is useable only once, and is good for only 2 minutes: %s" +msgid "This link is useable only once, and is good for only 2 minutes: %s." msgstr "" #: lib/command.php:685 @@ -4755,10 +4755,6 @@ msgstr "Kuvaile ryhmää tai aihetta 140 merkillä" msgid "Describe the group or topic in %d characters" msgstr "Kuvaile ryhmää tai aihetta 140 merkillä" -#: lib/groupeditform.php:172 -msgid "Description" -msgstr "Kuvaus" - #: lib/groupeditform.php:179 msgid "" "Location for the group, if any, like \"City, State (or Region), Country\"" @@ -4930,21 +4926,9 @@ msgstr "" "----\n" "Voit vaihtaa sähköpostiosoitetta tai ilmoitusasetuksiasi %8$s\n" -#: lib/mail.php:254 -#, php-format -msgid "Location: %s\n" -msgstr "Kotipaikka: %s\n" - -#: lib/mail.php:256 -#, php-format -msgid "Homepage: %s\n" -msgstr "Kotisivu: %s\n" - #: lib/mail.php:258 -#, php-format -msgid "" -"Bio: %s\n" -"\n" +#, fuzzy, php-format +msgid "Bio: %s" msgstr "" "Tietoja: %s\n" "\n" @@ -5090,6 +5074,27 @@ msgstr "" msgid "from" msgstr " lähteestä " +#: lib/mailhandler.php:37 +msgid "Could not parse message." +msgstr "Ei voitu lukea viestiä." + +#: lib/mailhandler.php:42 +msgid "Not a registered user." +msgstr "Tuo ei ole rekisteröitynyt käyttäjä." + +#: lib/mailhandler.php:46 +msgid "Sorry, that is not your incoming email address." +msgstr "Valitettavasti tuo ei ole oikea osoite sähköpostipäivityksille." + +#: lib/mailhandler.php:50 +msgid "Sorry, no incoming email allowed." +msgstr "Valitettavasti päivitysten teko sähköpostilla ei ole sallittua." + +#: lib/mailhandler.php:228 +#, fuzzy, php-format +msgid "Unsupported message type: %s" +msgstr "Kuvatiedoston formaattia ei ole tuettu." + #: lib/mediafile.php:98 lib/mediafile.php:123 msgid "There was a database error while saving your file. Please try again." msgstr "" @@ -5121,7 +5126,7 @@ msgid "File upload stopped by extension." msgstr "" #: lib/mediafile.php:179 lib/mediafile.php:216 -msgid "File exceeds user's quota!" +msgid "File exceeds user's quota." msgstr "" #: lib/mediafile.php:196 lib/mediafile.php:233 @@ -5129,7 +5134,8 @@ msgid "File could not be moved to destination directory." msgstr "" #: lib/mediafile.php:201 lib/mediafile.php:237 -msgid "Could not determine file's mime-type!" +#, fuzzy +msgid "Could not determine file's MIME type." msgstr "Julkista päivitysvirtaa ei saatu." #: lib/mediafile.php:270 @@ -5139,7 +5145,7 @@ msgstr "" #: lib/mediafile.php:275 #, php-format -msgid "%s is not a supported filetype on this server." +msgid "%s is not a supported file type on this server." msgstr "" #: lib/messageform.php:120 @@ -5172,7 +5178,17 @@ msgid "Attach a file" msgstr "" #: lib/noticeform.php:212 -msgid "Share your location" +#, fuzzy +msgid "Share my location." +msgstr "Tageja ei voitu tallentaa." + +#: lib/noticeform.php:214 +#, fuzzy +msgid "Do not share my location." +msgstr "Tageja ei voitu tallentaa." + +#: lib/noticeform.php:215 +msgid "Hide this info" msgstr "" #: lib/noticelist.php:428 @@ -5295,6 +5311,11 @@ msgstr "Lähettämäsi viestit" msgid "Tags in %s's notices" msgstr "Tagit käyttäjän %s päivityksissä" +#: lib/plugin.php:114 +#, fuzzy +msgid "Unknown" +msgstr "Tuntematon toiminto" + #: lib/profileaction.php:109 lib/profileaction.php:192 lib/subgroupnav.php:82 msgid "Subscriptions" msgstr "Tilaukset" @@ -5476,10 +5497,6 @@ msgstr "" msgid "People Tagcloud as tagged" msgstr "" -#: lib/subscriptionlist.php:126 -msgid "(none)" -msgstr "(tyhjä)" - #: lib/tagcloudsection.php:56 msgid "None" msgstr "Ei mitään" @@ -5597,19 +5614,3 @@ msgstr "Kotisivun verkko-osoite ei ole toimiva." #, php-format msgid "%s is not a valid color! Use 3 or 6 hex chars." msgstr "" - -#: scripts/maildaemon.php:48 -msgid "Could not parse message." -msgstr "Ei voitu lukea viestiä." - -#: scripts/maildaemon.php:53 -msgid "Not a registered user." -msgstr "Tuo ei ole rekisteröitynyt käyttäjä." - -#: scripts/maildaemon.php:57 -msgid "Sorry, that is not your incoming email address." -msgstr "Valitettavasti tuo ei ole oikea osoite sähköpostipäivityksille." - -#: scripts/maildaemon.php:61 -msgid "Sorry, no incoming email allowed." -msgstr "Valitettavasti päivitysten teko sähköpostilla ei ole sallittua." diff --git a/locale/fr/LC_MESSAGES/statusnet.po b/locale/fr/LC_MESSAGES/statusnet.po index 1f0cb61fc..341d26556 100644 --- a/locale/fr/LC_MESSAGES/statusnet.po +++ b/locale/fr/LC_MESSAGES/statusnet.po @@ -13,12 +13,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-01-03 10:37+0000\n" -"PO-Revision-Date: 2010-01-03 10:37:51+0000\n" +"POT-Creation-Date: 2010-01-10 11:27+0000\n" +"PO-Revision-Date: 2010-01-10 11:28:09+0000\n" "Language-Team: French\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha (r60575); Translate extension (2009-12-06)\n" +"X-Generator: MediaWiki 1.16alpha (r60888); Translate extension (2010-01-04)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: fr\n" "X-Message-Group: out-statusnet\n" @@ -55,11 +55,6 @@ msgstr "Page non trouvée" msgid "No such user." msgstr "Utilisateur non trouvé." -#: actions/all.php:84 -#, php-format -msgid "%s and friends, page %d" -msgstr "%s et ses amis - page %d" - #: actions/all.php:86 actions/all.php:167 actions/allrss.php:115 #: actions/apitimelinefriends.php:115 actions/apitimelinehome.php:115 #: lib/personalgroupnav.php:100 @@ -102,12 +97,12 @@ msgstr "" #: actions/all.php:134 #, php-format msgid "" -"You can try to [nudge %s](../%s) from his profile or [post something to his " -"or her attention](%%%%action.newnotice%%%%?status_textarea=%s)." +"You can try to [nudge %1$s](../%2$s) from his profile or [post something to " +"his or her attention](%%%%action.newnotice%%%%?status_textarea=%3$s)." msgstr "" -"Vous pouvez essayer de [faire un clin d’œil à %s](../%s) depuis son profil " -"ou [poster quelque chose à son intention](%%%%action.newnotice%%%%?" -"status_textarea=%s)." +"Vous pouvez essayer de [faire un clin d’œil à %1$s](../%2$s) depuis son " +"profil ou [poster quelque chose à son intention](%%%%action.newnotice%%%%?" +"status_textarea=%3$s)." #: actions/all.php:137 actions/replies.php:209 actions/showstream.php:202 #, php-format @@ -133,6 +128,23 @@ msgstr "Statuts de %1$s et ses amis dans %2$s!" #: actions/apiaccountupdateprofile.php:97 #: actions/apiaccountupdateprofilebackgroundimage.php:94 #: actions/apiaccountupdateprofilecolors.php:118 +#: actions/apidirectmessage.php:156 actions/apifavoritecreate.php:99 +#: actions/apifavoritedestroy.php:100 actions/apifriendshipscreate.php:100 +#: actions/apifriendshipsdestroy.php:100 actions/apifriendshipsshow.php:129 +#: actions/apigroupcreate.php:136 actions/apigroupismember.php:114 +#: actions/apigroupjoin.php:155 actions/apigroupleave.php:141 +#: actions/apigrouplist.php:132 actions/apigrouplistall.php:120 +#: actions/apigroupmembership.php:106 actions/apigroupshow.php:105 +#: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102 +#: actions/apistatusesretweets.php:112 actions/apistatusesshow.php:108 +#: actions/apistatusnetconfig.php:133 actions/apistatusnetversion.php:93 +#: actions/apisubscriptions.php:111 actions/apitimelinefavorites.php:146 +#: actions/apitimelinefriends.php:156 actions/apitimelinegroup.php:150 +#: actions/apitimelinehome.php:156 actions/apitimelinementions.php:151 +#: actions/apitimelinepublic.php:131 actions/apitimelineretweetedbyme.php:122 +#: actions/apitimelineretweetedtome.php:121 +#: actions/apitimelineretweetsofme.php:122 actions/apitimelinetag.php:141 +#: actions/apitimelineuser.php:165 actions/apiusershow.php:101 msgid "API method not found." msgstr "Méthode API non trouvée !" @@ -192,6 +204,9 @@ msgstr "" #: actions/apiaccountupdateprofilebackgroundimage.php:146 #: actions/apiaccountupdateprofilecolors.php:164 #: actions/apiaccountupdateprofilecolors.php:174 +#: actions/groupdesignsettings.php:287 actions/groupdesignsettings.php:297 +#: actions/userdesignsettings.php:210 actions/userdesignsettings.php:220 +#: actions/userdesignsettings.php:263 actions/userdesignsettings.php:273 msgid "Unable to save your design settings." msgstr "Impossible de sauvegarder les parmètres de la conception." @@ -232,26 +247,6 @@ msgstr "Messages envoyés à %s" msgid "All the direct messages sent to %s" msgstr "Tous les messages envoyés à %s" -#: actions/apidirectmessage.php:156 actions/apifavoritecreate.php:99 -#: actions/apifavoritedestroy.php:100 actions/apifriendshipscreate.php:100 -#: actions/apifriendshipsdestroy.php:100 actions/apifriendshipsshow.php:129 -#: actions/apigroupcreate.php:136 actions/apigroupismember.php:114 -#: actions/apigroupjoin.php:155 actions/apigroupleave.php:141 -#: actions/apigrouplist.php:132 actions/apigrouplistall.php:120 -#: actions/apigroupmembership.php:106 actions/apigroupshow.php:105 -#: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102 -#: actions/apistatusesretweets.php:112 actions/apistatusesshow.php:108 -#: actions/apistatusnetconfig.php:133 actions/apistatusnetversion.php:93 -#: actions/apisubscriptions.php:111 actions/apitimelinefavorites.php:146 -#: actions/apitimelinefriends.php:156 actions/apitimelinegroup.php:150 -#: actions/apitimelinehome.php:156 actions/apitimelinementions.php:151 -#: actions/apitimelinepublic.php:131 actions/apitimelineretweetedbyme.php:122 -#: actions/apitimelineretweetedtome.php:121 -#: actions/apitimelineretweetsofme.php:122 actions/apitimelinetag.php:141 -#: actions/apitimelineuser.php:165 actions/apiusershow.php:101 -msgid "API method not found!" -msgstr "Méthode API non trouvée !" - #: actions/apidirectmessagenew.php:126 msgid "No message text!" msgstr "Message sans texte !" @@ -277,7 +272,8 @@ msgid "No status found with that ID." msgstr "Aucun statut trouvé avec cet identifiant. " #: actions/apifavoritecreate.php:119 -msgid "This status is already a favorite!" +#, fuzzy +msgid "This status is already a favorite." msgstr "Cet avis a déjà été ajouté à vos favoris !" #: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:176 @@ -285,7 +281,8 @@ msgid "Could not create favorite." msgstr "Impossible de créer le favori." #: actions/apifavoritedestroy.php:122 -msgid "That status is not a favorite!" +#, fuzzy +msgid "That status is not a favorite." msgstr "Cet avis n’est pas un favori !" #: actions/apifavoritedestroy.php:134 actions/disfavor.php:87 @@ -306,7 +303,8 @@ msgid "Could not unfollow user: User not found." msgstr "Impossible de ne plus suivre l’utilisateur : utilisateur non trouvé." #: actions/apifriendshipsdestroy.php:120 -msgid "You cannot unfollow yourself!" +#, fuzzy +msgid "You cannot unfollow yourself." msgstr "Vous ne pouvez pas ne plus vous suivre vous-même !" #: actions/apifriendshipsexists.php:94 @@ -393,7 +391,7 @@ msgstr "L’alias ne peut pas être le même que le pseudo." msgid "Group not found!" msgstr "Groupe non trouvé !" -#: actions/apigroupjoin.php:110 +#: actions/apigroupjoin.php:110 actions/joingroup.php:90 lib/command.php:217 msgid "You are already a member of that group." msgstr "Vous êtes déjà membre de ce groupe." @@ -401,30 +399,25 @@ msgstr "Vous êtes déjà membre de ce groupe." msgid "You have been blocked from that group by the admin." msgstr "Vous avez été bloqué de ce groupe par l’administrateur." -#: actions/apigroupjoin.php:138 +#: actions/apigroupjoin.php:138 actions/joingroup.php:128 lib/command.php:234 #, php-format -msgid "Could not join user %s to group %s." -msgstr "Impossible de joindre l’utilisateur %s au groupe %s." +msgid "Could not join user %1$s to group %2$s." +msgstr "Impossible de joindre l’utilisateur %1$s au groupe %2$s." #: actions/apigroupleave.php:114 msgid "You are not a member of this group." msgstr "Vous n'êtes pas membre de ce groupe." -#: actions/apigroupleave.php:124 +#: actions/apigroupleave.php:124 actions/leavegroup.php:127 #, php-format -msgid "Could not remove user %s to group %s." -msgstr "Impossible de retirer l’utilisateur %s du groupe %s" +msgid "Could not remove user %1$s from group %2$s." +msgstr "Impossible de retirer l’utilisateur %1$s du groupe %2$s." #: actions/apigrouplist.php:95 #, php-format msgid "%s's groups" msgstr "Groupes de %s" -#: actions/apigrouplist.php:103 -#, php-format -msgid "Groups %s is a member of on %s." -msgstr "Les groupes dont %s est membre sur %s." - #: actions/apigrouplistall.php:90 actions/usergroups.php:62 #, php-format msgid "%s groups" @@ -448,11 +441,11 @@ msgstr "Vous ne pouvez pas supprimer le statut d’un autre utilisateur." msgid "No such notice." msgstr "Avis non trouvé." -#: actions/apistatusesretweet.php:83 +#: actions/apistatusesretweet.php:83 lib/command.php:422 msgid "Cannot repeat your own notice." msgstr "Vous ne pouvez pas reprendre votre propre avis." -#: actions/apistatusesretweet.php:91 +#: actions/apistatusesretweet.php:91 lib/command.php:427 msgid "Already repeated that notice." msgstr "Vous avez déjà repris cet avis." @@ -465,7 +458,7 @@ msgid "No status with that ID found." msgstr "Aucun statut trouvé avec cet identifiant." #: actions/apistatusesupdate.php:157 actions/newnotice.php:155 -#: scripts/maildaemon.php:71 +#: lib/mailhandler.php:60 #, php-format msgid "That's too long. Max notice size is %d chars." msgstr "C’est trop long ! La taille maximale de l’avis est de %d caractères." @@ -487,13 +480,13 @@ msgstr "Format non supporté." #: actions/apitimelinefavorites.php:108 #, php-format -msgid "%s / Favorites from %s" -msgstr "%s / Favoris de %s" +msgid "%1$s / Favorites from %2$s" +msgstr "%1$s / Favoris de %2$s" #: actions/apitimelinefavorites.php:120 #, php-format -msgid "%s updates favorited by %s / %s." -msgstr "%s statuts ont été ajoutés aux favoris de %s / %s." +msgid "%1$s updates favorited by %2$s / %2$s." +msgstr "%1$s mises à jour des favoris de %2$s / %2$s." #: actions/apitimelinegroup.php:109 actions/apitimelineuser.php:118 #: actions/grouprss.php:131 actions/userrss.php:90 @@ -560,8 +553,11 @@ msgstr "Non trouvé." msgid "No such attachment." msgstr "Pièce jointe non trouvée." -#: actions/avatarbynickname.php:59 actions/grouprss.php:91 -#: actions/leavegroup.php:76 +#: actions/avatarbynickname.php:59 actions/blockedfromgroup.php:73 +#: actions/editgroup.php:84 actions/groupdesignsettings.php:84 +#: actions/grouplogo.php:86 actions/groupmembers.php:76 +#: actions/grouprss.php:91 actions/joingroup.php:76 actions/leavegroup.php:76 +#: actions/showgroup.php:121 msgid "No nickname." msgstr "Aucun pseudo." @@ -586,8 +582,8 @@ msgstr "" "taille maximale du fichier est de %s." #: actions/avatarsettings.php:106 actions/avatarsettings.php:185 -#: actions/grouplogo.php:178 actions/remotesubscribe.php:191 -#: actions/userauthorization.php:72 actions/userrss.php:103 +#: actions/remotesubscribe.php:191 actions/userauthorization.php:72 +#: actions/userrss.php:103 msgid "User without matching profile" msgstr "Utilisateur sans profil correspondant" @@ -619,9 +615,9 @@ msgstr "Transfert" msgid "Crop" msgstr "Recadrer" -#: actions/avatarsettings.php:268 actions/disfavor.php:74 -#: actions/emailsettings.php:238 actions/favor.php:75 actions/geocode.php:50 -#: actions/groupblock.php:66 actions/grouplogo.php:309 +#: actions/avatarsettings.php:268 actions/deletenotice.php:157 +#: actions/disfavor.php:74 actions/emailsettings.php:238 actions/favor.php:75 +#: actions/geocode.php:50 actions/groupblock.php:66 actions/grouplogo.php:309 #: actions/groupunblock.php:66 actions/imsettings.php:206 #: actions/invite.php:56 actions/login.php:135 actions/makeadmin.php:66 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80 @@ -705,19 +701,15 @@ msgstr "Bloquer cet utilisateur" msgid "Failed to save block information." msgstr "Impossible d’enregistrer les informations de blocage." -#: actions/blockedfromgroup.php:73 actions/editgroup.php:84 -#: actions/groupdesignsettings.php:84 actions/grouplogo.php:86 -#: actions/groupmembers.php:76 actions/joingroup.php:76 -#: actions/showgroup.php:121 -msgid "No nickname" -msgstr "Aucun pseudo" - #: actions/blockedfromgroup.php:80 actions/editgroup.php:96 +#: actions/foafgroup.php:44 actions/foafgroup.php:62 actions/groupblock.php:86 #: actions/groupbyid.php:83 actions/groupdesignsettings.php:97 #: actions/grouplogo.php:99 actions/groupmembers.php:83 -#: actions/joingroup.php:83 actions/showgroup.php:137 -msgid "No such group" -msgstr "Aucun groupe trouvé" +#: actions/grouprss.php:98 actions/groupunblock.php:86 +#: actions/joingroup.php:83 actions/leavegroup.php:83 actions/makeadmin.php:86 +#: actions/showgroup.php:137 lib/command.php:212 lib/command.php:263 +msgid "No such group." +msgstr "Aucun groupe trouvé." #: actions/blockedfromgroup.php:90 #, php-format @@ -726,8 +718,8 @@ msgstr "%s profils bloqués" #: actions/blockedfromgroup.php:93 #, php-format -msgid "%s blocked profiles, page %d" -msgstr "%s profils bloqués, page %d" +msgid "%1$s blocked profiles, page %2$d" +msgstr "%1$s profils bloqués, page %2$d" #: actions/blockedfromgroup.php:108 msgid "A list of the users blocked from joining this group." @@ -839,12 +831,6 @@ msgstr "Ne pas supprimer cet avis" msgid "Delete this notice" msgstr "Supprimer cet avis" -#: actions/deletenotice.php:157 -msgid "There was a problem with your session token. Try again, please." -msgstr "" -"Un problème est survenu avec votre jeton de session. Veuillez essayer à " -"nouveau." - #: actions/deleteuser.php:67 msgid "You cannot delete users." msgstr "Vous ne pouvez pas supprimer des utilisateurs." @@ -870,7 +856,7 @@ msgid "Delete this user" msgstr "Supprimer cet utilisateur" #: actions/designadminpanel.php:62 lib/accountsettingsaction.php:124 -#: lib/adminpanelaction.php:302 lib/groupnav.php:119 +#: lib/adminpanelaction.php:316 lib/groupnav.php:119 msgid "Design" msgstr "Conception" @@ -1010,7 +996,8 @@ msgstr "Vous devez ouvrir une session pour créer un groupe." #: actions/editgroup.php:103 actions/editgroup.php:168 #: actions/groupdesignsettings.php:104 actions/grouplogo.php:106 -msgid "You must be an admin to edit the group" +#, fuzzy +msgid "You must be an admin to edit the group." msgstr "Seuls les administrateurs d’un groupe peuvent le modifier." #: actions/editgroup.php:154 @@ -1035,7 +1022,8 @@ msgid "Options saved." msgstr "Vos options ont été enregistrées." #: actions/emailsettings.php:60 -msgid "Email Settings" +#, fuzzy +msgid "Email settings" msgstr "Paramètres du courriel" #: actions/emailsettings.php:71 @@ -1072,8 +1060,9 @@ msgid "Cancel" msgstr "Annuler" #: actions/emailsettings.php:121 -msgid "Email Address" -msgstr "Adresse de courriel" +#, fuzzy +msgid "Email address" +msgstr "Adresses courriel" #: actions/emailsettings.php:123 msgid "Email address, like \"UserName@example.org\"" @@ -1148,9 +1137,10 @@ msgstr "Aucune adresse courriel." msgid "Cannot normalize that email address" msgstr "Impossible d’utiliser cette adresse courriel" -#: actions/emailsettings.php:331 actions/siteadminpanel.php:157 -msgid "Not a valid email address" -msgstr "Adresse courriel invalide" +#: actions/emailsettings.php:331 actions/register.php:201 +#: actions/siteadminpanel.php:157 +msgid "Not a valid email address." +msgstr "Adresse courriel invalide." #: actions/emailsettings.php:334 msgid "That is already your email address." @@ -1332,18 +1322,11 @@ msgstr "Le service distant utilise une version inconnue du protocole OMB." msgid "Error updating remote profile" msgstr "Erreur lors de la mise à jour du profil distant" -#: actions/foafgroup.php:44 actions/foafgroup.php:62 actions/groupblock.php:86 -#: actions/grouprss.php:98 actions/groupunblock.php:86 -#: actions/leavegroup.php:83 actions/makeadmin.php:86 lib/command.php:212 -#: lib/command.php:263 -msgid "No such group." -msgstr "Aucun groupe trouvé." - -#: actions/getfile.php:75 +#: actions/getfile.php:79 msgid "No such file." msgstr "Fichier non trouvé." -#: actions/getfile.php:79 +#: actions/getfile.php:83 msgid "Cannot read file." msgstr "Impossible de lire le fichier" @@ -1355,7 +1338,7 @@ msgstr "Aucun profil n’a été spécifié." #: actions/groupblock.php:76 actions/groupunblock.php:76 #: actions/makeadmin.php:76 actions/subedit.php:53 actions/tagother.php:46 -#: lib/profileformaction.php:77 +#: actions/unsubscribe.php:84 lib/profileformaction.php:77 msgid "No profile with that ID." msgstr "Aucun profil ne correspond à cet identifiant." @@ -1383,12 +1366,12 @@ msgstr "Bloquer cet utilisateur du groupe" #: actions/groupblock.php:162 #, php-format msgid "" -"Are you sure you want to block user \"%s\" from the group \"%s\"? They will " -"be removed from the group, unable to post, and unable to subscribe to the " -"group in the future." +"Are you sure you want to block user \"%1$s\" from the group \"%2$s\"? They " +"will be removed from the group, unable to post, and unable to subscribe to " +"the group in the future." msgstr "" -"Êtes-vous sûr(e) de vouloir bloquer l’utilisateur \"%s\" du groupe \"%s\"? " -"Ils seront supprimés du groupe, il leur sera interdit d’y poster, et de s’y " +"Voulez-vous vraiment bloquer l’utilisateur « %1$s » du groupe « %2$s » ? Ils " +"seront supprimés du groupe ; il leur sera interdit d’y poster et de s’y " "abonner à l’avenir." #: actions/groupblock.php:178 @@ -1404,9 +1387,9 @@ msgid "Database error blocking user from group." msgstr "" "Erreur de la base de données lors du blocage de l’utilisateur du groupe." -#: actions/groupbyid.php:74 -msgid "No ID" -msgstr "Aucun identifiant" +#: actions/groupbyid.php:74 actions/userbyid.php:70 +msgid "No ID." +msgstr "Aucun identifiant." #: actions/groupdesignsettings.php:68 msgid "You must be logged in to edit a group." @@ -1429,12 +1412,6 @@ msgstr "" msgid "Couldn't update your design." msgstr "Impossible de mettre à jour votre conception." -#: actions/groupdesignsettings.php:287 actions/groupdesignsettings.php:297 -#: actions/userdesignsettings.php:210 actions/userdesignsettings.php:220 -#: actions/userdesignsettings.php:263 actions/userdesignsettings.php:273 -msgid "Unable to save your design settings!" -msgstr "Impossible de sauvegarder les préférences de conception !" - #: actions/groupdesignsettings.php:308 actions/userdesignsettings.php:231 msgid "Design preferences saved." msgstr "Préférences de conception enregistrées." @@ -1451,6 +1428,11 @@ msgstr "" "Vous pouvez choisir un logo pour votre groupe. La taille maximale du fichier " "est de %s." +#: actions/grouplogo.php:178 +#, fuzzy +msgid "User without matching profile." +msgstr "Utilisateur sans profil correspondant" + #: actions/grouplogo.php:362 msgid "Pick a square area of the image to be the logo." msgstr "Sélectionnez une zone de forme carrée sur l’image qui sera le logo." @@ -1470,14 +1452,14 @@ msgstr "Membres du groupe %s" #: actions/groupmembers.php:96 #, php-format -msgid "%s group members, page %d" -msgstr "Membres du groupe %s - page %d" +msgid "%1$s group members, page %2$d" +msgstr "Membres du groupe %1$s - page %2$d" #: actions/groupmembers.php:111 msgid "A list of the users in this group." msgstr "Liste des utilisateurs inscrits à ce groupe." -#: actions/groupmembers.php:175 lib/action.php:441 lib/groupnav.php:107 +#: actions/groupmembers.php:175 lib/action.php:442 lib/groupnav.php:107 msgid "Admin" msgstr "Administrer" @@ -1582,7 +1564,8 @@ msgid "Error removing the block." msgstr "Erreur lors de l’annulation du blocage." #: actions/imsettings.php:59 -msgid "IM Settings" +#, fuzzy +msgid "IM settings" msgstr "Paramètres de messagerie instantanée" #: actions/imsettings.php:70 @@ -1614,7 +1597,8 @@ msgstr "" "votre liste de contacts ?)" #: actions/imsettings.php:124 -msgid "IM Address" +#, fuzzy +msgid "IM address" msgstr "Adresse de messagerie instantanée" #: actions/imsettings.php:126 @@ -1679,11 +1663,6 @@ msgstr "" msgid "That is not your Jabber ID." msgstr "Ceci n’est pas votre identifiant Jabber." -#: actions/inbox.php:59 -#, php-format -msgid "Inbox for %s - page %d" -msgstr "Boîte de réception de %s - page %d" - #: actions/inbox.php:62 #, php-format msgid "Inbox for %s" @@ -1722,10 +1701,10 @@ msgstr "Inviter de nouveaux utilisateurs" msgid "You are already subscribed to these users:" msgstr "Vous êtes déjà abonné à ces utilisateurs :" -#: actions/invite.php:131 actions/invite.php:139 +#: actions/invite.php:131 actions/invite.php:139 lib/command.php:315 #, php-format -msgid "%s (%s)" -msgstr "%s (%s)" +msgid "%1$s (%2$s)" +msgstr "%1$s (%2$s)" #: actions/invite.php:136 msgid "" @@ -1768,7 +1747,7 @@ msgstr "Message personnel" msgid "Optionally add a personal message to the invitation." msgstr "Ajouter un message personnel à l’invitation (optionnel)." -#: actions/invite.php:197 lib/messageform.php:178 lib/noticeform.php:232 +#: actions/invite.php:197 lib/messageform.php:178 lib/noticeform.php:234 msgid "Send" msgstr "Envoyer" @@ -1840,19 +1819,10 @@ msgstr "" msgid "You must be logged in to join a group." msgstr "Vous devez ouvrir une session pour rejoindre un groupe." -#: actions/joingroup.php:90 lib/command.php:217 -msgid "You are already a member of that group" -msgstr "Vous êtes déjà membre de ce groupe" - -#: actions/joingroup.php:128 lib/command.php:234 -#, php-format -msgid "Could not join user %s to group %s" -msgstr "Impossible d’inscrire l’utilisateur %s au groupe %s" - #: actions/joingroup.php:135 lib/command.php:239 #, php-format -msgid "%s joined group %s" -msgstr "%s a rejoint le groupe %s" +msgid "%1$s joined group %2$s" +msgstr "%1$s a rejoint le groupe %2$s" #: actions/leavegroup.php:60 msgid "You must be logged in to leave a group." @@ -1866,15 +1836,10 @@ msgstr "Vous n'êtes pas membre de ce groupe." msgid "Could not find membership record." msgstr "Aucun enregistrement à ce groupe n’a été trouvé." -#: actions/leavegroup.php:127 lib/command.php:284 -#, php-format -msgid "Could not remove user %s to group %s" -msgstr "Impossible de retirer l’utilisateur %s du groupe %s" - #: actions/leavegroup.php:134 lib/command.php:289 #, php-format -msgid "%s left group %s" -msgstr "%s a quitté le groupe %s" +msgid "%1$s left group %2$s" +msgstr "%1$s a quitté le groupe %2$s" #: actions/login.php:83 actions/register.php:137 msgid "Already logged in." @@ -1894,7 +1859,7 @@ msgstr "" "Erreur lors de la mise en place de l'utilisateur. Vous n'y êtes probablement " "pas autorisé." -#: actions/login.php:208 actions/login.php:261 lib/action.php:459 +#: actions/login.php:208 actions/login.php:261 lib/action.php:460 #: lib/logingroupnav.php:79 msgid "Login" msgstr "Ouvrir une session" @@ -1953,20 +1918,20 @@ msgstr "" #: actions/makeadmin.php:95 #, php-format -msgid "%s is already an admin for group \"%s\"." -msgstr "%s est déjà un administrateur du groupe « %s »." +msgid "%1$s is already an admin for group \"%2$s\"." +msgstr "%1$s est déjà administrateur du groupe « %2$s »." #: actions/makeadmin.php:132 -#, php-format -msgid "Can't get membership record for %s in group %s" +#, fuzzy, php-format +msgid "Can't get membership record for %1$s in group %2$s." msgstr "" -"Impossible d'avoir les enregistrements d'appartenance pour %s dans le groupe " -"%s" +"Impossible d'avoir les enregistrements d'appartenance pour %1$s dans le " +"groupe %2$s" #: actions/makeadmin.php:145 -#, php-format -msgid "Can't make %s an admin for group %s" -msgstr "Impossible de faire %s un administrateur du groupe %s" +#, fuzzy, php-format +msgid "Can't make %1$s an admin for group %2$s." +msgstr "Impossible de rendre %1$s administrateur du groupe %2$s" #: actions/microsummary.php:69 msgid "No current status" @@ -2009,8 +1974,8 @@ msgstr "Message envoyé" #: actions/newmessage.php:185 lib/command.php:376 #, php-format -msgid "Direct message to %s sent" -msgstr "Votre message a été envoyé à %s" +msgid "Direct message to %s sent." +msgstr "Message direct à %s envoyé." #: actions/newmessage.php:210 actions/newnotice.php:245 lib/channel.php:170 msgid "Ajax Error" @@ -2039,8 +2004,8 @@ msgstr "Recherche de texte" #: actions/noticesearch.php:91 #, php-format -msgid "Search results for \"%s\" on %s" -msgstr "Résultat de la recherche pour « %s » sur %s" +msgid "Search results for \"%1$s\" on %2$s" +msgstr "Résultats de la recherche pour « %1$s » sur %2$s" #: actions/noticesearch.php:121 #, php-format @@ -2076,7 +2041,7 @@ msgid "" "This user doesn't allow nudges or hasn't confirmed or set his email yet." msgstr "" "Cet utilisateur n’accepte pas les clins d’œil ou n’a pas encore validé son " -"adresse courriel." +"adresse électronique." #: actions/nudge.php:94 msgid "Nudge sent" @@ -2148,11 +2113,6 @@ msgstr "Afficher ou masquer les paramètres de conception." msgid "URL shortening service is too long (max 50 chars)." msgstr "Le service de réduction d’URL est trop long (50 caractères maximum)." -#: actions/outbox.php:58 -#, php-format -msgid "Outbox for %s - page %d" -msgstr "Boîte d’envoi de %s - page %d" - #: actions/outbox.php:61 #, php-format msgid "Outbox for %s" @@ -2224,7 +2184,7 @@ msgstr "Impossible de sauvegarder le nouveau mot de passe." msgid "Password saved." msgstr "Mot de passe enregistré." -#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:308 +#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:326 msgid "Paths" msgstr "Chemins" @@ -2257,7 +2217,7 @@ msgid "Invalid SSL server. The maximum length is 255 characters." msgstr "Serveur SSL invalide. La longueur maximale est de 255 caractères." #: actions/pathsadminpanel.php:217 actions/siteadminpanel.php:58 -#: lib/adminpanelaction.php:299 +#: lib/adminpanelaction.php:311 msgid "Site" msgstr "Site" @@ -2350,7 +2310,8 @@ msgid "When to use SSL" msgstr "Quand utiliser SSL" #: actions/pathsadminpanel.php:308 -msgid "SSL Server" +#, fuzzy +msgid "SSL server" msgstr "Serveur SSL" #: actions/pathsadminpanel.php:309 @@ -2383,8 +2344,8 @@ msgstr "Cette marque est invalide : %s" #: actions/peopletag.php:144 #, php-format -msgid "Users self-tagged with %s - page %d" -msgstr "Utilisateurs marqués par eux-mêmes %s - page %d" +msgid "Users self-tagged with %1$s - page %2$d" +msgstr "Utilisateurs marqués par eux-mêmes avec %1$s - page %2$d" #: actions/postnotice.php:84 msgid "Invalid notice content" @@ -2392,9 +2353,10 @@ msgstr "Contenu invalide" #: actions/postnotice.php:90 #, php-format -msgid "Notice license ‘%s’ is not compatible with site license ‘%s’." +msgid "Notice license ‘%1$s’ is not compatible with site license ‘%2$s’." msgstr "" -"La licence des avis « %s » n'est pas compatible avec la licence du site « %s »." +"La licence des avis « %1$s » n'est pas compatible avec la licence du site « %2" +"$s »." #: actions/profilesettings.php:60 msgid "Profile settings" @@ -2516,19 +2478,19 @@ msgstr "Marque invalide : « %s »" msgid "Couldn't update user for autosubscribe." msgstr "Impossible de mettre à jour l’auto-abonnement." -#: actions/profilesettings.php:354 +#: actions/profilesettings.php:359 msgid "Couldn't save location prefs." msgstr "Impossible d’enregistrer les préférences de localisation." -#: actions/profilesettings.php:366 +#: actions/profilesettings.php:371 msgid "Couldn't save profile." msgstr "Impossible d’enregistrer le profil." -#: actions/profilesettings.php:374 +#: actions/profilesettings.php:379 msgid "Couldn't save tags." msgstr "Impossible d’enregistrer les marques." -#: actions/profilesettings.php:382 lib/adminpanelaction.php:126 +#: actions/profilesettings.php:387 lib/adminpanelaction.php:137 msgid "Settings saved." msgstr "Préférences enregistrées." @@ -2635,7 +2597,7 @@ msgstr "" "Pourquoi ne pas [créer un compte](%%action.register%%) et être le premier à " "en poster un !" -#: actions/publictagcloud.php:135 +#: actions/publictagcloud.php:131 msgid "Tag cloud" msgstr "Nuage de marques" @@ -2779,7 +2741,7 @@ msgstr "Désolé, code d’invitation invalide." msgid "Registration successful" msgstr "Compte créé avec succès" -#: actions/register.php:114 actions/register.php:502 lib/action.php:456 +#: actions/register.php:114 actions/register.php:502 lib/action.php:457 #: lib/logingroupnav.php:85 msgid "Register" msgstr "Créer un compte" @@ -2792,10 +2754,6 @@ msgstr "Création de compte non autorisée." msgid "You can't register if you don't agree to the license." msgstr "Vous devez accepter les termes de la licence pour créer un compte." -#: actions/register.php:201 -msgid "Not a valid email address." -msgstr "Adresse courriel invalide." - #: actions/register.php:212 msgid "Email address already exists." msgstr "Cette adresse courriel est déjà utilisée." @@ -2859,10 +2817,10 @@ msgstr "" #: actions/register.php:537 #, php-format msgid "" -"Congratulations, %s! And welcome to %%%%site.name%%%%. From here, you may " +"Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may " "want to...\n" "\n" -"* Go to [your profile](%s) and post your first message.\n" +"* Go to [your profile](%2$s) and post your first message.\n" "* Add a [Jabber/GTalk address](%%%%action.imsettings%%%%) so you can send " "notices through instant messages.\n" "* [Search for people](%%%%action.peoplesearch%%%%) that you may know or that " @@ -2874,16 +2832,16 @@ msgid "" "\n" "Thanks for signing up and we hope you enjoy using this service." msgstr "" -"Félicitations, %s! Bienvenue dans %%%%site.name%%%%. Vous pouvez " +"Félicitations, %1$s! Bienvenue dans %%%%site.name%%%%. Vous pouvez " "maintenant :\n" "\n" -"* Visiter [votre profil](%s) et poster votre premier message.\n" +"* Visiter [votre profil](%2$s) et poster votre premier message.\n" "* Ajouter une adresse [Jabber/GTalk](%%%%action.imsettings%%%%) afin " "d’envoyer et recevoir vos avis par messagerie instantanée.\n" "* [Chercher des personnes](%%%%action.peoplesearch%%%%) que vous pourriez " -"connaître ou qui partagent vos intêrets.\n" -"* Mettre votre [profil](%%%%action.profilesettings%%%%) à jour pour en dire " -"plus à votre sujet.\n" +"connaître ou qui partagent vos intérêts.\n" +"* Mettre à jour vos [paramètres de profil](%%%%action.profilesettings%%%%) " +"pour en dire plus à votre sujet.\n" "* Parcourir la [documentation](%%%%doc.help%%%%) en ligne pour en savoir " "plus sur le fonctionnement du service.\n" "\n" @@ -2986,11 +2944,6 @@ msgstr "Repris !" msgid "Replies to %s" msgstr "Réponses à %s" -#: actions/replies.php:127 -#, php-format -msgid "Replies to %s, page %d" -msgstr "Réponses à %s - page %d" - #: actions/replies.php:144 #, php-format msgid "Replies feed for %s (RSS 1.0)" @@ -3009,11 +2962,11 @@ msgstr "Flux des réponses pour %s (Atom)" #: actions/replies.php:198 #, php-format msgid "" -"This is the timeline showing replies to %s but %s hasn't received a notice " -"to his attention yet." +"This is the timeline showing replies to %1$s but %2$s hasn't received a " +"notice to his attention yet." msgstr "" -"Ceci est la chronologie des réponses à %s mais %s n’a encore reçu aucun avis " -"à son intention." +"Ceci est la chronologie des réponses à %1$s mais %2$s n’a encore reçu aucun " +"avis à son intention." #: actions/replies.php:203 #, php-format @@ -3028,11 +2981,12 @@ msgstr "" #: actions/replies.php:205 #, php-format msgid "" -"You can try to [nudge %s](../%s) or [post something to his or her attention]" -"(%%%%action.newnotice%%%%?status_textarea=%s)." +"You can try to [nudge %1$s](../%2$s) or [post something to his or her " +"attention](%%%%action.newnotice%%%%?status_textarea=%3$s)." msgstr "" -"Vous pouvez essayer de [faire un clin d’œil à %s](../%s) ou de [poster " -"quelque chose à son intention](%%%%action.newnotice%%%%?status_textarea=%s)" +"Vous pouvez essayer de [faire un clin d’œil à %1$s](../%2$s) ou de [poster " +"quelque chose à son intention](%%%%action.newnotice%%%%?status_textarea=%3" +"$s)." #: actions/repliesrss.php:72 #, php-format @@ -3048,11 +3002,6 @@ msgstr "" msgid "User is already sandboxed." msgstr "L'utilisateur est déjà dans le bac à sable." -#: actions/showfavorites.php:79 -#, php-format -msgid "%s's favorite notices, page %d" -msgstr "Avis favoris de %s, page %d" - #: actions/showfavorites.php:132 msgid "Could not retrieve favorite notices." msgstr "Impossible d’afficher les favoris." @@ -3110,11 +3059,6 @@ msgstr "C’est un moyen de partager ce que vous aimez." msgid "%s group" msgstr "Groupe %s" -#: actions/showgroup.php:84 -#, php-format -msgid "%s group, page %d" -msgstr "Groupe %s - page %d" - #: actions/showgroup.php:218 msgid "Group profile" msgstr "Profil du groupe" @@ -3163,7 +3107,7 @@ msgstr "Membres" #: actions/showgroup.php:386 lib/profileaction.php:117 #: lib/profileaction.php:148 lib/profileaction.php:236 lib/section.php:95 -#: lib/tagcloudsection.php:71 +#: lib/subscriptionlist.php:126 lib/tagcloudsection.php:71 msgid "(None)" msgstr "(aucun)" @@ -3241,15 +3185,10 @@ msgstr "Avis supprimé." msgid " tagged %s" msgstr " marqué %s" -#: actions/showstream.php:79 -#, php-format -msgid "%s, page %d" -msgstr "%s - page %d" - #: actions/showstream.php:122 #, php-format -msgid "Notice feed for %s tagged %s (RSS 1.0)" -msgstr "Fil des avis pour %s marqués %s (RSS 1.0)" +msgid "Notice feed for %1$s tagged %2$s (RSS 1.0)" +msgstr "Fil des avis pour %1$s marqués %2$s (RSS 1.0)" #: actions/showstream.php:129 #, php-format @@ -3273,8 +3212,9 @@ msgstr "ami d’un ami pour %s" #: actions/showstream.php:191 #, php-format -msgid "This is the timeline for %s but %s hasn't posted anything yet." -msgstr "C’est le flux de %s mais %s n’a rien publié pour le moment." +msgid "This is the timeline for %1$s but %2$s hasn't posted anything yet." +msgstr "" +"Ceci est la chronologie de %1$s mais %2$s n’a rien publié pour le moment." #: actions/showstream.php:196 msgid "" @@ -3287,11 +3227,11 @@ msgstr "" #: actions/showstream.php:198 #, php-format msgid "" -"You can try to nudge %s or [post something to his or her attention](%%%%" -"action.newnotice%%%%?status_textarea=%s)." +"You can try to nudge %1$s or [post something to his or her attention](%%%%" +"action.newnotice%%%%?status_textarea=%2$s)." msgstr "" -"Vous pouvez essayer de faire un clin d’œil à %s ou de [poster quelque chose " -"à son intention](%%%%action.newnotice%%%%?status_textarea=%s)." +"Vous pouvez essayer de faire un clin d’œil à %1$s ou de [poster quelque " +"chose à son intention](%%%%action.newnotice%%%%?status_textarea=%2$s)." #: actions/showstream.php:234 #, php-format @@ -3340,12 +3280,13 @@ msgid "Site name must have non-zero length." msgstr "Le nom du site ne peut pas être vide." #: actions/siteadminpanel.php:154 -msgid "You must have a valid contact email address" +#, fuzzy +msgid "You must have a valid contact email address." msgstr "Vous devez avoir une adresse de courriel de contact valide." #: actions/siteadminpanel.php:172 -#, php-format -msgid "Unknown language \"%s\"" +#, fuzzy, php-format +msgid "Unknown language \"%s\"." msgstr "Langue « %s » inconnue" #: actions/siteadminpanel.php:179 @@ -3527,7 +3468,8 @@ msgid "Save site settings" msgstr "Sauvegarder les paramètres du site" #: actions/smssettings.php:58 -msgid "SMS Settings" +#, fuzzy +msgid "SMS settings" msgstr "Paramètres SMS" #: actions/smssettings.php:69 @@ -3558,7 +3500,8 @@ msgid "Enter the code you received on your phone." msgstr "Entrez le code que vous avez reçu sur votre téléphone." #: actions/smssettings.php:138 -msgid "SMS Phone number" +#, fuzzy +msgid "SMS phone number" msgstr "Numéro SMS" #: actions/smssettings.php:140 @@ -3652,8 +3595,8 @@ msgstr "Abonnés à %s" #: actions/subscribers.php:52 #, php-format -msgid "%s subscribers, page %d" -msgstr "Abonnés à %s - page &d" +msgid "%1$s subscribers, page %2$d" +msgstr "Abonnés à %1$s - page %2$d" #: actions/subscribers.php:63 msgid "These are the people who listen to your notices." @@ -3693,8 +3636,8 @@ msgstr "Abonnements de %s" #: actions/subscriptions.php:54 #, php-format -msgid "%s subscriptions, page %d" -msgstr "Abonnements de %s - page %d" +msgid "%1$s subscriptions, page %2$d" +msgstr "Abonnements de %1$s - page %2$d" #: actions/subscriptions.php:65 msgid "These are the people whose notices you listen to." @@ -3734,11 +3677,6 @@ msgstr "Jabber" msgid "SMS" msgstr "SMS" -#: actions/tag.php:68 -#, php-format -msgid "Notices tagged with %s, page %d" -msgstr "Avis marqués %s - page %d" - #: actions/tag.php:86 #, php-format msgid "Notice feed for tag %s (RSS 1.0)" @@ -3823,22 +3761,19 @@ msgstr "L'utilisateur n'est pas réduit au silence." msgid "No profile id in request." msgstr "Aucune identité de profil dans la requête." -#: actions/unsubscribe.php:84 -msgid "No profile with that id." -msgstr "Aucun profil avec cet identifiant." - #: actions/unsubscribe.php:98 msgid "Unsubscribed" msgstr "Désabonné" #: actions/updateprofile.php:62 actions/userauthorization.php:330 #, php-format -msgid "Listenee stream license ‘%s’ is not compatible with site license ‘%s’." +msgid "" +"Listenee stream license ‘%1$s’ is not compatible with site license ‘%2$s’." msgstr "" -"La licence du flux auquel vous êtes abonné(e) ‘%s’ n’est pas compatible avec " -"la licence du site ‘%s’." +"La licence du flux auquel vous êtes abonné(e), « %1$s », n’est pas compatible " +"avec la licence du site « %2$s »." -#: actions/useradminpanel.php:58 lib/adminpanelaction.php:305 +#: actions/useradminpanel.php:58 lib/adminpanelaction.php:321 #: lib/personalgroupnav.php:115 msgid "User" msgstr "Utilisateur" @@ -3941,7 +3876,7 @@ msgstr "" "abonner aux avis de cet utilisateur. Si vous n’avez pas demandé à vous " "abonner aux avis de quelqu’un, cliquez « Rejeter »." -#: actions/userauthorization.php:188 +#: actions/userauthorization.php:188 actions/version.php:165 msgid "License" msgstr "Licence" @@ -3996,8 +3931,8 @@ msgstr "" #: actions/userauthorization.php:296 #, php-format -msgid "Listener URI ‘%s’ not found here" -msgstr "L’URI de l’auditeur ‘%s’ n’a pas été trouvée" +msgid "Listener URI ‘%s’ not found here." +msgstr "L’URI de l’auditeur ‘%s’ n’a pas été trouvée ici." #: actions/userauthorization.php:301 #, php-format @@ -4030,10 +3965,6 @@ msgstr "Impossible de lire l’URL de l’avatar « %s »." msgid "Wrong image type for avatar URL ‘%s’." msgstr "Format d’image invalide pour l’URL de l’avatar « %s »." -#: actions/userbyid.php:70 -msgid "No ID." -msgstr "Aucun identifiant." - #: actions/userdesignsettings.php:76 lib/designsettings.php:65 msgid "Profile design" msgstr "Conception de profil" @@ -4050,11 +3981,6 @@ msgstr "" msgid "Enjoy your hotdog!" msgstr "Bon appétit !" -#: actions/usergroups.php:64 -#, php-format -msgid "%s groups, page %d" -msgstr "Groupes de %s - page %d" - #: actions/usergroups.php:130 msgid "Search for more groups" msgstr "Rechercher pour plus de groupes" @@ -4071,6 +3997,81 @@ msgstr "" "Essayez de [rechercher un groupe](%%action.groupsearch%%) et de vous y " "inscrire." +#: actions/version.php:73 +#, php-format +msgid "StatusNet %s" +msgstr "StatusNet %s" + +#: actions/version.php:153 +#, php-format +msgid "" +"This site is powered by %1$s version %2$s, Copyright 2008-2010 StatusNet, " +"Inc. and contributors." +msgstr "" +"Ce site est propulsé par %1$s, version %2$s, Copyright 2008-2010 StatusNet, " +"Inc. et ses contributeurs." + +#: actions/version.php:157 +msgid "StatusNet" +msgstr "StatusNet" + +#: actions/version.php:161 +msgid "Contributors" +msgstr "Contributeurs" + +#: actions/version.php:168 +msgid "" +"StatusNet is free software: you can redistribute it and/or modify it under " +"the terms of the GNU Affero General Public License as published by the Free " +"Software Foundation, either version 3 of the License, or (at your option) " +"any later version. " +msgstr "" +"StatusNet est un logiciel libre : vous pouvez le redistribuer et/ou le " +"modifier en respectant les termes de la licence Licence Publique Générale " +"GNU Affero telle qu'elle a été publiée par la Free Software Foundation, dans " +"sa version 3 ou (comme vous le souhaitez) toute version plus récente. " + +#: actions/version.php:174 +msgid "" +"This program is distributed in the hope that it will be useful, but WITHOUT " +"ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or " +"FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License " +"for more details. " +msgstr "" +"Ce programme est distribué dans l'espoir qu'il sera utile, mais SANS AUCUNE " +"GARANTIE ; sans même la garantie implicite de COMMERCIALISATION ou " +"D'ADAPTATION À UN BUT PARTICULIER. Pour plus de détails, voir la Licence " +"Publique Générale GNU Affero." + +#: actions/version.php:180 +#, php-format +msgid "" +"You should have received a copy of the GNU Affero General Public License " +"along with this program. If not, see %s." +msgstr "" +"Vous avez dû recevoir une copie de la Licence Publique Générale GNU Affero " +"avec ce programme. Si ce n'est pas le cas, consultez %s." + +#: actions/version.php:189 +msgid "Plugins" +msgstr "Extensions" + +#: actions/version.php:195 +msgid "Name" +msgstr "Nom" + +#: actions/version.php:196 lib/action.php:741 +msgid "Version" +msgstr "Version" + +#: actions/version.php:197 +msgid "Author(s)" +msgstr "Auteur(s)" + +#: actions/version.php:198 lib/groupeditform.php:172 +msgid "Description" +msgstr "Description" + #: classes/File.php:137 #, php-format msgid "" @@ -4143,7 +4144,7 @@ msgstr "Problème lors de l’enregistrement de l’avis." msgid "DB error inserting reply: %s" msgstr "Erreur de base de donnée en insérant la réponse :%s" -#: classes/Notice.php:1361 +#: classes/Notice.php:1359 #, php-format msgid "RT @%1$s %2$s" msgstr "RT @%1$s %2$s" @@ -4189,137 +4190,132 @@ msgstr "Autres " msgid "Other options" msgstr "Autres options " -#: lib/action.php:144 -#, php-format -msgid "%s - %s" -msgstr "%s - %s" - #: lib/action.php:159 msgid "Untitled page" msgstr "Page sans nom" -#: lib/action.php:426 +#: lib/action.php:427 msgid "Primary site navigation" msgstr "Navigation primaire du site" -#: lib/action.php:432 +#: lib/action.php:433 msgid "Home" msgstr "Accueil" -#: lib/action.php:432 +#: lib/action.php:433 msgid "Personal profile and friends timeline" msgstr "Profil personnel et flux des amis" -#: lib/action.php:434 +#: lib/action.php:435 msgid "Account" msgstr "Compte" -#: lib/action.php:434 +#: lib/action.php:435 msgid "Change your email, avatar, password, profile" msgstr "Modifier votre courriel, avatar, mot de passe, profil" -#: lib/action.php:437 +#: lib/action.php:438 msgid "Connect" msgstr "Connecter" -#: lib/action.php:437 +#: lib/action.php:438 msgid "Connect to services" msgstr "Se connecter aux services" -#: lib/action.php:441 +#: lib/action.php:442 msgid "Change site configuration" msgstr "Modifier la configuration du site" -#: lib/action.php:445 lib/subgroupnav.php:105 +#: lib/action.php:446 lib/subgroupnav.php:105 msgid "Invite" msgstr "Inviter" -#: lib/action.php:446 lib/subgroupnav.php:106 +#: lib/action.php:447 lib/subgroupnav.php:106 #, php-format msgid "Invite friends and colleagues to join you on %s" msgstr "Inviter des amis et collègues à vous rejoindre dans %s" -#: lib/action.php:451 +#: lib/action.php:452 msgid "Logout" msgstr "Fermeture de session" -#: lib/action.php:451 +#: lib/action.php:452 msgid "Logout from the site" msgstr "Fermer la session" -#: lib/action.php:456 +#: lib/action.php:457 msgid "Create an account" msgstr "Créer un compte" -#: lib/action.php:459 +#: lib/action.php:460 msgid "Login to the site" msgstr "Ouvrir une session" -#: lib/action.php:462 lib/action.php:725 +#: lib/action.php:463 lib/action.php:726 msgid "Help" msgstr "Aide" -#: lib/action.php:462 +#: lib/action.php:463 msgid "Help me!" msgstr "À l’aide !" -#: lib/action.php:465 lib/searchaction.php:127 +#: lib/action.php:466 lib/searchaction.php:127 msgid "Search" msgstr "Rechercher" -#: lib/action.php:465 +#: lib/action.php:466 msgid "Search for people or text" msgstr "Rechercher des personnes ou du texte" -#: lib/action.php:486 +#: lib/action.php:487 msgid "Site notice" msgstr "Notice du site" -#: lib/action.php:552 +#: lib/action.php:553 msgid "Local views" msgstr "Vues locales" -#: lib/action.php:618 +#: lib/action.php:619 msgid "Page notice" msgstr "Avis de la page" -#: lib/action.php:720 +#: lib/action.php:721 msgid "Secondary site navigation" msgstr "Navigation secondaire du site" -#: lib/action.php:727 +#: lib/action.php:728 msgid "About" msgstr "À propos" -#: lib/action.php:729 +#: lib/action.php:730 msgid "FAQ" msgstr "FAQ" -#: lib/action.php:733 +#: lib/action.php:734 msgid "TOS" msgstr "CGU" -#: lib/action.php:736 +#: lib/action.php:737 msgid "Privacy" msgstr "Confidentialité" -#: lib/action.php:738 +#: lib/action.php:739 msgid "Source" msgstr "Source" -#: lib/action.php:740 +#: lib/action.php:743 msgid "Contact" msgstr "Contact" -#: lib/action.php:742 +#: lib/action.php:745 msgid "Badge" msgstr "Insigne" -#: lib/action.php:770 +#: lib/action.php:773 msgid "StatusNet software license" msgstr "Licence du logiciel StatusNet" -#: lib/action.php:773 +#: lib/action.php:776 #, php-format msgid "" "**%%site.name%%** is a microblogging service brought to you by [%%site." @@ -4328,12 +4324,12 @@ msgstr "" "**%%site.name%%** est un service de microblogging qui vous est proposé par " "[%%site.broughtby%%](%%site.broughtbyurl%%)." -#: lib/action.php:775 +#: lib/action.php:778 #, php-format msgid "**%%site.name%%** is a microblogging service. " msgstr "**%%site.name%%** est un service de micro-blogging." -#: lib/action.php:777 +#: lib/action.php:780 #, php-format msgid "" "It runs the [StatusNet](http://status.net/) microblogging software, version %" @@ -4344,31 +4340,31 @@ msgstr "" "version %s, disponible sous la licence [GNU Affero General Public License] " "(http://www.fsf.org/licensing/licenses/agpl-3.0.html)." -#: lib/action.php:791 +#: lib/action.php:794 msgid "Site content license" msgstr "Licence du contenu du site" -#: lib/action.php:800 +#: lib/action.php:803 msgid "All " msgstr "Tous " -#: lib/action.php:805 +#: lib/action.php:808 msgid "license." msgstr "licence." -#: lib/action.php:1099 +#: lib/action.php:1102 msgid "Pagination" msgstr "Pagination" -#: lib/action.php:1108 +#: lib/action.php:1111 msgid "After" msgstr "Après" -#: lib/action.php:1116 +#: lib/action.php:1119 msgid "Before" msgstr "Avant" -#: lib/action.php:1164 +#: lib/action.php:1167 msgid "There was a problem with your session token." msgstr "Un problème est survenu avec votre jeton de session." @@ -4376,27 +4372,31 @@ msgstr "Un problème est survenu avec votre jeton de session." msgid "You cannot make changes to this site." msgstr "Vous ne pouvez pas faire de modifications sur ce site." -#: lib/adminpanelaction.php:195 +#: lib/adminpanelaction.php:107 +msgid "Changes to that panel are not allowed." +msgstr "La modification de ce panneau n'est pas autorisée." + +#: lib/adminpanelaction.php:206 msgid "showForm() not implemented." msgstr "showForm() n’a pas été implémentée." -#: lib/adminpanelaction.php:224 +#: lib/adminpanelaction.php:235 msgid "saveSettings() not implemented." msgstr "saveSettings() n’a pas été implémentée." -#: lib/adminpanelaction.php:247 +#: lib/adminpanelaction.php:258 msgid "Unable to delete design setting." msgstr "Impossible de supprimer les paramètres de conception." -#: lib/adminpanelaction.php:300 +#: lib/adminpanelaction.php:312 msgid "Basic site configuration" msgstr "Configuration basique du site" -#: lib/adminpanelaction.php:303 +#: lib/adminpanelaction.php:317 msgid "Design configuration" msgstr "Configuration de la conception" -#: lib/adminpanelaction.php:306 lib/adminpanelaction.php:309 +#: lib/adminpanelaction.php:322 lib/adminpanelaction.php:327 msgid "Paths configuration" msgstr "Configuration des chemins" @@ -4420,11 +4420,19 @@ msgstr "Avis sur lesquels cette pièce jointe apparaît." msgid "Tags for this attachment" msgstr "Marques de cette pièce jointe" +#: lib/authenticationplugin.php:182 lib/authenticationplugin.php:187 +msgid "Password changing failed" +msgstr "La modification du mot de passe a échoué" + +#: lib/authenticationplugin.php:197 +msgid "Password changing is not allowed" +msgstr "La modification du mot de passe n'est pas autorisée" + #: lib/channel.php:138 lib/channel.php:158 msgid "Command results" msgstr "Résultats de la commande" -#: lib/channel.php:210 +#: lib/channel.php:210 lib/mailhandler.php:142 msgid "Command complete" msgstr "Commande complétée" @@ -4438,8 +4446,8 @@ msgstr "Désolé, cette commande n’a pas encore été implémentée." #: lib/command.php:88 #, php-format -msgid "Could not find a user with nickname %s" -msgstr "Impossible de trouver un utilisateur avec le pseudo %s" +msgid "Could not find a user with nickname %s." +msgstr "Impossible de trouver un utilisateur avec le pseudo %s." #: lib/command.php:92 msgid "It does not make a lot of sense to nudge yourself!" @@ -4447,8 +4455,8 @@ msgstr "Ça n’a pas de sens de se faire un clin d’œil à soi-même !" #: lib/command.php:99 #, php-format -msgid "Nudge sent to %s" -msgstr "Coup de code envoyé à %s" +msgid "Nudge sent to %s." +msgstr "Clin d'Å“il envoyé à %s." #: lib/command.php:126 #, php-format @@ -4462,34 +4470,34 @@ msgstr "" "Messages : %3$s" #: lib/command.php:152 lib/command.php:399 lib/command.php:460 -msgid "Notice with that id does not exist" -msgstr "Aucun avis avec cet identifiant n’existe" +msgid "Notice with that id does not exist." +msgstr "Aucun avis avec cet identifiant n’existe." #: lib/command.php:168 lib/command.php:415 lib/command.php:476 #: lib/command.php:532 -msgid "User has no last notice" -msgstr "Aucun avis récent pour cet utilisateur" +msgid "User has no last notice." +msgstr "Aucun avis récent pour cet utilisateur." #: lib/command.php:190 msgid "Notice marked as fave." msgstr "Avis ajouté aux favoris." -#: lib/command.php:315 +#: lib/command.php:284 #, php-format -msgid "%1$s (%2$s)" -msgstr "%1$s (%2$s)" +msgid "Could not remove user %1$s to group %2$s." +msgstr "Impossible de retirer l’utilisateur %1$s du groupe %2$s." #: lib/command.php:318 -#, php-format -msgid "Fullname: %s" +#, fuzzy, php-format +msgid "Full name: %s" msgstr "Nom complet : %s" -#: lib/command.php:321 +#: lib/command.php:321 lib/mail.php:254 #, php-format msgid "Location: %s" msgstr "Emplacement : %s" -#: lib/command.php:324 +#: lib/command.php:324 lib/mail.php:256 #, php-format msgid "Homepage: %s" msgstr "Site Web : %s" @@ -4501,27 +4509,19 @@ msgstr "À propos : %s" #: lib/command.php:358 scripts/xmppdaemon.php:301 #, php-format -msgid "Message too long - maximum is %d characters, you sent %d" +msgid "Message too long - maximum is %1$d characters, you sent %2$d." msgstr "" -"Message trop long ! La taille maximale est de %d caractères ; vous en avez " -"entré %d." +"Message trop long ! La taille maximale est de %1$d caractères ; vous en avez " +"entré %2$d." #: lib/command.php:378 msgid "Error sending direct message." msgstr "Une erreur est survenue pendant l’envoi de votre message." -#: lib/command.php:422 -msgid "Cannot repeat your own notice" -msgstr "Impossible de reprendre votre propre avis" - -#: lib/command.php:427 -msgid "Already repeated that notice" -msgstr "Avis déjà repris" - #: lib/command.php:435 #, php-format -msgid "Notice from %s repeated" -msgstr "Avis de %s repris" +msgid "Notice from %s repeated." +msgstr "Avis de %s repris." #: lib/command.php:437 msgid "Error repeating notice." @@ -4529,23 +4529,23 @@ msgstr "Erreur lors de la reprise de l'avis." #: lib/command.php:491 #, php-format -msgid "Notice too long - maximum is %d characters, you sent %d" +msgid "Notice too long - maximum is %1$d characters, you sent %2$d." msgstr "" -"Avis trop long ! La taille maximale est de %d caractères ; vous en avez " -"entré %d." +"Avis trop long ! La taille maximale est de %1$d caractères ; vous en avez " +"entré %2$d." #: lib/command.php:500 #, php-format -msgid "Reply to %s sent" -msgstr "Réponse à %s envoyée" +msgid "Reply to %s sent." +msgstr "Réponse à %s envoyée." #: lib/command.php:502 msgid "Error saving notice." msgstr "Problème lors de l’enregistrement de l’avis." #: lib/command.php:556 -msgid "Specify the name of the user to subscribe to" -msgstr "Indiquez le nom de l’utilisateur auquel vous souhaitez vous abonner" +msgid "Specify the name of the user to subscribe to." +msgstr "Indiquez le nom de l’utilisateur auquel vous souhaitez vous abonner." #: lib/command.php:563 #, php-format @@ -4553,8 +4553,9 @@ msgid "Subscribed to %s" msgstr "Abonné à %s" #: lib/command.php:584 -msgid "Specify the name of the user to unsubscribe from" -msgstr "Indiquez le nom de l’utilisateur duquel vous souhaitez vous désabonner" +msgid "Specify the name of the user to unsubscribe from." +msgstr "" +"Indiquez le nom de l’utilisateur duquel vous souhaitez vous désabonner." #: lib/command.php:591 #, php-format @@ -4582,20 +4583,20 @@ msgid "Can't turn on notification." msgstr "Impossible d’activer les avertissements." #: lib/command.php:650 -msgid "Login command is disabled" -msgstr "La commande d'ouverture de session est désactivée" +msgid "Login command is disabled." +msgstr "La commande d'ouverture de session est désactivée." #: lib/command.php:664 #, php-format -msgid "Could not create login token for %s" -msgstr "Impossible de créer le jeton d'ouverture de session pour %s" +msgid "Could not create login token for %s." +msgstr "Impossible de créer le jeton d'ouverture de session pour %s." #: lib/command.php:669 #, php-format -msgid "This link is useable only once, and is good for only 2 minutes: %s" +msgid "This link is useable only once, and is good for only 2 minutes: %s." msgstr "" "Ce lien n’est utilisable qu’une seule fois, et est valable uniquement " -"pendant 2 minutes : %s" +"pendant 2 minutes : %s." #: lib/command.php:685 msgid "You are not subscribed to anyone." @@ -4697,7 +4698,7 @@ msgstr "" "last <nickname> - même effet que 'get'\n" "on <nickname> - pas encore implémenté.\n" "off <nickname> - pas encore implémenté.\n" -"nudge <nickname> - rappeler à un utilisateur de poster.\n" +"nudge <nickname> - envoyer un clin d'Å“il à l'utilisateur.\n" "invite <phone number> - pas encore implémenté.\n" "track <word> - pas encore implémenté.\n" "untrack <word> - pas encore implémenté.\n" @@ -4823,10 +4824,6 @@ msgstr "Description du groupe ou du sujet" msgid "Describe the group or topic in %d characters" msgstr "Description du groupe ou du sujet en %d caractères" -#: lib/groupeditform.php:172 -msgid "Description" -msgstr "Description" - #: lib/groupeditform.php:179 msgid "" "Location for the group, if any, like \"City, State (or Region), Country\"" @@ -5013,21 +5010,9 @@ msgstr "" "----\n" "Changez votre adresse de courriel ou vos options de notification sur %8$s\n" -#: lib/mail.php:254 -#, php-format -msgid "Location: %s\n" -msgstr "Emplacement : %s\n" - -#: lib/mail.php:256 -#, php-format -msgid "Homepage: %s\n" -msgstr "Site Web : %s\n" - #: lib/mail.php:258 -#, php-format -msgid "" -"Bio: %s\n" -"\n" +#, fuzzy, php-format +msgid "Bio: %s" msgstr "" "Bio : %s\n" "\n" @@ -5227,6 +5212,27 @@ msgstr "" msgid "from" msgstr "de" +#: lib/mailhandler.php:37 +msgid "Could not parse message." +msgstr "Impossible de déchiffrer ce message." + +#: lib/mailhandler.php:42 +msgid "Not a registered user." +msgstr "Ceci n’est pas un utilisateur inscrit." + +#: lib/mailhandler.php:46 +msgid "Sorry, that is not your incoming email address." +msgstr "Désolé, ceci n’est pas votre adresse de courriel entrant." + +#: lib/mailhandler.php:50 +msgid "Sorry, no incoming email allowed." +msgstr "Désolé, la réception de courriels n’est pas permise." + +#: lib/mailhandler.php:228 +#, php-format +msgid "Unsupported message type: %s" +msgstr "Type de message non-supporté : %s" + #: lib/mediafile.php:98 lib/mediafile.php:123 msgid "There was a database error while saving your file. Please try again." msgstr "" @@ -5262,7 +5268,8 @@ msgid "File upload stopped by extension." msgstr "Import de fichier stoppé par une extension." #: lib/mediafile.php:179 lib/mediafile.php:216 -msgid "File exceeds user's quota!" +#, fuzzy +msgid "File exceeds user's quota." msgstr "Le fichier dépasse le quota de l’utilisateur." #: lib/mediafile.php:196 lib/mediafile.php:233 @@ -5270,7 +5277,8 @@ msgid "File could not be moved to destination directory." msgstr "Le fichier n’a pas pu être déplacé dans le dossier de destination." #: lib/mediafile.php:201 lib/mediafile.php:237 -msgid "Could not determine file's mime-type!" +#, fuzzy +msgid "Could not determine file's MIME type." msgstr "Impossible de déterminer le mime-type du fichier !" #: lib/mediafile.php:270 @@ -5279,8 +5287,8 @@ msgid " Try using another %s format." msgstr " Essayez d’utiliser un autre %s format." #: lib/mediafile.php:275 -#, php-format -msgid "%s is not a supported filetype on this server." +#, fuzzy, php-format +msgid "%s is not a supported file type on this server." msgstr "%s n’est pas un type de fichier supporté sur ce serveur." #: lib/messageform.php:120 @@ -5313,8 +5321,16 @@ msgid "Attach a file" msgstr "Attacher un fichier" #: lib/noticeform.php:212 -msgid "Share your location" -msgstr "Partager votre localisation" +msgid "Share my location." +msgstr "Partager ma localisation." + +#: lib/noticeform.php:214 +msgid "Do not share my location." +msgstr "Ne pas partager ma localisation." + +#: lib/noticeform.php:215 +msgid "Hide this info" +msgstr "Masquer cette info" #: lib/noticelist.php:428 #, php-format @@ -5430,6 +5446,10 @@ msgstr "Vos messages envoyés" msgid "Tags in %s's notices" msgstr "Marques dans les avis de %s" +#: lib/plugin.php:114 +msgid "Unknown" +msgstr "Inconnu" + #: lib/profileaction.php:109 lib/profileaction.php:192 lib/subgroupnav.php:82 msgid "Subscriptions" msgstr "Abonnements" @@ -5599,10 +5619,6 @@ msgstr "Nuage de marques pour une personne (ajoutées par eux-même)" msgid "People Tagcloud as tagged" msgstr "Nuage de marques pour une personne" -#: lib/subscriptionlist.php:126 -msgid "(none)" -msgstr "(aucun)" - #: lib/tagcloudsection.php:56 msgid "None" msgstr "Aucun" @@ -5717,19 +5733,3 @@ msgstr "&s n’est pas une couleur valide !" msgid "%s is not a valid color! Use 3 or 6 hex chars." msgstr "" "%s n’est pas une couleur valide ! Utilisez 3 ou 6 caractères hexadécimaux." - -#: scripts/maildaemon.php:48 -msgid "Could not parse message." -msgstr "Impossible de déchiffrer ce message." - -#: scripts/maildaemon.php:53 -msgid "Not a registered user." -msgstr "Ceci n’est pas un utilisateur inscrit." - -#: scripts/maildaemon.php:57 -msgid "Sorry, that is not your incoming email address." -msgstr "Désolé, ceci n’est pas votre adresse de courriel entrant." - -#: scripts/maildaemon.php:61 -msgid "Sorry, no incoming email allowed." -msgstr "Désolé, la réception de courriels n’est pas permise." diff --git a/locale/ga/LC_MESSAGES/statusnet.po b/locale/ga/LC_MESSAGES/statusnet.po index 70c96bef5..97d4fcbcb 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-01-03 10:37+0000\n" -"PO-Revision-Date: 2010-01-03 10:37:54+0000\n" +"POT-Creation-Date: 2010-01-10 11:27+0000\n" +"PO-Revision-Date: 2010-01-10 11:28:13+0000\n" "Language-Team: Irish\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha (r60575); Translate extension (2009-12-06)\n" +"X-Generator: MediaWiki 1.16alpha (r60888); Translate extension (2010-01-04)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: ga\n" "X-Message-Group: out-statusnet\n" @@ -52,11 +52,6 @@ msgstr "Non existe a etiqueta." msgid "No such user." msgstr "Ningún usuario." -#: actions/all.php:84 -#, fuzzy, php-format -msgid "%s and friends, page %d" -msgstr "%s e amigos" - #: actions/all.php:86 actions/all.php:167 actions/allrss.php:115 #: actions/apitimelinefriends.php:115 actions/apitimelinehome.php:115 #: lib/personalgroupnav.php:100 @@ -95,8 +90,8 @@ msgstr "" #: actions/all.php:134 #, php-format msgid "" -"You can try to [nudge %s](../%s) from his profile or [post something to his " -"or her attention](%%%%action.newnotice%%%%?status_textarea=%s)." +"You can try to [nudge %1$s](../%2$s) from his profile or [post something to " +"his or her attention](%%%%action.newnotice%%%%?status_textarea=%3$s)." msgstr "" #: actions/all.php:137 actions/replies.php:209 actions/showstream.php:202 @@ -122,6 +117,23 @@ msgstr "Actualizacións dende %1$s e amigos en %2$s!" #: actions/apiaccountupdateprofile.php:97 #: actions/apiaccountupdateprofilebackgroundimage.php:94 #: actions/apiaccountupdateprofilecolors.php:118 +#: actions/apidirectmessage.php:156 actions/apifavoritecreate.php:99 +#: actions/apifavoritedestroy.php:100 actions/apifriendshipscreate.php:100 +#: actions/apifriendshipsdestroy.php:100 actions/apifriendshipsshow.php:129 +#: actions/apigroupcreate.php:136 actions/apigroupismember.php:114 +#: actions/apigroupjoin.php:155 actions/apigroupleave.php:141 +#: actions/apigrouplist.php:132 actions/apigrouplistall.php:120 +#: actions/apigroupmembership.php:106 actions/apigroupshow.php:105 +#: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102 +#: actions/apistatusesretweets.php:112 actions/apistatusesshow.php:108 +#: actions/apistatusnetconfig.php:133 actions/apistatusnetversion.php:93 +#: actions/apisubscriptions.php:111 actions/apitimelinefavorites.php:146 +#: actions/apitimelinefriends.php:156 actions/apitimelinegroup.php:150 +#: actions/apitimelinehome.php:156 actions/apitimelinementions.php:151 +#: actions/apitimelinepublic.php:131 actions/apitimelineretweetedbyme.php:122 +#: actions/apitimelineretweetedtome.php:121 +#: actions/apitimelineretweetsofme.php:122 actions/apitimelinetag.php:141 +#: actions/apitimelineuser.php:165 actions/apiusershow.php:101 #, fuzzy msgid "API method not found." msgstr "Método da API non atopado" @@ -180,6 +192,9 @@ msgstr "" #: actions/apiaccountupdateprofilebackgroundimage.php:146 #: actions/apiaccountupdateprofilecolors.php:164 #: actions/apiaccountupdateprofilecolors.php:174 +#: actions/groupdesignsettings.php:287 actions/groupdesignsettings.php:297 +#: actions/userdesignsettings.php:210 actions/userdesignsettings.php:220 +#: actions/userdesignsettings.php:263 actions/userdesignsettings.php:273 #, fuzzy msgid "Unable to save your design settings." msgstr "Non se puideron gardar os teus axustes de Twitter!" @@ -223,26 +238,6 @@ msgstr "Mensaxes directas para %s" msgid "All the direct messages sent to %s" msgstr "Tódalas mensaxes directas enviadas a %s" -#: actions/apidirectmessage.php:156 actions/apifavoritecreate.php:99 -#: actions/apifavoritedestroy.php:100 actions/apifriendshipscreate.php:100 -#: actions/apifriendshipsdestroy.php:100 actions/apifriendshipsshow.php:129 -#: actions/apigroupcreate.php:136 actions/apigroupismember.php:114 -#: actions/apigroupjoin.php:155 actions/apigroupleave.php:141 -#: actions/apigrouplist.php:132 actions/apigrouplistall.php:120 -#: actions/apigroupmembership.php:106 actions/apigroupshow.php:105 -#: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102 -#: actions/apistatusesretweets.php:112 actions/apistatusesshow.php:108 -#: actions/apistatusnetconfig.php:133 actions/apistatusnetversion.php:93 -#: actions/apisubscriptions.php:111 actions/apitimelinefavorites.php:146 -#: actions/apitimelinefriends.php:156 actions/apitimelinegroup.php:150 -#: actions/apitimelinehome.php:156 actions/apitimelinementions.php:151 -#: actions/apitimelinepublic.php:131 actions/apitimelineretweetedbyme.php:122 -#: actions/apitimelineretweetedtome.php:121 -#: actions/apitimelineretweetsofme.php:122 actions/apitimelinetag.php:141 -#: actions/apitimelineuser.php:165 actions/apiusershow.php:101 -msgid "API method not found!" -msgstr "Método da API non atopado" - #: actions/apidirectmessagenew.php:126 msgid "No message text!" msgstr "Non hai mensaxes de texto!" @@ -269,7 +264,7 @@ msgstr "Non se atopou un estado con ese ID." #: actions/apifavoritecreate.php:119 #, fuzzy -msgid "This status is already a favorite!" +msgid "This status is already a favorite." msgstr "Este chÃo xa é un favorito!" #: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:176 @@ -278,7 +273,7 @@ msgstr "Non se puido crear o favorito." #: actions/apifavoritedestroy.php:122 #, fuzzy -msgid "That status is not a favorite!" +msgid "That status is not a favorite." msgstr "Este chÃo non é un favorito!" #: actions/apifavoritedestroy.php:134 actions/disfavor.php:87 @@ -300,8 +295,9 @@ msgid "Could not unfollow user: User not found." msgstr "Non podes seguir a este usuario: o Usuario non se atopa." #: actions/apifriendshipsdestroy.php:120 -msgid "You cannot unfollow yourself!" -msgstr "" +#, fuzzy +msgid "You cannot unfollow yourself." +msgstr "Non se puido actualizar o usuario." #: actions/apifriendshipsexists.php:94 msgid "Two user ids or screen_names must be supplied." @@ -390,7 +386,7 @@ msgstr "" msgid "Group not found!" msgstr "Método da API non atopado" -#: actions/apigroupjoin.php:110 +#: actions/apigroupjoin.php:110 actions/joingroup.php:90 lib/command.php:217 msgid "You are already a member of that group." msgstr "Xa estas suscrito a estes usuarios:" @@ -398,18 +394,18 @@ msgstr "Xa estas suscrito a estes usuarios:" msgid "You have been blocked from that group by the admin." msgstr "" -#: actions/apigroupjoin.php:138 +#: actions/apigroupjoin.php:138 actions/joingroup.php:128 lib/command.php:234 #, fuzzy, php-format -msgid "Could not join user %s to group %s." +msgid "Could not join user %1$s to group %2$s." msgstr "Non podes seguir a este usuario: o Usuario non se atopa." #: actions/apigroupleave.php:114 msgid "You are not a member of this group." msgstr "Non estás suscrito a ese perfil" -#: actions/apigroupleave.php:124 +#: actions/apigroupleave.php:124 actions/leavegroup.php:127 #, fuzzy, php-format -msgid "Could not remove user %s to group %s." +msgid "Could not remove user %1$s from group %2$s." msgstr "Non podes seguir a este usuario: o Usuario non se atopa." #: actions/apigrouplist.php:95 @@ -417,11 +413,6 @@ msgstr "Non podes seguir a este usuario: o Usuario non se atopa." msgid "%s's groups" msgstr "Usuarios" -#: actions/apigrouplist.php:103 -#, fuzzy, php-format -msgid "Groups %s is a member of on %s." -msgstr "%1s non é unha orixe fiable." - #: actions/apigrouplistall.php:90 actions/usergroups.php:62 #, php-format msgid "%s groups" @@ -445,12 +436,12 @@ msgstr "Non deberÃas eliminar o estado de outro usuario" msgid "No such notice." msgstr "Ningún chÃo." -#: actions/apistatusesretweet.php:83 +#: actions/apistatusesretweet.php:83 lib/command.php:422 #, fuzzy msgid "Cannot repeat your own notice." msgstr "Non se pode activar a notificación." -#: actions/apistatusesretweet.php:91 +#: actions/apistatusesretweet.php:91 lib/command.php:427 #, fuzzy msgid "Already repeated that notice." msgstr "Eliminar chÃo" @@ -465,7 +456,7 @@ msgid "No status with that ID found." msgstr "Non existe ningún estado con esa ID atopada." #: actions/apistatusesupdate.php:157 actions/newnotice.php:155 -#: scripts/maildaemon.php:71 +#: lib/mailhandler.php:60 #, fuzzy, php-format msgid "That's too long. Max notice size is %d chars." msgstr "" @@ -486,13 +477,13 @@ msgid "Unsupported format." msgstr "Formato de ficheiro de imaxe non soportado." #: actions/apitimelinefavorites.php:108 -#, php-format -msgid "%s / Favorites from %s" +#, fuzzy, php-format +msgid "%1$s / Favorites from %2$s" msgstr "%s / Favoritos dende %s" #: actions/apitimelinefavorites.php:120 -#, php-format -msgid "%s updates favorited by %s / %s." +#, fuzzy, php-format +msgid "%1$s updates favorited by %2$s / %2$s." msgstr "%s updates favorited by %s / %s." #: actions/apitimelinegroup.php:109 actions/apitimelineuser.php:118 @@ -561,8 +552,11 @@ msgstr "Non atopado" msgid "No such attachment." msgstr "Ningún documento." -#: actions/avatarbynickname.php:59 actions/grouprss.php:91 -#: actions/leavegroup.php:76 +#: actions/avatarbynickname.php:59 actions/blockedfromgroup.php:73 +#: actions/editgroup.php:84 actions/groupdesignsettings.php:84 +#: actions/grouplogo.php:86 actions/groupmembers.php:76 +#: actions/grouprss.php:91 actions/joingroup.php:76 actions/leavegroup.php:76 +#: actions/showgroup.php:121 msgid "No nickname." msgstr "Sen alcume." @@ -585,8 +579,8 @@ msgid "You can upload your personal avatar. The maximum file size is %s." msgstr "Podes actualizar a túa información do perfil persoal aquÃ" #: actions/avatarsettings.php:106 actions/avatarsettings.php:185 -#: actions/grouplogo.php:178 actions/remotesubscribe.php:191 -#: actions/userauthorization.php:72 actions/userrss.php:103 +#: actions/remotesubscribe.php:191 actions/userauthorization.php:72 +#: actions/userrss.php:103 msgid "User without matching profile" msgstr "Usuario sen un perfil que coincida." @@ -620,9 +614,9 @@ msgstr "Subir" msgid "Crop" msgstr "" -#: actions/avatarsettings.php:268 actions/disfavor.php:74 -#: actions/emailsettings.php:238 actions/favor.php:75 actions/geocode.php:50 -#: actions/groupblock.php:66 actions/grouplogo.php:309 +#: actions/avatarsettings.php:268 actions/deletenotice.php:157 +#: actions/disfavor.php:74 actions/emailsettings.php:238 actions/favor.php:75 +#: actions/geocode.php:50 actions/groupblock.php:66 actions/grouplogo.php:309 #: actions/groupunblock.php:66 actions/imsettings.php:206 #: actions/invite.php:56 actions/login.php:135 actions/makeadmin.php:66 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80 @@ -708,21 +702,16 @@ msgstr "Bloquear usuario" msgid "Failed to save block information." msgstr "Erro ao gardar información de bloqueo." -#: actions/blockedfromgroup.php:73 actions/editgroup.php:84 -#: actions/groupdesignsettings.php:84 actions/grouplogo.php:86 -#: actions/groupmembers.php:76 actions/joingroup.php:76 -#: actions/showgroup.php:121 -#, fuzzy -msgid "No nickname" -msgstr "Sen alcume." - #: actions/blockedfromgroup.php:80 actions/editgroup.php:96 +#: actions/foafgroup.php:44 actions/foafgroup.php:62 actions/groupblock.php:86 #: actions/groupbyid.php:83 actions/groupdesignsettings.php:97 #: actions/grouplogo.php:99 actions/groupmembers.php:83 -#: actions/joingroup.php:83 actions/showgroup.php:137 +#: actions/grouprss.php:98 actions/groupunblock.php:86 +#: actions/joingroup.php:83 actions/leavegroup.php:83 actions/makeadmin.php:86 +#: actions/showgroup.php:137 lib/command.php:212 lib/command.php:263 #, fuzzy -msgid "No such group" -msgstr "Non é o usuario" +msgid "No such group." +msgstr "Non existe a etiqueta." #: actions/blockedfromgroup.php:90 #, php-format @@ -730,9 +719,9 @@ msgid "%s blocked profiles" msgstr "" #: actions/blockedfromgroup.php:93 -#, php-format -msgid "%s blocked profiles, page %d" -msgstr "" +#, fuzzy, php-format +msgid "%1$s blocked profiles, page %2$d" +msgstr "%s e amigos" #: actions/blockedfromgroup.php:108 msgid "A list of the users blocked from joining this group." @@ -851,11 +840,6 @@ msgstr "Non se pode eliminar este chÃos." msgid "Delete this notice" msgstr "Eliminar chÃo" -#: actions/deletenotice.php:157 -#, fuzzy -msgid "There was a problem with your session token. Try again, please." -msgstr "Houbo un problema co teu token de sesión. Tentao de novo, anda..." - #: actions/deleteuser.php:67 #, fuzzy msgid "You cannot delete users." @@ -883,7 +867,7 @@ msgid "Delete this user" msgstr "Eliminar chÃo" #: actions/designadminpanel.php:62 lib/accountsettingsaction.php:124 -#: lib/adminpanelaction.php:302 lib/groupnav.php:119 +#: lib/adminpanelaction.php:316 lib/groupnav.php:119 msgid "Design" msgstr "" @@ -1032,7 +1016,7 @@ msgstr "Debes estar logueado para invitar a outros usuarios a empregar %s" #: actions/editgroup.php:103 actions/editgroup.php:168 #: actions/groupdesignsettings.php:104 actions/grouplogo.php:106 #, fuzzy -msgid "You must be an admin to edit the group" +msgid "You must be an admin to edit the group." msgstr "Debes estar logueado para invitar a outros usuarios a empregar %s" #: actions/editgroup.php:154 @@ -1060,7 +1044,8 @@ msgid "Options saved." msgstr "Configuracións gardadas." #: actions/emailsettings.php:60 -msgid "Email Settings" +#, fuzzy +msgid "Email settings" msgstr "Configuración de Correo" #: actions/emailsettings.php:71 @@ -1098,8 +1083,9 @@ msgid "Cancel" msgstr "Cancelar" #: actions/emailsettings.php:121 -msgid "Email Address" -msgstr "Enderezo de correo" +#, fuzzy +msgid "Email address" +msgstr "Enderezos de correo" #: actions/emailsettings.php:123 msgid "Email address, like \"UserName@example.org\"" @@ -1173,9 +1159,10 @@ msgstr "Non se inseriu unha dirección de correo" msgid "Cannot normalize that email address" msgstr "Esa dirección de correo non se pode normalizar " -#: actions/emailsettings.php:331 actions/siteadminpanel.php:157 -msgid "Not a valid email address" -msgstr "Non é unha dirección de correo válida" +#: actions/emailsettings.php:331 actions/register.php:201 +#: actions/siteadminpanel.php:157 +msgid "Not a valid email address." +msgstr "Non é un enderezo de correo válido." #: actions/emailsettings.php:334 msgid "That is already your email address." @@ -1361,19 +1348,11 @@ msgstr "Versión de protocolo OMB descoñecida." msgid "Error updating remote profile" msgstr "Acounteceu un erro actualizando o perfil remoto" -#: actions/foafgroup.php:44 actions/foafgroup.php:62 actions/groupblock.php:86 -#: actions/grouprss.php:98 actions/groupunblock.php:86 -#: actions/leavegroup.php:83 actions/makeadmin.php:86 lib/command.php:212 -#: lib/command.php:263 -#, fuzzy -msgid "No such group." -msgstr "Non existe a etiqueta." - -#: actions/getfile.php:75 +#: actions/getfile.php:79 msgid "No such file." msgstr "Ningún chÃo." -#: actions/getfile.php:79 +#: actions/getfile.php:83 msgid "Cannot read file." msgstr "Bloqueo de usuario fallido." @@ -1385,7 +1364,7 @@ msgstr "Non se especificou ningún perfil." #: actions/groupblock.php:76 actions/groupunblock.php:76 #: actions/makeadmin.php:76 actions/subedit.php:53 actions/tagother.php:46 -#: lib/profileformaction.php:77 +#: actions/unsubscribe.php:84 lib/profileformaction.php:77 msgid "No profile with that ID." msgstr "Non se atopou un perfil con ese ID." @@ -1417,9 +1396,9 @@ msgstr "Bloquear usuario" #: actions/groupblock.php:162 #, fuzzy, php-format msgid "" -"Are you sure you want to block user \"%s\" from the group \"%s\"? They will " -"be removed from the group, unable to post, and unable to subscribe to the " -"group in the future." +"Are you sure you want to block user \"%1$s\" from the group \"%2$s\"? They " +"will be removed from the group, unable to post, and unable to subscribe to " +"the group in the future." msgstr "" "Seguro que queres bloquear a este usuario? Despois diso, vai ser de-suscrito " "do teur perfil, non será capaz de suscribirse a ti nun futuro, e non vas a " @@ -1437,9 +1416,10 @@ msgstr "" msgid "Database error blocking user from group." msgstr "" -#: actions/groupbyid.php:74 -msgid "No ID" -msgstr "" +#: actions/groupbyid.php:74 actions/userbyid.php:70 +#, fuzzy +msgid "No ID." +msgstr "Sen id." #: actions/groupdesignsettings.php:68 #, fuzzy @@ -1462,13 +1442,6 @@ msgstr "" msgid "Couldn't update your design." msgstr "Non se puido actualizar o usuario." -#: actions/groupdesignsettings.php:287 actions/groupdesignsettings.php:297 -#: actions/userdesignsettings.php:210 actions/userdesignsettings.php:220 -#: actions/userdesignsettings.php:263 actions/userdesignsettings.php:273 -#, fuzzy -msgid "Unable to save your design settings!" -msgstr "Non se puideron gardar os teus axustes de Twitter!" - #: actions/groupdesignsettings.php:308 actions/userdesignsettings.php:231 #, fuzzy msgid "Design preferences saved." @@ -1484,6 +1457,11 @@ msgid "" "You can upload a logo image for your group. The maximum file size is %s." msgstr "" +#: actions/grouplogo.php:178 +#, fuzzy +msgid "User without matching profile." +msgstr "Usuario sen un perfil que coincida." + #: actions/grouplogo.php:362 msgid "Pick a square area of the image to be the logo." msgstr "" @@ -1505,14 +1483,14 @@ msgstr "" #: actions/groupmembers.php:96 #, php-format -msgid "%s group members, page %d" +msgid "%1$s group members, page %2$d" msgstr "" #: actions/groupmembers.php:111 msgid "A list of the users in this group." msgstr "" -#: actions/groupmembers.php:175 lib/action.php:441 lib/groupnav.php:107 +#: actions/groupmembers.php:175 lib/action.php:442 lib/groupnav.php:107 msgid "Admin" msgstr "" @@ -1610,7 +1588,8 @@ msgid "Error removing the block." msgstr "Acounteceu un erro borrando o bloqueo." #: actions/imsettings.php:59 -msgid "IM Settings" +#, fuzzy +msgid "IM settings" msgstr "Configuracións de IM" #: actions/imsettings.php:70 @@ -1640,7 +1619,8 @@ msgstr "" "message with further instructions. (Did you add %s to your buddy list?)" #: actions/imsettings.php:124 -msgid "IM Address" +#, fuzzy +msgid "IM address" msgstr "Enderezo de IM" #: actions/imsettings.php:126 @@ -1703,11 +1683,6 @@ msgstr "" msgid "That is not your Jabber ID." msgstr "Esa non é a túa conta Jabber." -#: actions/inbox.php:59 -#, php-format -msgid "Inbox for %s - page %d" -msgstr "Band. Entrada para %s - páxina %d" - #: actions/inbox.php:62 #, php-format msgid "Inbox for %s" @@ -1744,10 +1719,10 @@ msgstr "Invitar a novos usuarios" msgid "You are already subscribed to these users:" msgstr "Xa estas suscrito a estes usuarios:" -#: actions/invite.php:131 actions/invite.php:139 +#: actions/invite.php:131 actions/invite.php:139 lib/command.php:315 #, php-format -msgid "%s (%s)" -msgstr "%s (%s)" +msgid "%1$s (%2$s)" +msgstr "%1$s (%2$s)" #: actions/invite.php:136 msgid "" @@ -1789,7 +1764,7 @@ msgstr "Mensaxe persoal" msgid "Optionally add a personal message to the invitation." msgstr "Opcionalmente engadir unha mensaxe persoal á invitación." -#: actions/invite.php:197 lib/messageform.php:178 lib/noticeform.php:232 +#: actions/invite.php:197 lib/messageform.php:178 lib/noticeform.php:234 msgid "Send" msgstr "Enviar" @@ -1858,19 +1833,9 @@ msgstr "" msgid "You must be logged in to join a group." msgstr "Debes estar logueado para invitar a outros usuarios a empregar %s" -#: actions/joingroup.php:90 lib/command.php:217 -#, fuzzy -msgid "You are already a member of that group" -msgstr "Xa estas suscrito a estes usuarios:" - -#: actions/joingroup.php:128 lib/command.php:234 -#, fuzzy, php-format -msgid "Could not join user %s to group %s" -msgstr "Non podes seguir a este usuario: o Usuario non se atopa." - #: actions/joingroup.php:135 lib/command.php:239 #, fuzzy, php-format -msgid "%s joined group %s" +msgid "%1$s joined group %2$s" msgstr "%s / Favoritos dende %s" #: actions/leavegroup.php:60 @@ -1888,15 +1853,10 @@ msgstr "Non estás suscrito a ese perfil" msgid "Could not find membership record." msgstr "Non se puido actualizar o rexistro de usuario." -#: actions/leavegroup.php:127 lib/command.php:284 -#, fuzzy, php-format -msgid "Could not remove user %s to group %s" -msgstr "Non podes seguir a este usuario: o Usuario non se atopa." - #: actions/leavegroup.php:134 lib/command.php:289 -#, php-format -msgid "%s left group %s" -msgstr "" +#, fuzzy, php-format +msgid "%1$s left group %2$s" +msgstr "%s / Favoritos dende %s" #: actions/login.php:83 actions/register.php:137 msgid "Already logged in." @@ -1916,7 +1876,7 @@ msgstr "Usuario ou contrasinal incorrectos." msgid "Error setting user. You are probably not authorized." msgstr "Non está autorizado." -#: actions/login.php:208 actions/login.php:261 lib/action.php:459 +#: actions/login.php:208 actions/login.php:261 lib/action.php:460 #: lib/logingroupnav.php:79 msgid "Login" msgstr "Inicio de sesión" @@ -1971,19 +1931,19 @@ msgid "Only an admin can make another user an admin." msgstr "" #: actions/makeadmin.php:95 -#, php-format -msgid "%s is already an admin for group \"%s\"." -msgstr "" +#, fuzzy, php-format +msgid "%1$s is already an admin for group \"%2$s\"." +msgstr "O usuario bloqueoute." #: actions/makeadmin.php:132 -#, php-format -msgid "Can't get membership record for %s in group %s" -msgstr "" +#, fuzzy, php-format +msgid "Can't get membership record for %1$s in group %2$s." +msgstr "Non podes seguir a este usuario: o Usuario non se atopa." #: actions/makeadmin.php:145 -#, php-format -msgid "Can't make %s an admin for group %s" -msgstr "" +#, fuzzy, php-format +msgid "Can't make %1$s an admin for group %2$s." +msgstr "O usuario bloqueoute." #: actions/microsummary.php:69 msgid "No current status" @@ -2027,8 +1987,8 @@ msgid "Message sent" msgstr "Non hai mensaxes de texto!" #: actions/newmessage.php:185 lib/command.php:376 -#, php-format -msgid "Direct message to %s sent" +#, fuzzy, php-format +msgid "Direct message to %s sent." msgstr "Mensaxe directo a %s enviado" #: actions/newmessage.php:210 actions/newnotice.php:245 lib/channel.php:170 @@ -2058,7 +2018,7 @@ msgstr "Procura de texto" #: actions/noticesearch.php:91 #, fuzzy, php-format -msgid "Search results for \"%s\" on %s" +msgid "Search results for \"%1$s\" on %2$s" msgstr "Buscar \"%s\" na Liña de tempo" #: actions/noticesearch.php:121 @@ -2164,11 +2124,6 @@ msgstr "" msgid "URL shortening service is too long (max 50 chars)." msgstr "Sistema de acortamento de URLs demasiado longo (max 50 car.)." -#: actions/outbox.php:58 -#, php-format -msgid "Outbox for %s - page %d" -msgstr "Band. SaÃda para %s - páxina %d" - #: actions/outbox.php:61 #, php-format msgid "Outbox for %s" @@ -2242,7 +2197,7 @@ msgstr "Non se pode gardar a contrasinal." msgid "Password saved." msgstr "Contrasinal gardada." -#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:308 +#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:326 msgid "Paths" msgstr "" @@ -2275,7 +2230,7 @@ msgid "Invalid SSL server. The maximum length is 255 characters." msgstr "" #: actions/pathsadminpanel.php:217 actions/siteadminpanel.php:58 -#: lib/adminpanelaction.php:299 +#: lib/adminpanelaction.php:311 #, fuzzy msgid "Site" msgstr "Invitar" @@ -2377,8 +2332,9 @@ msgid "When to use SSL" msgstr "" #: actions/pathsadminpanel.php:308 -msgid "SSL Server" -msgstr "" +#, fuzzy +msgid "SSL server" +msgstr "Recuperar" #: actions/pathsadminpanel.php:309 msgid "Server to direct SSL requests to" @@ -2408,8 +2364,8 @@ msgid "Not a valid people tag: %s" msgstr "%s non é unha etiqueta de xente válida" #: actions/peopletag.php:144 -#, php-format -msgid "Users self-tagged with %s - page %d" +#, fuzzy, php-format +msgid "Users self-tagged with %1$s - page %2$d" msgstr "Usuarios auto-etiquetados como %s - páxina %d" #: actions/postnotice.php:84 @@ -2418,7 +2374,7 @@ msgstr "Contido do chÃo inválido" #: actions/postnotice.php:90 #, php-format -msgid "Notice license ‘%s’ is not compatible with site license ‘%s’." +msgid "Notice license ‘%1$s’ is not compatible with site license ‘%2$s’." msgstr "" #: actions/profilesettings.php:60 @@ -2544,20 +2500,20 @@ msgstr "Etiqueta inválida: '%s'" msgid "Couldn't update user for autosubscribe." msgstr "Non se puido actualizar o usuario para autosuscrición." -#: actions/profilesettings.php:354 +#: actions/profilesettings.php:359 #, fuzzy msgid "Couldn't save location prefs." msgstr "Non se puideron gardar as etiquetas." -#: actions/profilesettings.php:366 +#: actions/profilesettings.php:371 msgid "Couldn't save profile." msgstr "Non se puido gardar o perfil." -#: actions/profilesettings.php:374 +#: actions/profilesettings.php:379 msgid "Couldn't save tags." msgstr "Non se puideron gardar as etiquetas." -#: actions/profilesettings.php:382 lib/adminpanelaction.php:126 +#: actions/profilesettings.php:387 lib/adminpanelaction.php:137 msgid "Settings saved." msgstr "Configuracións gardadas." @@ -2662,7 +2618,7 @@ msgid "" "one!" msgstr "" -#: actions/publictagcloud.php:135 +#: actions/publictagcloud.php:131 msgid "Tag cloud" msgstr "" @@ -2801,7 +2757,7 @@ msgstr "Acounteceu un erro co código de confirmación." msgid "Registration successful" msgstr "Xa estas rexistrado!!" -#: actions/register.php:114 actions/register.php:502 lib/action.php:456 +#: actions/register.php:114 actions/register.php:502 lib/action.php:457 #: lib/logingroupnav.php:85 msgid "Register" msgstr "Rexistrar" @@ -2814,10 +2770,6 @@ msgstr "Non se permite o rexistro neste intre." msgid "You can't register if you don't agree to the license." msgstr "Non podes rexistrarte se non estas de acordo coa licenza." -#: actions/register.php:201 -msgid "Not a valid email address." -msgstr "Non é un enderezo de correo válido." - #: actions/register.php:212 msgid "Email address already exists." msgstr "O enderezo de correo xa existe." @@ -2882,12 +2834,12 @@ msgstr "" "dirección IM, número de teléfono." #: actions/register.php:537 -#, php-format +#, fuzzy, php-format msgid "" -"Congratulations, %s! And welcome to %%%%site.name%%%%. From here, you may " +"Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may " "want to...\n" "\n" -"* Go to [your profile](%s) and post your first message.\n" +"* Go to [your profile](%2$s) and post your first message.\n" "* Add a [Jabber/GTalk address](%%%%action.imsettings%%%%) so you can send " "notices through instant messages.\n" "* [Search for people](%%%%action.peoplesearch%%%%) that you may know or that " @@ -3018,11 +2970,6 @@ msgstr "Crear" msgid "Replies to %s" msgstr "Replies to %s" -#: actions/replies.php:127 -#, fuzzy, php-format -msgid "Replies to %s, page %d" -msgstr "Replies to %s" - #: actions/replies.php:144 #, fuzzy, php-format msgid "Replies feed for %s (RSS 1.0)" @@ -3041,8 +2988,8 @@ msgstr "Fonte de chÃos para %s" #: actions/replies.php:198 #, php-format msgid "" -"This is the timeline showing replies to %s but %s hasn't received a notice " -"to his attention yet." +"This is the timeline showing replies to %1$s but %2$s hasn't received a " +"notice to his attention yet." msgstr "" #: actions/replies.php:203 @@ -3055,8 +3002,8 @@ msgstr "" #: actions/replies.php:205 #, php-format msgid "" -"You can try to [nudge %s](../%s) or [post something to his or her attention]" -"(%%%%action.newnotice%%%%?status_textarea=%s)." +"You can try to [nudge %1$s](../%2$s) or [post something to his or her " +"attention](%%%%action.newnotice%%%%?status_textarea=%3$s)." msgstr "" #: actions/repliesrss.php:72 @@ -3074,11 +3021,6 @@ msgstr "Non podes enviar mensaxes a este usurio." msgid "User is already sandboxed." msgstr "O usuario bloqueoute." -#: actions/showfavorites.php:79 -#, fuzzy, php-format -msgid "%s's favorite notices, page %d" -msgstr "ChÃos favoritos de %s" - #: actions/showfavorites.php:132 msgid "Could not retrieve favorite notices." msgstr "Non se pode " @@ -3128,11 +3070,6 @@ msgstr "" msgid "%s group" msgstr "" -#: actions/showgroup.php:84 -#, php-format -msgid "%s group, page %d" -msgstr "" - #: actions/showgroup.php:218 #, fuzzy msgid "Group profile" @@ -3185,7 +3122,7 @@ msgstr "Membro dende" #: actions/showgroup.php:386 lib/profileaction.php:117 #: lib/profileaction.php:148 lib/profileaction.php:236 lib/section.php:95 -#: lib/tagcloudsection.php:71 +#: lib/subscriptionlist.php:126 lib/tagcloudsection.php:71 #, fuzzy msgid "(None)" msgstr "(nada)" @@ -3262,14 +3199,9 @@ msgstr "ChÃo publicado" msgid " tagged %s" msgstr "ChÃos tagueados con %s" -#: actions/showstream.php:79 -#, fuzzy, php-format -msgid "%s, page %d" -msgstr "Band. Entrada para %s - páxina %d" - #: actions/showstream.php:122 #, fuzzy, php-format -msgid "Notice feed for %s tagged %s (RSS 1.0)" +msgid "Notice feed for %1$s tagged %2$s (RSS 1.0)" msgstr "Fonte de chÃos para %s" #: actions/showstream.php:129 @@ -3294,7 +3226,7 @@ msgstr "Band. SaÃda para %s" #: actions/showstream.php:191 #, php-format -msgid "This is the timeline for %s but %s hasn't posted anything yet." +msgid "This is the timeline for %1$s but %2$s hasn't posted anything yet." msgstr "" #: actions/showstream.php:196 @@ -3306,8 +3238,8 @@ msgstr "" #: actions/showstream.php:198 #, php-format msgid "" -"You can try to nudge %s or [post something to his or her attention](%%%%" -"action.newnotice%%%%?status_textarea=%s)." +"You can try to nudge %1$s or [post something to his or her attention](%%%%" +"action.newnotice%%%%?status_textarea=%2$s)." msgstr "" #: actions/showstream.php:234 @@ -3360,12 +3292,12 @@ msgstr "" #: actions/siteadminpanel.php:154 #, fuzzy -msgid "You must have a valid contact email address" +msgid "You must have a valid contact email address." msgstr "Non é unha dirección de correo válida" #: actions/siteadminpanel.php:172 #, php-format -msgid "Unknown language \"%s\"" +msgid "Unknown language \"%s\"." msgstr "" #: actions/siteadminpanel.php:179 @@ -3555,7 +3487,8 @@ msgid "Save site settings" msgstr "Configuracións de Twitter" #: actions/smssettings.php:58 -msgid "SMS Settings" +#, fuzzy +msgid "SMS settings" msgstr "Configuracións de SMS" #: actions/smssettings.php:69 @@ -3584,7 +3517,8 @@ msgid "Enter the code you received on your phone." msgstr "Insire o código que recibiches no teu teléfono." #: actions/smssettings.php:138 -msgid "SMS Phone number" +#, fuzzy +msgid "SMS phone number" msgstr "Número de Teléfono do SMS" #: actions/smssettings.php:140 @@ -3677,9 +3611,9 @@ msgid "%s subscribers" msgstr "Subscritores" #: actions/subscribers.php:52 -#, php-format -msgid "%s subscribers, page %d" -msgstr "" +#, fuzzy, php-format +msgid "%1$s subscribers, page %2$d" +msgstr "Tódalas subscricións" #: actions/subscribers.php:63 msgid "These are the people who listen to your notices." @@ -3715,7 +3649,7 @@ msgstr "Tódalas subscricións" #: actions/subscriptions.php:54 #, fuzzy, php-format -msgid "%s subscriptions, page %d" +msgid "%1$s subscriptions, page %2$d" msgstr "Tódalas subscricións" #: actions/subscriptions.php:65 @@ -3750,11 +3684,6 @@ msgstr "Jabber." msgid "SMS" msgstr "SMS" -#: actions/tag.php:68 -#, fuzzy, php-format -msgid "Notices tagged with %s, page %d" -msgstr "ChÃos tagueados con %s" - #: actions/tag.php:86 #, fuzzy, php-format msgid "Notice feed for tag %s (RSS 1.0)" @@ -3846,20 +3775,17 @@ msgstr "O usuario non ten perfil." msgid "No profile id in request." msgstr "Non hai identificador de perfil na peticion." -#: actions/unsubscribe.php:84 -msgid "No profile with that id." -msgstr "Non se atopou un perfil con ese ID." - #: actions/unsubscribe.php:98 msgid "Unsubscribed" msgstr "De-suscribido" #: actions/updateprofile.php:62 actions/userauthorization.php:330 #, php-format -msgid "Listenee stream license ‘%s’ is not compatible with site license ‘%s’." +msgid "" +"Listenee stream license ‘%1$s’ is not compatible with site license ‘%2$s’." msgstr "" -#: actions/useradminpanel.php:58 lib/adminpanelaction.php:305 +#: actions/useradminpanel.php:58 lib/adminpanelaction.php:321 #: lib/personalgroupnav.php:115 msgid "User" msgstr "Usuario" @@ -3968,7 +3894,7 @@ msgstr "" "user's notices. If you didn't just ask to subscribe to someone's notices, " "click \"Cancel\"." -#: actions/userauthorization.php:188 +#: actions/userauthorization.php:188 actions/version.php:165 msgid "License" msgstr "" @@ -4027,7 +3953,7 @@ msgstr "" #: actions/userauthorization.php:296 #, php-format -msgid "Listener URI ‘%s’ not found here" +msgid "Listener URI ‘%s’ not found here." msgstr "" #: actions/userauthorization.php:301 @@ -4060,11 +3986,6 @@ msgstr "Non se pode ler a URL do avatar de '%s'" msgid "Wrong image type for avatar URL ‘%s’." msgstr "Tipo de imaxe incorrecto para '%s'" -#: actions/userbyid.php:70 -#, fuzzy -msgid "No ID." -msgstr "Sen id." - #: actions/userdesignsettings.php:76 lib/designsettings.php:65 #, fuzzy msgid "Profile design" @@ -4080,11 +4001,6 @@ msgstr "" msgid "Enjoy your hotdog!" msgstr "" -#: actions/usergroups.php:64 -#, php-format -msgid "%s groups, page %d" -msgstr "" - #: actions/usergroups.php:130 msgid "Search for more groups" msgstr "" @@ -4099,6 +4015,73 @@ msgstr "%1s non é unha orixe fiable." msgid "Try [searching for groups](%%action.groupsearch%%) and joining them." msgstr "" +#: actions/version.php:73 +#, fuzzy, php-format +msgid "StatusNet %s" +msgstr "EstatÃsticas" + +#: actions/version.php:153 +#, php-format +msgid "" +"This site is powered by %1$s version %2$s, Copyright 2008-2010 StatusNet, " +"Inc. and contributors." +msgstr "" + +#: actions/version.php:157 +#, fuzzy +msgid "StatusNet" +msgstr "Avatar actualizado." + +#: actions/version.php:161 +msgid "Contributors" +msgstr "" + +#: actions/version.php:168 +msgid "" +"StatusNet is free software: you can redistribute it and/or modify it under " +"the terms of the GNU Affero General Public License as published by the Free " +"Software Foundation, either version 3 of the License, or (at your option) " +"any later version. " +msgstr "" + +#: actions/version.php:174 +msgid "" +"This program is distributed in the hope that it will be useful, but WITHOUT " +"ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or " +"FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License " +"for more details. " +msgstr "" + +#: actions/version.php:180 +#, php-format +msgid "" +"You should have received a copy of the GNU Affero General Public License " +"along with this program. If not, see %s." +msgstr "" + +#: actions/version.php:189 +msgid "Plugins" +msgstr "" + +#: actions/version.php:195 +#, fuzzy +msgid "Name" +msgstr "Alcume" + +#: actions/version.php:196 lib/action.php:741 +#, fuzzy +msgid "Version" +msgstr "Persoal" + +#: actions/version.php:197 +msgid "Author(s)" +msgstr "" + +#: actions/version.php:198 lib/groupeditform.php:172 +#, fuzzy +msgid "Description" +msgstr "Subscricións" + #: classes/File.php:137 #, php-format msgid "" @@ -4172,7 +4155,7 @@ msgstr "Aconteceu un erro ó gardar o chÃo." msgid "DB error inserting reply: %s" msgstr "Erro ó inserir a contestación na BD: %s" -#: classes/Notice.php:1361 +#: classes/Notice.php:1359 #, fuzzy, php-format msgid "RT @%1$s %2$s" msgstr "%1$s (%2$s)" @@ -4222,148 +4205,143 @@ msgstr "Outros" msgid "Other options" msgstr "Outras opcions" -#: lib/action.php:144 -#, fuzzy, php-format -msgid "%s - %s" -msgstr "%s (%s)" - #: lib/action.php:159 msgid "Untitled page" msgstr "" -#: lib/action.php:426 +#: lib/action.php:427 msgid "Primary site navigation" msgstr "" -#: lib/action.php:432 +#: lib/action.php:433 msgid "Home" msgstr "Persoal" -#: lib/action.php:432 +#: lib/action.php:433 msgid "Personal profile and friends timeline" msgstr "" -#: lib/action.php:434 +#: lib/action.php:435 #, fuzzy msgid "Account" msgstr "Sobre" -#: lib/action.php:434 +#: lib/action.php:435 #, fuzzy msgid "Change your email, avatar, password, profile" msgstr "Cambiar contrasinal" -#: lib/action.php:437 +#: lib/action.php:438 msgid "Connect" msgstr "Conectar" -#: lib/action.php:437 +#: lib/action.php:438 #, fuzzy msgid "Connect to services" msgstr "Non se pode redireccionar ao servidor: %s" -#: lib/action.php:441 +#: lib/action.php:442 #, fuzzy msgid "Change site configuration" msgstr "Navegación de subscricións" -#: lib/action.php:445 lib/subgroupnav.php:105 +#: lib/action.php:446 lib/subgroupnav.php:105 msgid "Invite" msgstr "Invitar" -#: lib/action.php:446 lib/subgroupnav.php:106 +#: lib/action.php:447 lib/subgroupnav.php:106 #, fuzzy, php-format msgid "Invite friends and colleagues to join you on %s" msgstr "" "Emprega este formulario para invitar ós teus amigos e colegas a empregar " "este servizo." -#: lib/action.php:451 +#: lib/action.php:452 msgid "Logout" msgstr "Sair" -#: lib/action.php:451 +#: lib/action.php:452 msgid "Logout from the site" msgstr "" -#: lib/action.php:456 +#: lib/action.php:457 #, fuzzy msgid "Create an account" msgstr "Crear nova conta" -#: lib/action.php:459 +#: lib/action.php:460 msgid "Login to the site" msgstr "" -#: lib/action.php:462 lib/action.php:725 +#: lib/action.php:463 lib/action.php:726 msgid "Help" msgstr "Axuda" -#: lib/action.php:462 +#: lib/action.php:463 #, fuzzy msgid "Help me!" msgstr "Axuda" -#: lib/action.php:465 lib/searchaction.php:127 +#: lib/action.php:466 lib/searchaction.php:127 msgid "Search" msgstr "Buscar" -#: lib/action.php:465 +#: lib/action.php:466 msgid "Search for people or text" msgstr "" -#: lib/action.php:486 +#: lib/action.php:487 #, fuzzy msgid "Site notice" msgstr "Novo chÃo" -#: lib/action.php:552 +#: lib/action.php:553 msgid "Local views" msgstr "" -#: lib/action.php:618 +#: lib/action.php:619 #, fuzzy msgid "Page notice" msgstr "Novo chÃo" -#: lib/action.php:720 +#: lib/action.php:721 #, fuzzy msgid "Secondary site navigation" msgstr "Navegación de subscricións" -#: lib/action.php:727 +#: lib/action.php:728 msgid "About" msgstr "Sobre" -#: lib/action.php:729 +#: lib/action.php:730 msgid "FAQ" msgstr "Preguntas frecuentes" -#: lib/action.php:733 +#: lib/action.php:734 msgid "TOS" msgstr "" -#: lib/action.php:736 +#: lib/action.php:737 msgid "Privacy" msgstr "Privacidade" -#: lib/action.php:738 +#: lib/action.php:739 msgid "Source" msgstr "Fonte" -#: lib/action.php:740 +#: lib/action.php:743 msgid "Contact" msgstr "Contacto" -#: lib/action.php:742 +#: lib/action.php:745 msgid "Badge" msgstr "" -#: lib/action.php:770 +#: lib/action.php:773 msgid "StatusNet software license" msgstr "" -#: lib/action.php:773 +#: lib/action.php:776 #, php-format msgid "" "**%%site.name%%** is a microblogging service brought to you by [%%site." @@ -4372,12 +4350,12 @@ msgstr "" "**%%site.name%%** é un servizo de microbloguexo que che proporciona [%%site." "broughtby%%](%%site.broughtbyurl%%). " -#: lib/action.php:775 +#: lib/action.php:778 #, php-format msgid "**%%site.name%%** is a microblogging service. " msgstr "**%%site.name%%** é un servizo de microbloguexo." -#: lib/action.php:777 +#: lib/action.php:780 #, php-format msgid "" "It runs the [StatusNet](http://status.net/) microblogging software, version %" @@ -4388,35 +4366,35 @@ msgstr "" "%s, dispoñible baixo licenza [GNU Affero General Public License](http://www." "fsf.org/licensing/licenses/agpl-3.0.html)." -#: lib/action.php:791 +#: lib/action.php:794 #, fuzzy msgid "Site content license" msgstr "Atopar no contido dos chÃos" -#: lib/action.php:800 +#: lib/action.php:803 #, fuzzy msgid "All " msgstr "Todos" -#: lib/action.php:805 +#: lib/action.php:808 msgid "license." msgstr "" -#: lib/action.php:1099 +#: lib/action.php:1102 msgid "Pagination" msgstr "" -#: lib/action.php:1108 +#: lib/action.php:1111 #, fuzzy msgid "After" msgstr "« Despois" -#: lib/action.php:1116 +#: lib/action.php:1119 #, fuzzy msgid "Before" msgstr "Antes »" -#: lib/action.php:1164 +#: lib/action.php:1167 #, fuzzy msgid "There was a problem with your session token." msgstr "Houbo un problema co teu token de sesión. Tentao de novo, anda..." @@ -4426,32 +4404,37 @@ msgstr "Houbo un problema co teu token de sesión. Tentao de novo, anda..." msgid "You cannot make changes to this site." msgstr "Non podes enviar mensaxes a este usurio." -#: lib/adminpanelaction.php:195 +#: lib/adminpanelaction.php:107 +#, fuzzy +msgid "Changes to that panel are not allowed." +msgstr "Non se permite o rexistro neste intre." + +#: lib/adminpanelaction.php:206 #, fuzzy msgid "showForm() not implemented." msgstr "Comando non implementado." -#: lib/adminpanelaction.php:224 +#: lib/adminpanelaction.php:235 #, fuzzy msgid "saveSettings() not implemented." msgstr "Comando non implementado." -#: lib/adminpanelaction.php:247 +#: lib/adminpanelaction.php:258 #, fuzzy msgid "Unable to delete design setting." msgstr "Non se puideron gardar os teus axustes de Twitter!" -#: lib/adminpanelaction.php:300 +#: lib/adminpanelaction.php:312 #, fuzzy msgid "Basic site configuration" msgstr "Confirmar correo electrónico" -#: lib/adminpanelaction.php:303 +#: lib/adminpanelaction.php:317 #, fuzzy msgid "Design configuration" msgstr "Confirmación de SMS" -#: lib/adminpanelaction.php:306 lib/adminpanelaction.php:309 +#: lib/adminpanelaction.php:322 lib/adminpanelaction.php:327 #, fuzzy msgid "Paths configuration" msgstr "Confirmación de SMS" @@ -4477,11 +4460,21 @@ msgstr "" msgid "Tags for this attachment" msgstr "" +#: lib/authenticationplugin.php:182 lib/authenticationplugin.php:187 +#, fuzzy +msgid "Password changing failed" +msgstr "Contrasinal gardada." + +#: lib/authenticationplugin.php:197 +#, fuzzy +msgid "Password changing is not allowed" +msgstr "Contrasinal gardada." + #: lib/channel.php:138 lib/channel.php:158 msgid "Command results" msgstr "Resultados do comando" -#: lib/channel.php:210 +#: lib/channel.php:210 lib/mailhandler.php:142 msgid "Command complete" msgstr "Comando completo" @@ -4495,7 +4488,7 @@ msgstr "Desculpa, este comando todavÃa non está implementado." #: lib/command.php:88 #, fuzzy, php-format -msgid "Could not find a user with nickname %s" +msgid "Could not find a user with nickname %s." msgstr "Non se puido actualizar o usuario coa dirección de correo electrónico." #: lib/command.php:92 @@ -4504,7 +4497,7 @@ msgstr "" #: lib/command.php:99 #, fuzzy, php-format -msgid "Nudge sent to %s" +msgid "Nudge sent to %s." msgstr "Toque enviado" #: lib/command.php:126 @@ -4519,34 +4512,36 @@ msgstr "" "ChÃos: %3$s" #: lib/command.php:152 lib/command.php:399 lib/command.php:460 -msgid "Notice with that id does not exist" -msgstr "" +#, fuzzy +msgid "Notice with that id does not exist." +msgstr "Non se atopou un perfil con ese ID." #: lib/command.php:168 lib/command.php:415 lib/command.php:476 #: lib/command.php:532 -msgid "User has no last notice" +#, fuzzy +msgid "User has no last notice." msgstr "O usuario non ten último chio." #: lib/command.php:190 msgid "Notice marked as fave." msgstr "ChÃo marcado coma favorito." -#: lib/command.php:315 -#, php-format -msgid "%1$s (%2$s)" -msgstr "%1$s (%2$s)" +#: lib/command.php:284 +#, fuzzy, php-format +msgid "Could not remove user %1$s to group %2$s." +msgstr "Non podes seguir a este usuario: o Usuario non se atopa." #: lib/command.php:318 -#, php-format -msgid "Fullname: %s" +#, fuzzy, php-format +msgid "Full name: %s" msgstr "Nome completo: %s" -#: lib/command.php:321 +#: lib/command.php:321 lib/mail.php:254 #, php-format msgid "Location: %s" msgstr "Ubicación: %s" -#: lib/command.php:324 +#: lib/command.php:324 lib/mail.php:256 #, php-format msgid "Homepage: %s" msgstr "Páxina persoal: %s" @@ -4558,26 +4553,16 @@ msgstr "Sobre: %s" #: lib/command.php:358 scripts/xmppdaemon.php:301 #, fuzzy, php-format -msgid "Message too long - maximum is %d characters, you sent %d" +msgid "Message too long - maximum is %1$d characters, you sent %2$d." msgstr "Mensaxe demasiado longa - o máximo é 140 caracteres, ti enviaches %d " #: lib/command.php:378 msgid "Error sending direct message." msgstr "Erro ó enviar a mensaxe directa." -#: lib/command.php:422 -#, fuzzy -msgid "Cannot repeat your own notice" -msgstr "Non se pode activar a notificación." - -#: lib/command.php:427 -#, fuzzy -msgid "Already repeated that notice" -msgstr "Eliminar chÃo" - #: lib/command.php:435 #, fuzzy, php-format -msgid "Notice from %s repeated" +msgid "Notice from %s repeated." msgstr "ChÃo publicado" #: lib/command.php:437 @@ -4587,12 +4572,12 @@ msgstr "Aconteceu un erro ó gardar o chÃo." #: lib/command.php:491 #, fuzzy, php-format -msgid "Notice too long - maximum is %d characters, you sent %d" +msgid "Notice too long - maximum is %1$d characters, you sent %2$d." msgstr "Mensaxe demasiado longa - o máximo é 140 caracteres, ti enviaches %d " #: lib/command.php:500 -#, php-format -msgid "Reply to %s sent" +#, fuzzy, php-format +msgid "Reply to %s sent." msgstr "Non se pode eliminar este chÃos." #: lib/command.php:502 @@ -4601,7 +4586,8 @@ msgid "Error saving notice." msgstr "Aconteceu un erro ó gardar o chÃo." #: lib/command.php:556 -msgid "Specify the name of the user to subscribe to" +#, fuzzy +msgid "Specify the name of the user to subscribe to." msgstr "Especifica o nome do usuario ó que queres suscribirte" #: lib/command.php:563 @@ -4610,7 +4596,8 @@ msgid "Subscribed to %s" msgstr "Suscrito a %s" #: lib/command.php:584 -msgid "Specify the name of the user to unsubscribe from" +#, fuzzy +msgid "Specify the name of the user to unsubscribe from." msgstr "Especifica o nome de usuario ó que queres deixar de seguir" #: lib/command.php:591 @@ -4639,17 +4626,17 @@ msgid "Can't turn on notification." msgstr "Non se pode activar a notificación." #: lib/command.php:650 -msgid "Login command is disabled" +msgid "Login command is disabled." msgstr "" #: lib/command.php:664 #, fuzzy, php-format -msgid "Could not create login token for %s" +msgid "Could not create login token for %s." msgstr "Non se puido crear o favorito." #: lib/command.php:669 #, php-format -msgid "This link is useable only once, and is good for only 2 minutes: %s" +msgid "This link is useable only once, and is good for only 2 minutes: %s." msgstr "" #: lib/command.php:685 @@ -4884,11 +4871,6 @@ msgstr "Contanos un pouco de ti e dos teus intereses en 140 caractéres." msgid "Describe the group or topic in %d characters" msgstr "Contanos un pouco de ti e dos teus intereses en 140 caractéres." -#: lib/groupeditform.php:172 -#, fuzzy -msgid "Description" -msgstr "Subscricións" - #: lib/groupeditform.php:179 #, fuzzy msgid "" @@ -5074,23 +5056,11 @@ msgstr "" "Atentamente todo seu,\n" "%4$s.\n" -#: lib/mail.php:254 +#: lib/mail.php:258 #, fuzzy, php-format -msgid "Location: %s\n" +msgid "Bio: %s" msgstr "Ubicación: %s" -#: lib/mail.php:256 -#, fuzzy, php-format -msgid "Homepage: %s\n" -msgstr "Páxina persoal: %s" - -#: lib/mail.php:258 -#, php-format -msgid "" -"Bio: %s\n" -"\n" -msgstr "" - #: lib/mail.php:286 #, php-format msgid "New email address for posting to %s" @@ -5268,6 +5238,27 @@ msgstr "" msgid "from" msgstr " dende " +#: lib/mailhandler.php:37 +msgid "Could not parse message." +msgstr "Non se puido analizaar a mensaxe." + +#: lib/mailhandler.php:42 +msgid "Not a registered user." +msgstr "Non é un usuario rexistrado." + +#: lib/mailhandler.php:46 +msgid "Sorry, that is not your incoming email address." +msgstr "Ise é un enderezo IM incorrecto." + +#: lib/mailhandler.php:50 +msgid "Sorry, no incoming email allowed." +msgstr "Aivá, non se permiten correos entrantes." + +#: lib/mailhandler.php:228 +#, fuzzy, php-format +msgid "Unsupported message type: %s" +msgstr "Formato de ficheiro de imaxe non soportado." + #: lib/mediafile.php:98 lib/mediafile.php:123 msgid "There was a database error while saving your file. Please try again." msgstr "" @@ -5299,7 +5290,7 @@ msgid "File upload stopped by extension." msgstr "" #: lib/mediafile.php:179 lib/mediafile.php:216 -msgid "File exceeds user's quota!" +msgid "File exceeds user's quota." msgstr "" #: lib/mediafile.php:196 lib/mediafile.php:233 @@ -5307,7 +5298,8 @@ msgid "File could not be moved to destination directory." msgstr "" #: lib/mediafile.php:201 lib/mediafile.php:237 -msgid "Could not determine file's mime-type!" +#, fuzzy +msgid "Could not determine file's MIME type." msgstr "Non se pudo recuperar a liña de tempo publica." #: lib/mediafile.php:270 @@ -5317,7 +5309,7 @@ msgstr "" #: lib/mediafile.php:275 #, php-format -msgid "%s is not a supported filetype on this server." +msgid "%s is not a supported file type on this server." msgstr "" #: lib/messageform.php:120 @@ -5353,7 +5345,17 @@ msgid "Attach a file" msgstr "" #: lib/noticeform.php:212 -msgid "Share your location" +#, fuzzy +msgid "Share my location." +msgstr "Non se puideron gardar as etiquetas." + +#: lib/noticeform.php:214 +#, fuzzy +msgid "Do not share my location." +msgstr "Non se puideron gardar as etiquetas." + +#: lib/noticeform.php:215 +msgid "Hide this info" msgstr "" #: lib/noticelist.php:428 @@ -5481,6 +5483,11 @@ msgstr "As túas mensaxes enviadas" msgid "Tags in %s's notices" msgstr "O usuario non ten último chio." +#: lib/plugin.php:114 +#, fuzzy +msgid "Unknown" +msgstr "Acción descoñecida" + #: lib/profileaction.php:109 lib/profileaction.php:192 lib/subgroupnav.php:82 msgid "Subscriptions" msgstr "Subscricións" @@ -5666,10 +5673,6 @@ msgstr "" msgid "People Tagcloud as tagged" msgstr "" -#: lib/subscriptionlist.php:126 -msgid "(none)" -msgstr "(nada)" - #: lib/tagcloudsection.php:56 #, fuzzy msgid "None" @@ -5792,19 +5795,3 @@ msgstr "%1s non é unha orixe fiable." #, php-format msgid "%s is not a valid color! Use 3 or 6 hex chars." msgstr "" - -#: scripts/maildaemon.php:48 -msgid "Could not parse message." -msgstr "Non se puido analizaar a mensaxe." - -#: scripts/maildaemon.php:53 -msgid "Not a registered user." -msgstr "Non é un usuario rexistrado." - -#: scripts/maildaemon.php:57 -msgid "Sorry, that is not your incoming email address." -msgstr "Ise é un enderezo IM incorrecto." - -#: scripts/maildaemon.php:61 -msgid "Sorry, no incoming email allowed." -msgstr "Aivá, non se permiten correos entrantes." diff --git a/locale/he/LC_MESSAGES/statusnet.po b/locale/he/LC_MESSAGES/statusnet.po index 2249462bb..64e5e15f1 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-01-03 10:37+0000\n" -"PO-Revision-Date: 2010-01-03 10:37:59+0000\n" +"POT-Creation-Date: 2010-01-10 11:27+0000\n" +"PO-Revision-Date: 2010-01-10 11:28:16+0000\n" "Language-Team: Hebrew\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha (r60575); Translate extension (2009-12-06)\n" +"X-Generator: MediaWiki 1.16alpha (r60888); Translate extension (2010-01-04)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: he\n" "X-Message-Group: out-statusnet\n" @@ -50,11 +50,6 @@ msgstr "×ין הודעה כזו." msgid "No such user." msgstr "×ין משתמש ×›×–×”." -#: actions/all.php:84 -#, fuzzy, php-format -msgid "%s and friends, page %d" -msgstr "%s וחברי×" - #: actions/all.php:86 actions/all.php:167 actions/allrss.php:115 #: actions/apitimelinefriends.php:115 actions/apitimelinehome.php:115 #: lib/personalgroupnav.php:100 @@ -93,8 +88,8 @@ msgstr "" #: actions/all.php:134 #, php-format msgid "" -"You can try to [nudge %s](../%s) from his profile or [post something to his " -"or her attention](%%%%action.newnotice%%%%?status_textarea=%s)." +"You can try to [nudge %1$s](../%2$s) from his profile or [post something to " +"his or her attention](%%%%action.newnotice%%%%?status_textarea=%3$s)." msgstr "" #: actions/all.php:137 actions/replies.php:209 actions/showstream.php:202 @@ -120,6 +115,23 @@ msgstr "" #: actions/apiaccountupdateprofile.php:97 #: actions/apiaccountupdateprofilebackgroundimage.php:94 #: actions/apiaccountupdateprofilecolors.php:118 +#: actions/apidirectmessage.php:156 actions/apifavoritecreate.php:99 +#: actions/apifavoritedestroy.php:100 actions/apifriendshipscreate.php:100 +#: actions/apifriendshipsdestroy.php:100 actions/apifriendshipsshow.php:129 +#: actions/apigroupcreate.php:136 actions/apigroupismember.php:114 +#: actions/apigroupjoin.php:155 actions/apigroupleave.php:141 +#: actions/apigrouplist.php:132 actions/apigrouplistall.php:120 +#: actions/apigroupmembership.php:106 actions/apigroupshow.php:105 +#: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102 +#: actions/apistatusesretweets.php:112 actions/apistatusesshow.php:108 +#: actions/apistatusnetconfig.php:133 actions/apistatusnetversion.php:93 +#: actions/apisubscriptions.php:111 actions/apitimelinefavorites.php:146 +#: actions/apitimelinefriends.php:156 actions/apitimelinegroup.php:150 +#: actions/apitimelinehome.php:156 actions/apitimelinementions.php:151 +#: actions/apitimelinepublic.php:131 actions/apitimelineretweetedbyme.php:122 +#: actions/apitimelineretweetedtome.php:121 +#: actions/apitimelineretweetsofme.php:122 actions/apitimelinetag.php:141 +#: actions/apitimelineuser.php:165 actions/apiusershow.php:101 #, fuzzy msgid "API method not found." msgstr "קוד ×”×ישור ×œ× × ×ž×¦×." @@ -178,6 +190,9 @@ msgstr "" #: actions/apiaccountupdateprofilebackgroundimage.php:146 #: actions/apiaccountupdateprofilecolors.php:164 #: actions/apiaccountupdateprofilecolors.php:174 +#: actions/groupdesignsettings.php:287 actions/groupdesignsettings.php:297 +#: actions/userdesignsettings.php:210 actions/userdesignsettings.php:220 +#: actions/userdesignsettings.php:263 actions/userdesignsettings.php:273 msgid "Unable to save your design settings." msgstr "" @@ -220,26 +235,6 @@ msgstr "" msgid "All the direct messages sent to %s" msgstr "" -#: actions/apidirectmessage.php:156 actions/apifavoritecreate.php:99 -#: actions/apifavoritedestroy.php:100 actions/apifriendshipscreate.php:100 -#: actions/apifriendshipsdestroy.php:100 actions/apifriendshipsshow.php:129 -#: actions/apigroupcreate.php:136 actions/apigroupismember.php:114 -#: actions/apigroupjoin.php:155 actions/apigroupleave.php:141 -#: actions/apigrouplist.php:132 actions/apigrouplistall.php:120 -#: actions/apigroupmembership.php:106 actions/apigroupshow.php:105 -#: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102 -#: actions/apistatusesretweets.php:112 actions/apistatusesshow.php:108 -#: actions/apistatusnetconfig.php:133 actions/apistatusnetversion.php:93 -#: actions/apisubscriptions.php:111 actions/apitimelinefavorites.php:146 -#: actions/apitimelinefriends.php:156 actions/apitimelinegroup.php:150 -#: actions/apitimelinehome.php:156 actions/apitimelinementions.php:151 -#: actions/apitimelinepublic.php:131 actions/apitimelineretweetedbyme.php:122 -#: actions/apitimelineretweetedtome.php:121 -#: actions/apitimelineretweetsofme.php:122 actions/apitimelinetag.php:141 -#: actions/apitimelineuser.php:165 actions/apiusershow.php:101 -msgid "API method not found!" -msgstr "" - #: actions/apidirectmessagenew.php:126 msgid "No message text!" msgstr "" @@ -263,15 +258,16 @@ msgid "No status found with that ID." msgstr "" #: actions/apifavoritecreate.php:119 -msgid "This status is already a favorite!" -msgstr "" +#, fuzzy +msgid "This status is already a favorite." +msgstr "זהו כבר זיהוי ×”-Jabber שלך." #: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:176 msgid "Could not create favorite." msgstr "" #: actions/apifavoritedestroy.php:122 -msgid "That status is not a favorite!" +msgid "That status is not a favorite." msgstr "" #: actions/apifavoritedestroy.php:134 actions/disfavor.php:87 @@ -293,8 +289,9 @@ msgid "Could not unfollow user: User not found." msgstr "× ×›×©×œ×” ×”×”×¤× ×™×” לשרת: %s" #: actions/apifriendshipsdestroy.php:120 -msgid "You cannot unfollow yourself!" -msgstr "" +#, fuzzy +msgid "You cannot unfollow yourself." +msgstr "עידכון המשתמש × ×›×©×œ." #: actions/apifriendshipsexists.php:94 msgid "Two user ids or screen_names must be supplied." @@ -381,7 +378,7 @@ msgstr "" msgid "Group not found!" msgstr "×œ× × ×ž×¦×" -#: actions/apigroupjoin.php:110 +#: actions/apigroupjoin.php:110 actions/joingroup.php:90 lib/command.php:217 #, fuzzy msgid "You are already a member of that group." msgstr "כבר × ×›× ×¡×ª למערכת!" @@ -390,9 +387,9 @@ msgstr "כבר × ×›× ×¡×ª למערכת!" msgid "You have been blocked from that group by the admin." msgstr "" -#: actions/apigroupjoin.php:138 +#: actions/apigroupjoin.php:138 actions/joingroup.php:128 lib/command.php:234 #, fuzzy, php-format -msgid "Could not join user %s to group %s." +msgid "Could not join user %1$s to group %2$s." msgstr "× ×›×©×œ×” ×”×”×¤× ×™×” לשרת: %s" #: actions/apigroupleave.php:114 @@ -400,9 +397,9 @@ msgstr "× ×›×©×œ×” ×”×”×¤× ×™×” לשרת: %s" msgid "You are not a member of this group." msgstr "×œ× ×©×œ×—× ×• ××œ×™× ×• ×ת הפרופיל ×”×–×”" -#: actions/apigroupleave.php:124 +#: actions/apigroupleave.php:124 actions/leavegroup.php:127 #, fuzzy, php-format -msgid "Could not remove user %s to group %s." +msgid "Could not remove user %1$s from group %2$s." msgstr "× ×›×©×œ×” יצירת OpenID מתוך: %s" #: actions/apigrouplist.php:95 @@ -410,11 +407,6 @@ msgstr "× ×›×©×œ×” יצירת OpenID מתוך: %s" msgid "%s's groups" msgstr "פרופיל" -#: actions/apigrouplist.php:103 -#, fuzzy, php-format -msgid "Groups %s is a member of on %s." -msgstr "×œ× ×©×œ×—× ×• ××œ×™× ×• ×ת הפרופיל ×”×–×”" - #: actions/apigrouplistall.php:90 actions/usergroups.php:62 #, php-format msgid "%s groups" @@ -438,12 +430,12 @@ msgstr "" msgid "No such notice." msgstr "×ין הודעה כזו." -#: actions/apistatusesretweet.php:83 +#: actions/apistatusesretweet.php:83 lib/command.php:422 #, fuzzy msgid "Cannot repeat your own notice." msgstr "×œ× × ×™×ª×Ÿ ×œ×”×™×¨×©× ×œ×œ× ×”×¡×›×ž×” לרשיון" -#: actions/apistatusesretweet.php:91 +#: actions/apistatusesretweet.php:91 lib/command.php:427 #, fuzzy msgid "Already repeated that notice." msgstr "כבר × ×›× ×¡×ª למערכת!" @@ -458,7 +450,7 @@ msgid "No status with that ID found." msgstr "" #: actions/apistatusesupdate.php:157 actions/newnotice.php:155 -#: scripts/maildaemon.php:71 +#: lib/mailhandler.php:60 #, fuzzy, php-format msgid "That's too long. Max notice size is %d chars." msgstr "×–×” ×רוך מידי. ×ורך מירבי להודעה ×”×•× 140 ×ותיות." @@ -478,14 +470,14 @@ msgid "Unsupported format." msgstr "פורמט ×”×ª×ž×•× ×” ××™× ×• × ×ª×ž×š." #: actions/apitimelinefavorites.php:108 -#, php-format -msgid "%s / Favorites from %s" -msgstr "" +#, fuzzy, php-format +msgid "%1$s / Favorites from %2$s" +msgstr "הסטטוס של %1$s ב-%2$s " #: actions/apitimelinefavorites.php:120 -#, php-format -msgid "%s updates favorited by %s / %s." -msgstr "" +#, fuzzy, php-format +msgid "%1$s updates favorited by %2$s / %2$s." +msgstr "מיקרובלוג מ×ת %s" #: actions/apitimelinegroup.php:109 actions/apitimelineuser.php:118 #: actions/grouprss.php:131 actions/userrss.php:90 @@ -554,8 +546,11 @@ msgstr "×œ× × ×ž×¦×" msgid "No such attachment." msgstr "×ין מסמך ×›×–×”." -#: actions/avatarbynickname.php:59 actions/grouprss.php:91 -#: actions/leavegroup.php:76 +#: actions/avatarbynickname.php:59 actions/blockedfromgroup.php:73 +#: actions/editgroup.php:84 actions/groupdesignsettings.php:84 +#: actions/grouplogo.php:86 actions/groupmembers.php:76 +#: actions/grouprss.php:91 actions/joingroup.php:76 actions/leavegroup.php:76 +#: actions/showgroup.php:121 msgid "No nickname." msgstr "×ין ×›×™× ×•×™" @@ -578,8 +573,8 @@ msgid "You can upload your personal avatar. The maximum file size is %s." msgstr "" #: actions/avatarsettings.php:106 actions/avatarsettings.php:185 -#: actions/grouplogo.php:178 actions/remotesubscribe.php:191 -#: actions/userauthorization.php:72 actions/userrss.php:103 +#: actions/remotesubscribe.php:191 actions/userauthorization.php:72 +#: actions/userrss.php:103 msgid "User without matching profile" msgstr "" @@ -613,9 +608,9 @@ msgstr "ההעלה" msgid "Crop" msgstr "" -#: actions/avatarsettings.php:268 actions/disfavor.php:74 -#: actions/emailsettings.php:238 actions/favor.php:75 actions/geocode.php:50 -#: actions/groupblock.php:66 actions/grouplogo.php:309 +#: actions/avatarsettings.php:268 actions/deletenotice.php:157 +#: actions/disfavor.php:74 actions/emailsettings.php:238 actions/favor.php:75 +#: actions/geocode.php:50 actions/groupblock.php:66 actions/grouplogo.php:309 #: actions/groupunblock.php:66 actions/imsettings.php:206 #: actions/invite.php:56 actions/login.php:135 actions/makeadmin.php:66 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80 @@ -699,20 +694,15 @@ msgstr "×ין משתמש ×›×–×”." msgid "Failed to save block information." msgstr "" -#: actions/blockedfromgroup.php:73 actions/editgroup.php:84 -#: actions/groupdesignsettings.php:84 actions/grouplogo.php:86 -#: actions/groupmembers.php:76 actions/joingroup.php:76 -#: actions/showgroup.php:121 -#, fuzzy -msgid "No nickname" -msgstr "×ין ×›×™× ×•×™" - #: actions/blockedfromgroup.php:80 actions/editgroup.php:96 +#: actions/foafgroup.php:44 actions/foafgroup.php:62 actions/groupblock.php:86 #: actions/groupbyid.php:83 actions/groupdesignsettings.php:97 #: actions/grouplogo.php:99 actions/groupmembers.php:83 -#: actions/joingroup.php:83 actions/showgroup.php:137 +#: actions/grouprss.php:98 actions/groupunblock.php:86 +#: actions/joingroup.php:83 actions/leavegroup.php:83 actions/makeadmin.php:86 +#: actions/showgroup.php:137 lib/command.php:212 lib/command.php:263 #, fuzzy -msgid "No such group" +msgid "No such group." msgstr "×ין הודעה כזו." #: actions/blockedfromgroup.php:90 @@ -722,7 +712,7 @@ msgstr "למשתמש ×ין פרופיל." #: actions/blockedfromgroup.php:93 #, fuzzy, php-format -msgid "%s blocked profiles, page %d" +msgid "%1$s blocked profiles, page %2$d" msgstr "%s וחברי×" #: actions/blockedfromgroup.php:108 @@ -837,10 +827,6 @@ msgstr "×ין הודעה כזו." msgid "Delete this notice" msgstr "" -#: actions/deletenotice.php:157 -msgid "There was a problem with your session token. Try again, please." -msgstr "" - #: actions/deleteuser.php:67 #, fuzzy msgid "You cannot delete users." @@ -868,7 +854,7 @@ msgid "Delete this user" msgstr "×ין משתמש ×›×–×”." #: actions/designadminpanel.php:62 lib/accountsettingsaction.php:124 -#: lib/adminpanelaction.php:302 lib/groupnav.php:119 +#: lib/adminpanelaction.php:316 lib/groupnav.php:119 msgid "Design" msgstr "" @@ -1016,7 +1002,7 @@ msgstr "" #: actions/editgroup.php:103 actions/editgroup.php:168 #: actions/groupdesignsettings.php:104 actions/grouplogo.php:106 -msgid "You must be an admin to edit the group" +msgid "You must be an admin to edit the group." msgstr "" #: actions/editgroup.php:154 @@ -1044,8 +1030,9 @@ msgid "Options saved." msgstr "ההגדרות × ×©×ž×¨×•." #: actions/emailsettings.php:60 -msgid "Email Settings" -msgstr "" +#, fuzzy +msgid "Email settings" +msgstr "הגדרות הפרופיל" #: actions/emailsettings.php:71 #, php-format @@ -1079,8 +1066,9 @@ msgid "Cancel" msgstr "בטל" #: actions/emailsettings.php:121 -msgid "Email Address" -msgstr "" +#, fuzzy +msgid "Email address" +msgstr "כתובת ×ž×¡×¨×™× ×ž×™×“×™×™×" #: actions/emailsettings.php:123 msgid "Email address, like \"UserName@example.org\"" @@ -1153,8 +1141,9 @@ msgstr "" msgid "Cannot normalize that email address" msgstr "" -#: actions/emailsettings.php:331 actions/siteadminpanel.php:157 -msgid "Not a valid email address" +#: actions/emailsettings.php:331 actions/register.php:201 +#: actions/siteadminpanel.php:157 +msgid "Not a valid email address." msgstr "" #: actions/emailsettings.php:334 @@ -1338,20 +1327,12 @@ msgstr "גירסה ×œ× ×ž×•×›×¨×ª של פרוטוקול OMB" msgid "Error updating remote profile" msgstr "שגי××” בעדכון פרופיל מרוחק" -#: actions/foafgroup.php:44 actions/foafgroup.php:62 actions/groupblock.php:86 -#: actions/grouprss.php:98 actions/groupunblock.php:86 -#: actions/leavegroup.php:83 actions/makeadmin.php:86 lib/command.php:212 -#: lib/command.php:263 -#, fuzzy -msgid "No such group." -msgstr "×ין הודעה כזו." - -#: actions/getfile.php:75 +#: actions/getfile.php:79 #, fuzzy msgid "No such file." msgstr "×ין הודעה כזו." -#: actions/getfile.php:79 +#: actions/getfile.php:83 #, fuzzy msgid "Cannot read file." msgstr "×ין הודעה כזו." @@ -1364,7 +1345,7 @@ msgstr "" #: actions/groupblock.php:76 actions/groupunblock.php:76 #: actions/makeadmin.php:76 actions/subedit.php:53 actions/tagother.php:46 -#: lib/profileformaction.php:77 +#: actions/unsubscribe.php:84 lib/profileformaction.php:77 msgid "No profile with that ID." msgstr "" @@ -1395,9 +1376,9 @@ msgstr "×ין משתמש ×›×–×”." #: actions/groupblock.php:162 #, php-format msgid "" -"Are you sure you want to block user \"%s\" from the group \"%s\"? They will " -"be removed from the group, unable to post, and unable to subscribe to the " -"group in the future." +"Are you sure you want to block user \"%1$s\" from the group \"%2$s\"? They " +"will be removed from the group, unable to post, and unable to subscribe to " +"the group in the future." msgstr "" #: actions/groupblock.php:178 @@ -1414,9 +1395,10 @@ msgstr "×ין משתמש ×›×–×”." msgid "Database error blocking user from group." msgstr "" -#: actions/groupbyid.php:74 -msgid "No ID" -msgstr "" +#: actions/groupbyid.php:74 actions/userbyid.php:70 +#, fuzzy +msgid "No ID." +msgstr "×ין זיהוי." #: actions/groupdesignsettings.php:68 msgid "You must be logged in to edit a group." @@ -1439,12 +1421,6 @@ msgstr "" msgid "Couldn't update your design." msgstr "עידכון המשתמש × ×›×©×œ." -#: actions/groupdesignsettings.php:287 actions/groupdesignsettings.php:297 -#: actions/userdesignsettings.php:210 actions/userdesignsettings.php:220 -#: actions/userdesignsettings.php:263 actions/userdesignsettings.php:273 -msgid "Unable to save your design settings!" -msgstr "" - #: actions/groupdesignsettings.php:308 actions/userdesignsettings.php:231 #, fuzzy msgid "Design preferences saved." @@ -1460,6 +1436,11 @@ msgid "" "You can upload a logo image for your group. The maximum file size is %s." msgstr "" +#: actions/grouplogo.php:178 +#, fuzzy +msgid "User without matching profile." +msgstr "למשתמש ×ין פרופיל." + #: actions/grouplogo.php:362 msgid "Pick a square area of the image to be the logo." msgstr "" @@ -1481,14 +1462,14 @@ msgstr "" #: actions/groupmembers.php:96 #, php-format -msgid "%s group members, page %d" +msgid "%1$s group members, page %2$d" msgstr "" #: actions/groupmembers.php:111 msgid "A list of the users in this group." msgstr "" -#: actions/groupmembers.php:175 lib/action.php:441 lib/groupnav.php:107 +#: actions/groupmembers.php:175 lib/action.php:442 lib/groupnav.php:107 msgid "Admin" msgstr "" @@ -1587,7 +1568,8 @@ msgid "Error removing the block." msgstr "שגי××” בשמירת המשתמש." #: actions/imsettings.php:59 -msgid "IM Settings" +#, fuzzy +msgid "IM settings" msgstr "הגדרות ×ž×¡×¨×™× ×ž×™×“×™×™×" #: actions/imsettings.php:70 @@ -1618,7 +1600,8 @@ msgstr "" "× ×•×¡×¤×•×ª×¥ (×”×× ×”×•×¡×¤×ª ×ת %s לרשימת ×”×—×‘×¨×™× ×©×œ×š?)" #: actions/imsettings.php:124 -msgid "IM Address" +#, fuzzy +msgid "IM address" msgstr "כתובת ×ž×¡×¨×™× ×ž×™×“×™×™×" #: actions/imsettings.php:126 @@ -1679,11 +1662,6 @@ msgstr "" msgid "That is not your Jabber ID." msgstr "זהו ×œ× ×–×™×”×•×™ ×”-Jabber שלך." -#: actions/inbox.php:59 -#, php-format -msgid "Inbox for %s - page %d" -msgstr "" - #: actions/inbox.php:62 #, php-format msgid "Inbox for %s" @@ -1719,9 +1697,9 @@ msgstr "" msgid "You are already subscribed to these users:" msgstr "" -#: actions/invite.php:131 actions/invite.php:139 +#: actions/invite.php:131 actions/invite.php:139 lib/command.php:315 #, php-format -msgid "%s (%s)" +msgid "%1$s (%2$s)" msgstr "" #: actions/invite.php:136 @@ -1760,7 +1738,7 @@ msgstr "" msgid "Optionally add a personal message to the invitation." msgstr "" -#: actions/invite.php:197 lib/messageform.php:178 lib/noticeform.php:232 +#: actions/invite.php:197 lib/messageform.php:178 lib/noticeform.php:234 msgid "Send" msgstr "שלח" @@ -1804,19 +1782,9 @@ msgstr "" msgid "You must be logged in to join a group." msgstr "" -#: actions/joingroup.php:90 lib/command.php:217 -#, fuzzy -msgid "You are already a member of that group" -msgstr "כבר × ×›× ×¡×ª למערכת!" - -#: actions/joingroup.php:128 lib/command.php:234 -#, fuzzy, php-format -msgid "Could not join user %s to group %s" -msgstr "× ×›×©×œ×” ×”×”×¤× ×™×” לשרת: %s" - #: actions/joingroup.php:135 lib/command.php:239 #, php-format -msgid "%s joined group %s" +msgid "%1$s joined group %2$s" msgstr "" #: actions/leavegroup.php:60 @@ -1832,15 +1800,10 @@ msgstr "×œ× ×©×œ×—× ×• ××œ×™× ×• ×ת הפרופיל ×”×–×”" msgid "Could not find membership record." msgstr "" -#: actions/leavegroup.php:127 lib/command.php:284 -#, fuzzy, php-format -msgid "Could not remove user %s to group %s" -msgstr "× ×›×©×œ×” יצירת OpenID מתוך: %s" - #: actions/leavegroup.php:134 lib/command.php:289 -#, php-format -msgid "%s left group %s" -msgstr "" +#, fuzzy, php-format +msgid "%1$s left group %2$s" +msgstr "הסטטוס של %1$s ב-%2$s " #: actions/login.php:83 actions/register.php:137 msgid "Already logged in." @@ -1860,7 +1823,7 @@ msgstr "×©× ×ž×©×ª×ž×© ×ו סיסמה ×œ× × ×›×•× ×™×." msgid "Error setting user. You are probably not authorized." msgstr "×œ× ×ž×•×¨×©×”." -#: actions/login.php:208 actions/login.php:261 lib/action.php:459 +#: actions/login.php:208 actions/login.php:261 lib/action.php:460 #: lib/logingroupnav.php:79 msgid "Login" msgstr "×”×™×›× ×¡" @@ -1912,19 +1875,19 @@ msgid "Only an admin can make another user an admin." msgstr "" #: actions/makeadmin.php:95 -#, php-format -msgid "%s is already an admin for group \"%s\"." -msgstr "" +#, fuzzy, php-format +msgid "%1$s is already an admin for group \"%2$s\"." +msgstr "למשתמש ×ין פרופיל." #: actions/makeadmin.php:132 -#, php-format -msgid "Can't get membership record for %s in group %s" -msgstr "" +#, fuzzy, php-format +msgid "Can't get membership record for %1$s in group %2$s." +msgstr "× ×›×©×œ×” יצירת OpenID מתוך: %s" #: actions/makeadmin.php:145 -#, php-format -msgid "Can't make %s an admin for group %s" -msgstr "" +#, fuzzy, php-format +msgid "Can't make %1$s an admin for group %2$s." +msgstr "למשתמש ×ין פרופיל." #: actions/microsummary.php:69 msgid "No current status" @@ -1967,7 +1930,7 @@ msgstr "הודעה חדשה" #: actions/newmessage.php:185 lib/command.php:376 #, php-format -msgid "Direct message to %s sent" +msgid "Direct message to %s sent." msgstr "" #: actions/newmessage.php:210 actions/newnotice.php:245 lib/channel.php:170 @@ -1998,7 +1961,7 @@ msgstr "חיפוש טקסט" #: actions/noticesearch.php:91 #, fuzzy, php-format -msgid "Search results for \"%s\" on %s" +msgid "Search results for \"%1$s\" on %2$s" msgstr "חיפוש ברצף ×חרי \"%s\"" #: actions/noticesearch.php:121 @@ -2104,11 +2067,6 @@ msgstr "" msgid "URL shortening service is too long (max 50 chars)." msgstr "×©× ×”×ž×™×§×•× ×רוך מידי (מותר עד 255 ×ותיות)." -#: actions/outbox.php:58 -#, php-format -msgid "Outbox for %s - page %d" -msgstr "" - #: actions/outbox.php:61 #, php-format msgid "Outbox for %s" @@ -2181,7 +2139,7 @@ msgstr "×œ× × ×™×ª×Ÿ לשמור ×ת הסיסמה" msgid "Password saved." msgstr "הסיסמה × ×©×ž×¨×”." -#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:308 +#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:326 msgid "Paths" msgstr "" @@ -2214,7 +2172,7 @@ msgid "Invalid SSL server. The maximum length is 255 characters." msgstr "" #: actions/pathsadminpanel.php:217 actions/siteadminpanel.php:58 -#: lib/adminpanelaction.php:299 +#: lib/adminpanelaction.php:311 msgid "Site" msgstr "" @@ -2315,8 +2273,9 @@ msgid "When to use SSL" msgstr "" #: actions/pathsadminpanel.php:308 -msgid "SSL Server" -msgstr "" +#, fuzzy +msgid "SSL server" +msgstr "שיחזור" #: actions/pathsadminpanel.php:309 msgid "Server to direct SSL requests to" @@ -2346,9 +2305,9 @@ msgid "Not a valid people tag: %s" msgstr "×œ× ×¢×•×ž×“ ×‘×›×œ×œ×™× ×œ-OpenID." #: actions/peopletag.php:144 -#, php-format -msgid "Users self-tagged with %s - page %d" -msgstr "" +#, fuzzy, php-format +msgid "Users self-tagged with %1$s - page %2$d" +msgstr "מיקרובלוג מ×ת %s" #: actions/postnotice.php:84 msgid "Invalid notice content" @@ -2356,7 +2315,7 @@ msgstr "תוכן ההודעה ×œ× ×—×•×§×™" #: actions/postnotice.php:90 #, php-format -msgid "Notice license ‘%s’ is not compatible with site license ‘%s’." +msgid "Notice license ‘%1$s’ is not compatible with site license ‘%2$s’." msgstr "" #: actions/profilesettings.php:60 @@ -2475,21 +2434,21 @@ msgstr "כתובת ×תר הבית '%s' ××™× ×” חוקית" msgid "Couldn't update user for autosubscribe." msgstr "" -#: actions/profilesettings.php:354 +#: actions/profilesettings.php:359 #, fuzzy msgid "Couldn't save location prefs." msgstr "שמירת הפרופיל × ×›×©×œ×”." -#: actions/profilesettings.php:366 +#: actions/profilesettings.php:371 msgid "Couldn't save profile." msgstr "שמירת הפרופיל × ×›×©×œ×”." -#: actions/profilesettings.php:374 +#: actions/profilesettings.php:379 #, fuzzy msgid "Couldn't save tags." msgstr "שמירת הפרופיל × ×›×©×œ×”." -#: actions/profilesettings.php:382 lib/adminpanelaction.php:126 +#: actions/profilesettings.php:387 lib/adminpanelaction.php:137 msgid "Settings saved." msgstr "ההגדרות × ×©×ž×¨×•." @@ -2586,7 +2545,7 @@ msgid "" "one!" msgstr "" -#: actions/publictagcloud.php:135 +#: actions/publictagcloud.php:131 msgid "Tag cloud" msgstr "" @@ -2723,7 +2682,7 @@ msgstr "שגי××” ב×ישור הקוד." msgid "Registration successful" msgstr "" -#: actions/register.php:114 actions/register.php:502 lib/action.php:456 +#: actions/register.php:114 actions/register.php:502 lib/action.php:457 #: lib/logingroupnav.php:85 msgid "Register" msgstr "הירש×" @@ -2736,10 +2695,6 @@ msgstr "" msgid "You can't register if you don't agree to the license." msgstr "×œ× × ×™×ª×Ÿ ×œ×”×™×¨×©× ×œ×œ× ×”×¡×›×ž×” לרשיון" -#: actions/register.php:201 -msgid "Not a valid email address." -msgstr "" - #: actions/register.php:212 msgid "Email address already exists." msgstr "" @@ -2796,10 +2751,10 @@ msgstr "" #: actions/register.php:537 #, php-format msgid "" -"Congratulations, %s! And welcome to %%%%site.name%%%%. From here, you may " +"Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may " "want to...\n" "\n" -"* Go to [your profile](%s) and post your first message.\n" +"* Go to [your profile](%2$s) and post your first message.\n" "* Add a [Jabber/GTalk address](%%%%action.imsettings%%%%) so you can send " "notices through instant messages.\n" "* [Search for people](%%%%action.peoplesearch%%%%) that you may know or that " @@ -2912,11 +2867,6 @@ msgstr "צור" msgid "Replies to %s" msgstr "תגובת עבור %s" -#: actions/replies.php:127 -#, fuzzy, php-format -msgid "Replies to %s, page %d" -msgstr "תגובת עבור %s" - #: actions/replies.php:144 #, fuzzy, php-format msgid "Replies feed for %s (RSS 1.0)" @@ -2935,8 +2885,8 @@ msgstr "×”×–× ×ª הודעות של %s" #: actions/replies.php:198 #, php-format msgid "" -"This is the timeline showing replies to %s but %s hasn't received a notice " -"to his attention yet." +"This is the timeline showing replies to %1$s but %2$s hasn't received a " +"notice to his attention yet." msgstr "" #: actions/replies.php:203 @@ -2949,8 +2899,8 @@ msgstr "" #: actions/replies.php:205 #, php-format msgid "" -"You can try to [nudge %s](../%s) or [post something to his or her attention]" -"(%%%%action.newnotice%%%%?status_textarea=%s)." +"You can try to [nudge %1$s](../%2$s) or [post something to his or her " +"attention](%%%%action.newnotice%%%%?status_textarea=%3$s)." msgstr "" #: actions/repliesrss.php:72 @@ -2968,11 +2918,6 @@ msgstr "×œ× ×©×œ×—× ×• ××œ×™× ×• ×ת הפרופיל ×”×–×”" msgid "User is already sandboxed." msgstr "למשתמש ×ין פרופיל." -#: actions/showfavorites.php:79 -#, fuzzy, php-format -msgid "%s's favorite notices, page %d" -msgstr "×ין הודעה כזו." - #: actions/showfavorites.php:132 msgid "Could not retrieve favorite notices." msgstr "" @@ -3022,11 +2967,6 @@ msgstr "" msgid "%s group" msgstr "" -#: actions/showgroup.php:84 -#, php-format -msgid "%s group, page %d" -msgstr "" - #: actions/showgroup.php:218 #, fuzzy msgid "Group profile" @@ -3078,7 +3018,7 @@ msgstr "חבר מ××–" #: actions/showgroup.php:386 lib/profileaction.php:117 #: lib/profileaction.php:148 lib/profileaction.php:236 lib/section.php:95 -#: lib/tagcloudsection.php:71 +#: lib/subscriptionlist.php:126 lib/tagcloudsection.php:71 msgid "(None)" msgstr "" @@ -3146,14 +3086,9 @@ msgstr "הודעות" msgid " tagged %s" msgstr "" -#: actions/showstream.php:79 -#, php-format -msgid "%s, page %d" -msgstr "" - #: actions/showstream.php:122 #, fuzzy, php-format -msgid "Notice feed for %s tagged %s (RSS 1.0)" +msgid "Notice feed for %1$s tagged %2$s (RSS 1.0)" msgstr "×”×–× ×ª הודעות של %s" #: actions/showstream.php:129 @@ -3178,7 +3113,7 @@ msgstr "" #: actions/showstream.php:191 #, php-format -msgid "This is the timeline for %s but %s hasn't posted anything yet." +msgid "This is the timeline for %1$s but %2$s hasn't posted anything yet." msgstr "" #: actions/showstream.php:196 @@ -3190,8 +3125,8 @@ msgstr "" #: actions/showstream.php:198 #, php-format msgid "" -"You can try to nudge %s or [post something to his or her attention](%%%%" -"action.newnotice%%%%?status_textarea=%s)." +"You can try to nudge %1$s or [post something to his or her attention](%%%%" +"action.newnotice%%%%?status_textarea=%2$s)." msgstr "" #: actions/showstream.php:234 @@ -3234,12 +3169,12 @@ msgid "Site name must have non-zero length." msgstr "" #: actions/siteadminpanel.php:154 -msgid "You must have a valid contact email address" +msgid "You must have a valid contact email address." msgstr "" #: actions/siteadminpanel.php:172 #, php-format -msgid "Unknown language \"%s\"" +msgid "Unknown language \"%s\"." msgstr "" #: actions/siteadminpanel.php:179 @@ -3426,8 +3361,9 @@ msgid "Save site settings" msgstr "הגדרות" #: actions/smssettings.php:58 -msgid "SMS Settings" -msgstr "" +#, fuzzy +msgid "SMS settings" +msgstr "הגדרות ×ž×¡×¨×™× ×ž×™×“×™×™×" #: actions/smssettings.php:69 #, php-format @@ -3456,7 +3392,7 @@ msgid "Enter the code you received on your phone." msgstr "" #: actions/smssettings.php:138 -msgid "SMS Phone number" +msgid "SMS phone number" msgstr "" #: actions/smssettings.php:140 @@ -3545,9 +3481,9 @@ msgid "%s subscribers" msgstr "×ž× ×•×™×™×" #: actions/subscribers.php:52 -#, php-format -msgid "%s subscribers, page %d" -msgstr "" +#, fuzzy, php-format +msgid "%1$s subscribers, page %2$d" +msgstr "כל ×”×ž× ×•×™×™×" #: actions/subscribers.php:63 msgid "These are the people who listen to your notices." @@ -3583,7 +3519,7 @@ msgstr "כל ×”×ž× ×•×™×™×" #: actions/subscriptions.php:54 #, fuzzy, php-format -msgid "%s subscriptions, page %d" +msgid "%1$s subscriptions, page %2$d" msgstr "כל ×”×ž× ×•×™×™×" #: actions/subscriptions.php:65 @@ -3619,11 +3555,6 @@ msgstr "×ין זיהוי Jabber ×›×–×”." msgid "SMS" msgstr "סמס" -#: actions/tag.php:68 -#, fuzzy, php-format -msgid "Notices tagged with %s, page %d" -msgstr "מיקרובלוג מ×ת %s" - #: actions/tag.php:86 #, fuzzy, php-format msgid "Notice feed for tag %s (RSS 1.0)" @@ -3711,11 +3642,6 @@ msgstr "למשתמש ×ין פרופיל." msgid "No profile id in request." msgstr "השרת ×œ× ×”×—×–×™×¨ כתובת פרופיל" -#: actions/unsubscribe.php:84 -#, fuzzy -msgid "No profile with that id." -msgstr "×ין פרופיל תו×× ×œ×¤×¨×•×¤×™×œ המרוחק " - #: actions/unsubscribe.php:98 #, fuzzy msgid "Unsubscribed" @@ -3723,10 +3649,11 @@ msgstr "בטל ×ž× ×•×™" #: actions/updateprofile.php:62 actions/userauthorization.php:330 #, php-format -msgid "Listenee stream license ‘%s’ is not compatible with site license ‘%s’." +msgid "" +"Listenee stream license ‘%1$s’ is not compatible with site license ‘%2$s’." msgstr "" -#: actions/useradminpanel.php:58 lib/adminpanelaction.php:305 +#: actions/useradminpanel.php:58 lib/adminpanelaction.php:321 #: lib/personalgroupnav.php:115 msgid "User" msgstr "מתשמש" @@ -3831,7 +3758,7 @@ msgstr "" "בדוק ×ת ×”×¤×¨×˜×™× ×›×“×™ ×œ×•×•×“× ×©×‘×¨×¦×•× ×š ×œ×”×™×¨×©× ×›×ž× ×•×™ להודעות משתמש ×–×”. ×× ××™× ×š רוצה " "להירש×, לחץ \"בטל\"." -#: actions/userauthorization.php:188 +#: actions/userauthorization.php:188 actions/version.php:165 msgid "License" msgstr "" @@ -3888,7 +3815,7 @@ msgstr "" #: actions/userauthorization.php:296 #, php-format -msgid "Listener URI ‘%s’ not found here" +msgid "Listener URI ‘%s’ not found here." msgstr "" #: actions/userauthorization.php:301 @@ -3921,11 +3848,6 @@ msgstr "×œ× × ×™×ª×Ÿ ×œ×§×¨×•× ×ת ×”-URL '%s' של ×”×ª×ž×•× ×”" msgid "Wrong image type for avatar URL ‘%s’." msgstr "סוג ×”×ª×ž×•× ×” של '%s' ××™× ×• מת××™×" -#: actions/userbyid.php:70 -#, fuzzy -msgid "No ID." -msgstr "×ין זיהוי." - #: actions/userdesignsettings.php:76 lib/designsettings.php:65 #, fuzzy msgid "Profile design" @@ -3941,11 +3863,6 @@ msgstr "" msgid "Enjoy your hotdog!" msgstr "" -#: actions/usergroups.php:64 -#, php-format -msgid "%s groups, page %d" -msgstr "" - #: actions/usergroups.php:130 msgid "Search for more groups" msgstr "" @@ -3960,6 +3877,73 @@ msgstr "×œ× ×©×œ×—× ×• ××œ×™× ×• ×ת הפרופיל ×”×–×”" msgid "Try [searching for groups](%%action.groupsearch%%) and joining them." msgstr "" +#: actions/version.php:73 +#, fuzzy, php-format +msgid "StatusNet %s" +msgstr "סטטיסטיקה" + +#: actions/version.php:153 +#, php-format +msgid "" +"This site is powered by %1$s version %2$s, Copyright 2008-2010 StatusNet, " +"Inc. and contributors." +msgstr "" + +#: actions/version.php:157 +#, fuzzy +msgid "StatusNet" +msgstr "×”×ª×ž×•× ×” ×¢×•×“×›× ×”." + +#: actions/version.php:161 +msgid "Contributors" +msgstr "" + +#: actions/version.php:168 +msgid "" +"StatusNet is free software: you can redistribute it and/or modify it under " +"the terms of the GNU Affero General Public License as published by the Free " +"Software Foundation, either version 3 of the License, or (at your option) " +"any later version. " +msgstr "" + +#: actions/version.php:174 +msgid "" +"This program is distributed in the hope that it will be useful, but WITHOUT " +"ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or " +"FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License " +"for more details. " +msgstr "" + +#: actions/version.php:180 +#, php-format +msgid "" +"You should have received a copy of the GNU Affero General Public License " +"along with this program. If not, see %s." +msgstr "" + +#: actions/version.php:189 +msgid "Plugins" +msgstr "" + +#: actions/version.php:195 +#, fuzzy +msgid "Name" +msgstr "×›×™× ×•×™" + +#: actions/version.php:196 lib/action.php:741 +#, fuzzy +msgid "Version" +msgstr "×ישי" + +#: actions/version.php:197 +msgid "Author(s)" +msgstr "" + +#: actions/version.php:198 lib/groupeditform.php:172 +#, fuzzy +msgid "Description" +msgstr "הרשמות" + #: classes/File.php:137 #, php-format msgid "" @@ -4028,7 +4012,7 @@ msgstr "בעיה בשמירת ההודעה." msgid "DB error inserting reply: %s" msgstr "שגי×ת מסד × ×ª×•× ×™× ×‘×”×›× ×¡×ª התגובה: %s" -#: classes/Notice.php:1361 +#: classes/Notice.php:1359 #, php-format msgid "RT @%1$s %2$s" msgstr "" @@ -4078,145 +4062,140 @@ msgstr "" msgid "Other options" msgstr "" -#: lib/action.php:144 -#, php-format -msgid "%s - %s" -msgstr "" - #: lib/action.php:159 msgid "Untitled page" msgstr "" -#: lib/action.php:426 +#: lib/action.php:427 msgid "Primary site navigation" msgstr "" -#: lib/action.php:432 +#: lib/action.php:433 msgid "Home" msgstr "בית" -#: lib/action.php:432 +#: lib/action.php:433 msgid "Personal profile and friends timeline" msgstr "" -#: lib/action.php:434 +#: lib/action.php:435 #, fuzzy msgid "Account" msgstr "×ודות" -#: lib/action.php:434 +#: lib/action.php:435 msgid "Change your email, avatar, password, profile" msgstr "" -#: lib/action.php:437 +#: lib/action.php:438 msgid "Connect" msgstr "התחבר" -#: lib/action.php:437 +#: lib/action.php:438 #, fuzzy msgid "Connect to services" msgstr "× ×›×©×œ×” ×”×”×¤× ×™×” לשרת: %s" -#: lib/action.php:441 +#: lib/action.php:442 #, fuzzy msgid "Change site configuration" msgstr "הרשמות" -#: lib/action.php:445 lib/subgroupnav.php:105 +#: lib/action.php:446 lib/subgroupnav.php:105 msgid "Invite" msgstr "" -#: lib/action.php:446 lib/subgroupnav.php:106 +#: lib/action.php:447 lib/subgroupnav.php:106 #, php-format msgid "Invite friends and colleagues to join you on %s" msgstr "" -#: lib/action.php:451 +#: lib/action.php:452 msgid "Logout" msgstr "צ×" -#: lib/action.php:451 +#: lib/action.php:452 msgid "Logout from the site" msgstr "" -#: lib/action.php:456 +#: lib/action.php:457 #, fuzzy msgid "Create an account" msgstr "צור חשבון חדש" -#: lib/action.php:459 +#: lib/action.php:460 msgid "Login to the site" msgstr "" -#: lib/action.php:462 lib/action.php:725 +#: lib/action.php:463 lib/action.php:726 msgid "Help" msgstr "עזרה" -#: lib/action.php:462 +#: lib/action.php:463 #, fuzzy msgid "Help me!" msgstr "עזרה" -#: lib/action.php:465 lib/searchaction.php:127 +#: lib/action.php:466 lib/searchaction.php:127 msgid "Search" msgstr "חיפוש" -#: lib/action.php:465 +#: lib/action.php:466 msgid "Search for people or text" msgstr "" -#: lib/action.php:486 +#: lib/action.php:487 #, fuzzy msgid "Site notice" msgstr "הודעה חדשה" -#: lib/action.php:552 +#: lib/action.php:553 msgid "Local views" msgstr "" -#: lib/action.php:618 +#: lib/action.php:619 #, fuzzy msgid "Page notice" msgstr "הודעה חדשה" -#: lib/action.php:720 +#: lib/action.php:721 #, fuzzy msgid "Secondary site navigation" msgstr "הרשמות" -#: lib/action.php:727 +#: lib/action.php:728 msgid "About" msgstr "×ודות" -#: lib/action.php:729 +#: lib/action.php:730 msgid "FAQ" msgstr "רשימת ש×לות × ×¤×•×¦×•×ª" -#: lib/action.php:733 +#: lib/action.php:734 msgid "TOS" msgstr "" -#: lib/action.php:736 +#: lib/action.php:737 msgid "Privacy" msgstr "פרטיות" -#: lib/action.php:738 +#: lib/action.php:739 msgid "Source" msgstr "מקור" -#: lib/action.php:740 +#: lib/action.php:743 msgid "Contact" msgstr "צור קשר" -#: lib/action.php:742 +#: lib/action.php:745 msgid "Badge" msgstr "" -#: lib/action.php:770 +#: lib/action.php:773 msgid "StatusNet software license" msgstr "" -#: lib/action.php:773 +#: lib/action.php:776 #, php-format msgid "" "**%%site.name%%** is a microblogging service brought to you by [%%site." @@ -4225,12 +4204,12 @@ msgstr "" "**%%site.name%%** ×”×•× ×©×¨×•×ª ביקרובלוג ×”× ×™×ª×Ÿ על ידי [%%site.broughtby%%](%%" "site.broughtbyurl%%)." -#: lib/action.php:775 +#: lib/action.php:778 #, php-format msgid "**%%site.name%%** is a microblogging service. " msgstr "**%%site.name%%** ×”×•× ×©×¨×•×ª ביקרובלוג." -#: lib/action.php:777 +#: lib/action.php:780 #, php-format msgid "" "It runs the [StatusNet](http://status.net/) microblogging software, version %" @@ -4241,34 +4220,34 @@ msgstr "" "s, המופצת תחת רשיון [GNU Affero General Public License](http://www.fsf.org/" "licensing/licenses/agpl-3.0.html)" -#: lib/action.php:791 +#: lib/action.php:794 #, fuzzy msgid "Site content license" msgstr "הודעה חדשה" -#: lib/action.php:800 +#: lib/action.php:803 msgid "All " msgstr "" -#: lib/action.php:805 +#: lib/action.php:808 msgid "license." msgstr "" -#: lib/action.php:1099 +#: lib/action.php:1102 msgid "Pagination" msgstr "" -#: lib/action.php:1108 +#: lib/action.php:1111 #, fuzzy msgid "After" msgstr "<< ×חרי" -#: lib/action.php:1116 +#: lib/action.php:1119 #, fuzzy msgid "Before" msgstr "×œ×¤× ×™ >>" -#: lib/action.php:1164 +#: lib/action.php:1167 msgid "There was a problem with your session token." msgstr "" @@ -4276,28 +4255,32 @@ msgstr "" msgid "You cannot make changes to this site." msgstr "" -#: lib/adminpanelaction.php:195 +#: lib/adminpanelaction.php:107 +msgid "Changes to that panel are not allowed." +msgstr "" + +#: lib/adminpanelaction.php:206 msgid "showForm() not implemented." msgstr "" -#: lib/adminpanelaction.php:224 +#: lib/adminpanelaction.php:235 msgid "saveSettings() not implemented." msgstr "" -#: lib/adminpanelaction.php:247 +#: lib/adminpanelaction.php:258 msgid "Unable to delete design setting." msgstr "" -#: lib/adminpanelaction.php:300 +#: lib/adminpanelaction.php:312 #, fuzzy msgid "Basic site configuration" msgstr "הרשמות" -#: lib/adminpanelaction.php:303 +#: lib/adminpanelaction.php:317 msgid "Design configuration" msgstr "" -#: lib/adminpanelaction.php:306 lib/adminpanelaction.php:309 +#: lib/adminpanelaction.php:322 lib/adminpanelaction.php:327 #, fuzzy msgid "Paths configuration" msgstr "הרשמות" @@ -4323,11 +4306,21 @@ msgstr "" msgid "Tags for this attachment" msgstr "" +#: lib/authenticationplugin.php:182 lib/authenticationplugin.php:187 +#, fuzzy +msgid "Password changing failed" +msgstr "הסיסמה × ×©×ž×¨×”." + +#: lib/authenticationplugin.php:197 +#, fuzzy +msgid "Password changing is not allowed" +msgstr "הסיסמה × ×©×ž×¨×”." + #: lib/channel.php:138 lib/channel.php:158 msgid "Command results" msgstr "" -#: lib/channel.php:210 +#: lib/channel.php:210 lib/mailhandler.php:142 msgid "Command complete" msgstr "" @@ -4340,8 +4333,8 @@ msgid "Sorry, this command is not yet implemented." msgstr "" #: lib/command.php:88 -#, php-format -msgid "Could not find a user with nickname %s" +#, fuzzy, php-format +msgid "Could not find a user with nickname %s." msgstr "עידכון המשתמש × ×›×©×œ." #: lib/command.php:92 @@ -4350,7 +4343,7 @@ msgstr "" #: lib/command.php:99 #, php-format -msgid "Nudge sent to %s" +msgid "Nudge sent to %s." msgstr "" #: lib/command.php:126 @@ -4362,34 +4355,36 @@ msgid "" msgstr "" #: lib/command.php:152 lib/command.php:399 lib/command.php:460 -msgid "Notice with that id does not exist" -msgstr "" +#, fuzzy +msgid "Notice with that id does not exist." +msgstr "×ין פרופיל תו×× ×œ×¤×¨×•×¤×™×œ המרוחק " #: lib/command.php:168 lib/command.php:415 lib/command.php:476 #: lib/command.php:532 -msgid "User has no last notice" -msgstr "" +#, fuzzy +msgid "User has no last notice." +msgstr "למשתמש ×ין פרופיל." #: lib/command.php:190 msgid "Notice marked as fave." msgstr "" -#: lib/command.php:315 -#, php-format -msgid "%1$s (%2$s)" -msgstr "" +#: lib/command.php:284 +#, fuzzy, php-format +msgid "Could not remove user %1$s to group %2$s." +msgstr "× ×›×©×œ×” יצירת OpenID מתוך: %s" #: lib/command.php:318 -#, php-format -msgid "Fullname: %s" -msgstr "" +#, fuzzy, php-format +msgid "Full name: %s" +msgstr "×©× ×ž×œ×" -#: lib/command.php:321 +#: lib/command.php:321 lib/mail.php:254 #, php-format msgid "Location: %s" msgstr "" -#: lib/command.php:324 +#: lib/command.php:324 lib/mail.php:256 #, php-format msgid "Homepage: %s" msgstr "" @@ -4401,24 +4396,16 @@ msgstr "×ודות: %s" #: lib/command.php:358 scripts/xmppdaemon.php:301 #, php-format -msgid "Message too long - maximum is %d characters, you sent %d" +msgid "Message too long - maximum is %1$d characters, you sent %2$d." msgstr "" #: lib/command.php:378 msgid "Error sending direct message." msgstr "" -#: lib/command.php:422 -msgid "Cannot repeat your own notice" -msgstr "" - -#: lib/command.php:427 -msgid "Already repeated that notice" -msgstr "" - #: lib/command.php:435 #, fuzzy, php-format -msgid "Notice from %s repeated" +msgid "Notice from %s repeated." msgstr "הודעות" #: lib/command.php:437 @@ -4428,12 +4415,12 @@ msgstr "בעיה בשמירת ההודעה." #: lib/command.php:491 #, php-format -msgid "Notice too long - maximum is %d characters, you sent %d" +msgid "Notice too long - maximum is %1$d characters, you sent %2$d." msgstr "" #: lib/command.php:500 #, fuzzy, php-format -msgid "Reply to %s sent" +msgid "Reply to %s sent." msgstr "תגובת עבור %s" #: lib/command.php:502 @@ -4442,7 +4429,7 @@ msgid "Error saving notice." msgstr "בעיה בשמירת ההודעה." #: lib/command.php:556 -msgid "Specify the name of the user to subscribe to" +msgid "Specify the name of the user to subscribe to." msgstr "" #: lib/command.php:563 @@ -4451,7 +4438,7 @@ msgid "Subscribed to %s" msgstr "" #: lib/command.php:584 -msgid "Specify the name of the user to unsubscribe from" +msgid "Specify the name of the user to unsubscribe from." msgstr "" #: lib/command.php:591 @@ -4480,17 +4467,17 @@ msgid "Can't turn on notification." msgstr "" #: lib/command.php:650 -msgid "Login command is disabled" +msgid "Login command is disabled." msgstr "" #: lib/command.php:664 #, fuzzy, php-format -msgid "Could not create login token for %s" +msgid "Could not create login token for %s." msgstr "שמירת מידע ×”×ª×ž×•× ×” × ×›×©×œ" #: lib/command.php:669 #, php-format -msgid "This link is useable only once, and is good for only 2 minutes: %s" +msgid "This link is useable only once, and is good for only 2 minutes: %s." msgstr "" #: lib/command.php:685 @@ -4687,11 +4674,6 @@ msgstr "ת×ר ×ת עצמך ו×ת × ×•×©××™ ×”×¢× ×™×™×Ÿ שלך ב-140 ×ות msgid "Describe the group or topic in %d characters" msgstr "ת×ר ×ת עצמך ו×ת × ×•×©××™ ×”×¢× ×™×™×Ÿ שלך ב-140 ×ותיות" -#: lib/groupeditform.php:172 -#, fuzzy -msgid "Description" -msgstr "הרשמות" - #: lib/groupeditform.php:179 #, fuzzy msgid "" @@ -4863,22 +4845,10 @@ msgstr "" " שלך,\n" " %4$s.\n" -#: lib/mail.php:254 -#, php-format -msgid "Location: %s\n" -msgstr "" - -#: lib/mail.php:256 -#, php-format -msgid "Homepage: %s\n" -msgstr "" - #: lib/mail.php:258 -#, php-format -msgid "" -"Bio: %s\n" -"\n" -msgstr "" +#, fuzzy, php-format +msgid "Bio: %s" +msgstr "×ודות: %s" #: lib/mail.php:286 #, php-format @@ -5012,6 +4982,27 @@ msgstr "" msgid "from" msgstr "" +#: lib/mailhandler.php:37 +msgid "Could not parse message." +msgstr "" + +#: lib/mailhandler.php:42 +msgid "Not a registered user." +msgstr "" + +#: lib/mailhandler.php:46 +msgid "Sorry, that is not your incoming email address." +msgstr "" + +#: lib/mailhandler.php:50 +msgid "Sorry, no incoming email allowed." +msgstr "" + +#: lib/mailhandler.php:228 +#, fuzzy, php-format +msgid "Unsupported message type: %s" +msgstr "פורמט ×”×ª×ž×•× ×” ××™× ×• × ×ª×ž×š." + #: lib/mediafile.php:98 lib/mediafile.php:123 msgid "There was a database error while saving your file. Please try again." msgstr "" @@ -5043,7 +5034,7 @@ msgid "File upload stopped by extension." msgstr "" #: lib/mediafile.php:179 lib/mediafile.php:216 -msgid "File exceeds user's quota!" +msgid "File exceeds user's quota." msgstr "" #: lib/mediafile.php:196 lib/mediafile.php:233 @@ -5052,7 +5043,7 @@ msgstr "" #: lib/mediafile.php:201 lib/mediafile.php:237 #, fuzzy -msgid "Could not determine file's mime-type!" +msgid "Could not determine file's MIME type." msgstr "עידכון המשתמש × ×›×©×œ." #: lib/mediafile.php:270 @@ -5062,7 +5053,7 @@ msgstr "" #: lib/mediafile.php:275 #, php-format -msgid "%s is not a supported filetype on this server." +msgid "%s is not a supported file type on this server." msgstr "" #: lib/messageform.php:120 @@ -5097,7 +5088,17 @@ msgid "Attach a file" msgstr "" #: lib/noticeform.php:212 -msgid "Share your location" +#, fuzzy +msgid "Share my location." +msgstr "שמירת הפרופיל × ×›×©×œ×”." + +#: lib/noticeform.php:214 +#, fuzzy +msgid "Do not share my location." +msgstr "שמירת הפרופיל × ×›×©×œ×”." + +#: lib/noticeform.php:215 +msgid "Hide this info" msgstr "" #: lib/noticelist.php:428 @@ -5220,6 +5221,10 @@ msgstr "" msgid "Tags in %s's notices" msgstr "" +#: lib/plugin.php:114 +msgid "Unknown" +msgstr "" + #: lib/profileaction.php:109 lib/profileaction.php:192 lib/subgroupnav.php:82 msgid "Subscriptions" msgstr "הרשמות" @@ -5403,10 +5408,6 @@ msgstr "" msgid "People Tagcloud as tagged" msgstr "" -#: lib/subscriptionlist.php:126 -msgid "(none)" -msgstr "" - #: lib/tagcloudsection.php:56 #, fuzzy msgid "None" @@ -5526,19 +5527,3 @@ msgstr "ל×תר הבית יש כתובת ×œ× ×—×•×§×™×ª." #, php-format msgid "%s is not a valid color! Use 3 or 6 hex chars." msgstr "" - -#: scripts/maildaemon.php:48 -msgid "Could not parse message." -msgstr "" - -#: scripts/maildaemon.php:53 -msgid "Not a registered user." -msgstr "" - -#: scripts/maildaemon.php:57 -msgid "Sorry, that is not your incoming email address." -msgstr "" - -#: scripts/maildaemon.php:61 -msgid "Sorry, no incoming email allowed." -msgstr "" diff --git a/locale/hsb/LC_MESSAGES/statusnet.po b/locale/hsb/LC_MESSAGES/statusnet.po index e2ba2677f..ed1cfc991 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-01-03 10:37+0000\n" -"PO-Revision-Date: 2010-01-03 10:38:02+0000\n" +"POT-Creation-Date: 2010-01-10 11:27+0000\n" +"PO-Revision-Date: 2010-01-10 11:28:19+0000\n" "Language-Team: Dutch\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha (r60575); Translate extension (2009-12-06)\n" +"X-Generator: MediaWiki 1.16alpha (r60888); Translate extension (2010-01-04)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: hsb\n" "X-Message-Group: out-statusnet\n" @@ -52,11 +52,6 @@ msgstr "Strona njeeksistuje" msgid "No such user." msgstr "Wužiwar njeeksistuje" -#: actions/all.php:84 -#, php-format -msgid "%s and friends, page %d" -msgstr "%s a pÅ™ećeljo, bok %d" - #: actions/all.php:86 actions/all.php:167 actions/allrss.php:115 #: actions/apitimelinefriends.php:115 actions/apitimelinehome.php:115 #: lib/personalgroupnav.php:100 @@ -95,8 +90,8 @@ msgstr "" #: actions/all.php:134 #, php-format msgid "" -"You can try to [nudge %s](../%s) from his profile or [post something to his " -"or her attention](%%%%action.newnotice%%%%?status_textarea=%s)." +"You can try to [nudge %1$s](../%2$s) from his profile or [post something to " +"his or her attention](%%%%action.newnotice%%%%?status_textarea=%3$s)." msgstr "" #: actions/all.php:137 actions/replies.php:209 actions/showstream.php:202 @@ -121,6 +116,23 @@ msgstr "" #: actions/apiaccountupdateprofile.php:97 #: actions/apiaccountupdateprofilebackgroundimage.php:94 #: actions/apiaccountupdateprofilecolors.php:118 +#: actions/apidirectmessage.php:156 actions/apifavoritecreate.php:99 +#: actions/apifavoritedestroy.php:100 actions/apifriendshipscreate.php:100 +#: actions/apifriendshipsdestroy.php:100 actions/apifriendshipsshow.php:129 +#: actions/apigroupcreate.php:136 actions/apigroupismember.php:114 +#: actions/apigroupjoin.php:155 actions/apigroupleave.php:141 +#: actions/apigrouplist.php:132 actions/apigrouplistall.php:120 +#: actions/apigroupmembership.php:106 actions/apigroupshow.php:105 +#: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102 +#: actions/apistatusesretweets.php:112 actions/apistatusesshow.php:108 +#: actions/apistatusnetconfig.php:133 actions/apistatusnetversion.php:93 +#: actions/apisubscriptions.php:111 actions/apitimelinefavorites.php:146 +#: actions/apitimelinefriends.php:156 actions/apitimelinegroup.php:150 +#: actions/apitimelinehome.php:156 actions/apitimelinementions.php:151 +#: actions/apitimelinepublic.php:131 actions/apitimelineretweetedbyme.php:122 +#: actions/apitimelineretweetedtome.php:121 +#: actions/apitimelineretweetsofme.php:122 actions/apitimelinetag.php:141 +#: actions/apitimelineuser.php:165 actions/apiusershow.php:101 msgid "API method not found." msgstr "API-metoda njenamakana." @@ -176,6 +188,9 @@ msgstr "" #: actions/apiaccountupdateprofilebackgroundimage.php:146 #: actions/apiaccountupdateprofilecolors.php:164 #: actions/apiaccountupdateprofilecolors.php:174 +#: actions/groupdesignsettings.php:287 actions/groupdesignsettings.php:297 +#: actions/userdesignsettings.php:210 actions/userdesignsettings.php:220 +#: actions/userdesignsettings.php:263 actions/userdesignsettings.php:273 msgid "Unable to save your design settings." msgstr "" @@ -216,26 +231,6 @@ msgstr "Direktne powÄ›sće do %s" msgid "All the direct messages sent to %s" msgstr "WÅ¡Ä› do %s pósÅ‚ane direktne powÄ›sće" -#: actions/apidirectmessage.php:156 actions/apifavoritecreate.php:99 -#: actions/apifavoritedestroy.php:100 actions/apifriendshipscreate.php:100 -#: actions/apifriendshipsdestroy.php:100 actions/apifriendshipsshow.php:129 -#: actions/apigroupcreate.php:136 actions/apigroupismember.php:114 -#: actions/apigroupjoin.php:155 actions/apigroupleave.php:141 -#: actions/apigrouplist.php:132 actions/apigrouplistall.php:120 -#: actions/apigroupmembership.php:106 actions/apigroupshow.php:105 -#: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102 -#: actions/apistatusesretweets.php:112 actions/apistatusesshow.php:108 -#: actions/apistatusnetconfig.php:133 actions/apistatusnetversion.php:93 -#: actions/apisubscriptions.php:111 actions/apitimelinefavorites.php:146 -#: actions/apitimelinefriends.php:156 actions/apitimelinegroup.php:150 -#: actions/apitimelinehome.php:156 actions/apitimelinementions.php:151 -#: actions/apitimelinepublic.php:131 actions/apitimelineretweetedbyme.php:122 -#: actions/apitimelineretweetedtome.php:121 -#: actions/apitimelineretweetsofme.php:122 actions/apitimelinetag.php:141 -#: actions/apitimelineuser.php:165 actions/apiusershow.php:101 -msgid "API method not found!" -msgstr "API-metoda njenamakana!" - #: actions/apidirectmessagenew.php:126 msgid "No message text!" msgstr "Žadyn powÄ›sćowy tekst!" @@ -259,7 +254,8 @@ msgid "No status found with that ID." msgstr "Status z tym ID njenamakany." #: actions/apifavoritecreate.php:119 -msgid "This status is already a favorite!" +#, fuzzy +msgid "This status is already a favorite." msgstr "Tutón status je hižo faworit!" #: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:176 @@ -267,7 +263,8 @@ msgid "Could not create favorite." msgstr "" #: actions/apifavoritedestroy.php:122 -msgid "That status is not a favorite!" +#, fuzzy +msgid "That status is not a favorite." msgstr "Tón status faworit njeje!" #: actions/apifavoritedestroy.php:134 actions/disfavor.php:87 @@ -288,8 +285,9 @@ msgid "Could not unfollow user: User not found." msgstr "" #: actions/apifriendshipsdestroy.php:120 -msgid "You cannot unfollow yourself!" -msgstr "" +#, fuzzy +msgid "You cannot unfollow yourself." +msgstr "NjemóžeÅ¡ so samoho blokować." #: actions/apifriendshipsexists.php:94 msgid "Two user ids or screen_names must be supplied." @@ -373,7 +371,7 @@ msgstr "Alias njemóže samsny kaž pÅ™imjeno być." msgid "Group not found!" msgstr "Skupina njenamakana!" -#: actions/apigroupjoin.php:110 +#: actions/apigroupjoin.php:110 actions/joingroup.php:90 lib/command.php:217 msgid "You are already a member of that group." msgstr "Sy hižo ÄÅ‚on teje skupiny." @@ -381,30 +379,25 @@ msgstr "Sy hižo ÄÅ‚on teje skupiny." msgid "You have been blocked from that group by the admin." msgstr "" -#: actions/apigroupjoin.php:138 -#, php-format -msgid "Could not join user %s to group %s." -msgstr "" +#: actions/apigroupjoin.php:138 actions/joingroup.php:128 lib/command.php:234 +#, fuzzy, php-format +msgid "Could not join user %1$s to group %2$s." +msgstr "Skupina njeje so daÅ‚a aktualizować." #: actions/apigroupleave.php:114 msgid "You are not a member of this group." msgstr "Njejsy ÄÅ‚on tuteje skupiny." -#: actions/apigroupleave.php:124 -#, php-format -msgid "Could not remove user %s to group %s." -msgstr "" +#: actions/apigroupleave.php:124 actions/leavegroup.php:127 +#, fuzzy, php-format +msgid "Could not remove user %1$s from group %2$s." +msgstr "Skupina njeje so daÅ‚a aktualizować." #: actions/apigrouplist.php:95 #, php-format msgid "%s's groups" msgstr "" -#: actions/apigrouplist.php:103 -#, php-format -msgid "Groups %s is a member of on %s." -msgstr "" - #: actions/apigrouplistall.php:90 actions/usergroups.php:62 #, php-format msgid "%s groups" @@ -428,11 +421,11 @@ msgstr "NjemóžeÅ¡ status druheho wužiwarja zniÄić." msgid "No such notice." msgstr "Zdźělenka njeeksistuje." -#: actions/apistatusesretweet.php:83 +#: actions/apistatusesretweet.php:83 lib/command.php:422 msgid "Cannot repeat your own notice." msgstr "Njemóžno twoju zdźělenku wospjetować." -#: actions/apistatusesretweet.php:91 +#: actions/apistatusesretweet.php:91 lib/command.php:427 msgid "Already repeated that notice." msgstr "Tuta zdźělenka bu hižo wospjetowana." @@ -445,7 +438,7 @@ msgid "No status with that ID found." msgstr "Žadyn status z tym ID namakany." #: actions/apistatusesupdate.php:157 actions/newnotice.php:155 -#: scripts/maildaemon.php:71 +#: lib/mailhandler.php:60 #, php-format msgid "That's too long. Max notice size is %d chars." msgstr "To je pÅ™edoÅ‚ho. Maksimalna wulkosć zdźělenki je %d znamjeÅ¡kow." @@ -465,12 +458,12 @@ msgstr "NjepodpÄ›rany format." #: actions/apitimelinefavorites.php:108 #, php-format -msgid "%s / Favorites from %s" +msgid "%1$s / Favorites from %2$s" msgstr "" #: actions/apitimelinefavorites.php:120 #, php-format -msgid "%s updates favorited by %s / %s." +msgid "%1$s updates favorited by %2$s / %2$s." msgstr "" #: actions/apitimelinegroup.php:109 actions/apitimelineuser.php:118 @@ -538,8 +531,11 @@ msgstr "Njenamakany." msgid "No such attachment." msgstr "PÅ™iwěšk njeeksistuje." -#: actions/avatarbynickname.php:59 actions/grouprss.php:91 -#: actions/leavegroup.php:76 +#: actions/avatarbynickname.php:59 actions/blockedfromgroup.php:73 +#: actions/editgroup.php:84 actions/groupdesignsettings.php:84 +#: actions/grouplogo.php:86 actions/groupmembers.php:76 +#: actions/grouprss.php:91 actions/joingroup.php:76 actions/leavegroup.php:76 +#: actions/showgroup.php:121 msgid "No nickname." msgstr "Žane pÅ™imjeno." @@ -563,8 +559,8 @@ msgstr "" "MóžeÅ¡ swój wosobinski awatar nahrać. Maksimalna datajowa wulkosć je %s." #: actions/avatarsettings.php:106 actions/avatarsettings.php:185 -#: actions/grouplogo.php:178 actions/remotesubscribe.php:191 -#: actions/userauthorization.php:72 actions/userrss.php:103 +#: actions/remotesubscribe.php:191 actions/userauthorization.php:72 +#: actions/userrss.php:103 msgid "User without matching profile" msgstr "Wužiwar bjez hodźaceho so profila" @@ -596,9 +592,9 @@ msgstr "Nahrać" msgid "Crop" msgstr "" -#: actions/avatarsettings.php:268 actions/disfavor.php:74 -#: actions/emailsettings.php:238 actions/favor.php:75 actions/geocode.php:50 -#: actions/groupblock.php:66 actions/grouplogo.php:309 +#: actions/avatarsettings.php:268 actions/deletenotice.php:157 +#: actions/disfavor.php:74 actions/emailsettings.php:238 actions/favor.php:75 +#: actions/geocode.php:50 actions/groupblock.php:66 actions/grouplogo.php:309 #: actions/groupunblock.php:66 actions/imsettings.php:206 #: actions/invite.php:56 actions/login.php:135 actions/makeadmin.php:66 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80 @@ -677,19 +673,15 @@ msgstr "Tutoho wužiwarja blokować" msgid "Failed to save block information." msgstr "" -#: actions/blockedfromgroup.php:73 actions/editgroup.php:84 -#: actions/groupdesignsettings.php:84 actions/grouplogo.php:86 -#: actions/groupmembers.php:76 actions/joingroup.php:76 -#: actions/showgroup.php:121 -msgid "No nickname" -msgstr "Žane pÅ™imjeno" - #: actions/blockedfromgroup.php:80 actions/editgroup.php:96 +#: actions/foafgroup.php:44 actions/foafgroup.php:62 actions/groupblock.php:86 #: actions/groupbyid.php:83 actions/groupdesignsettings.php:97 #: actions/grouplogo.php:99 actions/groupmembers.php:83 -#: actions/joingroup.php:83 actions/showgroup.php:137 -msgid "No such group" -msgstr "Skupina njeeksistuje" +#: actions/grouprss.php:98 actions/groupunblock.php:86 +#: actions/joingroup.php:83 actions/leavegroup.php:83 actions/makeadmin.php:86 +#: actions/showgroup.php:137 lib/command.php:212 lib/command.php:263 +msgid "No such group." +msgstr "Skupina njeeksistuje." #: actions/blockedfromgroup.php:90 #, php-format @@ -697,9 +689,9 @@ msgid "%s blocked profiles" msgstr "" #: actions/blockedfromgroup.php:93 -#, php-format -msgid "%s blocked profiles, page %d" -msgstr "" +#, fuzzy, php-format +msgid "%1$s blocked profiles, page %2$d" +msgstr "%s a pÅ™ećeljo, bok %d" #: actions/blockedfromgroup.php:108 msgid "A list of the users blocked from joining this group." @@ -809,10 +801,6 @@ msgstr "Tutu zdźělenku njewuÅ¡mórnyć" msgid "Delete this notice" msgstr "Tutu zdźělenku wuÅ¡mórnyć" -#: actions/deletenotice.php:157 -msgid "There was a problem with your session token. Try again, please." -msgstr "" - #: actions/deleteuser.php:67 msgid "You cannot delete users." msgstr "NjemóžeÅ¡ wužiwarjow wuÅ¡mórnyć." @@ -836,7 +824,7 @@ msgid "Delete this user" msgstr "Tutoho wužiwarja wuÅ¡mórnyć" #: actions/designadminpanel.php:62 lib/accountsettingsaction.php:124 -#: lib/adminpanelaction.php:302 lib/groupnav.php:119 +#: lib/adminpanelaction.php:316 lib/groupnav.php:119 msgid "Design" msgstr "Design" @@ -975,7 +963,8 @@ msgstr "DyrbiÅ¡ pÅ™izjewjeny być, zo by skupinu wutworiÅ‚." #: actions/editgroup.php:103 actions/editgroup.php:168 #: actions/groupdesignsettings.php:104 actions/grouplogo.php:106 -msgid "You must be an admin to edit the group" +#, fuzzy +msgid "You must be an admin to edit the group." msgstr "DyrbiÅ¡ administrator być, zo by skupinu wobdźěłaÅ‚." #: actions/editgroup.php:154 @@ -1000,7 +989,8 @@ msgid "Options saved." msgstr "Opcije skÅ‚adowane." #: actions/emailsettings.php:60 -msgid "Email Settings" +#, fuzzy +msgid "Email settings" msgstr "E-mejlowe nastajenja" #: actions/emailsettings.php:71 @@ -1035,8 +1025,9 @@ msgid "Cancel" msgstr "PÅ™etorhnyć" #: actions/emailsettings.php:121 -msgid "Email Address" -msgstr "E-mejlowa adresa" +#, fuzzy +msgid "Email address" +msgstr "E-mejlowe adresy" #: actions/emailsettings.php:123 msgid "Email address, like \"UserName@example.org\"" @@ -1109,9 +1100,10 @@ msgstr "Žana e-mejlowa adresa." msgid "Cannot normalize that email address" msgstr "" -#: actions/emailsettings.php:331 actions/siteadminpanel.php:157 -msgid "Not a valid email address" -msgstr "Njeje pÅ‚aćiwa e-mejlowa adresa" +#: actions/emailsettings.php:331 actions/register.php:201 +#: actions/siteadminpanel.php:157 +msgid "Not a valid email address." +msgstr "NjepÅ‚aćiwa e-mejlowa adresa." #: actions/emailsettings.php:334 msgid "That is already your email address." @@ -1285,18 +1277,11 @@ msgstr "" msgid "Error updating remote profile" msgstr "" -#: actions/foafgroup.php:44 actions/foafgroup.php:62 actions/groupblock.php:86 -#: actions/grouprss.php:98 actions/groupunblock.php:86 -#: actions/leavegroup.php:83 actions/makeadmin.php:86 lib/command.php:212 -#: lib/command.php:263 -msgid "No such group." -msgstr "Skupina njeeksistuje." - -#: actions/getfile.php:75 +#: actions/getfile.php:79 msgid "No such file." msgstr "Dataja njeeksistuje." -#: actions/getfile.php:79 +#: actions/getfile.php:83 msgid "Cannot read file." msgstr "Dataja njeda so Äitać." @@ -1308,7 +1293,7 @@ msgstr "Žadyn profil podaty." #: actions/groupblock.php:76 actions/groupunblock.php:76 #: actions/makeadmin.php:76 actions/subedit.php:53 actions/tagother.php:46 -#: lib/profileformaction.php:77 +#: actions/unsubscribe.php:84 lib/profileformaction.php:77 msgid "No profile with that ID." msgstr "Žadyn profil z tym ID." @@ -1336,9 +1321,9 @@ msgstr "Wužiwarja za skupinu blokować" #: actions/groupblock.php:162 #, php-format msgid "" -"Are you sure you want to block user \"%s\" from the group \"%s\"? They will " -"be removed from the group, unable to post, and unable to subscribe to the " -"group in the future." +"Are you sure you want to block user \"%1$s\" from the group \"%2$s\"? They " +"will be removed from the group, unable to post, and unable to subscribe to " +"the group in the future." msgstr "" #: actions/groupblock.php:178 @@ -1353,9 +1338,9 @@ msgstr "Tutoho wužiwarja za tutu skupinu blokować" msgid "Database error blocking user from group." msgstr "" -#: actions/groupbyid.php:74 -msgid "No ID" -msgstr "Žadyn ID" +#: actions/groupbyid.php:74 actions/userbyid.php:70 +msgid "No ID." +msgstr "Žadyn ID." #: actions/groupdesignsettings.php:68 msgid "You must be logged in to edit a group." @@ -1376,12 +1361,6 @@ msgstr "" msgid "Couldn't update your design." msgstr "" -#: actions/groupdesignsettings.php:287 actions/groupdesignsettings.php:297 -#: actions/userdesignsettings.php:210 actions/userdesignsettings.php:220 -#: actions/userdesignsettings.php:263 actions/userdesignsettings.php:273 -msgid "Unable to save your design settings!" -msgstr "" - #: actions/groupdesignsettings.php:308 actions/userdesignsettings.php:231 msgid "Design preferences saved." msgstr "Designowe nastajenja skÅ‚adowane." @@ -1398,6 +1377,11 @@ msgstr "" "MóžeÅ¡ logowy wobraz za swoju skupinu nahrać. Maksimalna datajowa wulkosć je %" "s." +#: actions/grouplogo.php:178 +#, fuzzy +msgid "User without matching profile." +msgstr "Wužiwar bjez hodźaceho so profila" + #: actions/grouplogo.php:362 msgid "Pick a square area of the image to be the logo." msgstr "" @@ -1416,15 +1400,15 @@ msgid "%s group members" msgstr "" #: actions/groupmembers.php:96 -#, php-format -msgid "%s group members, page %d" -msgstr "" +#, fuzzy, php-format +msgid "%1$s group members, page %2$d" +msgstr "%s abonentow, strona %d" #: actions/groupmembers.php:111 msgid "A list of the users in this group." msgstr "Lisćina wužiwarjow w tutej skupinje." -#: actions/groupmembers.php:175 lib/action.php:441 lib/groupnav.php:107 +#: actions/groupmembers.php:175 lib/action.php:442 lib/groupnav.php:107 msgid "Admin" msgstr "Administrator" @@ -1516,7 +1500,8 @@ msgid "Error removing the block." msgstr "" #: actions/imsettings.php:59 -msgid "IM Settings" +#, fuzzy +msgid "IM settings" msgstr "IM-nastajenja" #: actions/imsettings.php:70 @@ -1542,7 +1527,8 @@ msgid "" msgstr "" #: actions/imsettings.php:124 -msgid "IM Address" +#, fuzzy +msgid "IM address" msgstr "IM-adresa" #: actions/imsettings.php:126 @@ -1599,11 +1585,6 @@ msgstr "" msgid "That is not your Jabber ID." msgstr "To njeje twój ID Jabber." -#: actions/inbox.php:59 -#, php-format -msgid "Inbox for %s - page %d" -msgstr "" - #: actions/inbox.php:62 #, php-format msgid "Inbox for %s" @@ -1639,10 +1620,10 @@ msgstr "Nowych wužiwarjow pÅ™eprosyć" msgid "You are already subscribed to these users:" msgstr "Sy tutych wužiwarjow hižo abonowaÅ‚:" -#: actions/invite.php:131 actions/invite.php:139 +#: actions/invite.php:131 actions/invite.php:139 lib/command.php:315 #, php-format -msgid "%s (%s)" -msgstr "%s (%s)" +msgid "%1$s (%2$s)" +msgstr "%1$s (%2$s)" #: actions/invite.php:136 msgid "" @@ -1682,7 +1663,7 @@ msgstr "Wosobinska powÄ›sć" msgid "Optionally add a personal message to the invitation." msgstr "Wosobinsku powÄ›sć po dobrozdaću pÅ™eproÅ¡enju pÅ™idać." -#: actions/invite.php:197 lib/messageform.php:178 lib/noticeform.php:232 +#: actions/invite.php:197 lib/messageform.php:178 lib/noticeform.php:234 msgid "Send" msgstr "PósÅ‚ać" @@ -1726,18 +1707,9 @@ msgstr "" msgid "You must be logged in to join a group." msgstr "" -#: actions/joingroup.php:90 lib/command.php:217 -msgid "You are already a member of that group" -msgstr "" - -#: actions/joingroup.php:128 lib/command.php:234 -#, php-format -msgid "Could not join user %s to group %s" -msgstr "" - #: actions/joingroup.php:135 lib/command.php:239 #, php-format -msgid "%s joined group %s" +msgid "%1$s joined group %2$s" msgstr "" #: actions/leavegroup.php:60 @@ -1752,14 +1724,9 @@ msgstr "Njejsy ÄÅ‚on teje skupiny." msgid "Could not find membership record." msgstr "" -#: actions/leavegroup.php:127 lib/command.php:284 -#, php-format -msgid "Could not remove user %s to group %s" -msgstr "" - #: actions/leavegroup.php:134 lib/command.php:289 #, php-format -msgid "%s left group %s" +msgid "%1$s left group %2$s" msgstr "" #: actions/login.php:83 actions/register.php:137 @@ -1778,7 +1745,7 @@ msgstr "WopaÄne wužiwarske mjeno abo hesÅ‚o." msgid "Error setting user. You are probably not authorized." msgstr "Zmylk pÅ™i nastajenju wužiwarja. Snano njejsy awtorizowany." -#: actions/login.php:208 actions/login.php:261 lib/action.php:459 +#: actions/login.php:208 actions/login.php:261 lib/action.php:460 #: lib/logingroupnav.php:79 msgid "Login" msgstr "PÅ™izjewić" @@ -1828,19 +1795,19 @@ msgid "Only an admin can make another user an admin." msgstr "Jenož administrator móže druheho wužiwarja k administratorej Äinić." #: actions/makeadmin.php:95 -#, php-format -msgid "%s is already an admin for group \"%s\"." +#, fuzzy, php-format +msgid "%1$s is already an admin for group \"%2$s\"." msgstr "%s je hižo administrator za skupinu \"%s\"." #: actions/makeadmin.php:132 -#, php-format -msgid "Can't get membership record for %s in group %s" -msgstr "" +#, fuzzy, php-format +msgid "Can't get membership record for %1$s in group %2$s." +msgstr "Skupina njeje so daÅ‚a aktualizować." #: actions/makeadmin.php:145 -#, php-format -msgid "Can't make %s an admin for group %s" -msgstr "" +#, fuzzy, php-format +msgid "Can't make %1$s an admin for group %2$s." +msgstr "%s je hižo administrator za skupinu \"%s\"." #: actions/microsummary.php:69 msgid "No current status" @@ -1881,9 +1848,9 @@ msgid "Message sent" msgstr "PowÄ›sć pósÅ‚ana" #: actions/newmessage.php:185 lib/command.php:376 -#, php-format -msgid "Direct message to %s sent" -msgstr "" +#, fuzzy, php-format +msgid "Direct message to %s sent." +msgstr "Direktne powÄ›sće do %s" #: actions/newmessage.php:210 actions/newnotice.php:245 lib/channel.php:170 msgid "Ajax Error" @@ -1910,7 +1877,7 @@ msgstr "Tekstowe pytanje" #: actions/noticesearch.php:91 #, php-format -msgid "Search results for \"%s\" on %s" +msgid "Search results for \"%1$s\" on %2$s" msgstr "" #: actions/noticesearch.php:121 @@ -2012,11 +1979,6 @@ msgstr "" msgid "URL shortening service is too long (max 50 chars)." msgstr "" -#: actions/outbox.php:58 -#, php-format -msgid "Outbox for %s - page %d" -msgstr "" - #: actions/outbox.php:61 #, php-format msgid "Outbox for %s" @@ -2087,7 +2049,7 @@ msgstr "" msgid "Password saved." msgstr "HesÅ‚o skÅ‚adowane." -#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:308 +#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:326 msgid "Paths" msgstr "Šćežki" @@ -2120,7 +2082,7 @@ msgid "Invalid SSL server. The maximum length is 255 characters." msgstr "" #: actions/pathsadminpanel.php:217 actions/siteadminpanel.php:58 -#: lib/adminpanelaction.php:299 +#: lib/adminpanelaction.php:311 msgid "Site" msgstr "SydÅ‚o" @@ -2213,7 +2175,8 @@ msgid "When to use SSL" msgstr "" #: actions/pathsadminpanel.php:308 -msgid "SSL Server" +#, fuzzy +msgid "SSL server" msgstr "SSL-serwer" #: actions/pathsadminpanel.php:309 @@ -2242,7 +2205,7 @@ msgstr "" #: actions/peopletag.php:144 #, php-format -msgid "Users self-tagged with %s - page %d" +msgid "Users self-tagged with %1$s - page %2$d" msgstr "" #: actions/postnotice.php:84 @@ -2251,7 +2214,7 @@ msgstr "NjepÅ‚aćiwy wobsah zdźělenki" #: actions/postnotice.php:90 #, php-format -msgid "Notice license ‘%s’ is not compatible with site license ‘%s’." +msgid "Notice license ‘%1$s’ is not compatible with site license ‘%2$s’." msgstr "" #: actions/profilesettings.php:60 @@ -2368,19 +2331,19 @@ msgstr "" msgid "Couldn't update user for autosubscribe." msgstr "" -#: actions/profilesettings.php:354 +#: actions/profilesettings.php:359 msgid "Couldn't save location prefs." msgstr "Nastajenja mÄ›stna njedachu so skÅ‚adować." -#: actions/profilesettings.php:366 +#: actions/profilesettings.php:371 msgid "Couldn't save profile." msgstr "" -#: actions/profilesettings.php:374 +#: actions/profilesettings.php:379 msgid "Couldn't save tags." msgstr "" -#: actions/profilesettings.php:382 lib/adminpanelaction.php:126 +#: actions/profilesettings.php:387 lib/adminpanelaction.php:137 msgid "Settings saved." msgstr "Nastajenja skÅ‚adowane." @@ -2473,7 +2436,7 @@ msgid "" "one!" msgstr "" -#: actions/publictagcloud.php:135 +#: actions/publictagcloud.php:131 msgid "Tag cloud" msgstr "" @@ -2610,7 +2573,7 @@ msgstr "Wodaj, njepÅ‚aćiwy pÅ™eproÅ¡enski kod." msgid "Registration successful" msgstr "Registrowanje wuspěšne" -#: actions/register.php:114 actions/register.php:502 lib/action.php:456 +#: actions/register.php:114 actions/register.php:502 lib/action.php:457 #: lib/logingroupnav.php:85 msgid "Register" msgstr "Registrować" @@ -2623,10 +2586,6 @@ msgstr "Registracija njedowolena." msgid "You can't register if you don't agree to the license." msgstr "" -#: actions/register.php:201 -msgid "Not a valid email address." -msgstr "NjepÅ‚aćiwa e-mejlowa adresa." - #: actions/register.php:212 msgid "Email address already exists." msgstr "E-mejlowa adresa hižo eksistuje." @@ -2683,10 +2642,10 @@ msgstr "" #: actions/register.php:537 #, php-format msgid "" -"Congratulations, %s! And welcome to %%%%site.name%%%%. From here, you may " +"Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may " "want to...\n" "\n" -"* Go to [your profile](%s) and post your first message.\n" +"* Go to [your profile](%2$s) and post your first message.\n" "* Add a [Jabber/GTalk address](%%%%action.imsettings%%%%) so you can send " "notices through instant messages.\n" "* [Search for people](%%%%action.peoplesearch%%%%) that you may know or that " @@ -2788,11 +2747,6 @@ msgstr "Wospjetowany!" msgid "Replies to %s" msgstr "" -#: actions/replies.php:127 -#, php-format -msgid "Replies to %s, page %d" -msgstr "" - #: actions/replies.php:144 #, php-format msgid "Replies feed for %s (RSS 1.0)" @@ -2811,8 +2765,8 @@ msgstr "" #: actions/replies.php:198 #, php-format msgid "" -"This is the timeline showing replies to %s but %s hasn't received a notice " -"to his attention yet." +"This is the timeline showing replies to %1$s but %2$s hasn't received a " +"notice to his attention yet." msgstr "" #: actions/replies.php:203 @@ -2825,8 +2779,8 @@ msgstr "" #: actions/replies.php:205 #, php-format msgid "" -"You can try to [nudge %s](../%s) or [post something to his or her attention]" -"(%%%%action.newnotice%%%%?status_textarea=%s)." +"You can try to [nudge %1$s](../%2$s) or [post something to his or her " +"attention](%%%%action.newnotice%%%%?status_textarea=%3$s)." msgstr "" #: actions/repliesrss.php:72 @@ -2842,11 +2796,6 @@ msgstr "" msgid "User is already sandboxed." msgstr "" -#: actions/showfavorites.php:79 -#, php-format -msgid "%s's favorite notices, page %d" -msgstr "" - #: actions/showfavorites.php:132 msgid "Could not retrieve favorite notices." msgstr "" @@ -2896,11 +2845,6 @@ msgstr "" msgid "%s group" msgstr "" -#: actions/showgroup.php:84 -#, php-format -msgid "%s group, page %d" -msgstr "" - #: actions/showgroup.php:218 msgid "Group profile" msgstr "Skupinski profil" @@ -2949,7 +2893,7 @@ msgstr "Čłonojo" #: actions/showgroup.php:386 lib/profileaction.php:117 #: lib/profileaction.php:148 lib/profileaction.php:236 lib/section.php:95 -#: lib/tagcloudsection.php:71 +#: lib/subscriptionlist.php:126 lib/tagcloudsection.php:71 msgid "(None)" msgstr "(Žadyn)" @@ -3015,15 +2959,10 @@ msgstr "Zdźělenka zniÄena." msgid " tagged %s" msgstr "" -#: actions/showstream.php:79 -#, php-format -msgid "%s, page %d" -msgstr "" - #: actions/showstream.php:122 -#, php-format -msgid "Notice feed for %s tagged %s (RSS 1.0)" -msgstr "" +#, fuzzy, php-format +msgid "Notice feed for %1$s tagged %2$s (RSS 1.0)" +msgstr "Kanal za pÅ™ećelow wužiwarja %s (RSS 1.0)" #: actions/showstream.php:129 #, php-format @@ -3047,7 +2986,7 @@ msgstr "FOAF za %s" #: actions/showstream.php:191 #, php-format -msgid "This is the timeline for %s but %s hasn't posted anything yet." +msgid "This is the timeline for %1$s but %2$s hasn't posted anything yet." msgstr "" #: actions/showstream.php:196 @@ -3059,8 +2998,8 @@ msgstr "" #: actions/showstream.php:198 #, php-format msgid "" -"You can try to nudge %s or [post something to his or her attention](%%%%" -"action.newnotice%%%%?status_textarea=%s)." +"You can try to nudge %1$s or [post something to his or her attention](%%%%" +"action.newnotice%%%%?status_textarea=%2$s)." msgstr "" #: actions/showstream.php:234 @@ -3102,12 +3041,13 @@ msgid "Site name must have non-zero length." msgstr "" #: actions/siteadminpanel.php:154 -msgid "You must have a valid contact email address" -msgstr "" +#, fuzzy +msgid "You must have a valid contact email address." +msgstr "NjepÅ‚aćiwa e-mejlowa adresa." #: actions/siteadminpanel.php:172 -#, php-format -msgid "Unknown language \"%s\"" +#, fuzzy, php-format +msgid "Unknown language \"%s\"." msgstr "Njeznata rÄ›Ä \"%s\"" #: actions/siteadminpanel.php:179 @@ -3287,8 +3227,9 @@ msgid "Save site settings" msgstr "SydÅ‚owe nastajenja skÅ‚adować" #: actions/smssettings.php:58 -msgid "SMS Settings" -msgstr "" +#, fuzzy +msgid "SMS settings" +msgstr "IM-nastajenja" #: actions/smssettings.php:69 #, php-format @@ -3316,8 +3257,9 @@ msgid "Enter the code you received on your phone." msgstr "" #: actions/smssettings.php:138 -msgid "SMS Phone number" -msgstr "" +#, fuzzy +msgid "SMS phone number" +msgstr "Žane telefonowe ÄisÅ‚o." #: actions/smssettings.php:140 msgid "Phone number, no punctuation or spaces, with area code" @@ -3400,8 +3342,8 @@ msgid "%s subscribers" msgstr "%s abonentow" #: actions/subscribers.php:52 -#, php-format -msgid "%s subscribers, page %d" +#, fuzzy, php-format +msgid "%1$s subscribers, page %2$d" msgstr "%s abonentow, strona %d" #: actions/subscribers.php:63 @@ -3437,8 +3379,8 @@ msgid "%s subscriptions" msgstr "%s abonementow" #: actions/subscriptions.php:54 -#, php-format -msgid "%s subscriptions, page %d" +#, fuzzy, php-format +msgid "%1$s subscriptions, page %2$d" msgstr "%s abonementow, strona %d" #: actions/subscriptions.php:65 @@ -3473,11 +3415,6 @@ msgstr "Jabber" msgid "SMS" msgstr "SMS" -#: actions/tag.php:68 -#, php-format -msgid "Notices tagged with %s, page %d" -msgstr "" - #: actions/tag.php:86 #, php-format msgid "Notice feed for tag %s (RSS 1.0)" @@ -3557,20 +3494,17 @@ msgstr "" msgid "No profile id in request." msgstr "" -#: actions/unsubscribe.php:84 -msgid "No profile with that id." -msgstr "" - #: actions/unsubscribe.php:98 msgid "Unsubscribed" msgstr "Wotskazany" #: actions/updateprofile.php:62 actions/userauthorization.php:330 #, php-format -msgid "Listenee stream license ‘%s’ is not compatible with site license ‘%s’." +msgid "" +"Listenee stream license ‘%1$s’ is not compatible with site license ‘%2$s’." msgstr "" -#: actions/useradminpanel.php:58 lib/adminpanelaction.php:305 +#: actions/useradminpanel.php:58 lib/adminpanelaction.php:321 #: lib/personalgroupnav.php:115 msgid "User" msgstr "Wužiwar" @@ -3668,7 +3602,7 @@ msgid "" "click “Rejectâ€." msgstr "" -#: actions/userauthorization.php:188 +#: actions/userauthorization.php:188 actions/version.php:165 msgid "License" msgstr "Licenca" @@ -3717,7 +3651,7 @@ msgstr "" #: actions/userauthorization.php:296 #, php-format -msgid "Listener URI ‘%s’ not found here" +msgid "Listener URI ‘%s’ not found here." msgstr "" #: actions/userauthorization.php:301 @@ -3750,10 +3684,6 @@ msgstr "" msgid "Wrong image type for avatar URL ‘%s’." msgstr "" -#: actions/userbyid.php:70 -msgid "No ID." -msgstr "Žadyn ID." - #: actions/userdesignsettings.php:76 lib/designsettings.php:65 msgid "Profile design" msgstr "" @@ -3768,11 +3698,6 @@ msgstr "" msgid "Enjoy your hotdog!" msgstr "" -#: actions/usergroups.php:64 -#, php-format -msgid "%s groups, page %d" -msgstr "" - #: actions/usergroups.php:130 msgid "Search for more groups" msgstr "" @@ -3787,6 +3712,73 @@ msgstr "" msgid "Try [searching for groups](%%action.groupsearch%%) and joining them." msgstr "" +#: actions/version.php:73 +#, fuzzy, php-format +msgid "StatusNet %s" +msgstr "Statistika" + +#: actions/version.php:153 +#, php-format +msgid "" +"This site is powered by %1$s version %2$s, Copyright 2008-2010 StatusNet, " +"Inc. and contributors." +msgstr "" + +#: actions/version.php:157 +#, fuzzy +msgid "StatusNet" +msgstr "Status zniÄeny." + +#: actions/version.php:161 +msgid "Contributors" +msgstr "" + +#: actions/version.php:168 +msgid "" +"StatusNet is free software: you can redistribute it and/or modify it under " +"the terms of the GNU Affero General Public License as published by the Free " +"Software Foundation, either version 3 of the License, or (at your option) " +"any later version. " +msgstr "" + +#: actions/version.php:174 +msgid "" +"This program is distributed in the hope that it will be useful, but WITHOUT " +"ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or " +"FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License " +"for more details. " +msgstr "" + +#: actions/version.php:180 +#, php-format +msgid "" +"You should have received a copy of the GNU Affero General Public License " +"along with this program. If not, see %s." +msgstr "" + +#: actions/version.php:189 +msgid "Plugins" +msgstr "" + +#: actions/version.php:195 +#, fuzzy +msgid "Name" +msgstr "PÅ™imjeno" + +#: actions/version.php:196 lib/action.php:741 +#, fuzzy +msgid "Version" +msgstr "Posedźenja" + +#: actions/version.php:197 +#, fuzzy +msgid "Author(s)" +msgstr "Awtor" + +#: actions/version.php:198 lib/groupeditform.php:172 +msgid "Description" +msgstr "Wopisanje" + #: classes/File.php:137 #, php-format msgid "" @@ -3853,7 +3845,7 @@ msgstr "" msgid "DB error inserting reply: %s" msgstr "" -#: classes/Notice.php:1361 +#: classes/Notice.php:1359 #, php-format msgid "RT @%1$s %2$s" msgstr "" @@ -3899,149 +3891,144 @@ msgstr "Druhe" msgid "Other options" msgstr "Druhe opcije" -#: lib/action.php:144 -#, php-format -msgid "%s - %s" -msgstr "%s - %s" - #: lib/action.php:159 msgid "Untitled page" msgstr "Strona bjez titula" -#: lib/action.php:426 +#: lib/action.php:427 msgid "Primary site navigation" msgstr "" -#: lib/action.php:432 +#: lib/action.php:433 msgid "Home" msgstr "" -#: lib/action.php:432 +#: lib/action.php:433 msgid "Personal profile and friends timeline" msgstr "" -#: lib/action.php:434 +#: lib/action.php:435 msgid "Account" msgstr "Konto" -#: lib/action.php:434 +#: lib/action.php:435 msgid "Change your email, avatar, password, profile" msgstr "" -#: lib/action.php:437 +#: lib/action.php:438 msgid "Connect" msgstr "Zwjazać" -#: lib/action.php:437 +#: lib/action.php:438 msgid "Connect to services" msgstr "" -#: lib/action.php:441 +#: lib/action.php:442 msgid "Change site configuration" msgstr "" -#: lib/action.php:445 lib/subgroupnav.php:105 +#: lib/action.php:446 lib/subgroupnav.php:105 msgid "Invite" msgstr "PÅ™eprosyć" -#: lib/action.php:446 lib/subgroupnav.php:106 +#: lib/action.php:447 lib/subgroupnav.php:106 #, php-format msgid "Invite friends and colleagues to join you on %s" msgstr "" -#: lib/action.php:451 +#: lib/action.php:452 msgid "Logout" msgstr "" -#: lib/action.php:451 +#: lib/action.php:452 msgid "Logout from the site" msgstr "" -#: lib/action.php:456 +#: lib/action.php:457 msgid "Create an account" msgstr "Konto zaÅ‚ožić" -#: lib/action.php:459 +#: lib/action.php:460 msgid "Login to the site" msgstr "" -#: lib/action.php:462 lib/action.php:725 +#: lib/action.php:463 lib/action.php:726 msgid "Help" msgstr "Pomoc" -#: lib/action.php:462 +#: lib/action.php:463 msgid "Help me!" msgstr "Pomhaj!" -#: lib/action.php:465 lib/searchaction.php:127 +#: lib/action.php:466 lib/searchaction.php:127 msgid "Search" msgstr "Pytać" -#: lib/action.php:465 +#: lib/action.php:466 msgid "Search for people or text" msgstr "Za ludźimi abo tekstom pytać" -#: lib/action.php:486 +#: lib/action.php:487 msgid "Site notice" msgstr "" -#: lib/action.php:552 +#: lib/action.php:553 msgid "Local views" msgstr "" -#: lib/action.php:618 +#: lib/action.php:619 msgid "Page notice" msgstr "" -#: lib/action.php:720 +#: lib/action.php:721 msgid "Secondary site navigation" msgstr "" -#: lib/action.php:727 +#: lib/action.php:728 msgid "About" msgstr "Wo" -#: lib/action.php:729 +#: lib/action.php:730 msgid "FAQ" msgstr "Huste praÅ¡enja" -#: lib/action.php:733 +#: lib/action.php:734 msgid "TOS" msgstr "" -#: lib/action.php:736 +#: lib/action.php:737 msgid "Privacy" msgstr "Priwatnosć" -#: lib/action.php:738 +#: lib/action.php:739 msgid "Source" msgstr "ŽórÅ‚o" -#: lib/action.php:740 +#: lib/action.php:743 msgid "Contact" msgstr "Kontakt" -#: lib/action.php:742 +#: lib/action.php:745 msgid "Badge" msgstr "" -#: lib/action.php:770 +#: lib/action.php:773 msgid "StatusNet software license" msgstr "" -#: lib/action.php:773 +#: lib/action.php:776 #, php-format msgid "" "**%%site.name%%** is a microblogging service brought to you by [%%site." "broughtby%%](%%site.broughtbyurl%%). " msgstr "" -#: lib/action.php:775 +#: lib/action.php:778 #, php-format msgid "**%%site.name%%** is a microblogging service. " msgstr "" -#: lib/action.php:777 +#: lib/action.php:780 #, php-format msgid "" "It runs the [StatusNet](http://status.net/) microblogging software, version %" @@ -4049,31 +4036,31 @@ msgid "" "org/licensing/licenses/agpl-3.0.html)." msgstr "" -#: lib/action.php:791 +#: lib/action.php:794 msgid "Site content license" msgstr "" -#: lib/action.php:800 +#: lib/action.php:803 msgid "All " msgstr "" -#: lib/action.php:805 +#: lib/action.php:808 msgid "license." msgstr "" -#: lib/action.php:1099 +#: lib/action.php:1102 msgid "Pagination" msgstr "" -#: lib/action.php:1108 +#: lib/action.php:1111 msgid "After" msgstr "" -#: lib/action.php:1116 +#: lib/action.php:1119 msgid "Before" msgstr "" -#: lib/action.php:1164 +#: lib/action.php:1167 msgid "There was a problem with your session token." msgstr "" @@ -4081,27 +4068,32 @@ msgstr "" msgid "You cannot make changes to this site." msgstr "" -#: lib/adminpanelaction.php:195 +#: lib/adminpanelaction.php:107 +#, fuzzy +msgid "Changes to that panel are not allowed." +msgstr "Registracija njedowolena." + +#: lib/adminpanelaction.php:206 msgid "showForm() not implemented." msgstr "" -#: lib/adminpanelaction.php:224 +#: lib/adminpanelaction.php:235 msgid "saveSettings() not implemented." msgstr "" -#: lib/adminpanelaction.php:247 +#: lib/adminpanelaction.php:258 msgid "Unable to delete design setting." msgstr "" -#: lib/adminpanelaction.php:300 +#: lib/adminpanelaction.php:312 msgid "Basic site configuration" msgstr "" -#: lib/adminpanelaction.php:303 +#: lib/adminpanelaction.php:317 msgid "Design configuration" msgstr "" -#: lib/adminpanelaction.php:306 lib/adminpanelaction.php:309 +#: lib/adminpanelaction.php:322 lib/adminpanelaction.php:327 msgid "Paths configuration" msgstr "" @@ -4125,11 +4117,21 @@ msgstr "" msgid "Tags for this attachment" msgstr "" +#: lib/authenticationplugin.php:182 lib/authenticationplugin.php:187 +#, fuzzy +msgid "Password changing failed" +msgstr "HesÅ‚o zmÄ›njene" + +#: lib/authenticationplugin.php:197 +#, fuzzy +msgid "Password changing is not allowed" +msgstr "HesÅ‚o zmÄ›njene" + #: lib/channel.php:138 lib/channel.php:158 msgid "Command results" msgstr "" -#: lib/channel.php:210 +#: lib/channel.php:210 lib/mailhandler.php:142 msgid "Command complete" msgstr "" @@ -4143,7 +4145,7 @@ msgstr "" #: lib/command.php:88 #, php-format -msgid "Could not find a user with nickname %s" +msgid "Could not find a user with nickname %s." msgstr "" #: lib/command.php:92 @@ -4152,7 +4154,7 @@ msgstr "" #: lib/command.php:99 #, php-format -msgid "Nudge sent to %s" +msgid "Nudge sent to %s." msgstr "" #: lib/command.php:126 @@ -4164,34 +4166,37 @@ msgid "" msgstr "" #: lib/command.php:152 lib/command.php:399 lib/command.php:460 -msgid "Notice with that id does not exist" +#, fuzzy +msgid "Notice with that id does not exist." msgstr "" +"Wužiwar z tej e-mejlowej adresu abo tym wužiwarskim mjenom njeeksistuje." #: lib/command.php:168 lib/command.php:415 lib/command.php:476 #: lib/command.php:532 -msgid "User has no last notice" -msgstr "" +#, fuzzy +msgid "User has no last notice." +msgstr "Wužiwar nima profil." #: lib/command.php:190 msgid "Notice marked as fave." msgstr "" -#: lib/command.php:315 -#, php-format -msgid "%1$s (%2$s)" -msgstr "%1$s (%2$s)" +#: lib/command.php:284 +#, fuzzy, php-format +msgid "Could not remove user %1$s to group %2$s." +msgstr "Skupina njeje so daÅ‚a aktualizować." #: lib/command.php:318 -#, php-format -msgid "Fullname: %s" +#, fuzzy, php-format +msgid "Full name: %s" msgstr "DospoÅ‚ne mjeno: %s" -#: lib/command.php:321 +#: lib/command.php:321 lib/mail.php:254 #, php-format msgid "Location: %s" msgstr "MÄ›stno: %s" -#: lib/command.php:324 +#: lib/command.php:324 lib/mail.php:256 #, php-format msgid "Homepage: %s" msgstr "" @@ -4203,24 +4208,16 @@ msgstr "Wo: %s" #: lib/command.php:358 scripts/xmppdaemon.php:301 #, php-format -msgid "Message too long - maximum is %d characters, you sent %d" +msgid "Message too long - maximum is %1$d characters, you sent %2$d." msgstr "" #: lib/command.php:378 msgid "Error sending direct message." msgstr "" -#: lib/command.php:422 -msgid "Cannot repeat your own notice" -msgstr "" - -#: lib/command.php:427 -msgid "Already repeated that notice" -msgstr "Tuta zdźělenka bu hižo wospjetowana" - #: lib/command.php:435 -#, php-format -msgid "Notice from %s repeated" +#, fuzzy, php-format +msgid "Notice from %s repeated." msgstr "Zdźělenka wot %s wospjetowana" #: lib/command.php:437 @@ -4229,20 +4226,20 @@ msgstr "Zmylk pÅ™i wospjetowanju zdźělenki" #: lib/command.php:491 #, php-format -msgid "Notice too long - maximum is %d characters, you sent %d" +msgid "Notice too long - maximum is %1$d characters, you sent %2$d." msgstr "" #: lib/command.php:500 -#, php-format -msgid "Reply to %s sent" -msgstr "" +#, fuzzy, php-format +msgid "Reply to %s sent." +msgstr "Na tutu zdźělenku wotmoÅ‚wić" #: lib/command.php:502 msgid "Error saving notice." msgstr "" #: lib/command.php:556 -msgid "Specify the name of the user to subscribe to" +msgid "Specify the name of the user to subscribe to." msgstr "" #: lib/command.php:563 @@ -4251,7 +4248,7 @@ msgid "Subscribed to %s" msgstr "" #: lib/command.php:584 -msgid "Specify the name of the user to unsubscribe from" +msgid "Specify the name of the user to unsubscribe from." msgstr "" #: lib/command.php:591 @@ -4280,17 +4277,17 @@ msgid "Can't turn on notification." msgstr "" #: lib/command.php:650 -msgid "Login command is disabled" +msgid "Login command is disabled." msgstr "" #: lib/command.php:664 -#, php-format -msgid "Could not create login token for %s" +#, fuzzy, php-format +msgid "Could not create login token for %s." msgstr "Njeje móžno byÅ‚o, pÅ™izjewjenske znamjeÅ¡ko za %s wutworić" #: lib/command.php:669 #, php-format -msgid "This link is useable only once, and is good for only 2 minutes: %s" +msgid "This link is useable only once, and is good for only 2 minutes: %s." msgstr "" #: lib/command.php:685 @@ -4484,10 +4481,6 @@ msgstr "Skupinu abo temu wopisać" msgid "Describe the group or topic in %d characters" msgstr "Skupinu abo temu w %d znamjeÅ¡kach wopisać" -#: lib/groupeditform.php:172 -msgid "Description" -msgstr "Wopisanje" - #: lib/groupeditform.php:179 msgid "" "Location for the group, if any, like \"City, State (or Region), Country\"" @@ -4646,21 +4639,9 @@ msgid "" "Change your email address or notification options at %8$s\n" msgstr "" -#: lib/mail.php:254 -#, php-format -msgid "Location: %s\n" -msgstr "MÄ›stno: %s\n" - -#: lib/mail.php:256 -#, php-format -msgid "Homepage: %s\n" -msgstr "Startowa strona: %s\n" - #: lib/mail.php:258 -#, php-format -msgid "" -"Bio: %s\n" -"\n" +#, fuzzy, php-format +msgid "Bio: %s" msgstr "" "Biografija: %s\n" "\n" @@ -4797,6 +4778,27 @@ msgstr "" msgid "from" msgstr "wot" +#: lib/mailhandler.php:37 +msgid "Could not parse message." +msgstr "" + +#: lib/mailhandler.php:42 +msgid "Not a registered user." +msgstr "Žadyn zregistrowany wužiwar." + +#: lib/mailhandler.php:46 +msgid "Sorry, that is not your incoming email address." +msgstr "Wodaj, to twoja adresa za dochadźace e-mejle njeje." + +#: lib/mailhandler.php:50 +msgid "Sorry, no incoming email allowed." +msgstr "Wodaj, dochadźaće e-mejle njejsu dowolene." + +#: lib/mailhandler.php:228 +#, fuzzy, php-format +msgid "Unsupported message type: %s" +msgstr "NjepodpÄ›rany format." + #: lib/mediafile.php:98 lib/mediafile.php:123 msgid "There was a database error while saving your file. Please try again." msgstr "" @@ -4828,7 +4830,7 @@ msgid "File upload stopped by extension." msgstr "" #: lib/mediafile.php:179 lib/mediafile.php:216 -msgid "File exceeds user's quota!" +msgid "File exceeds user's quota." msgstr "" #: lib/mediafile.php:196 lib/mediafile.php:233 @@ -4836,7 +4838,7 @@ msgid "File could not be moved to destination directory." msgstr "" #: lib/mediafile.php:201 lib/mediafile.php:237 -msgid "Could not determine file's mime-type!" +msgid "Could not determine file's MIME type." msgstr "" #: lib/mediafile.php:270 @@ -4845,8 +4847,8 @@ msgid " Try using another %s format." msgstr "" #: lib/mediafile.php:275 -#, php-format -msgid "%s is not a supported filetype on this server." +#, fuzzy, php-format +msgid "%s is not a supported file type on this server." msgstr "%s njeje podpÄ›rany datajowy typ na tutym serwerje." #: lib/messageform.php:120 @@ -4879,7 +4881,17 @@ msgid "Attach a file" msgstr "Dataju pÅ™ipowÄ›snyć" #: lib/noticeform.php:212 -msgid "Share your location" +#, fuzzy +msgid "Share my location." +msgstr "Nastajenja mÄ›stna njedachu so skÅ‚adować." + +#: lib/noticeform.php:214 +#, fuzzy +msgid "Do not share my location." +msgstr "Nastajenja mÄ›stna njedachu so skÅ‚adować." + +#: lib/noticeform.php:215 +msgid "Hide this info" msgstr "" #: lib/noticelist.php:428 @@ -4996,6 +5008,11 @@ msgstr "Twoje pósÅ‚ane powÄ›sće" msgid "Tags in %s's notices" msgstr "" +#: lib/plugin.php:114 +#, fuzzy +msgid "Unknown" +msgstr "Njeznata akcija" + #: lib/profileaction.php:109 lib/profileaction.php:192 lib/subgroupnav.php:82 msgid "Subscriptions" msgstr "Abonementy" @@ -5165,10 +5182,6 @@ msgstr "" msgid "People Tagcloud as tagged" msgstr "" -#: lib/subscriptionlist.php:126 -msgid "(none)" -msgstr "(žadyn)" - #: lib/tagcloudsection.php:56 msgid "None" msgstr "Žadyn" @@ -5284,19 +5297,3 @@ msgid "%s is not a valid color! Use 3 or 6 hex chars." msgstr "" "%s pÅ‚aćiwa barba njeje! Wužij 3 heksadecimalne znamjeÅ¡ka abo 6 " "heksadecimalnych znamjeÅ¡kow." - -#: scripts/maildaemon.php:48 -msgid "Could not parse message." -msgstr "" - -#: scripts/maildaemon.php:53 -msgid "Not a registered user." -msgstr "Žadyn zregistrowany wužiwar." - -#: scripts/maildaemon.php:57 -msgid "Sorry, that is not your incoming email address." -msgstr "Wodaj, to twoja adresa za dochadźace e-mejle njeje." - -#: scripts/maildaemon.php:61 -msgid "Sorry, no incoming email allowed." -msgstr "Wodaj, dochadźaće e-mejle njejsu dowolene." diff --git a/locale/ia/LC_MESSAGES/statusnet.po b/locale/ia/LC_MESSAGES/statusnet.po index 1b1b0810f..c01c3a785 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-01-03 10:37+0000\n" -"PO-Revision-Date: 2010-01-03 10:38:05+0000\n" +"POT-Creation-Date: 2010-01-10 11:27+0000\n" +"PO-Revision-Date: 2010-01-10 11:28:22+0000\n" "Language-Team: Interlingua\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha (r60575); Translate extension (2009-12-06)\n" +"X-Generator: MediaWiki 1.16alpha (r60888); Translate extension (2010-01-04)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: ia\n" "X-Message-Group: out-statusnet\n" @@ -50,11 +50,6 @@ msgstr "Pagina non existe" msgid "No such user." msgstr "Usator non existe." -#: actions/all.php:84 -#, php-format -msgid "%s and friends, page %d" -msgstr "%s e amicos, pagina %d" - #: actions/all.php:86 actions/all.php:167 actions/allrss.php:115 #: actions/apitimelinefriends.php:115 actions/apitimelinehome.php:115 #: lib/personalgroupnav.php:100 @@ -95,10 +90,10 @@ msgstr "" "action.groups%%) o publica alique tu mesme." #: actions/all.php:134 -#, php-format +#, fuzzy, php-format msgid "" -"You can try to [nudge %s](../%s) from his profile or [post something to his " -"or her attention](%%%%action.newnotice%%%%?status_textarea=%s)." +"You can try to [nudge %1$s](../%2$s) from his profile or [post something to " +"his or her attention](%%%%action.newnotice%%%%?status_textarea=%3$s)." msgstr "" "Tu pote tentar [dar un pulsata a %s](../%s) in su profilo o [publicar un " "message a su attention](%%%%action.newnotice%%%%?status_textarea=%s)." @@ -127,6 +122,23 @@ msgstr "Actualisationes de %1$s e su amicos in %2$s!" #: actions/apiaccountupdateprofile.php:97 #: actions/apiaccountupdateprofilebackgroundimage.php:94 #: actions/apiaccountupdateprofilecolors.php:118 +#: actions/apidirectmessage.php:156 actions/apifavoritecreate.php:99 +#: actions/apifavoritedestroy.php:100 actions/apifriendshipscreate.php:100 +#: actions/apifriendshipsdestroy.php:100 actions/apifriendshipsshow.php:129 +#: actions/apigroupcreate.php:136 actions/apigroupismember.php:114 +#: actions/apigroupjoin.php:155 actions/apigroupleave.php:141 +#: actions/apigrouplist.php:132 actions/apigrouplistall.php:120 +#: actions/apigroupmembership.php:106 actions/apigroupshow.php:105 +#: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102 +#: actions/apistatusesretweets.php:112 actions/apistatusesshow.php:108 +#: actions/apistatusnetconfig.php:133 actions/apistatusnetversion.php:93 +#: actions/apisubscriptions.php:111 actions/apitimelinefavorites.php:146 +#: actions/apitimelinefriends.php:156 actions/apitimelinegroup.php:150 +#: actions/apitimelinehome.php:156 actions/apitimelinementions.php:151 +#: actions/apitimelinepublic.php:131 actions/apitimelineretweetedbyme.php:122 +#: actions/apitimelineretweetedtome.php:121 +#: actions/apitimelineretweetsofme.php:122 actions/apitimelinetag.php:141 +#: actions/apitimelineuser.php:165 actions/apiusershow.php:101 msgid "API method not found." msgstr "Methodo API non trovate." @@ -186,6 +198,9 @@ msgstr "" #: actions/apiaccountupdateprofilebackgroundimage.php:146 #: actions/apiaccountupdateprofilecolors.php:164 #: actions/apiaccountupdateprofilecolors.php:174 +#: actions/groupdesignsettings.php:287 actions/groupdesignsettings.php:297 +#: actions/userdesignsettings.php:210 actions/userdesignsettings.php:220 +#: actions/userdesignsettings.php:263 actions/userdesignsettings.php:273 msgid "Unable to save your design settings." msgstr "Impossibile salveguardar le configurationes del apparentia." @@ -226,26 +241,6 @@ msgstr "Messages directe a %s" msgid "All the direct messages sent to %s" msgstr "Tote le messages directe inviate a %s" -#: actions/apidirectmessage.php:156 actions/apifavoritecreate.php:99 -#: actions/apifavoritedestroy.php:100 actions/apifriendshipscreate.php:100 -#: actions/apifriendshipsdestroy.php:100 actions/apifriendshipsshow.php:129 -#: actions/apigroupcreate.php:136 actions/apigroupismember.php:114 -#: actions/apigroupjoin.php:155 actions/apigroupleave.php:141 -#: actions/apigrouplist.php:132 actions/apigrouplistall.php:120 -#: actions/apigroupmembership.php:106 actions/apigroupshow.php:105 -#: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102 -#: actions/apistatusesretweets.php:112 actions/apistatusesshow.php:108 -#: actions/apistatusnetconfig.php:133 actions/apistatusnetversion.php:93 -#: actions/apisubscriptions.php:111 actions/apitimelinefavorites.php:146 -#: actions/apitimelinefriends.php:156 actions/apitimelinegroup.php:150 -#: actions/apitimelinehome.php:156 actions/apitimelinementions.php:151 -#: actions/apitimelinepublic.php:131 actions/apitimelineretweetedbyme.php:122 -#: actions/apitimelineretweetedtome.php:121 -#: actions/apitimelineretweetsofme.php:122 actions/apitimelinetag.php:141 -#: actions/apitimelineuser.php:165 actions/apiusershow.php:101 -msgid "API method not found!" -msgstr "Methodo API non trovate!" - #: actions/apidirectmessagenew.php:126 msgid "No message text!" msgstr "Message sin texto!" @@ -269,7 +264,8 @@ msgid "No status found with that ID." msgstr "Nulle stato trovate con iste ID." #: actions/apifavoritecreate.php:119 -msgid "This status is already a favorite!" +#, fuzzy +msgid "This status is already a favorite." msgstr "Iste stato es ja favorite!" #: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:176 @@ -277,7 +273,8 @@ msgid "Could not create favorite." msgstr "Non poteva crear le favorite." #: actions/apifavoritedestroy.php:122 -msgid "That status is not a favorite!" +#, fuzzy +msgid "That status is not a favorite." msgstr "Iste stato non es favorite!" #: actions/apifavoritedestroy.php:134 actions/disfavor.php:87 @@ -298,7 +295,8 @@ msgid "Could not unfollow user: User not found." msgstr "Non poteva cessar de sequer le usator: Usator non trovate." #: actions/apifriendshipsdestroy.php:120 -msgid "You cannot unfollow yourself!" +#, fuzzy +msgid "You cannot unfollow yourself." msgstr "Tu non pote cessar de sequer te mesme!" #: actions/apifriendshipsexists.php:94 @@ -383,7 +381,7 @@ msgstr "Le alias non pote esser identic al pseudonymo." msgid "Group not found!" msgstr "Gruppo non trovate!" -#: actions/apigroupjoin.php:110 +#: actions/apigroupjoin.php:110 actions/joingroup.php:90 lib/command.php:217 msgid "You are already a member of that group." msgstr "Tu es ja membro de iste gruppo." @@ -391,18 +389,18 @@ msgstr "Tu es ja membro de iste gruppo." msgid "You have been blocked from that group by the admin." msgstr "Le administrator te ha blocate de iste gruppo." -#: actions/apigroupjoin.php:138 -#, php-format -msgid "Could not join user %s to group %s." +#: actions/apigroupjoin.php:138 actions/joingroup.php:128 lib/command.php:234 +#, fuzzy, php-format +msgid "Could not join user %1$s to group %2$s." msgstr "Non poteva inscriber le usator %s in le gruppo %s." #: actions/apigroupleave.php:114 msgid "You are not a member of this group." msgstr "Tu non es membro de iste gruppo." -#: actions/apigroupleave.php:124 -#, php-format -msgid "Could not remove user %s to group %s." +#: actions/apigroupleave.php:124 actions/leavegroup.php:127 +#, fuzzy, php-format +msgid "Could not remove user %1$s from group %2$s." msgstr "Non poteva remover le usator %s del gruppo %s." #: actions/apigrouplist.php:95 @@ -410,11 +408,6 @@ msgstr "Non poteva remover le usator %s del gruppo %s." msgid "%s's groups" msgstr "Gruppos de %s" -#: actions/apigrouplist.php:103 -#, php-format -msgid "Groups %s is a member of on %s." -msgstr "Le gruppos del quales %s es membro in %s." - #: actions/apigrouplistall.php:90 actions/usergroups.php:62 #, php-format msgid "%s groups" @@ -438,11 +431,11 @@ msgstr "Tu non pote deler le stato de un altere usator." msgid "No such notice." msgstr "Nota non trovate." -#: actions/apistatusesretweet.php:83 +#: actions/apistatusesretweet.php:83 lib/command.php:422 msgid "Cannot repeat your own notice." msgstr "Non pote repeter tu proprie nota." -#: actions/apistatusesretweet.php:91 +#: actions/apistatusesretweet.php:91 lib/command.php:427 msgid "Already repeated that notice." msgstr "Iste nota ha ja essite repetite." @@ -455,7 +448,7 @@ msgid "No status with that ID found." msgstr "Nulle stato trovate con iste ID." #: actions/apistatusesupdate.php:157 actions/newnotice.php:155 -#: scripts/maildaemon.php:71 +#: lib/mailhandler.php:60 #, php-format msgid "That's too long. Max notice size is %d chars." msgstr "" @@ -477,13 +470,13 @@ msgid "Unsupported format." msgstr "Formato non supportate." #: actions/apitimelinefavorites.php:108 -#, php-format -msgid "%s / Favorites from %s" +#, fuzzy, php-format +msgid "%1$s / Favorites from %2$s" msgstr "%s / Favorites de %s" #: actions/apitimelinefavorites.php:120 -#, php-format -msgid "%s updates favorited by %s / %s." +#, fuzzy, php-format +msgid "%1$s updates favorited by %2$s / %2$s." msgstr "%s actualisationes favoritisate per %s / %s." #: actions/apitimelinegroup.php:109 actions/apitimelineuser.php:118 @@ -552,8 +545,11 @@ msgstr "Non trovate." msgid "No such attachment." msgstr "Attachamento non existe." -#: actions/avatarbynickname.php:59 actions/grouprss.php:91 -#: actions/leavegroup.php:76 +#: actions/avatarbynickname.php:59 actions/blockedfromgroup.php:73 +#: actions/editgroup.php:84 actions/groupdesignsettings.php:84 +#: actions/grouplogo.php:86 actions/groupmembers.php:76 +#: actions/grouprss.php:91 actions/joingroup.php:76 actions/leavegroup.php:76 +#: actions/showgroup.php:121 msgid "No nickname." msgstr "Nulle pseudonymo." @@ -576,8 +572,8 @@ msgid "You can upload your personal avatar. The maximum file size is %s." msgstr "Tu pote cargar tu avatar personal. Le dimension maxime del file es %s." #: actions/avatarsettings.php:106 actions/avatarsettings.php:185 -#: actions/grouplogo.php:178 actions/remotesubscribe.php:191 -#: actions/userauthorization.php:72 actions/userrss.php:103 +#: actions/remotesubscribe.php:191 actions/userauthorization.php:72 +#: actions/userrss.php:103 msgid "User without matching profile" msgstr "Usator sin profilo correspondente" @@ -609,9 +605,9 @@ msgstr "Cargar" msgid "Crop" msgstr "Taliar" -#: actions/avatarsettings.php:268 actions/disfavor.php:74 -#: actions/emailsettings.php:238 actions/favor.php:75 actions/geocode.php:50 -#: actions/groupblock.php:66 actions/grouplogo.php:309 +#: actions/avatarsettings.php:268 actions/deletenotice.php:157 +#: actions/disfavor.php:74 actions/emailsettings.php:238 actions/favor.php:75 +#: actions/geocode.php:50 actions/groupblock.php:66 actions/grouplogo.php:309 #: actions/groupunblock.php:66 actions/imsettings.php:206 #: actions/invite.php:56 actions/login.php:135 actions/makeadmin.php:66 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80 @@ -693,19 +689,15 @@ msgstr "Blocar iste usator" msgid "Failed to save block information." msgstr "Falleva de salveguardar le information del blocada." -#: actions/blockedfromgroup.php:73 actions/editgroup.php:84 -#: actions/groupdesignsettings.php:84 actions/grouplogo.php:86 -#: actions/groupmembers.php:76 actions/joingroup.php:76 -#: actions/showgroup.php:121 -msgid "No nickname" -msgstr "Nulle pseudonymo" - #: actions/blockedfromgroup.php:80 actions/editgroup.php:96 +#: actions/foafgroup.php:44 actions/foafgroup.php:62 actions/groupblock.php:86 #: actions/groupbyid.php:83 actions/groupdesignsettings.php:97 #: actions/grouplogo.php:99 actions/groupmembers.php:83 -#: actions/joingroup.php:83 actions/showgroup.php:137 -msgid "No such group" -msgstr "Gruppo non existe" +#: actions/grouprss.php:98 actions/groupunblock.php:86 +#: actions/joingroup.php:83 actions/leavegroup.php:83 actions/makeadmin.php:86 +#: actions/showgroup.php:137 lib/command.php:212 lib/command.php:263 +msgid "No such group." +msgstr "Gruppo non existe." #: actions/blockedfromgroup.php:90 #, php-format @@ -713,8 +705,8 @@ msgid "%s blocked profiles" msgstr "%s profilos blocate" #: actions/blockedfromgroup.php:93 -#, php-format -msgid "%s blocked profiles, page %d" +#, fuzzy, php-format +msgid "%1$s blocked profiles, page %2$d" msgstr "%s profilos blocate, pagina %d" #: actions/blockedfromgroup.php:108 @@ -827,10 +819,6 @@ msgstr "Non deler iste nota" msgid "Delete this notice" msgstr "Deler iste nota" -#: actions/deletenotice.php:157 -msgid "There was a problem with your session token. Try again, please." -msgstr "Occurreva un problema con le indicio de tu session. Per favor reproba." - #: actions/deleteuser.php:67 msgid "You cannot delete users." msgstr "Tu non pote deler usatores." @@ -856,7 +844,7 @@ msgid "Delete this user" msgstr "Deler iste usator" #: actions/designadminpanel.php:62 lib/accountsettingsaction.php:124 -#: lib/adminpanelaction.php:302 lib/groupnav.php:119 +#: lib/adminpanelaction.php:316 lib/groupnav.php:119 msgid "Design" msgstr "Apparentia" @@ -996,7 +984,8 @@ msgstr "Tu debe aperir un session pro crear un gruppo." #: actions/editgroup.php:103 actions/editgroup.php:168 #: actions/groupdesignsettings.php:104 actions/grouplogo.php:106 -msgid "You must be an admin to edit the group" +#, fuzzy +msgid "You must be an admin to edit the group." msgstr "Tu debe esser administrator pro modificar le gruppo." #: actions/editgroup.php:154 @@ -1021,7 +1010,8 @@ msgid "Options saved." msgstr "Optiones salveguardate." #: actions/emailsettings.php:60 -msgid "Email Settings" +#, fuzzy +msgid "Email settings" msgstr "Configuration de e-mail" #: actions/emailsettings.php:71 @@ -1058,8 +1048,9 @@ msgid "Cancel" msgstr "Cancellar" #: actions/emailsettings.php:121 -msgid "Email Address" -msgstr "Adresse de e-mail" +#, fuzzy +msgid "Email address" +msgstr "Adresses de e-mail" #: actions/emailsettings.php:123 msgid "Email address, like \"UserName@example.org\"" @@ -1133,9 +1124,10 @@ msgstr "Nulle adresse de e-mail." msgid "Cannot normalize that email address" msgstr "Non pote normalisar iste adresse de e-mail" -#: actions/emailsettings.php:331 actions/siteadminpanel.php:157 -msgid "Not a valid email address" -msgstr "Adresse de e-mail invalide" +#: actions/emailsettings.php:331 actions/register.php:201 +#: actions/siteadminpanel.php:157 +msgid "Not a valid email address." +msgstr "Adresse de e-mail invalide." #: actions/emailsettings.php:334 msgid "That is already your email address." @@ -1317,18 +1309,11 @@ msgstr "Le servicio remote usa un version incognite del protocollo OMB." msgid "Error updating remote profile" msgstr "Error in actualisar le profilo remote" -#: actions/foafgroup.php:44 actions/foafgroup.php:62 actions/groupblock.php:86 -#: actions/grouprss.php:98 actions/groupunblock.php:86 -#: actions/leavegroup.php:83 actions/makeadmin.php:86 lib/command.php:212 -#: lib/command.php:263 -msgid "No such group." -msgstr "Gruppo non existe." - -#: actions/getfile.php:75 +#: actions/getfile.php:79 msgid "No such file." msgstr "File non existe." -#: actions/getfile.php:79 +#: actions/getfile.php:83 msgid "Cannot read file." msgstr "Non pote leger file." @@ -1340,7 +1325,7 @@ msgstr "Nulle profilo specificate." #: actions/groupblock.php:76 actions/groupunblock.php:76 #: actions/makeadmin.php:76 actions/subedit.php:53 actions/tagother.php:46 -#: lib/profileformaction.php:77 +#: actions/unsubscribe.php:84 lib/profileformaction.php:77 msgid "No profile with that ID." msgstr "Non existe un profilo con iste ID." @@ -1366,11 +1351,11 @@ msgid "Block user from group" msgstr "Blocar usator del gruppo" #: actions/groupblock.php:162 -#, php-format +#, fuzzy, php-format msgid "" -"Are you sure you want to block user \"%s\" from the group \"%s\"? They will " -"be removed from the group, unable to post, and unable to subscribe to the " -"group in the future." +"Are you sure you want to block user \"%1$s\" from the group \"%2$s\"? They " +"will be removed from the group, unable to post, and unable to subscribe to " +"the group in the future." msgstr "" "Es tu secur de voler blocar le usator \"%s\" del gruppo \"%s\"? Ille essera " "removite del gruppo, non potera publicar messages, e non potera subscriber " @@ -1388,9 +1373,9 @@ msgstr "Blocar iste usator de iste gruppo" msgid "Database error blocking user from group." msgstr "Error del base de datos al blocar le usator del gruppo." -#: actions/groupbyid.php:74 -msgid "No ID" -msgstr "Nulle ID" +#: actions/groupbyid.php:74 actions/userbyid.php:70 +msgid "No ID." +msgstr "Nulle ID." #: actions/groupdesignsettings.php:68 msgid "You must be logged in to edit a group." @@ -1413,12 +1398,6 @@ msgstr "" msgid "Couldn't update your design." msgstr "Non poteva actualisar tu apparentia." -#: actions/groupdesignsettings.php:287 actions/groupdesignsettings.php:297 -#: actions/userdesignsettings.php:210 actions/userdesignsettings.php:220 -#: actions/userdesignsettings.php:263 actions/userdesignsettings.php:273 -msgid "Unable to save your design settings!" -msgstr "Impossibile salveguardar le configuration de tu apparentia!" - #: actions/groupdesignsettings.php:308 actions/userdesignsettings.php:231 msgid "Design preferences saved." msgstr "Preferentias de apparentia salveguardate." @@ -1435,6 +1414,11 @@ msgstr "" "Tu pote cargar un imagine pro le logotypo de tu gruppo. Le dimension maxime " "del file es %s." +#: actions/grouplogo.php:178 +#, fuzzy +msgid "User without matching profile." +msgstr "Usator sin profilo correspondente" + #: actions/grouplogo.php:362 msgid "Pick a square area of the image to be the logo." msgstr "Selige un area quadrate del imagine que devenira le logotypo." @@ -1453,15 +1437,15 @@ msgid "%s group members" msgstr "Membros del gruppo %s" #: actions/groupmembers.php:96 -#, php-format -msgid "%s group members, page %d" +#, fuzzy, php-format +msgid "%1$s group members, page %2$d" msgstr "Membros del gruppo %s, pagina %d" #: actions/groupmembers.php:111 msgid "A list of the users in this group." msgstr "Un lista de usatores in iste gruppo." -#: actions/groupmembers.php:175 lib/action.php:441 lib/groupnav.php:107 +#: actions/groupmembers.php:175 lib/action.php:442 lib/groupnav.php:107 msgid "Admin" msgstr "Administrator" @@ -1564,7 +1548,8 @@ msgid "Error removing the block." msgstr "Error de remover le blocada." #: actions/imsettings.php:59 -msgid "IM Settings" +#, fuzzy +msgid "IM settings" msgstr "Configuration de messageria instantanee" #: actions/imsettings.php:70 @@ -1594,7 +1579,8 @@ msgstr "" "message con ulterior instructiones. (Ha tu addite %s a tu lista de amicos?)" #: actions/imsettings.php:124 -msgid "IM Address" +#, fuzzy +msgid "IM address" msgstr "Adresse de messageria instantanee" #: actions/imsettings.php:126 @@ -1658,11 +1644,6 @@ msgstr "" msgid "That is not your Jabber ID." msgstr "Isto non es tu ID de Jabber." -#: actions/inbox.php:59 -#, php-format -msgid "Inbox for %s - page %d" -msgstr "Cassa de entrata de %s - pagina %d" - #: actions/inbox.php:62 #, php-format msgid "Inbox for %s" @@ -1700,10 +1681,10 @@ msgstr "Invitar nove usatores" msgid "You are already subscribed to these users:" msgstr "Tu es a subscribite a iste usatores:" -#: actions/invite.php:131 actions/invite.php:139 +#: actions/invite.php:131 actions/invite.php:139 lib/command.php:315 #, php-format -msgid "%s (%s)" -msgstr "%s (%s)" +msgid "%1$s (%2$s)" +msgstr "" #: actions/invite.php:136 msgid "" @@ -1746,7 +1727,7 @@ msgstr "Message personal" msgid "Optionally add a personal message to the invitation." msgstr "Si tu vole, adde un message personal al invitation." -#: actions/invite.php:197 lib/messageform.php:178 lib/noticeform.php:232 +#: actions/invite.php:197 lib/messageform.php:178 lib/noticeform.php:234 msgid "Send" msgstr "Inviar" @@ -1816,18 +1797,9 @@ msgstr "" msgid "You must be logged in to join a group." msgstr "Tu debe aperir un session pro facer te membro de un gruppo." -#: actions/joingroup.php:90 lib/command.php:217 -msgid "You are already a member of that group" -msgstr "Tu es ja membro de iste gruppo" - -#: actions/joingroup.php:128 lib/command.php:234 -#, php-format -msgid "Could not join user %s to group %s" -msgstr "Non poteva facer le usator %s membro del gruppo %s" - #: actions/joingroup.php:135 lib/command.php:239 -#, php-format -msgid "%s joined group %s" +#, fuzzy, php-format +msgid "%1$s joined group %2$s" msgstr "%s se faceva membro del gruppo %s" #: actions/leavegroup.php:60 @@ -1842,14 +1814,9 @@ msgstr "Tu non es membro de iste gruppo." msgid "Could not find membership record." msgstr "Non poteva trovar le datos del membrato." -#: actions/leavegroup.php:127 lib/command.php:284 -#, php-format -msgid "Could not remove user %s to group %s" -msgstr "Non poteva remover le usator %s del gruppo %s" - #: actions/leavegroup.php:134 lib/command.php:289 -#, php-format -msgid "%s left group %s" +#, fuzzy, php-format +msgid "%1$s left group %2$s" msgstr "%s quitava le gruppo %s" #: actions/login.php:83 actions/register.php:137 @@ -1869,7 +1836,7 @@ msgid "Error setting user. You are probably not authorized." msgstr "" "Error de acceder al conto de usator. Tu probabilemente non es autorisate." -#: actions/login.php:208 actions/login.php:261 lib/action.php:459 +#: actions/login.php:208 actions/login.php:261 lib/action.php:460 #: lib/logingroupnav.php:79 msgid "Login" msgstr "Aperir session" @@ -1925,18 +1892,18 @@ msgid "Only an admin can make another user an admin." msgstr "Solmente un administrator pote facer un altere usator administrator." #: actions/makeadmin.php:95 -#, php-format -msgid "%s is already an admin for group \"%s\"." +#, fuzzy, php-format +msgid "%1$s is already an admin for group \"%2$s\"." msgstr "%s es ja administrator del gruppo \"%s\"." #: actions/makeadmin.php:132 -#, php-format -msgid "Can't get membership record for %s in group %s" +#, fuzzy, php-format +msgid "Can't get membership record for %1$s in group %2$s." msgstr "Non poteva obtener le datos del membrato de %s in le gruppo %s" #: actions/makeadmin.php:145 -#, php-format -msgid "Can't make %s an admin for group %s" +#, fuzzy, php-format +msgid "Can't make %1$s an admin for group %2$s." msgstr "Non pote facer %s administrator del gruppo %s" #: actions/microsummary.php:69 @@ -1980,8 +1947,8 @@ msgid "Message sent" msgstr "Message inviate" #: actions/newmessage.php:185 lib/command.php:376 -#, php-format -msgid "Direct message to %s sent" +#, fuzzy, php-format +msgid "Direct message to %s sent." msgstr "Message directe a %s inviate" #: actions/newmessage.php:210 actions/newnotice.php:245 lib/channel.php:170 @@ -2010,8 +1977,8 @@ msgid "Text search" msgstr "Recerca de texto" #: actions/noticesearch.php:91 -#, php-format -msgid "Search results for \"%s\" on %s" +#, fuzzy, php-format +msgid "Search results for \"%1$s\" on %2$s" msgstr "Resultatos del recerca de \"%s\" in %s" #: actions/noticesearch.php:121 @@ -2120,11 +2087,6 @@ msgstr "Monstrar o celar apparentias de profilo." msgid "URL shortening service is too long (max 50 chars)." msgstr "Le servicio de accurtamento de URL es troppo longe (max 50 chars)." -#: actions/outbox.php:58 -#, php-format -msgid "Outbox for %s - page %d" -msgstr "Cassa de exito pro %s - pagina %d" - #: actions/outbox.php:61 #, php-format msgid "Outbox for %s" @@ -2196,7 +2158,7 @@ msgstr "Non pote salveguardar le nove contrasigno." msgid "Password saved." msgstr "Contrasigno salveguardate." -#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:308 +#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:326 msgid "Paths" msgstr "Camminos" @@ -2229,7 +2191,7 @@ msgid "Invalid SSL server. The maximum length is 255 characters." msgstr "Servitor SSL invalide. Le longitude maxime es 255 characteres." #: actions/pathsadminpanel.php:217 actions/siteadminpanel.php:58 -#: lib/adminpanelaction.php:299 +#: lib/adminpanelaction.php:311 msgid "Site" msgstr "Sito" @@ -2322,7 +2284,8 @@ msgid "When to use SSL" msgstr "Quando usar SSL" #: actions/pathsadminpanel.php:308 -msgid "SSL Server" +#, fuzzy +msgid "SSL server" msgstr "Servitor SSL" #: actions/pathsadminpanel.php:309 @@ -2352,8 +2315,8 @@ msgid "Not a valid people tag: %s" msgstr "Etiquetta de personas invalide: %s" #: actions/peopletag.php:144 -#, php-format -msgid "Users self-tagged with %s - page %d" +#, fuzzy, php-format +msgid "Users self-tagged with %1$s - page %2$d" msgstr "Usatores auto-etiquettate con %s - pagina %d" #: actions/postnotice.php:84 @@ -2361,8 +2324,8 @@ msgid "Invalid notice content" msgstr "Le contento del nota es invalide" #: actions/postnotice.php:90 -#, php-format -msgid "Notice license ‘%s’ is not compatible with site license ‘%s’." +#, fuzzy, php-format +msgid "Notice license ‘%1$s’ is not compatible with site license ‘%2$s’." msgstr "" "Le licentia del nota '%s' non es compatibile con le licentia del sito '%s'." @@ -2485,19 +2448,19 @@ msgstr "Etiquetta invalide: \"%s\"" msgid "Couldn't update user for autosubscribe." msgstr "Non poteva actualisar usator pro autosubscription." -#: actions/profilesettings.php:354 +#: actions/profilesettings.php:359 msgid "Couldn't save location prefs." msgstr "Non poteva salveguardar le preferentias de loco." -#: actions/profilesettings.php:366 +#: actions/profilesettings.php:371 msgid "Couldn't save profile." msgstr "Non poteva salveguardar profilo." -#: actions/profilesettings.php:374 +#: actions/profilesettings.php:379 msgid "Couldn't save tags." msgstr "Non poteva salveguardar etiquettas." -#: actions/profilesettings.php:382 lib/adminpanelaction.php:126 +#: actions/profilesettings.php:387 lib/adminpanelaction.php:137 msgid "Settings saved." msgstr "Preferentias confirmate." @@ -2603,7 +2566,7 @@ msgstr "" "Proque non [registrar un conto](%%action.register%%) e devenir le prime a " "publicar un?" -#: actions/publictagcloud.php:135 +#: actions/publictagcloud.php:131 msgid "Tag cloud" msgstr "Etiquettario" @@ -2743,7 +2706,7 @@ msgstr "Pardono, le codice de invitation es invalide." msgid "Registration successful" msgstr "Registration succedite" -#: actions/register.php:114 actions/register.php:502 lib/action.php:456 +#: actions/register.php:114 actions/register.php:502 lib/action.php:457 #: lib/logingroupnav.php:85 msgid "Register" msgstr "Crear un conto" @@ -2757,10 +2720,6 @@ msgid "You can't register if you don't agree to the license." msgstr "" "Tu non pote registrar te si tu non te declara de accordo con le licentia." -#: actions/register.php:201 -msgid "Not a valid email address." -msgstr "Adresse de e-mail invalide." - #: actions/register.php:212 msgid "Email address already exists." msgstr "Le adresse de e-mail existe ja." @@ -2821,12 +2780,12 @@ msgstr "" "messageria instantanee, numero de telephono." #: actions/register.php:537 -#, php-format +#, fuzzy, php-format msgid "" -"Congratulations, %s! And welcome to %%%%site.name%%%%. From here, you may " +"Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may " "want to...\n" "\n" -"* Go to [your profile](%s) and post your first message.\n" +"* Go to [your profile](%2$s) and post your first message.\n" "* Add a [Jabber/GTalk address](%%%%action.imsettings%%%%) so you can send " "notices through instant messages.\n" "* [Search for people](%%%%action.peoplesearch%%%%) that you may know or that " @@ -2949,11 +2908,6 @@ msgstr "Repetite!" msgid "Replies to %s" msgstr "Responsas a %s" -#: actions/replies.php:127 -#, php-format -msgid "Replies to %s, page %d" -msgstr "Responsas a %s, pagina %d" - #: actions/replies.php:144 #, php-format msgid "Replies feed for %s (RSS 1.0)" @@ -2970,10 +2924,10 @@ msgid "Replies feed for %s (Atom)" msgstr "Syndication de responsas pro %s (Atom)" #: actions/replies.php:198 -#, php-format +#, fuzzy, php-format msgid "" -"This is the timeline showing replies to %s but %s hasn't received a notice " -"to his attention yet." +"This is the timeline showing replies to %1$s but %2$s hasn't received a " +"notice to his attention yet." msgstr "" "Isto es le chronologia de responsas a %s, ma %s non ha ancora recipite alcun " "nota a su attention." @@ -2988,10 +2942,10 @@ msgstr "" "personas o [devenir membro de gruppos](%%action.groups%%)." #: actions/replies.php:205 -#, php-format +#, fuzzy, php-format msgid "" -"You can try to [nudge %s](../%s) or [post something to his or her attention]" -"(%%%%action.newnotice%%%%?status_textarea=%s)." +"You can try to [nudge %1$s](../%2$s) or [post something to his or her " +"attention](%%%%action.newnotice%%%%?status_textarea=%3$s)." msgstr "" "Tu pote tentar [pulsar %s](../%s) o [publicar alique a su attention](%%%%" "action.newnotice%%%%?status_textarea=%s)." @@ -3009,11 +2963,6 @@ msgstr "Tu non pote mitter usatores in le cassa de sablo in iste sito." msgid "User is already sandboxed." msgstr "Usator es ja in cassa de sablo." -#: actions/showfavorites.php:79 -#, php-format -msgid "%s's favorite notices, page %d" -msgstr "Notas favorite de %s, pagina %d" - #: actions/showfavorites.php:132 msgid "Could not retrieve favorite notices." msgstr "Non poteva recuperar notas favorite." @@ -3071,11 +3020,6 @@ msgstr "Isto es un modo de condivider lo que te place." msgid "%s group" msgstr "Gruppo %s" -#: actions/showgroup.php:84 -#, php-format -msgid "%s group, page %d" -msgstr "Gruppo %s, pagina %d" - #: actions/showgroup.php:218 msgid "Group profile" msgstr "Profilo del gruppo" @@ -3124,7 +3068,7 @@ msgstr "Membros" #: actions/showgroup.php:386 lib/profileaction.php:117 #: lib/profileaction.php:148 lib/profileaction.php:236 lib/section.php:95 -#: lib/tagcloudsection.php:71 +#: lib/subscriptionlist.php:126 lib/tagcloudsection.php:71 msgid "(None)" msgstr "(Nulle)" @@ -3199,14 +3143,9 @@ msgstr "Nota delite." msgid " tagged %s" msgstr " con etiquetta %s" -#: actions/showstream.php:79 -#, php-format -msgid "%s, page %d" -msgstr "%s, pagina %d" - #: actions/showstream.php:122 -#, php-format -msgid "Notice feed for %s tagged %s (RSS 1.0)" +#, fuzzy, php-format +msgid "Notice feed for %1$s tagged %2$s (RSS 1.0)" msgstr "Syndication de notas pro %s con etiquetta %s (RSS 1.0)" #: actions/showstream.php:129 @@ -3230,8 +3169,8 @@ msgid "FOAF for %s" msgstr "Amico de un amico pro %s" #: actions/showstream.php:191 -#, php-format -msgid "This is the timeline for %s but %s hasn't posted anything yet." +#, fuzzy, php-format +msgid "This is the timeline for %1$s but %2$s hasn't posted anything yet." msgstr "Isto es le chronologia pro %s, ma %s non ha ancora publicate alique." #: actions/showstream.php:196 @@ -3243,10 +3182,10 @@ msgstr "" "alcun nota, dunque iste es un bon momento pro comenciar :)" #: actions/showstream.php:198 -#, php-format +#, fuzzy, php-format msgid "" -"You can try to nudge %s or [post something to his or her attention](%%%%" -"action.newnotice%%%%?status_textarea=%s)." +"You can try to nudge %1$s or [post something to his or her attention](%%%%" +"action.newnotice%%%%?status_textarea=%2$s)." msgstr "" "Tu pote tentar pulsar %s o [publicar un nota a su attention](%%%%action." "newnotice%%%%?status_textarea=%s)." @@ -3298,12 +3237,13 @@ msgid "Site name must have non-zero length." msgstr "Le longitude del nomine del sito debe esser plus que zero." #: actions/siteadminpanel.php:154 -msgid "You must have a valid contact email address" +#, fuzzy +msgid "You must have a valid contact email address." msgstr "Tu debe haber un valide adresse de e-mail pro contacto." #: actions/siteadminpanel.php:172 -#, php-format -msgid "Unknown language \"%s\"" +#, fuzzy, php-format +msgid "Unknown language \"%s\"." msgstr "Lingua \"%s\" incognite" #: actions/siteadminpanel.php:179 @@ -3485,7 +3425,8 @@ msgid "Save site settings" msgstr "Salveguardar configurationes del sito" #: actions/smssettings.php:58 -msgid "SMS Settings" +#, fuzzy +msgid "SMS settings" msgstr "Configuration SMS" #: actions/smssettings.php:69 @@ -3514,7 +3455,8 @@ msgid "Enter the code you received on your phone." msgstr "Entra le codice que tu ha recipite in tu telephono." #: actions/smssettings.php:138 -msgid "SMS Phone number" +#, fuzzy +msgid "SMS phone number" msgstr "Numero de telephono pro SMS" #: actions/smssettings.php:140 @@ -3605,8 +3547,8 @@ msgid "%s subscribers" msgstr "Subscriptores a %s" #: actions/subscribers.php:52 -#, php-format -msgid "%s subscribers, page %d" +#, fuzzy, php-format +msgid "%1$s subscribers, page %2$d" msgstr "Subscriptores a %s, pagina %d" #: actions/subscribers.php:63 @@ -3644,9 +3586,9 @@ msgid "%s subscriptions" msgstr "" #: actions/subscriptions.php:54 -#, php-format -msgid "%s subscriptions, page %d" -msgstr "" +#, fuzzy, php-format +msgid "%1$s subscriptions, page %2$d" +msgstr "Subscriptores a %s, pagina %d" #: actions/subscriptions.php:65 msgid "These are the people whose notices you listen to." @@ -3680,11 +3622,6 @@ msgstr "" msgid "SMS" msgstr "" -#: actions/tag.php:68 -#, php-format -msgid "Notices tagged with %s, page %d" -msgstr "" - #: actions/tag.php:86 #, php-format msgid "Notice feed for tag %s (RSS 1.0)" @@ -3764,20 +3701,18 @@ msgstr "" msgid "No profile id in request." msgstr "" -#: actions/unsubscribe.php:84 -msgid "No profile with that id." -msgstr "" - #: actions/unsubscribe.php:98 msgid "Unsubscribed" msgstr "" #: actions/updateprofile.php:62 actions/userauthorization.php:330 -#, php-format -msgid "Listenee stream license ‘%s’ is not compatible with site license ‘%s’." +#, fuzzy, php-format +msgid "" +"Listenee stream license ‘%1$s’ is not compatible with site license ‘%2$s’." msgstr "" +"Le licentia del nota '%s' non es compatibile con le licentia del sito '%s'." -#: actions/useradminpanel.php:58 lib/adminpanelaction.php:305 +#: actions/useradminpanel.php:58 lib/adminpanelaction.php:321 #: lib/personalgroupnav.php:115 msgid "User" msgstr "" @@ -3875,7 +3810,7 @@ msgid "" "click “Rejectâ€." msgstr "" -#: actions/userauthorization.php:188 +#: actions/userauthorization.php:188 actions/version.php:165 msgid "License" msgstr "" @@ -3924,7 +3859,7 @@ msgstr "" #: actions/userauthorization.php:296 #, php-format -msgid "Listener URI ‘%s’ not found here" +msgid "Listener URI ‘%s’ not found here." msgstr "" #: actions/userauthorization.php:301 @@ -3957,10 +3892,6 @@ msgstr "" msgid "Wrong image type for avatar URL ‘%s’." msgstr "" -#: actions/userbyid.php:70 -msgid "No ID." -msgstr "Nulle ID." - #: actions/userdesignsettings.php:76 lib/designsettings.php:65 msgid "Profile design" msgstr "" @@ -3975,11 +3906,6 @@ msgstr "" msgid "Enjoy your hotdog!" msgstr "" -#: actions/usergroups.php:64 -#, php-format -msgid "%s groups, page %d" -msgstr "" - #: actions/usergroups.php:130 msgid "Search for more groups" msgstr "" @@ -3994,6 +3920,72 @@ msgstr "" msgid "Try [searching for groups](%%action.groupsearch%%) and joining them." msgstr "" +#: actions/version.php:73 +#, fuzzy, php-format +msgid "StatusNet %s" +msgstr "Statisticas" + +#: actions/version.php:153 +#, php-format +msgid "" +"This site is powered by %1$s version %2$s, Copyright 2008-2010 StatusNet, " +"Inc. and contributors." +msgstr "" + +#: actions/version.php:157 +#, fuzzy +msgid "StatusNet" +msgstr "Stato delite." + +#: actions/version.php:161 +msgid "Contributors" +msgstr "" + +#: actions/version.php:168 +msgid "" +"StatusNet is free software: you can redistribute it and/or modify it under " +"the terms of the GNU Affero General Public License as published by the Free " +"Software Foundation, either version 3 of the License, or (at your option) " +"any later version. " +msgstr "" + +#: actions/version.php:174 +msgid "" +"This program is distributed in the hope that it will be useful, but WITHOUT " +"ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or " +"FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License " +"for more details. " +msgstr "" + +#: actions/version.php:180 +#, php-format +msgid "" +"You should have received a copy of the GNU Affero General Public License " +"along with this program. If not, see %s." +msgstr "" + +#: actions/version.php:189 +msgid "Plugins" +msgstr "" + +#: actions/version.php:195 +#, fuzzy +msgid "Name" +msgstr "Pseudonymo" + +#: actions/version.php:196 lib/action.php:741 +#, fuzzy +msgid "Version" +msgstr "Conversation" + +#: actions/version.php:197 +msgid "Author(s)" +msgstr "" + +#: actions/version.php:198 lib/groupeditform.php:172 +msgid "Description" +msgstr "" + #: classes/File.php:137 #, php-format msgid "" @@ -4060,7 +4052,7 @@ msgstr "" msgid "DB error inserting reply: %s" msgstr "" -#: classes/Notice.php:1361 +#: classes/Notice.php:1359 #, php-format msgid "RT @%1$s %2$s" msgstr "" @@ -4106,149 +4098,144 @@ msgstr "" msgid "Other options" msgstr "" -#: lib/action.php:144 -#, php-format -msgid "%s - %s" -msgstr "" - #: lib/action.php:159 msgid "Untitled page" msgstr "" -#: lib/action.php:426 +#: lib/action.php:427 msgid "Primary site navigation" msgstr "" -#: lib/action.php:432 +#: lib/action.php:433 msgid "Home" msgstr "" -#: lib/action.php:432 +#: lib/action.php:433 msgid "Personal profile and friends timeline" msgstr "" -#: lib/action.php:434 +#: lib/action.php:435 msgid "Account" msgstr "" -#: lib/action.php:434 +#: lib/action.php:435 msgid "Change your email, avatar, password, profile" msgstr "" -#: lib/action.php:437 +#: lib/action.php:438 msgid "Connect" msgstr "" -#: lib/action.php:437 +#: lib/action.php:438 msgid "Connect to services" msgstr "" -#: lib/action.php:441 +#: lib/action.php:442 msgid "Change site configuration" msgstr "" -#: lib/action.php:445 lib/subgroupnav.php:105 +#: lib/action.php:446 lib/subgroupnav.php:105 msgid "Invite" msgstr "" -#: lib/action.php:446 lib/subgroupnav.php:106 +#: lib/action.php:447 lib/subgroupnav.php:106 #, php-format msgid "Invite friends and colleagues to join you on %s" msgstr "" -#: lib/action.php:451 +#: lib/action.php:452 msgid "Logout" msgstr "" -#: lib/action.php:451 +#: lib/action.php:452 msgid "Logout from the site" msgstr "" -#: lib/action.php:456 +#: lib/action.php:457 msgid "Create an account" msgstr "" -#: lib/action.php:459 +#: lib/action.php:460 msgid "Login to the site" msgstr "" -#: lib/action.php:462 lib/action.php:725 +#: lib/action.php:463 lib/action.php:726 msgid "Help" msgstr "" -#: lib/action.php:462 +#: lib/action.php:463 msgid "Help me!" msgstr "" -#: lib/action.php:465 lib/searchaction.php:127 +#: lib/action.php:466 lib/searchaction.php:127 msgid "Search" msgstr "" -#: lib/action.php:465 +#: lib/action.php:466 msgid "Search for people or text" msgstr "" -#: lib/action.php:486 +#: lib/action.php:487 msgid "Site notice" msgstr "" -#: lib/action.php:552 +#: lib/action.php:553 msgid "Local views" msgstr "" -#: lib/action.php:618 +#: lib/action.php:619 msgid "Page notice" msgstr "" -#: lib/action.php:720 +#: lib/action.php:721 msgid "Secondary site navigation" msgstr "" -#: lib/action.php:727 +#: lib/action.php:728 msgid "About" msgstr "" -#: lib/action.php:729 +#: lib/action.php:730 msgid "FAQ" msgstr "" -#: lib/action.php:733 +#: lib/action.php:734 msgid "TOS" msgstr "" -#: lib/action.php:736 +#: lib/action.php:737 msgid "Privacy" msgstr "" -#: lib/action.php:738 +#: lib/action.php:739 msgid "Source" msgstr "" -#: lib/action.php:740 +#: lib/action.php:743 msgid "Contact" msgstr "" -#: lib/action.php:742 +#: lib/action.php:745 msgid "Badge" msgstr "" -#: lib/action.php:770 +#: lib/action.php:773 msgid "StatusNet software license" msgstr "" -#: lib/action.php:773 +#: lib/action.php:776 #, php-format msgid "" "**%%site.name%%** is a microblogging service brought to you by [%%site." "broughtby%%](%%site.broughtbyurl%%). " msgstr "" -#: lib/action.php:775 +#: lib/action.php:778 #, php-format msgid "**%%site.name%%** is a microblogging service. " msgstr "" -#: lib/action.php:777 +#: lib/action.php:780 #, php-format msgid "" "It runs the [StatusNet](http://status.net/) microblogging software, version %" @@ -4256,31 +4243,31 @@ msgid "" "org/licensing/licenses/agpl-3.0.html)." msgstr "" -#: lib/action.php:791 +#: lib/action.php:794 msgid "Site content license" msgstr "" -#: lib/action.php:800 +#: lib/action.php:803 msgid "All " msgstr "" -#: lib/action.php:805 +#: lib/action.php:808 msgid "license." msgstr "" -#: lib/action.php:1099 +#: lib/action.php:1102 msgid "Pagination" msgstr "" -#: lib/action.php:1108 +#: lib/action.php:1111 msgid "After" msgstr "" -#: lib/action.php:1116 +#: lib/action.php:1119 msgid "Before" msgstr "" -#: lib/action.php:1164 +#: lib/action.php:1167 msgid "There was a problem with your session token." msgstr "" @@ -4288,27 +4275,32 @@ msgstr "" msgid "You cannot make changes to this site." msgstr "" -#: lib/adminpanelaction.php:195 +#: lib/adminpanelaction.php:107 +#, fuzzy +msgid "Changes to that panel are not allowed." +msgstr "Registration non permittite." + +#: lib/adminpanelaction.php:206 msgid "showForm() not implemented." msgstr "" -#: lib/adminpanelaction.php:224 +#: lib/adminpanelaction.php:235 msgid "saveSettings() not implemented." msgstr "" -#: lib/adminpanelaction.php:247 +#: lib/adminpanelaction.php:258 msgid "Unable to delete design setting." msgstr "" -#: lib/adminpanelaction.php:300 +#: lib/adminpanelaction.php:312 msgid "Basic site configuration" msgstr "" -#: lib/adminpanelaction.php:303 +#: lib/adminpanelaction.php:317 msgid "Design configuration" msgstr "" -#: lib/adminpanelaction.php:306 lib/adminpanelaction.php:309 +#: lib/adminpanelaction.php:322 lib/adminpanelaction.php:327 msgid "Paths configuration" msgstr "" @@ -4332,11 +4324,21 @@ msgstr "" msgid "Tags for this attachment" msgstr "" +#: lib/authenticationplugin.php:182 lib/authenticationplugin.php:187 +#, fuzzy +msgid "Password changing failed" +msgstr "Cambio del contrasigno" + +#: lib/authenticationplugin.php:197 +#, fuzzy +msgid "Password changing is not allowed" +msgstr "Cambio del contrasigno" + #: lib/channel.php:138 lib/channel.php:158 msgid "Command results" msgstr "" -#: lib/channel.php:210 +#: lib/channel.php:210 lib/mailhandler.php:142 msgid "Command complete" msgstr "" @@ -4349,18 +4351,18 @@ msgid "Sorry, this command is not yet implemented." msgstr "" #: lib/command.php:88 -#, php-format -msgid "Could not find a user with nickname %s" -msgstr "" +#, fuzzy, php-format +msgid "Could not find a user with nickname %s." +msgstr "Non poteva trovar le usator de destination." #: lib/command.php:92 msgid "It does not make a lot of sense to nudge yourself!" msgstr "" #: lib/command.php:99 -#, php-format -msgid "Nudge sent to %s" -msgstr "" +#, fuzzy, php-format +msgid "Nudge sent to %s." +msgstr "Pulsata inviate" #: lib/command.php:126 #, php-format @@ -4371,34 +4373,36 @@ msgid "" msgstr "" #: lib/command.php:152 lib/command.php:399 lib/command.php:460 -msgid "Notice with that id does not exist" -msgstr "" +#, fuzzy +msgid "Notice with that id does not exist." +msgstr "Nulle usator existe con iste adresse de e-mail o nomine de usator." #: lib/command.php:168 lib/command.php:415 lib/command.php:476 #: lib/command.php:532 -msgid "User has no last notice" -msgstr "" +#, fuzzy +msgid "User has no last notice." +msgstr "Le usator non ha un profilo." #: lib/command.php:190 msgid "Notice marked as fave." msgstr "" -#: lib/command.php:315 -#, php-format -msgid "%1$s (%2$s)" -msgstr "" +#: lib/command.php:284 +#, fuzzy, php-format +msgid "Could not remove user %1$s to group %2$s." +msgstr "Non poteva remover le usator %s del gruppo %s" #: lib/command.php:318 -#, php-format -msgid "Fullname: %s" -msgstr "" +#, fuzzy, php-format +msgid "Full name: %s" +msgstr "Nomine complete" -#: lib/command.php:321 +#: lib/command.php:321 lib/mail.php:254 #, php-format msgid "Location: %s" msgstr "" -#: lib/command.php:324 +#: lib/command.php:324 lib/mail.php:256 #, php-format msgid "Homepage: %s" msgstr "" @@ -4410,25 +4414,17 @@ msgstr "" #: lib/command.php:358 scripts/xmppdaemon.php:301 #, php-format -msgid "Message too long - maximum is %d characters, you sent %d" +msgid "Message too long - maximum is %1$d characters, you sent %2$d." msgstr "" #: lib/command.php:378 msgid "Error sending direct message." msgstr "" -#: lib/command.php:422 -msgid "Cannot repeat your own notice" -msgstr "Non pote repeter tu proprie nota" - -#: lib/command.php:427 -msgid "Already repeated that notice" -msgstr "Iste nota ha ja essite repetite" - #: lib/command.php:435 -#, php-format -msgid "Notice from %s repeated" -msgstr "" +#, fuzzy, php-format +msgid "Notice from %s repeated." +msgstr "Nota delite." #: lib/command.php:437 msgid "Error repeating notice." @@ -4436,20 +4432,20 @@ msgstr "Error durante le repetition del nota." #: lib/command.php:491 #, php-format -msgid "Notice too long - maximum is %d characters, you sent %d" +msgid "Notice too long - maximum is %1$d characters, you sent %2$d." msgstr "" #: lib/command.php:500 -#, php-format -msgid "Reply to %s sent" -msgstr "" +#, fuzzy, php-format +msgid "Reply to %s sent." +msgstr "Responsas a %s" #: lib/command.php:502 msgid "Error saving notice." msgstr "" #: lib/command.php:556 -msgid "Specify the name of the user to subscribe to" +msgid "Specify the name of the user to subscribe to." msgstr "" #: lib/command.php:563 @@ -4458,7 +4454,7 @@ msgid "Subscribed to %s" msgstr "" #: lib/command.php:584 -msgid "Specify the name of the user to unsubscribe from" +msgid "Specify the name of the user to unsubscribe from." msgstr "" #: lib/command.php:591 @@ -4487,17 +4483,17 @@ msgid "Can't turn on notification." msgstr "" #: lib/command.php:650 -msgid "Login command is disabled" +msgid "Login command is disabled." msgstr "" #: lib/command.php:664 -#, php-format -msgid "Could not create login token for %s" -msgstr "" +#, fuzzy, php-format +msgid "Could not create login token for %s." +msgstr "Non poteva crear aliases." #: lib/command.php:669 #, php-format -msgid "This link is useable only once, and is good for only 2 minutes: %s" +msgid "This link is useable only once, and is good for only 2 minutes: %s." msgstr "" #: lib/command.php:685 @@ -4685,10 +4681,6 @@ msgstr "" msgid "Describe the group or topic in %d characters" msgstr "" -#: lib/groupeditform.php:172 -msgid "Description" -msgstr "" - #: lib/groupeditform.php:179 msgid "" "Location for the group, if any, like \"City, State (or Region), Country\"" @@ -4847,22 +4839,10 @@ msgid "" "Change your email address or notification options at %8$s\n" msgstr "" -#: lib/mail.php:254 -#, php-format -msgid "Location: %s\n" -msgstr "" - -#: lib/mail.php:256 -#, php-format -msgid "Homepage: %s\n" -msgstr "" - #: lib/mail.php:258 -#, php-format -msgid "" -"Bio: %s\n" -"\n" -msgstr "" +#, fuzzy, php-format +msgid "Bio: %s" +msgstr "Bio" #: lib/mail.php:286 #, php-format @@ -4996,6 +4976,27 @@ msgstr "" msgid "from" msgstr "" +#: lib/mailhandler.php:37 +msgid "Could not parse message." +msgstr "" + +#: lib/mailhandler.php:42 +msgid "Not a registered user." +msgstr "" + +#: lib/mailhandler.php:46 +msgid "Sorry, that is not your incoming email address." +msgstr "" + +#: lib/mailhandler.php:50 +msgid "Sorry, no incoming email allowed." +msgstr "" + +#: lib/mailhandler.php:228 +#, fuzzy, php-format +msgid "Unsupported message type: %s" +msgstr "Formato non supportate." + #: lib/mediafile.php:98 lib/mediafile.php:123 msgid "There was a database error while saving your file. Please try again." msgstr "" @@ -5027,7 +5028,7 @@ msgid "File upload stopped by extension." msgstr "" #: lib/mediafile.php:179 lib/mediafile.php:216 -msgid "File exceeds user's quota!" +msgid "File exceeds user's quota." msgstr "" #: lib/mediafile.php:196 lib/mediafile.php:233 @@ -5035,8 +5036,9 @@ msgid "File could not be moved to destination directory." msgstr "" #: lib/mediafile.php:201 lib/mediafile.php:237 -msgid "Could not determine file's mime-type!" -msgstr "" +#, fuzzy +msgid "Could not determine file's MIME type." +msgstr "Non poteva determinar le usator de origine." #: lib/mediafile.php:270 #, php-format @@ -5045,7 +5047,7 @@ msgstr "" #: lib/mediafile.php:275 #, php-format -msgid "%s is not a supported filetype on this server." +msgid "%s is not a supported file type on this server." msgstr "" #: lib/messageform.php:120 @@ -5078,7 +5080,17 @@ msgid "Attach a file" msgstr "" #: lib/noticeform.php:212 -msgid "Share your location" +#, fuzzy +msgid "Share my location." +msgstr "Non poteva salveguardar le preferentias de loco." + +#: lib/noticeform.php:214 +#, fuzzy +msgid "Do not share my location." +msgstr "Non poteva salveguardar le preferentias de loco." + +#: lib/noticeform.php:215 +msgid "Hide this info" msgstr "" #: lib/noticelist.php:428 @@ -5196,6 +5208,11 @@ msgstr "" msgid "Tags in %s's notices" msgstr "" +#: lib/plugin.php:114 +#, fuzzy +msgid "Unknown" +msgstr "Action incognite" + #: lib/profileaction.php:109 lib/profileaction.php:192 lib/subgroupnav.php:82 msgid "Subscriptions" msgstr "" @@ -5366,10 +5383,6 @@ msgstr "" msgid "People Tagcloud as tagged" msgstr "" -#: lib/subscriptionlist.php:126 -msgid "(none)" -msgstr "" - #: lib/tagcloudsection.php:56 msgid "None" msgstr "" @@ -5483,19 +5496,3 @@ msgstr "" #, php-format msgid "%s is not a valid color! Use 3 or 6 hex chars." msgstr "" - -#: scripts/maildaemon.php:48 -msgid "Could not parse message." -msgstr "" - -#: scripts/maildaemon.php:53 -msgid "Not a registered user." -msgstr "" - -#: scripts/maildaemon.php:57 -msgid "Sorry, that is not your incoming email address." -msgstr "" - -#: scripts/maildaemon.php:61 -msgid "Sorry, no incoming email allowed." -msgstr "" diff --git a/locale/is/LC_MESSAGES/statusnet.po b/locale/is/LC_MESSAGES/statusnet.po index 60498bc09..78375617d 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-01-03 10:37+0000\n" -"PO-Revision-Date: 2010-01-03 10:38:08+0000\n" +"POT-Creation-Date: 2010-01-10 11:27+0000\n" +"PO-Revision-Date: 2010-01-10 11:28:25+0000\n" "Language-Team: Icelandic\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha (r60575); Translate extension (2009-12-06)\n" +"X-Generator: MediaWiki 1.16alpha (r60888); Translate extension (2010-01-04)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: is\n" "X-Message-Group: out-statusnet\n" @@ -53,11 +53,6 @@ msgstr "Ekkert þannig merki." msgid "No such user." msgstr "Enginn svoleiðis notandi." -#: actions/all.php:84 -#, php-format -msgid "%s and friends, page %d" -msgstr "%s og vinirnir, sÃða %d" - #: actions/all.php:86 actions/all.php:167 actions/allrss.php:115 #: actions/apitimelinefriends.php:115 actions/apitimelinehome.php:115 #: lib/personalgroupnav.php:100 @@ -96,8 +91,8 @@ msgstr "" #: actions/all.php:134 #, php-format msgid "" -"You can try to [nudge %s](../%s) from his profile or [post something to his " -"or her attention](%%%%action.newnotice%%%%?status_textarea=%s)." +"You can try to [nudge %1$s](../%2$s) from his profile or [post something to " +"his or her attention](%%%%action.newnotice%%%%?status_textarea=%3$s)." msgstr "" #: actions/all.php:137 actions/replies.php:209 actions/showstream.php:202 @@ -122,6 +117,23 @@ msgstr "Færslur frá %1$s og vinum á %2$s!" #: actions/apiaccountupdateprofile.php:97 #: actions/apiaccountupdateprofilebackgroundimage.php:94 #: actions/apiaccountupdateprofilecolors.php:118 +#: actions/apidirectmessage.php:156 actions/apifavoritecreate.php:99 +#: actions/apifavoritedestroy.php:100 actions/apifriendshipscreate.php:100 +#: actions/apifriendshipsdestroy.php:100 actions/apifriendshipsshow.php:129 +#: actions/apigroupcreate.php:136 actions/apigroupismember.php:114 +#: actions/apigroupjoin.php:155 actions/apigroupleave.php:141 +#: actions/apigrouplist.php:132 actions/apigrouplistall.php:120 +#: actions/apigroupmembership.php:106 actions/apigroupshow.php:105 +#: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102 +#: actions/apistatusesretweets.php:112 actions/apistatusesshow.php:108 +#: actions/apistatusnetconfig.php:133 actions/apistatusnetversion.php:93 +#: actions/apisubscriptions.php:111 actions/apitimelinefavorites.php:146 +#: actions/apitimelinefriends.php:156 actions/apitimelinegroup.php:150 +#: actions/apitimelinehome.php:156 actions/apitimelinementions.php:151 +#: actions/apitimelinepublic.php:131 actions/apitimelineretweetedbyme.php:122 +#: actions/apitimelineretweetedtome.php:121 +#: actions/apitimelineretweetsofme.php:122 actions/apitimelinetag.php:141 +#: actions/apitimelineuser.php:165 actions/apiusershow.php:101 #, fuzzy msgid "API method not found." msgstr "Aðferð à forritsskilum fannst ekki!" @@ -180,6 +192,9 @@ msgstr "" #: actions/apiaccountupdateprofilebackgroundimage.php:146 #: actions/apiaccountupdateprofilecolors.php:164 #: actions/apiaccountupdateprofilecolors.php:174 +#: actions/groupdesignsettings.php:287 actions/groupdesignsettings.php:297 +#: actions/userdesignsettings.php:210 actions/userdesignsettings.php:220 +#: actions/userdesignsettings.php:263 actions/userdesignsettings.php:273 msgid "Unable to save your design settings." msgstr "" @@ -222,26 +237,6 @@ msgstr "Bein skilaboð til %s" msgid "All the direct messages sent to %s" msgstr "Öll bein skilaboð til %s" -#: actions/apidirectmessage.php:156 actions/apifavoritecreate.php:99 -#: actions/apifavoritedestroy.php:100 actions/apifriendshipscreate.php:100 -#: actions/apifriendshipsdestroy.php:100 actions/apifriendshipsshow.php:129 -#: actions/apigroupcreate.php:136 actions/apigroupismember.php:114 -#: actions/apigroupjoin.php:155 actions/apigroupleave.php:141 -#: actions/apigrouplist.php:132 actions/apigrouplistall.php:120 -#: actions/apigroupmembership.php:106 actions/apigroupshow.php:105 -#: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102 -#: actions/apistatusesretweets.php:112 actions/apistatusesshow.php:108 -#: actions/apistatusnetconfig.php:133 actions/apistatusnetversion.php:93 -#: actions/apisubscriptions.php:111 actions/apitimelinefavorites.php:146 -#: actions/apitimelinefriends.php:156 actions/apitimelinegroup.php:150 -#: actions/apitimelinehome.php:156 actions/apitimelinementions.php:151 -#: actions/apitimelinepublic.php:131 actions/apitimelineretweetedbyme.php:122 -#: actions/apitimelineretweetedtome.php:121 -#: actions/apitimelineretweetsofme.php:122 actions/apitimelinetag.php:141 -#: actions/apitimelineuser.php:165 actions/apiusershow.php:101 -msgid "API method not found!" -msgstr "Aðferð à forritsskilum fannst ekki!" - #: actions/apidirectmessagenew.php:126 msgid "No message text!" msgstr "Enginn texti à skilaboðum!" @@ -265,16 +260,18 @@ msgid "No status found with that ID." msgstr "Engin staða fundin með þessu kenni." #: actions/apifavoritecreate.php:119 -msgid "This status is already a favorite!" -msgstr "" +#, fuzzy +msgid "This status is already a favorite." +msgstr "Þetta babl er nú þegar à uppáhaldi!" #: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:176 msgid "Could not create favorite." msgstr "Gat ekki búið til uppáhald." #: actions/apifavoritedestroy.php:122 -msgid "That status is not a favorite!" -msgstr "" +#, fuzzy +msgid "That status is not a favorite." +msgstr "Þetta babl er ekki à uppáhaldi!" #: actions/apifavoritedestroy.php:134 actions/disfavor.php:87 msgid "Could not delete favorite." @@ -296,8 +293,9 @@ msgid "Could not unfollow user: User not found." msgstr "Get ekki fylgst með notanda: Notandinn finnst ekki." #: actions/apifriendshipsdestroy.php:120 -msgid "You cannot unfollow yourself!" -msgstr "" +#, fuzzy +msgid "You cannot unfollow yourself." +msgstr "Gat ekki uppfært notanda." #: actions/apifriendshipsexists.php:94 msgid "Two user ids or screen_names must be supplied." @@ -382,7 +380,7 @@ msgstr "" msgid "Group not found!" msgstr "Aðferð à forritsskilum fannst ekki!" -#: actions/apigroupjoin.php:110 +#: actions/apigroupjoin.php:110 actions/joingroup.php:90 lib/command.php:217 #, fuzzy msgid "You are already a member of that group." msgstr "Þú ert nú þegar meðlimur à þessum hópi" @@ -391,9 +389,9 @@ msgstr "Þú ert nú þegar meðlimur à þessum hópi" msgid "You have been blocked from that group by the admin." msgstr "" -#: actions/apigroupjoin.php:138 +#: actions/apigroupjoin.php:138 actions/joingroup.php:128 lib/command.php:234 #, fuzzy, php-format -msgid "Could not join user %s to group %s." +msgid "Could not join user %1$s to group %2$s." msgstr "Gat ekki bætt notandanum %s à hópinn %s" #: actions/apigroupleave.php:114 @@ -401,9 +399,9 @@ msgstr "Gat ekki bætt notandanum %s à hópinn %s" msgid "You are not a member of this group." msgstr "Þú ert ekki meðlimur à þessum hópi." -#: actions/apigroupleave.php:124 +#: actions/apigroupleave.php:124 actions/leavegroup.php:127 #, fuzzy, php-format -msgid "Could not remove user %s to group %s." +msgid "Could not remove user %1$s from group %2$s." msgstr "Gat ekki fjarlægt notandann %s úr hópnum %s" #: actions/apigrouplist.php:95 @@ -411,11 +409,6 @@ msgstr "Gat ekki fjarlægt notandann %s úr hópnum %s" msgid "%s's groups" msgstr "Hópar %s" -#: actions/apigrouplist.php:103 -#, fuzzy, php-format -msgid "Groups %s is a member of on %s." -msgstr "Hópar sem %s er meðlimur Ã" - #: actions/apigrouplistall.php:90 actions/usergroups.php:62 #, php-format msgid "%s groups" @@ -439,12 +432,12 @@ msgstr "Þú getur ekki eytt stöðu annars notanda." msgid "No such notice." msgstr "Ekkert svoleiðis babl." -#: actions/apistatusesretweet.php:83 +#: actions/apistatusesretweet.php:83 lib/command.php:422 #, fuzzy msgid "Cannot repeat your own notice." msgstr "Get ekki kveikt á tilkynningum." -#: actions/apistatusesretweet.php:91 +#: actions/apistatusesretweet.php:91 lib/command.php:427 #, fuzzy msgid "Already repeated that notice." msgstr "Eyða þessu babli" @@ -458,7 +451,7 @@ msgid "No status with that ID found." msgstr "Engin staða með þessu kenni fannst." #: actions/apistatusesupdate.php:157 actions/newnotice.php:155 -#: scripts/maildaemon.php:71 +#: lib/mailhandler.php:60 #, fuzzy, php-format msgid "That's too long. Max notice size is %d chars." msgstr "Þetta er of langt. Hámarkslengd babls er 140 tákn." @@ -478,13 +471,13 @@ msgid "Unsupported format." msgstr "Skráarsnið myndar ekki stutt." #: actions/apitimelinefavorites.php:108 -#, php-format -msgid "%s / Favorites from %s" +#, fuzzy, php-format +msgid "%1$s / Favorites from %2$s" msgstr "%s / Uppáhaldsbabl frá %s" #: actions/apitimelinefavorites.php:120 -#, php-format -msgid "%s updates favorited by %s / %s." +#, fuzzy, php-format +msgid "%1$s updates favorited by %2$s / %2$s." msgstr "%s færslur gerðar að uppáhaldsbabli af %s / %s." #: actions/apitimelinegroup.php:109 actions/apitimelineuser.php:118 @@ -552,8 +545,11 @@ msgstr "Fannst ekki." msgid "No such attachment." msgstr "" -#: actions/avatarbynickname.php:59 actions/grouprss.php:91 -#: actions/leavegroup.php:76 +#: actions/avatarbynickname.php:59 actions/blockedfromgroup.php:73 +#: actions/editgroup.php:84 actions/groupdesignsettings.php:84 +#: actions/grouplogo.php:86 actions/groupmembers.php:76 +#: actions/grouprss.php:91 actions/joingroup.php:76 actions/leavegroup.php:76 +#: actions/showgroup.php:121 msgid "No nickname." msgstr "Ekkert stuttnefni." @@ -576,8 +572,8 @@ msgid "You can upload your personal avatar. The maximum file size is %s." msgstr "" #: actions/avatarsettings.php:106 actions/avatarsettings.php:185 -#: actions/grouplogo.php:178 actions/remotesubscribe.php:191 -#: actions/userauthorization.php:72 actions/userrss.php:103 +#: actions/remotesubscribe.php:191 actions/userauthorization.php:72 +#: actions/userrss.php:103 msgid "User without matching profile" msgstr "Notandi með enga persónulega sÃðu sem passar við" @@ -609,9 +605,9 @@ msgstr "Hlaða upp" msgid "Crop" msgstr "Skera af" -#: actions/avatarsettings.php:268 actions/disfavor.php:74 -#: actions/emailsettings.php:238 actions/favor.php:75 actions/geocode.php:50 -#: actions/groupblock.php:66 actions/grouplogo.php:309 +#: actions/avatarsettings.php:268 actions/deletenotice.php:157 +#: actions/disfavor.php:74 actions/emailsettings.php:238 actions/favor.php:75 +#: actions/geocode.php:50 actions/groupblock.php:66 actions/grouplogo.php:309 #: actions/groupunblock.php:66 actions/imsettings.php:206 #: actions/invite.php:56 actions/login.php:135 actions/makeadmin.php:66 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80 @@ -693,19 +689,15 @@ msgstr "Loka á þennan notanda" msgid "Failed to save block information." msgstr "Mistókst að vista upplýsingar um notendalokun" -#: actions/blockedfromgroup.php:73 actions/editgroup.php:84 -#: actions/groupdesignsettings.php:84 actions/grouplogo.php:86 -#: actions/groupmembers.php:76 actions/joingroup.php:76 -#: actions/showgroup.php:121 -msgid "No nickname" -msgstr "Ekkert stuttnefni" - #: actions/blockedfromgroup.php:80 actions/editgroup.php:96 +#: actions/foafgroup.php:44 actions/foafgroup.php:62 actions/groupblock.php:86 #: actions/groupbyid.php:83 actions/groupdesignsettings.php:97 #: actions/grouplogo.php:99 actions/groupmembers.php:83 -#: actions/joingroup.php:83 actions/showgroup.php:137 -msgid "No such group" -msgstr "Enginn þannig hópur" +#: actions/grouprss.php:98 actions/groupunblock.php:86 +#: actions/joingroup.php:83 actions/leavegroup.php:83 actions/makeadmin.php:86 +#: actions/showgroup.php:137 lib/command.php:212 lib/command.php:263 +msgid "No such group." +msgstr "Enginn þannig hópur." #: actions/blockedfromgroup.php:90 #, php-format @@ -713,9 +705,9 @@ msgid "%s blocked profiles" msgstr "" #: actions/blockedfromgroup.php:93 -#, php-format -msgid "%s blocked profiles, page %d" -msgstr "" +#, fuzzy, php-format +msgid "%1$s blocked profiles, page %2$d" +msgstr "%s og vinirnir, sÃða %d" #: actions/blockedfromgroup.php:108 msgid "A list of the users blocked from joining this group." @@ -827,10 +819,6 @@ msgstr "" msgid "Delete this notice" msgstr "Eyða þessu babli" -#: actions/deletenotice.php:157 -msgid "There was a problem with your session token. Try again, please." -msgstr "" - #: actions/deleteuser.php:67 #, fuzzy msgid "You cannot delete users." @@ -858,7 +846,7 @@ msgid "Delete this user" msgstr "Eyða þessu babli" #: actions/designadminpanel.php:62 lib/accountsettingsaction.php:124 -#: lib/adminpanelaction.php:302 lib/groupnav.php:119 +#: lib/adminpanelaction.php:316 lib/groupnav.php:119 msgid "Design" msgstr "" @@ -1002,7 +990,8 @@ msgstr "Þú verður að hafa skráð þig inn til að búa til hóp." #: actions/editgroup.php:103 actions/editgroup.php:168 #: actions/groupdesignsettings.php:104 actions/grouplogo.php:106 -msgid "You must be an admin to edit the group" +#, fuzzy +msgid "You must be an admin to edit the group." msgstr "Þú verður að vera stjórnandi til að geta breytt hópnum" #: actions/editgroup.php:154 @@ -1027,7 +1016,8 @@ msgid "Options saved." msgstr "Valmöguleikar vistaðir." #: actions/emailsettings.php:60 -msgid "Email Settings" +#, fuzzy +msgid "Email settings" msgstr "Tölvupóstsstillingar" #: actions/emailsettings.php:71 @@ -1064,8 +1054,9 @@ msgid "Cancel" msgstr "Hætta við" #: actions/emailsettings.php:121 -msgid "Email Address" -msgstr "Tölvupóstfang" +#, fuzzy +msgid "Email address" +msgstr "Tölvupóstföng" #: actions/emailsettings.php:123 msgid "Email address, like \"UserName@example.org\"" @@ -1138,9 +1129,10 @@ msgstr "Ekkert tölvupóstfang." msgid "Cannot normalize that email address" msgstr "Get ekki staðlað þetta tölvupóstfang" -#: actions/emailsettings.php:331 actions/siteadminpanel.php:157 -msgid "Not a valid email address" -msgstr "Ekki tækt tölvupóstfang" +#: actions/emailsettings.php:331 actions/register.php:201 +#: actions/siteadminpanel.php:157 +msgid "Not a valid email address." +msgstr "Ekki tækt tölvupóstfang." #: actions/emailsettings.php:334 msgid "That is already your email address." @@ -1324,19 +1316,12 @@ msgstr "Óþekkt útgáfa OMB samskiptamátans." msgid "Error updating remote profile" msgstr "Villa kom upp à uppfærslu persónulegrar fjarsÃðu" -#: actions/foafgroup.php:44 actions/foafgroup.php:62 actions/groupblock.php:86 -#: actions/grouprss.php:98 actions/groupunblock.php:86 -#: actions/leavegroup.php:83 actions/makeadmin.php:86 lib/command.php:212 -#: lib/command.php:263 -msgid "No such group." -msgstr "Enginn þannig hópur." - -#: actions/getfile.php:75 +#: actions/getfile.php:79 #, fuzzy msgid "No such file." msgstr "Ekkert svoleiðis babl." -#: actions/getfile.php:79 +#: actions/getfile.php:83 #, fuzzy msgid "Cannot read file." msgstr "Týndum skránni okkar" @@ -1349,7 +1334,7 @@ msgstr "Engin persónuleg sÃða tilgreind" #: actions/groupblock.php:76 actions/groupunblock.php:76 #: actions/makeadmin.php:76 actions/subedit.php:53 actions/tagother.php:46 -#: lib/profileformaction.php:77 +#: actions/unsubscribe.php:84 lib/profileformaction.php:77 msgid "No profile with that ID." msgstr "Engin persónulega sÃða með þessu einkenni" @@ -1377,9 +1362,9 @@ msgstr "" #: actions/groupblock.php:162 #, php-format msgid "" -"Are you sure you want to block user \"%s\" from the group \"%s\"? They will " -"be removed from the group, unable to post, and unable to subscribe to the " -"group in the future." +"Are you sure you want to block user \"%1$s\" from the group \"%2$s\"? They " +"will be removed from the group, unable to post, and unable to subscribe to " +"the group in the future." msgstr "" #: actions/groupblock.php:178 @@ -1394,8 +1379,9 @@ msgstr "" msgid "Database error blocking user from group." msgstr "" -#: actions/groupbyid.php:74 -msgid "No ID" +#: actions/groupbyid.php:74 actions/userbyid.php:70 +#, fuzzy +msgid "No ID." msgstr "Ekkert einkenni" #: actions/groupdesignsettings.php:68 @@ -1417,12 +1403,6 @@ msgstr "" msgid "Couldn't update your design." msgstr "" -#: actions/groupdesignsettings.php:287 actions/groupdesignsettings.php:297 -#: actions/userdesignsettings.php:210 actions/userdesignsettings.php:220 -#: actions/userdesignsettings.php:263 actions/userdesignsettings.php:273 -msgid "Unable to save your design settings!" -msgstr "" - #: actions/groupdesignsettings.php:308 actions/userdesignsettings.php:231 msgid "Design preferences saved." msgstr "" @@ -1437,6 +1417,11 @@ msgid "" "You can upload a logo image for your group. The maximum file size is %s." msgstr "" +#: actions/grouplogo.php:178 +#, fuzzy +msgid "User without matching profile." +msgstr "Notandi með enga persónulega sÃðu sem passar við" + #: actions/grouplogo.php:362 msgid "Pick a square area of the image to be the logo." msgstr "" @@ -1455,15 +1440,15 @@ msgid "%s group members" msgstr "Hópmeðlimir %s" #: actions/groupmembers.php:96 -#, php-format -msgid "%s group members, page %d" +#, fuzzy, php-format +msgid "%1$s group members, page %2$d" msgstr "Hópmeðlimir %s, sÃða %d" #: actions/groupmembers.php:111 msgid "A list of the users in this group." msgstr "Listi yfir notendur à þessum hóp." -#: actions/groupmembers.php:175 lib/action.php:441 lib/groupnav.php:107 +#: actions/groupmembers.php:175 lib/action.php:442 lib/groupnav.php:107 msgid "Admin" msgstr "Stjórnandi" @@ -1555,7 +1540,8 @@ msgid "Error removing the block." msgstr "Vill kom upp við að aflétta notendalokun." #: actions/imsettings.php:59 -msgid "IM Settings" +#, fuzzy +msgid "IM settings" msgstr "Snarskilaboðastillingar" #: actions/imsettings.php:70 @@ -1588,7 +1574,8 @@ msgstr "" "s við à vinalistann þinn?)" #: actions/imsettings.php:124 -msgid "IM Address" +#, fuzzy +msgid "IM address" msgstr "Snarskilaboðafang" #: actions/imsettings.php:126 @@ -1651,11 +1638,6 @@ msgstr "" msgid "That is not your Jabber ID." msgstr "Þetta er ekki Jabber-kennið þitt." -#: actions/inbox.php:59 -#, php-format -msgid "Inbox for %s - page %d" -msgstr "Innhólf %s - sÃða %d" - #: actions/inbox.php:62 #, php-format msgid "Inbox for %s" @@ -1692,10 +1674,10 @@ msgstr "Bjóða nýjum notendum að vera með" msgid "You are already subscribed to these users:" msgstr "Þú ert nú þegar à áskrift að þessum notendum:" -#: actions/invite.php:131 actions/invite.php:139 +#: actions/invite.php:131 actions/invite.php:139 lib/command.php:315 #, php-format -msgid "%s (%s)" -msgstr "%s (%s)" +msgid "%1$s (%2$s)" +msgstr "%1$s (%2$s)" #: actions/invite.php:136 msgid "" @@ -1738,7 +1720,7 @@ msgstr "Persónuleg skilaboð" msgid "Optionally add a personal message to the invitation." msgstr "Bættu persónulegum skilaboðum við boðskortið ef þú vilt." -#: actions/invite.php:197 lib/messageform.php:178 lib/noticeform.php:232 +#: actions/invite.php:197 lib/messageform.php:178 lib/noticeform.php:234 msgid "Send" msgstr "Senda" @@ -1808,18 +1790,9 @@ msgstr "" msgid "You must be logged in to join a group." msgstr "Þú verður að hafa skráð þig inn til að bæta þér à hóp." -#: actions/joingroup.php:90 lib/command.php:217 -msgid "You are already a member of that group" -msgstr "Þú ert nú þegar meðlimur à þessum hópi" - -#: actions/joingroup.php:128 lib/command.php:234 -#, php-format -msgid "Could not join user %s to group %s" -msgstr "Gat ekki bætt notandanum %s à hópinn %s" - #: actions/joingroup.php:135 lib/command.php:239 -#, php-format -msgid "%s joined group %s" +#, fuzzy, php-format +msgid "%1$s joined group %2$s" msgstr "%s bætti sér à hópinn %s" #: actions/leavegroup.php:60 @@ -1834,14 +1807,9 @@ msgstr "Þú ert ekki meðlimur à þessum hópi." msgid "Could not find membership record." msgstr "Gat ekki fundið meðlimaskrá." -#: actions/leavegroup.php:127 lib/command.php:284 -#, php-format -msgid "Could not remove user %s to group %s" -msgstr "Gat ekki fjarlægt notandann %s úr hópnum %s" - #: actions/leavegroup.php:134 lib/command.php:289 -#, php-format -msgid "%s left group %s" +#, fuzzy, php-format +msgid "%1$s left group %2$s" msgstr "%s gekk úr hópnum %s" #: actions/login.php:83 actions/register.php:137 @@ -1862,7 +1830,7 @@ msgstr "Rangt notendanafn eða lykilorð." msgid "Error setting user. You are probably not authorized." msgstr "Engin heimild." -#: actions/login.php:208 actions/login.php:261 lib/action.php:459 +#: actions/login.php:208 actions/login.php:261 lib/action.php:460 #: lib/logingroupnav.php:79 msgid "Login" msgstr "Innskráning" @@ -1920,18 +1888,18 @@ msgstr "" #: actions/makeadmin.php:95 #, php-format -msgid "%s is already an admin for group \"%s\"." +msgid "%1$s is already an admin for group \"%2$s\"." msgstr "" #: actions/makeadmin.php:132 -#, php-format -msgid "Can't get membership record for %s in group %s" -msgstr "" +#, fuzzy, php-format +msgid "Can't get membership record for %1$s in group %2$s." +msgstr "Gat ekki fjarlægt notandann %s úr hópnum %s" #: actions/makeadmin.php:145 -#, php-format -msgid "Can't make %s an admin for group %s" -msgstr "" +#, fuzzy, php-format +msgid "Can't make %1$s an admin for group %2$s." +msgstr "Gat ekki fjarlægt notandann %s úr hópnum %s" #: actions/microsummary.php:69 msgid "No current status" @@ -1974,8 +1942,8 @@ msgid "Message sent" msgstr "" #: actions/newmessage.php:185 lib/command.php:376 -#, php-format -msgid "Direct message to %s sent" +#, fuzzy, php-format +msgid "Direct message to %s sent." msgstr "Bein skilaboð send til %s" #: actions/newmessage.php:210 actions/newnotice.php:245 lib/channel.php:170 @@ -2004,9 +1972,9 @@ msgid "Text search" msgstr "Textaleit" #: actions/noticesearch.php:91 -#, php-format -msgid "Search results for \"%s\" on %s" -msgstr "" +#, fuzzy, php-format +msgid "Search results for \"%1$s\" on %2$s" +msgstr "Skilaboð frá %1$s á %2$s" #: actions/noticesearch.php:121 #, php-format @@ -2110,11 +2078,6 @@ msgid "URL shortening service is too long (max 50 chars)." msgstr "" "Þjónusta sjálfvirkrar vefslóðastyttingar er of löng (à mesta lagi 50 stafir)." -#: actions/outbox.php:58 -#, php-format -msgid "Outbox for %s - page %d" -msgstr "Úthólf %s - sÃða %d" - #: actions/outbox.php:61 #, php-format msgid "Outbox for %s" @@ -2186,7 +2149,7 @@ msgstr "Get ekki vistað nýja lykilorðið." msgid "Password saved." msgstr "Lykilorð vistað." -#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:308 +#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:326 msgid "Paths" msgstr "" @@ -2219,7 +2182,7 @@ msgid "Invalid SSL server. The maximum length is 255 characters." msgstr "" #: actions/pathsadminpanel.php:217 actions/siteadminpanel.php:58 -#: lib/adminpanelaction.php:299 +#: lib/adminpanelaction.php:311 #, fuzzy msgid "Site" msgstr "Bjóða" @@ -2320,8 +2283,9 @@ msgid "When to use SSL" msgstr "" #: actions/pathsadminpanel.php:308 -msgid "SSL Server" -msgstr "" +#, fuzzy +msgid "SSL server" +msgstr "Endurheimta" #: actions/pathsadminpanel.php:309 msgid "Server to direct SSL requests to" @@ -2351,8 +2315,8 @@ msgid "Not a valid people tag: %s" msgstr "Ekki gilt persónumerki: %s" #: actions/peopletag.php:144 -#, php-format -msgid "Users self-tagged with %s - page %d" +#, fuzzy, php-format +msgid "Users self-tagged with %1$s - page %2$d" msgstr "Notendur sjálfmerktir með %s - sÃða %d" #: actions/postnotice.php:84 @@ -2361,7 +2325,7 @@ msgstr "Ótækt bablinnihald" #: actions/postnotice.php:90 #, php-format -msgid "Notice license ‘%s’ is not compatible with site license ‘%s’." +msgid "Notice license ‘%1$s’ is not compatible with site license ‘%2$s’." msgstr "" #: actions/profilesettings.php:60 @@ -2487,20 +2451,20 @@ msgstr "Ógilt merki: \"%s\"" msgid "Couldn't update user for autosubscribe." msgstr "Gat ekki uppfært notanda à sjálfvirka áskrift." -#: actions/profilesettings.php:354 +#: actions/profilesettings.php:359 #, fuzzy msgid "Couldn't save location prefs." msgstr "Gat ekki vistað merki." -#: actions/profilesettings.php:366 +#: actions/profilesettings.php:371 msgid "Couldn't save profile." msgstr "Gat ekki vistað persónulega sÃðu." -#: actions/profilesettings.php:374 +#: actions/profilesettings.php:379 msgid "Couldn't save tags." msgstr "Gat ekki vistað merki." -#: actions/profilesettings.php:382 lib/adminpanelaction.php:126 +#: actions/profilesettings.php:387 lib/adminpanelaction.php:137 msgid "Settings saved." msgstr "Stillingar vistaðar." @@ -2593,7 +2557,7 @@ msgid "" "one!" msgstr "" -#: actions/publictagcloud.php:135 +#: actions/publictagcloud.php:131 msgid "Tag cloud" msgstr "Merkjaský" @@ -2733,7 +2697,7 @@ msgstr "" msgid "Registration successful" msgstr "Nýskráning tókst" -#: actions/register.php:114 actions/register.php:502 lib/action.php:456 +#: actions/register.php:114 actions/register.php:502 lib/action.php:457 #: lib/logingroupnav.php:85 msgid "Register" msgstr "Nýskrá" @@ -2746,10 +2710,6 @@ msgstr "Nýskráning ekki leyfð." msgid "You can't register if you don't agree to the license." msgstr "Þú getur ekki nýskráð þig nema þú samþykkir leyfið." -#: actions/register.php:201 -msgid "Not a valid email address." -msgstr "Ekki tækt tölvupóstfang." - #: actions/register.php:212 msgid "Email address already exists." msgstr "Tölvupóstfang er nú þegar skráð." @@ -2806,12 +2766,12 @@ msgid "" msgstr "" #: actions/register.php:537 -#, php-format +#, fuzzy, php-format msgid "" -"Congratulations, %s! And welcome to %%%%site.name%%%%. From here, you may " +"Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may " "want to...\n" "\n" -"* Go to [your profile](%s) and post your first message.\n" +"* Go to [your profile](%2$s) and post your first message.\n" "* Add a [Jabber/GTalk address](%%%%action.imsettings%%%%) so you can send " "notices through instant messages.\n" "* [Search for people](%%%%action.peoplesearch%%%%) that you may know or that " @@ -2943,11 +2903,6 @@ msgstr "" msgid "Replies to %s" msgstr "Svör við %s" -#: actions/replies.php:127 -#, php-format -msgid "Replies to %s, page %d" -msgstr "Svör við %s, sÃða %d" - #: actions/replies.php:144 #, php-format msgid "Replies feed for %s (RSS 1.0)" @@ -2966,8 +2921,8 @@ msgstr "Bablveita fyrir hópinn %s" #: actions/replies.php:198 #, php-format msgid "" -"This is the timeline showing replies to %s but %s hasn't received a notice " -"to his attention yet." +"This is the timeline showing replies to %1$s but %2$s hasn't received a " +"notice to his attention yet." msgstr "" #: actions/replies.php:203 @@ -2980,8 +2935,8 @@ msgstr "" #: actions/replies.php:205 #, php-format msgid "" -"You can try to [nudge %s](../%s) or [post something to his or her attention]" -"(%%%%action.newnotice%%%%?status_textarea=%s)." +"You can try to [nudge %1$s](../%2$s) or [post something to his or her " +"attention](%%%%action.newnotice%%%%?status_textarea=%3$s)." msgstr "" #: actions/repliesrss.php:72 @@ -2998,11 +2953,6 @@ msgstr "Þú getur ekki sent þessum notanda skilaboð." msgid "User is already sandboxed." msgstr "" -#: actions/showfavorites.php:79 -#, php-format -msgid "%s's favorite notices, page %d" -msgstr "" - #: actions/showfavorites.php:132 msgid "Could not retrieve favorite notices." msgstr "Gat ekki sótt uppáhaldsbabl." @@ -3052,11 +3002,6 @@ msgstr "" msgid "%s group" msgstr "%s hópurinn" -#: actions/showgroup.php:84 -#, php-format -msgid "%s group, page %d" -msgstr "%s hópurinn, sÃða %d" - #: actions/showgroup.php:218 msgid "Group profile" msgstr "HópssÃðan" @@ -3105,7 +3050,7 @@ msgstr "Meðlimir" #: actions/showgroup.php:386 lib/profileaction.php:117 #: lib/profileaction.php:148 lib/profileaction.php:236 lib/section.php:95 -#: lib/tagcloudsection.php:71 +#: lib/subscriptionlist.php:126 lib/tagcloudsection.php:71 msgid "(None)" msgstr "(Ekkert)" @@ -3172,15 +3117,10 @@ msgstr "Babl sent inn" msgid " tagged %s" msgstr "" -#: actions/showstream.php:79 -#, php-format -msgid "%s, page %d" -msgstr "%s, sÃða %d" - #: actions/showstream.php:122 -#, php-format -msgid "Notice feed for %s tagged %s (RSS 1.0)" -msgstr "" +#, fuzzy, php-format +msgid "Notice feed for %1$s tagged %2$s (RSS 1.0)" +msgstr "Bablveita fyrir %s" #: actions/showstream.php:129 #, php-format @@ -3204,7 +3144,7 @@ msgstr "" #: actions/showstream.php:191 #, php-format -msgid "This is the timeline for %s but %s hasn't posted anything yet." +msgid "This is the timeline for %1$s but %2$s hasn't posted anything yet." msgstr "" #: actions/showstream.php:196 @@ -3216,8 +3156,8 @@ msgstr "" #: actions/showstream.php:198 #, php-format msgid "" -"You can try to nudge %s or [post something to his or her attention](%%%%" -"action.newnotice%%%%?status_textarea=%s)." +"You can try to nudge %1$s or [post something to his or her attention](%%%%" +"action.newnotice%%%%?status_textarea=%2$s)." msgstr "" #: actions/showstream.php:234 @@ -3261,12 +3201,12 @@ msgstr "" #: actions/siteadminpanel.php:154 #, fuzzy -msgid "You must have a valid contact email address" +msgid "You must have a valid contact email address." msgstr "Ekki tækt tölvupóstfang" #: actions/siteadminpanel.php:172 #, php-format -msgid "Unknown language \"%s\"" +msgid "Unknown language \"%s\"." msgstr "" #: actions/siteadminpanel.php:179 @@ -3456,7 +3396,8 @@ msgid "Save site settings" msgstr "Stillingar fyrir mynd" #: actions/smssettings.php:58 -msgid "SMS Settings" +#, fuzzy +msgid "SMS settings" msgstr "SMS stillingar" #: actions/smssettings.php:69 @@ -3486,7 +3427,8 @@ msgid "Enter the code you received on your phone." msgstr "Sláðu inn lykilinn sem þú fékkst à sÃmann þinn." #: actions/smssettings.php:138 -msgid "SMS Phone number" +#, fuzzy +msgid "SMS phone number" msgstr "SMS sÃmanúmer" #: actions/smssettings.php:140 @@ -3575,8 +3517,8 @@ msgid "%s subscribers" msgstr "%s áskrifendur" #: actions/subscribers.php:52 -#, php-format -msgid "%s subscribers, page %d" +#, fuzzy, php-format +msgid "%1$s subscribers, page %2$d" msgstr "%s áskrifendur, sÃða %d" #: actions/subscribers.php:63 @@ -3612,8 +3554,8 @@ msgid "%s subscriptions" msgstr "%s áskriftir" #: actions/subscriptions.php:54 -#, php-format -msgid "%s subscriptions, page %d" +#, fuzzy, php-format +msgid "%1$s subscriptions, page %2$d" msgstr "%s áskriftir, sÃða %d" #: actions/subscriptions.php:65 @@ -3648,11 +3590,6 @@ msgstr "Jabber snarskilaboðaþjónusta" msgid "SMS" msgstr "SMS" -#: actions/tag.php:68 -#, php-format -msgid "Notices tagged with %s, page %d" -msgstr "Babl merkt með %s, sÃða %d" - #: actions/tag.php:86 #, php-format msgid "Notice feed for tag %s (RSS 1.0)" @@ -3742,20 +3679,17 @@ msgstr "Notandi hefur enga persónulega sÃðu." msgid "No profile id in request." msgstr "Ekkert einkenni persónulegrar sÃðu à beiðni." -#: actions/unsubscribe.php:84 -msgid "No profile with that id." -msgstr "Enginn persónuleg sÃða með þessu einkenni." - #: actions/unsubscribe.php:98 msgid "Unsubscribed" msgstr "Ekki lengur áskrifandi" #: actions/updateprofile.php:62 actions/userauthorization.php:330 #, php-format -msgid "Listenee stream license ‘%s’ is not compatible with site license ‘%s’." +msgid "" +"Listenee stream license ‘%1$s’ is not compatible with site license ‘%2$s’." msgstr "" -#: actions/useradminpanel.php:58 lib/adminpanelaction.php:305 +#: actions/useradminpanel.php:58 lib/adminpanelaction.php:321 #: lib/personalgroupnav.php:115 msgid "User" msgstr "Notandi" @@ -3864,7 +3798,7 @@ msgstr "" "gerast áskrifandi að babli þessa notanda. Ef þú baðst ekki um að gerast " "áskrifandi að babli, smelltu þá á \"Hætta við\"." -#: actions/userauthorization.php:188 +#: actions/userauthorization.php:188 actions/version.php:165 msgid "License" msgstr "" @@ -3920,7 +3854,7 @@ msgstr "" #: actions/userauthorization.php:296 #, php-format -msgid "Listener URI ‘%s’ not found here" +msgid "Listener URI ‘%s’ not found here." msgstr "" #: actions/userauthorization.php:301 @@ -3953,11 +3887,6 @@ msgstr "Get ekki lesið slóðina fyrir myndina '%s'" msgid "Wrong image type for avatar URL ‘%s’." msgstr "Röng gerð myndar fyrir '%s'" -#: actions/userbyid.php:70 -#, fuzzy -msgid "No ID." -msgstr "Ekkert einkenni" - #: actions/userdesignsettings.php:76 lib/designsettings.php:65 msgid "Profile design" msgstr "" @@ -3972,11 +3901,6 @@ msgstr "" msgid "Enjoy your hotdog!" msgstr "" -#: actions/usergroups.php:64 -#, php-format -msgid "%s groups, page %d" -msgstr "Hópar %s, sÃða %d" - #: actions/usergroups.php:130 msgid "Search for more groups" msgstr "" @@ -3991,6 +3915,72 @@ msgstr "" msgid "Try [searching for groups](%%action.groupsearch%%) and joining them." msgstr "" +#: actions/version.php:73 +#, fuzzy, php-format +msgid "StatusNet %s" +msgstr "Tölfræði" + +#: actions/version.php:153 +#, php-format +msgid "" +"This site is powered by %1$s version %2$s, Copyright 2008-2010 StatusNet, " +"Inc. and contributors." +msgstr "" + +#: actions/version.php:157 +#, fuzzy +msgid "StatusNet" +msgstr "Tölfræði" + +#: actions/version.php:161 +msgid "Contributors" +msgstr "" + +#: actions/version.php:168 +msgid "" +"StatusNet is free software: you can redistribute it and/or modify it under " +"the terms of the GNU Affero General Public License as published by the Free " +"Software Foundation, either version 3 of the License, or (at your option) " +"any later version. " +msgstr "" + +#: actions/version.php:174 +msgid "" +"This program is distributed in the hope that it will be useful, but WITHOUT " +"ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or " +"FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License " +"for more details. " +msgstr "" + +#: actions/version.php:180 +#, php-format +msgid "" +"You should have received a copy of the GNU Affero General Public License " +"along with this program. If not, see %s." +msgstr "" + +#: actions/version.php:189 +msgid "Plugins" +msgstr "" + +#: actions/version.php:195 +#, fuzzy +msgid "Name" +msgstr "Stuttnefni" + +#: actions/version.php:196 lib/action.php:741 +#, fuzzy +msgid "Version" +msgstr "Persónulegt" + +#: actions/version.php:197 +msgid "Author(s)" +msgstr "" + +#: actions/version.php:198 lib/groupeditform.php:172 +msgid "Description" +msgstr "Lýsing" + #: classes/File.php:137 #, php-format msgid "" @@ -4060,7 +4050,7 @@ msgstr "Vandamál komu upp við að vista babl." msgid "DB error inserting reply: %s" msgstr "Gagnagrunnsvilla við innsetningu svars: %s" -#: classes/Notice.php:1361 +#: classes/Notice.php:1359 #, fuzzy, php-format msgid "RT @%1$s %2$s" msgstr "%1$s (%2$s)" @@ -4106,141 +4096,136 @@ msgstr "Annað" msgid "Other options" msgstr "Aðrir valkostir" -#: lib/action.php:144 -#, php-format -msgid "%s - %s" -msgstr "%s - %s" - #: lib/action.php:159 msgid "Untitled page" msgstr "Ónafngreind sÃða" -#: lib/action.php:426 +#: lib/action.php:427 msgid "Primary site navigation" msgstr "Stikl aðalsÃðu" -#: lib/action.php:432 +#: lib/action.php:433 msgid "Home" msgstr "Heim" -#: lib/action.php:432 +#: lib/action.php:433 msgid "Personal profile and friends timeline" msgstr "Persónuleg sÃða og vinarás" -#: lib/action.php:434 +#: lib/action.php:435 msgid "Account" msgstr "Aðgangur" -#: lib/action.php:434 +#: lib/action.php:435 msgid "Change your email, avatar, password, profile" msgstr "" "Breyttu tölvupóstinum þÃnum, einkennismyndinni þinni, lykilorðinu þÃnu, " "persónulegu sÃðunni þinni" -#: lib/action.php:437 +#: lib/action.php:438 msgid "Connect" msgstr "Tengjast" -#: lib/action.php:437 +#: lib/action.php:438 #, fuzzy msgid "Connect to services" msgstr "Gat ekki framsent til vefþjóns: %s" -#: lib/action.php:441 +#: lib/action.php:442 #, fuzzy msgid "Change site configuration" msgstr "Stikl aðalsÃðu" -#: lib/action.php:445 lib/subgroupnav.php:105 +#: lib/action.php:446 lib/subgroupnav.php:105 msgid "Invite" msgstr "Bjóða" -#: lib/action.php:446 lib/subgroupnav.php:106 +#: lib/action.php:447 lib/subgroupnav.php:106 #, php-format msgid "Invite friends and colleagues to join you on %s" msgstr "Bjóða vinum og vandamönnum að slást à hópinn á %s" -#: lib/action.php:451 +#: lib/action.php:452 msgid "Logout" msgstr "Útskráning" -#: lib/action.php:451 +#: lib/action.php:452 msgid "Logout from the site" msgstr "Skrá þig út af sÃðunni" -#: lib/action.php:456 +#: lib/action.php:457 msgid "Create an account" msgstr "Búa til aðgang" -#: lib/action.php:459 +#: lib/action.php:460 msgid "Login to the site" msgstr "Skrá þig inn á sÃðuna" -#: lib/action.php:462 lib/action.php:725 +#: lib/action.php:463 lib/action.php:726 msgid "Help" msgstr "Hjálp" -#: lib/action.php:462 +#: lib/action.php:463 msgid "Help me!" msgstr "Hjálp!" -#: lib/action.php:465 lib/searchaction.php:127 +#: lib/action.php:466 lib/searchaction.php:127 msgid "Search" msgstr "Leita" -#: lib/action.php:465 +#: lib/action.php:466 msgid "Search for people or text" msgstr "Leita að fólki eða texta" -#: lib/action.php:486 +#: lib/action.php:487 msgid "Site notice" msgstr "Babl vefsÃðunnar" -#: lib/action.php:552 +#: lib/action.php:553 msgid "Local views" msgstr "Staðbundin sýn" -#: lib/action.php:618 +#: lib/action.php:619 msgid "Page notice" msgstr "Babl sÃðunnar" -#: lib/action.php:720 +#: lib/action.php:721 msgid "Secondary site navigation" msgstr "Stikl undirsÃðu" -#: lib/action.php:727 +#: lib/action.php:728 msgid "About" msgstr "Um" -#: lib/action.php:729 +#: lib/action.php:730 msgid "FAQ" msgstr "Spurt og svarað" -#: lib/action.php:733 +#: lib/action.php:734 msgid "TOS" msgstr "" -#: lib/action.php:736 +#: lib/action.php:737 msgid "Privacy" msgstr "Friðhelgi" -#: lib/action.php:738 +#: lib/action.php:739 msgid "Source" msgstr "Frumþula" -#: lib/action.php:740 +#: lib/action.php:743 msgid "Contact" msgstr "Tengiliður" -#: lib/action.php:742 +#: lib/action.php:745 msgid "Badge" msgstr "" -#: lib/action.php:770 +#: lib/action.php:773 msgid "StatusNet software license" msgstr "Hugbúnaðarleyfi StatusNet" -#: lib/action.php:773 +#: lib/action.php:776 #, php-format msgid "" "**%%site.name%%** is a microblogging service brought to you by [%%site." @@ -4249,12 +4234,12 @@ msgstr "" "**%%site.name%%** er örbloggsþjónusta à boði [%%site.broughtby%%](%%site." "broughtbyurl%%). " -#: lib/action.php:775 +#: lib/action.php:778 #, php-format msgid "**%%site.name%%** is a microblogging service. " msgstr "**%%site.name%%** er örbloggsþjónusta." -#: lib/action.php:777 +#: lib/action.php:780 #, php-format msgid "" "It runs the [StatusNet](http://status.net/) microblogging software, version %" @@ -4265,32 +4250,32 @@ msgstr "" "sem er gefinn út undir [GNU Affero almenningsleyfinu](http://www.fsf.org/" "licensing/licenses/agpl-3.0.html)." -#: lib/action.php:791 +#: lib/action.php:794 #, fuzzy msgid "Site content license" msgstr "Hugbúnaðarleyfi StatusNet" -#: lib/action.php:800 +#: lib/action.php:803 msgid "All " msgstr "Allt " -#: lib/action.php:805 +#: lib/action.php:808 msgid "license." msgstr "leyfi." -#: lib/action.php:1099 +#: lib/action.php:1102 msgid "Pagination" msgstr "Uppröðun" -#: lib/action.php:1108 +#: lib/action.php:1111 msgid "After" msgstr "Eftir" -#: lib/action.php:1116 +#: lib/action.php:1119 msgid "Before" msgstr "Ãður" -#: lib/action.php:1164 +#: lib/action.php:1167 msgid "There was a problem with your session token." msgstr "Það komu upp vandamál varðandi setutókann þinn." @@ -4299,31 +4284,36 @@ msgstr "Það komu upp vandamál varðandi setutókann þinn." msgid "You cannot make changes to this site." msgstr "Þú getur ekki sent þessum notanda skilaboð." -#: lib/adminpanelaction.php:195 +#: lib/adminpanelaction.php:107 +#, fuzzy +msgid "Changes to that panel are not allowed." +msgstr "Nýskráning ekki leyfð." + +#: lib/adminpanelaction.php:206 #, fuzzy msgid "showForm() not implemented." msgstr "Skipun hefur ekki verið fullbúin" -#: lib/adminpanelaction.php:224 +#: lib/adminpanelaction.php:235 #, fuzzy msgid "saveSettings() not implemented." msgstr "Skipun hefur ekki verið fullbúin" -#: lib/adminpanelaction.php:247 +#: lib/adminpanelaction.php:258 msgid "Unable to delete design setting." msgstr "" -#: lib/adminpanelaction.php:300 +#: lib/adminpanelaction.php:312 #, fuzzy msgid "Basic site configuration" msgstr "Staðfesting tölvupóstfangs" -#: lib/adminpanelaction.php:303 +#: lib/adminpanelaction.php:317 #, fuzzy msgid "Design configuration" msgstr "SMS staðfesting" -#: lib/adminpanelaction.php:306 lib/adminpanelaction.php:309 +#: lib/adminpanelaction.php:322 lib/adminpanelaction.php:327 #, fuzzy msgid "Paths configuration" msgstr "SMS staðfesting" @@ -4348,11 +4338,21 @@ msgstr "" msgid "Tags for this attachment" msgstr "" +#: lib/authenticationplugin.php:182 lib/authenticationplugin.php:187 +#, fuzzy +msgid "Password changing failed" +msgstr "Lykilorðabreyting" + +#: lib/authenticationplugin.php:197 +#, fuzzy +msgid "Password changing is not allowed" +msgstr "Lykilorðabreyting" + #: lib/channel.php:138 lib/channel.php:158 msgid "Command results" msgstr "Niðurstöður skipunar" -#: lib/channel.php:210 +#: lib/channel.php:210 lib/mailhandler.php:142 msgid "Command complete" msgstr "Fullkláruð skipun" @@ -4366,7 +4366,7 @@ msgstr "Fyrirgefðu en þessi skipun hefur ekki enn verið útbúin." #: lib/command.php:88 #, fuzzy, php-format -msgid "Could not find a user with nickname %s" +msgid "Could not find a user with nickname %s." msgstr "Gat ekki uppfært notanda með staðfestu tölvupóstfangi." #: lib/command.php:92 @@ -4375,7 +4375,7 @@ msgstr "" #: lib/command.php:99 #, fuzzy, php-format -msgid "Nudge sent to %s" +msgid "Nudge sent to %s." msgstr "Ãtt við notanda" #: lib/command.php:126 @@ -4387,34 +4387,36 @@ msgid "" msgstr "" #: lib/command.php:152 lib/command.php:399 lib/command.php:460 -msgid "Notice with that id does not exist" -msgstr "" +#, fuzzy +msgid "Notice with that id does not exist." +msgstr "Enginn persónuleg sÃða með þessu einkenni." #: lib/command.php:168 lib/command.php:415 lib/command.php:476 #: lib/command.php:532 -msgid "User has no last notice" +#, fuzzy +msgid "User has no last notice." msgstr "Notandi hefur ekkert nýtt babl" #: lib/command.php:190 msgid "Notice marked as fave." msgstr "Babl gert að uppáhaldi." -#: lib/command.php:315 -#, php-format -msgid "%1$s (%2$s)" -msgstr "%1$s (%2$s)" +#: lib/command.php:284 +#, fuzzy, php-format +msgid "Could not remove user %1$s to group %2$s." +msgstr "Gat ekki fjarlægt notandann %s úr hópnum %s" #: lib/command.php:318 -#, php-format -msgid "Fullname: %s" +#, fuzzy, php-format +msgid "Full name: %s" msgstr "Fullt nafn: %s" -#: lib/command.php:321 +#: lib/command.php:321 lib/mail.php:254 #, php-format msgid "Location: %s" msgstr "Staðsetning: %s" -#: lib/command.php:324 +#: lib/command.php:324 lib/mail.php:256 #, php-format msgid "Homepage: %s" msgstr "HeimasÃða: %s" @@ -4426,26 +4428,16 @@ msgstr "Um: %s" #: lib/command.php:358 scripts/xmppdaemon.php:301 #, fuzzy, php-format -msgid "Message too long - maximum is %d characters, you sent %d" +msgid "Message too long - maximum is %1$d characters, you sent %2$d." msgstr "Skilaboð eru of löng - 140 tákn eru à mesta lagi leyfð en þú sendir %d" #: lib/command.php:378 msgid "Error sending direct message." msgstr "Villa kom upp við að senda bein skilaboð" -#: lib/command.php:422 -#, fuzzy -msgid "Cannot repeat your own notice" -msgstr "Get ekki kveikt á tilkynningum." - -#: lib/command.php:427 -#, fuzzy -msgid "Already repeated that notice" -msgstr "Eyða þessu babli" - #: lib/command.php:435 #, fuzzy, php-format -msgid "Notice from %s repeated" +msgid "Notice from %s repeated." msgstr "Babl sent inn" #: lib/command.php:437 @@ -4455,12 +4447,12 @@ msgstr "Vandamál komu upp við að vista babl." #: lib/command.php:491 #, fuzzy, php-format -msgid "Notice too long - maximum is %d characters, you sent %d" +msgid "Notice too long - maximum is %1$d characters, you sent %2$d." msgstr "Skilaboð eru of löng - 140 tákn eru à mesta lagi leyfð en þú sendir %d" #: lib/command.php:500 #, fuzzy, php-format -msgid "Reply to %s sent" +msgid "Reply to %s sent." msgstr "Svara þessu babli" #: lib/command.php:502 @@ -4469,7 +4461,8 @@ msgid "Error saving notice." msgstr "Vandamál komu upp við að vista babl." #: lib/command.php:556 -msgid "Specify the name of the user to subscribe to" +#, fuzzy +msgid "Specify the name of the user to subscribe to." msgstr "Tilgreindu nafn notandans sem þú vilt gerast áskrifandi að" #: lib/command.php:563 @@ -4478,7 +4471,8 @@ msgid "Subscribed to %s" msgstr "Nú ert þú áskrifandi að %s" #: lib/command.php:584 -msgid "Specify the name of the user to unsubscribe from" +#, fuzzy +msgid "Specify the name of the user to unsubscribe from." msgstr "Tilgreindu nafn notandans sem þú vilt hætta sem áskrifandi að" #: lib/command.php:591 @@ -4507,17 +4501,17 @@ msgid "Can't turn on notification." msgstr "Get ekki kveikt á tilkynningum." #: lib/command.php:650 -msgid "Login command is disabled" +msgid "Login command is disabled." msgstr "" #: lib/command.php:664 #, fuzzy, php-format -msgid "Could not create login token for %s" +msgid "Could not create login token for %s." msgstr "Gat ekki búið til uppáhald." #: lib/command.php:669 #, php-format -msgid "This link is useable only once, and is good for only 2 minutes: %s" +msgid "This link is useable only once, and is good for only 2 minutes: %s." msgstr "" #: lib/command.php:685 @@ -4713,10 +4707,6 @@ msgstr "Lýstu hópnum eða umfjöllunarefninu með 140 táknum" msgid "Describe the group or topic in %d characters" msgstr "Lýstu hópnum eða umfjöllunarefninu með 140 táknum" -#: lib/groupeditform.php:172 -msgid "Description" -msgstr "Lýsing" - #: lib/groupeditform.php:179 msgid "" "Location for the group, if any, like \"City, State (or Region), Country\"" @@ -4876,21 +4866,9 @@ msgid "" "Change your email address or notification options at %8$s\n" msgstr "" -#: lib/mail.php:254 -#, php-format -msgid "Location: %s\n" -msgstr "Staðsetning: %s\n" - -#: lib/mail.php:256 -#, php-format -msgid "Homepage: %s\n" -msgstr "VefsÃða: %s\n" - #: lib/mail.php:258 -#, php-format -msgid "" -"Bio: %s\n" -"\n" +#, fuzzy, php-format +msgid "Bio: %s" msgstr "" "Lýsing: %s\n" "\n" @@ -5036,6 +5014,27 @@ msgstr "" msgid "from" msgstr "frá" +#: lib/mailhandler.php:37 +msgid "Could not parse message." +msgstr "Gat ekki þáttað skilaboðin." + +#: lib/mailhandler.php:42 +msgid "Not a registered user." +msgstr "Ekki skráður notandi." + +#: lib/mailhandler.php:46 +msgid "Sorry, that is not your incoming email address." +msgstr "Afsakið en þetta er ekki móttökutölvupóstfangið þitt." + +#: lib/mailhandler.php:50 +msgid "Sorry, no incoming email allowed." +msgstr "Þvà miður er móttökutölvupóstur ekki leyfður." + +#: lib/mailhandler.php:228 +#, fuzzy, php-format +msgid "Unsupported message type: %s" +msgstr "Skráarsnið myndar ekki stutt." + #: lib/mediafile.php:98 lib/mediafile.php:123 msgid "There was a database error while saving your file. Please try again." msgstr "" @@ -5067,7 +5066,7 @@ msgid "File upload stopped by extension." msgstr "" #: lib/mediafile.php:179 lib/mediafile.php:216 -msgid "File exceeds user's quota!" +msgid "File exceeds user's quota." msgstr "" #: lib/mediafile.php:196 lib/mediafile.php:233 @@ -5076,7 +5075,7 @@ msgstr "" #: lib/mediafile.php:201 lib/mediafile.php:237 #, fuzzy -msgid "Could not determine file's mime-type!" +msgid "Could not determine file's MIME type." msgstr "Gat ekki eytt uppáhaldi." #: lib/mediafile.php:270 @@ -5086,7 +5085,7 @@ msgstr "" #: lib/mediafile.php:275 #, php-format -msgid "%s is not a supported filetype on this server." +msgid "%s is not a supported file type on this server." msgstr "" #: lib/messageform.php:120 @@ -5119,7 +5118,17 @@ msgid "Attach a file" msgstr "" #: lib/noticeform.php:212 -msgid "Share your location" +#, fuzzy +msgid "Share my location." +msgstr "Gat ekki vistað merki." + +#: lib/noticeform.php:214 +#, fuzzy +msgid "Do not share my location." +msgstr "Gat ekki vistað merki." + +#: lib/noticeform.php:215 +msgid "Hide this info" msgstr "" #: lib/noticelist.php:428 @@ -5241,6 +5250,11 @@ msgstr "Skilaboð sem þú hefur sent" msgid "Tags in %s's notices" msgstr "Merki à babli %s" +#: lib/plugin.php:114 +#, fuzzy +msgid "Unknown" +msgstr "Óþekkt aðgerð" + #: lib/profileaction.php:109 lib/profileaction.php:192 lib/subgroupnav.php:82 msgid "Subscriptions" msgstr "Ãskriftir" @@ -5419,10 +5433,6 @@ msgstr "" msgid "People Tagcloud as tagged" msgstr "" -#: lib/subscriptionlist.php:126 -msgid "(none)" -msgstr "(ekkert)" - #: lib/tagcloudsection.php:56 msgid "None" msgstr "Ekkert" @@ -5538,19 +5548,3 @@ msgstr "" #, php-format msgid "%s is not a valid color! Use 3 or 6 hex chars." msgstr "" - -#: scripts/maildaemon.php:48 -msgid "Could not parse message." -msgstr "Gat ekki þáttað skilaboðin." - -#: scripts/maildaemon.php:53 -msgid "Not a registered user." -msgstr "Ekki skráður notandi." - -#: scripts/maildaemon.php:57 -msgid "Sorry, that is not your incoming email address." -msgstr "Afsakið en þetta er ekki móttökutölvupóstfangið þitt." - -#: scripts/maildaemon.php:61 -msgid "Sorry, no incoming email allowed." -msgstr "Þvà miður er móttökutölvupóstur ekki leyfður." diff --git a/locale/it/LC_MESSAGES/statusnet.po b/locale/it/LC_MESSAGES/statusnet.po index 150c769d4..4d0b5ae68 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-01-03 10:37+0000\n" -"PO-Revision-Date: 2010-01-03 10:38:12+0000\n" +"POT-Creation-Date: 2010-01-10 11:27+0000\n" +"PO-Revision-Date: 2010-01-11 00:20:48+0000\n" "Language-Team: Italian\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha (r60575); Translate extension (2009-12-06)\n" +"X-Generator: MediaWiki 1.16alpha (r60910); Translate extension (2010-01-04)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: it\n" "X-Message-Group: out-statusnet\n" @@ -51,11 +51,6 @@ msgstr "Pagina inesistente." msgid "No such user." msgstr "Utente inesistente." -#: actions/all.php:84 -#, php-format -msgid "%s and friends, page %d" -msgstr "%s e amici, pagina %d" - #: actions/all.php:86 actions/all.php:167 actions/allrss.php:115 #: actions/apitimelinefriends.php:115 actions/apitimelinehome.php:115 #: lib/personalgroupnav.php:100 @@ -96,13 +91,14 @@ msgstr "" "scrivi un messaggio." #: actions/all.php:134 -#, php-format +#, fuzzy, php-format msgid "" -"You can try to [nudge %s](../%s) from his profile or [post something to his " -"or her attention](%%%%action.newnotice%%%%?status_textarea=%s)." +"You can try to [nudge %1$s](../%2$s) from his profile or [post something to " +"his or her attention](%%%%action.newnotice%%%%?status_textarea=%3$s)." msgstr "" -"Puoi provare a [richiamare %s](../%s) dal suo profilo o [scrivere qualche " -"cosa alla sua attenzione](%%%%action.newnotice%%%%?status_textarea=%s)." +"Puoi provare a [richiamare %1$s](../%2$s) dal suo profilo o [scrivere " +"qualche cosa alla sua attenzione](%%%%action.newnotice%%%%?status_textarea=%3" +"$s)." #: actions/all.php:137 actions/replies.php:209 actions/showstream.php:202 #, php-format @@ -128,6 +124,23 @@ msgstr "Messaggi da %1$s e amici su %2$s!" #: actions/apiaccountupdateprofile.php:97 #: actions/apiaccountupdateprofilebackgroundimage.php:94 #: actions/apiaccountupdateprofilecolors.php:118 +#: actions/apidirectmessage.php:156 actions/apifavoritecreate.php:99 +#: actions/apifavoritedestroy.php:100 actions/apifriendshipscreate.php:100 +#: actions/apifriendshipsdestroy.php:100 actions/apifriendshipsshow.php:129 +#: actions/apigroupcreate.php:136 actions/apigroupismember.php:114 +#: actions/apigroupjoin.php:155 actions/apigroupleave.php:141 +#: actions/apigrouplist.php:132 actions/apigrouplistall.php:120 +#: actions/apigroupmembership.php:106 actions/apigroupshow.php:105 +#: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102 +#: actions/apistatusesretweets.php:112 actions/apistatusesshow.php:108 +#: actions/apistatusnetconfig.php:133 actions/apistatusnetversion.php:93 +#: actions/apisubscriptions.php:111 actions/apitimelinefavorites.php:146 +#: actions/apitimelinefriends.php:156 actions/apitimelinegroup.php:150 +#: actions/apitimelinehome.php:156 actions/apitimelinementions.php:151 +#: actions/apitimelinepublic.php:131 actions/apitimelineretweetedbyme.php:122 +#: actions/apitimelineretweetedtome.php:121 +#: actions/apitimelineretweetsofme.php:122 actions/apitimelinetag.php:141 +#: actions/apitimelineuser.php:165 actions/apiusershow.php:101 msgid "API method not found." msgstr "Metodo delle API non trovato." @@ -187,6 +200,9 @@ msgstr "" #: actions/apiaccountupdateprofilebackgroundimage.php:146 #: actions/apiaccountupdateprofilecolors.php:164 #: actions/apiaccountupdateprofilecolors.php:174 +#: actions/groupdesignsettings.php:287 actions/groupdesignsettings.php:297 +#: actions/userdesignsettings.php:210 actions/userdesignsettings.php:220 +#: actions/userdesignsettings.php:263 actions/userdesignsettings.php:273 msgid "Unable to save your design settings." msgstr "Impossibile salvare la impostazioni dell'aspetto." @@ -227,26 +243,6 @@ msgstr "Messaggi diretti a %s" msgid "All the direct messages sent to %s" msgstr "Tutti i messaggi diretti inviati a %s" -#: actions/apidirectmessage.php:156 actions/apifavoritecreate.php:99 -#: actions/apifavoritedestroy.php:100 actions/apifriendshipscreate.php:100 -#: actions/apifriendshipsdestroy.php:100 actions/apifriendshipsshow.php:129 -#: actions/apigroupcreate.php:136 actions/apigroupismember.php:114 -#: actions/apigroupjoin.php:155 actions/apigroupleave.php:141 -#: actions/apigrouplist.php:132 actions/apigrouplistall.php:120 -#: actions/apigroupmembership.php:106 actions/apigroupshow.php:105 -#: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102 -#: actions/apistatusesretweets.php:112 actions/apistatusesshow.php:108 -#: actions/apistatusnetconfig.php:133 actions/apistatusnetversion.php:93 -#: actions/apisubscriptions.php:111 actions/apitimelinefavorites.php:146 -#: actions/apitimelinefriends.php:156 actions/apitimelinegroup.php:150 -#: actions/apitimelinehome.php:156 actions/apitimelinementions.php:151 -#: actions/apitimelinepublic.php:131 actions/apitimelineretweetedbyme.php:122 -#: actions/apitimelineretweetedtome.php:121 -#: actions/apitimelineretweetsofme.php:122 actions/apitimelinetag.php:141 -#: actions/apitimelineuser.php:165 actions/apiusershow.php:101 -msgid "API method not found!" -msgstr "Metodo delle API non trovato." - #: actions/apidirectmessagenew.php:126 msgid "No message text!" msgstr "Nessun testo nel messaggio!" @@ -270,16 +266,18 @@ msgid "No status found with that ID." msgstr "Nessuno messaggio trovato con quel ID." #: actions/apifavoritecreate.php:119 -msgid "This status is already a favorite!" -msgstr "Questo messaggio è già un preferito!" +#, fuzzy +msgid "This status is already a favorite." +msgstr "Questo messaggio è già un preferito." #: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:176 msgid "Could not create favorite." msgstr "Impossibile creare un preferito." #: actions/apifavoritedestroy.php:122 -msgid "That status is not a favorite!" -msgstr "Questo messaggio non è un preferito!" +#, fuzzy +msgid "That status is not a favorite." +msgstr "Questo messaggio non è un preferito." #: actions/apifavoritedestroy.php:134 actions/disfavor.php:87 msgid "Could not delete favorite." @@ -299,8 +297,9 @@ msgid "Could not unfollow user: User not found." msgstr "Impossibile non seguire l'utente: utente non trovato." #: actions/apifriendshipsdestroy.php:120 -msgid "You cannot unfollow yourself!" -msgstr "Non puoi non seguirti!" +#, fuzzy +msgid "You cannot unfollow yourself." +msgstr "Non puoi non seguirti." #: actions/apifriendshipsexists.php:94 msgid "Two user ids or screen_names must be supplied." @@ -386,7 +385,7 @@ msgstr "L'alias non può essere lo stesso del soprannome." msgid "Group not found!" msgstr "Gruppo non trovato!" -#: actions/apigroupjoin.php:110 +#: actions/apigroupjoin.php:110 actions/joingroup.php:90 lib/command.php:217 msgid "You are already a member of that group." msgstr "Fai già parte di quel gruppo." @@ -394,30 +393,25 @@ msgstr "Fai già parte di quel gruppo." msgid "You have been blocked from that group by the admin." msgstr "L'amministratore ti ha bloccato l'accesso a quel gruppo." -#: actions/apigroupjoin.php:138 -#, php-format -msgid "Could not join user %s to group %s." -msgstr "Impossibile iscrivere l'utente %s al gruppo %s." +#: actions/apigroupjoin.php:138 actions/joingroup.php:128 lib/command.php:234 +#, fuzzy, php-format +msgid "Could not join user %1$s to group %2$s." +msgstr "Impossibile iscrivere l'utente %1$s al gruppo %2$s." #: actions/apigroupleave.php:114 msgid "You are not a member of this group." msgstr "Non fai parte di questo gruppo." -#: actions/apigroupleave.php:124 -#, php-format -msgid "Could not remove user %s to group %s." -msgstr "Impossibile rimuovere l'utente %s dal gruppo %s." +#: actions/apigroupleave.php:124 actions/leavegroup.php:127 +#, fuzzy, php-format +msgid "Could not remove user %1$s from group %2$s." +msgstr "Impossibile rimuovere l'utente %1$s dal gruppo %2$s." #: actions/apigrouplist.php:95 #, php-format msgid "%s's groups" msgstr "Gruppi di %s" -#: actions/apigrouplist.php:103 -#, php-format -msgid "Groups %s is a member of on %s." -msgstr "Gruppi di cui %s fa parte su %s." - #: actions/apigrouplistall.php:90 actions/usergroups.php:62 #, php-format msgid "%s groups" @@ -441,11 +435,11 @@ msgstr "Non puoi eliminare il messaggio di un altro utente." msgid "No such notice." msgstr "Nessun messaggio." -#: actions/apistatusesretweet.php:83 +#: actions/apistatusesretweet.php:83 lib/command.php:422 msgid "Cannot repeat your own notice." msgstr "Non puoi ripetere un tuo messaggio." -#: actions/apistatusesretweet.php:91 +#: actions/apistatusesretweet.php:91 lib/command.php:427 msgid "Already repeated that notice." msgstr "Hai già ripetuto quel messaggio." @@ -458,7 +452,7 @@ msgid "No status with that ID found." msgstr "Nessun stato trovato con quel ID." #: actions/apistatusesupdate.php:157 actions/newnotice.php:155 -#: scripts/maildaemon.php:71 +#: lib/mailhandler.php:60 #, php-format msgid "That's too long. Max notice size is %d chars." msgstr "Troppo lungo. Lunghezza massima %d caratteri." @@ -478,14 +472,14 @@ msgid "Unsupported format." msgstr "Formato non supportato." #: actions/apitimelinefavorites.php:108 -#, php-format -msgid "%s / Favorites from %s" -msgstr "%s / Preferiti da %s" +#, fuzzy, php-format +msgid "%1$s / Favorites from %2$s" +msgstr "%1$s / Preferiti da %2$s" #: actions/apitimelinefavorites.php:120 -#, php-format -msgid "%s updates favorited by %s / %s." -msgstr "%s aggiornamenti preferiti da %s / %s" +#, fuzzy, php-format +msgid "%1$s updates favorited by %2$s / %2$s." +msgstr "%1$s aggiornamenti preferiti da %2$s / %3$s" #: actions/apitimelinegroup.php:109 actions/apitimelineuser.php:118 #: actions/grouprss.php:131 actions/userrss.php:90 @@ -552,8 +546,11 @@ msgstr "Non trovato." msgid "No such attachment." msgstr "Nessun allegato." -#: actions/avatarbynickname.php:59 actions/grouprss.php:91 -#: actions/leavegroup.php:76 +#: actions/avatarbynickname.php:59 actions/blockedfromgroup.php:73 +#: actions/editgroup.php:84 actions/groupdesignsettings.php:84 +#: actions/grouplogo.php:86 actions/groupmembers.php:76 +#: actions/grouprss.php:91 actions/joingroup.php:76 actions/leavegroup.php:76 +#: actions/showgroup.php:121 msgid "No nickname." msgstr "Nessun soprannome." @@ -577,8 +574,8 @@ msgstr "" "Puoi caricare la tua immagine personale. La dimensione massima del file è %s." #: actions/avatarsettings.php:106 actions/avatarsettings.php:185 -#: actions/grouplogo.php:178 actions/remotesubscribe.php:191 -#: actions/userauthorization.php:72 actions/userrss.php:103 +#: actions/remotesubscribe.php:191 actions/userauthorization.php:72 +#: actions/userrss.php:103 msgid "User without matching profile" msgstr "Utente senza profilo corrispondente" @@ -610,9 +607,9 @@ msgstr "Carica" msgid "Crop" msgstr "Ritaglia" -#: actions/avatarsettings.php:268 actions/disfavor.php:74 -#: actions/emailsettings.php:238 actions/favor.php:75 actions/geocode.php:50 -#: actions/groupblock.php:66 actions/grouplogo.php:309 +#: actions/avatarsettings.php:268 actions/deletenotice.php:157 +#: actions/disfavor.php:74 actions/emailsettings.php:238 actions/favor.php:75 +#: actions/geocode.php:50 actions/groupblock.php:66 actions/grouplogo.php:309 #: actions/groupunblock.php:66 actions/imsettings.php:206 #: actions/invite.php:56 actions/login.php:135 actions/makeadmin.php:66 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80 @@ -695,19 +692,15 @@ msgstr "Blocca questo utente" msgid "Failed to save block information." msgstr "Salvataggio delle informazioni per il blocco non riuscito." -#: actions/blockedfromgroup.php:73 actions/editgroup.php:84 -#: actions/groupdesignsettings.php:84 actions/grouplogo.php:86 -#: actions/groupmembers.php:76 actions/joingroup.php:76 -#: actions/showgroup.php:121 -msgid "No nickname" -msgstr "Nessun soprannome" - #: actions/blockedfromgroup.php:80 actions/editgroup.php:96 +#: actions/foafgroup.php:44 actions/foafgroup.php:62 actions/groupblock.php:86 #: actions/groupbyid.php:83 actions/groupdesignsettings.php:97 #: actions/grouplogo.php:99 actions/groupmembers.php:83 -#: actions/joingroup.php:83 actions/showgroup.php:137 -msgid "No such group" -msgstr "Nessun gruppo" +#: actions/grouprss.php:98 actions/groupunblock.php:86 +#: actions/joingroup.php:83 actions/leavegroup.php:83 actions/makeadmin.php:86 +#: actions/showgroup.php:137 lib/command.php:212 lib/command.php:263 +msgid "No such group." +msgstr "Nessuna gruppo." #: actions/blockedfromgroup.php:90 #, php-format @@ -715,9 +708,9 @@ msgid "%s blocked profiles" msgstr "Profili bloccati di %s" #: actions/blockedfromgroup.php:93 -#, php-format -msgid "%s blocked profiles, page %d" -msgstr "Profili bloccati di %s, pagina %d" +#, fuzzy, php-format +msgid "%1$s blocked profiles, page %2$d" +msgstr "Profili bloccati di %1$s, pagina %2$d" #: actions/blockedfromgroup.php:108 msgid "A list of the users blocked from joining this group." @@ -829,11 +822,6 @@ msgstr "Non eliminare il messaggio" msgid "Delete this notice" msgstr "Elimina questo messaggio" -#: actions/deletenotice.php:157 -msgid "There was a problem with your session token. Try again, please." -msgstr "" -"Si è verificato un problema con il tuo token di sessione. Prova di nuovo." - #: actions/deleteuser.php:67 msgid "You cannot delete users." msgstr "Non puoi eliminare utenti." @@ -859,7 +847,7 @@ msgid "Delete this user" msgstr "Elimina questo utente" #: actions/designadminpanel.php:62 lib/accountsettingsaction.php:124 -#: lib/adminpanelaction.php:302 lib/groupnav.php:119 +#: lib/adminpanelaction.php:316 lib/groupnav.php:119 msgid "Design" msgstr "Aspetto" @@ -999,8 +987,9 @@ msgstr "Devi eseguire l'accesso per creare un gruppo." #: actions/editgroup.php:103 actions/editgroup.php:168 #: actions/groupdesignsettings.php:104 actions/grouplogo.php:106 -msgid "You must be an admin to edit the group" -msgstr "Devi essere amministratore per modificare il gruppo" +#, fuzzy +msgid "You must be an admin to edit the group." +msgstr "Devi essere amministratore per modificare il gruppo." #: actions/editgroup.php:154 msgid "Use this form to edit the group." @@ -1024,7 +1013,8 @@ msgid "Options saved." msgstr "Opzioni salvate." #: actions/emailsettings.php:60 -msgid "Email Settings" +#, fuzzy +msgid "Email settings" msgstr "Impostazioni email" #: actions/emailsettings.php:71 @@ -1062,8 +1052,9 @@ msgid "Cancel" msgstr "Annulla" #: actions/emailsettings.php:121 -msgid "Email Address" -msgstr "Indirizzo email" +#, fuzzy +msgid "Email address" +msgstr "Indirizzi email" #: actions/emailsettings.php:123 msgid "Email address, like \"UserName@example.org\"" @@ -1139,9 +1130,10 @@ msgstr "Nessun indirizzo email." msgid "Cannot normalize that email address" msgstr "Impossibile normalizzare quell'indirizzo email" -#: actions/emailsettings.php:331 actions/siteadminpanel.php:157 -msgid "Not a valid email address" -msgstr "Non è un indirizzo email valido" +#: actions/emailsettings.php:331 actions/register.php:201 +#: actions/siteadminpanel.php:157 +msgid "Not a valid email address." +msgstr "Non è un indirizzo email valido." #: actions/emailsettings.php:334 msgid "That is already your email address." @@ -1239,7 +1231,7 @@ msgid "" "next to any notice you like." msgstr "" "Aggiungi tu un messaggio tra i tuoi preferiti facendo clic sul pulsante a " -"forma di cuore,." +"forma di cuore." #: actions/favorited.php:156 #, php-format @@ -1324,18 +1316,11 @@ msgstr "Il servizio remoto usa una versione del protocollo OMB sconosciuta." msgid "Error updating remote profile" msgstr "Errore nell'aggiornare il profilo remoto" -#: actions/foafgroup.php:44 actions/foafgroup.php:62 actions/groupblock.php:86 -#: actions/grouprss.php:98 actions/groupunblock.php:86 -#: actions/leavegroup.php:83 actions/makeadmin.php:86 lib/command.php:212 -#: lib/command.php:263 -msgid "No such group." -msgstr "Nessuna gruppo." - -#: actions/getfile.php:75 +#: actions/getfile.php:79 msgid "No such file." msgstr "Nessun file." -#: actions/getfile.php:79 +#: actions/getfile.php:83 msgid "Cannot read file." msgstr "Impossibile leggere il file." @@ -1347,7 +1332,7 @@ msgstr "Nessun profilo specificato." #: actions/groupblock.php:76 actions/groupunblock.php:76 #: actions/makeadmin.php:76 actions/subedit.php:53 actions/tagother.php:46 -#: lib/profileformaction.php:77 +#: actions/unsubscribe.php:84 lib/profileformaction.php:77 msgid "No profile with that ID." msgstr "Nessun profilo con quel ID." @@ -1373,14 +1358,15 @@ msgid "Block user from group" msgstr "Blocca l'utente dal gruppo" #: actions/groupblock.php:162 -#, php-format +#, fuzzy, php-format msgid "" -"Are you sure you want to block user \"%s\" from the group \"%s\"? They will " -"be removed from the group, unable to post, and unable to subscribe to the " -"group in the future." +"Are you sure you want to block user \"%1$s\" from the group \"%2$s\"? They " +"will be removed from the group, unable to post, and unable to subscribe to " +"the group in the future." msgstr "" -"Vuoi bloccare l'utente \"%s\" dal gruppo \"%s\"? L'utente verrà rimosso dal " -"gruppo, non potrà più inviare messaggi e non potrà più iscriversi al gruppo." +"Vuoi bloccare l'utente \"%1$s\" dal gruppo \"%2$s\"? L'utente verrà rimosso " +"dal gruppo, non potrà più inviare messaggi e non potrà più iscriversi al " +"gruppo." #: actions/groupblock.php:178 msgid "Do not block this user from this group" @@ -1394,9 +1380,9 @@ msgstr "Blocca l'utente da questo gruppo" msgid "Database error blocking user from group." msgstr "Errore del database nel bloccare l'utente dal gruppo." -#: actions/groupbyid.php:74 -msgid "No ID" -msgstr "Nessun ID" +#: actions/groupbyid.php:74 actions/userbyid.php:70 +msgid "No ID." +msgstr "Nessun ID." #: actions/groupdesignsettings.php:68 msgid "You must be logged in to edit a group." @@ -1419,12 +1405,6 @@ msgstr "" msgid "Couldn't update your design." msgstr "Impossibile aggiornare l'aspetto." -#: actions/groupdesignsettings.php:287 actions/groupdesignsettings.php:297 -#: actions/userdesignsettings.php:210 actions/userdesignsettings.php:220 -#: actions/userdesignsettings.php:263 actions/userdesignsettings.php:273 -msgid "Unable to save your design settings!" -msgstr "Impossibile salvare le tue impostazioni dell'aspetto." - #: actions/groupdesignsettings.php:308 actions/userdesignsettings.php:231 msgid "Design preferences saved." msgstr "Preferenze dell'aspetto salvate." @@ -1441,6 +1421,11 @@ msgstr "" "Puoi caricare un'immagine per il logo del tuo gruppo. La dimensione massima " "del file è di %s." +#: actions/grouplogo.php:178 +#, fuzzy +msgid "User without matching profile." +msgstr "Utente senza profilo corrispondente." + #: actions/grouplogo.php:362 msgid "Pick a square area of the image to be the logo." msgstr "Scegli un'area quadrata dell'immagine per il logo." @@ -1459,15 +1444,15 @@ msgid "%s group members" msgstr "Membri del gruppo %s" #: actions/groupmembers.php:96 -#, php-format -msgid "%s group members, page %d" -msgstr "Membri del gruppo %s, pagina %d" +#, fuzzy, php-format +msgid "%1$s group members, page %2$d" +msgstr "Membri del gruppo %1$s, pagina %2$d" #: actions/groupmembers.php:111 msgid "A list of the users in this group." msgstr "Un elenco degli utenti in questo gruppo." -#: actions/groupmembers.php:175 lib/action.php:441 lib/groupnav.php:107 +#: actions/groupmembers.php:175 lib/action.php:442 lib/groupnav.php:107 msgid "Admin" msgstr "Amministra" @@ -1570,7 +1555,8 @@ msgid "Error removing the block." msgstr "Errore nel rimuovere il blocco." #: actions/imsettings.php:59 -msgid "IM Settings" +#, fuzzy +msgid "IM settings" msgstr "Impostazioni messaggistica istantanea" #: actions/imsettings.php:70 @@ -1602,7 +1588,8 @@ msgstr "" "elenco contatti?" #: actions/imsettings.php:124 -msgid "IM Address" +#, fuzzy +msgid "IM address" msgstr "Indirizzo di messaggistica istantanea" #: actions/imsettings.php:126 @@ -1664,11 +1651,6 @@ msgstr "" msgid "That is not your Jabber ID." msgstr "Quello non è il tuo ID di Jabber." -#: actions/inbox.php:59 -#, php-format -msgid "Inbox for %s - page %d" -msgstr "Casella posta in arrivo di %s - pagina %d" - #: actions/inbox.php:62 #, php-format msgid "Inbox for %s" @@ -1706,10 +1688,10 @@ msgstr "Invita nuovi utenti" msgid "You are already subscribed to these users:" msgstr "Hai già un abbonamento a questi utenti:" -#: actions/invite.php:131 actions/invite.php:139 +#: actions/invite.php:131 actions/invite.php:139 lib/command.php:315 #, php-format -msgid "%s (%s)" -msgstr "%s (%s)" +msgid "%1$s (%2$s)" +msgstr "%1$s (%2$s)" #: actions/invite.php:136 msgid "" @@ -1751,7 +1733,7 @@ msgstr "Messaggio personale" msgid "Optionally add a personal message to the invitation." msgstr "Puoi aggiungere un messaggio personale agli inviti." -#: actions/invite.php:197 lib/messageform.php:178 lib/noticeform.php:232 +#: actions/invite.php:197 lib/messageform.php:178 lib/noticeform.php:234 msgid "Send" msgstr "Invia" @@ -1821,19 +1803,10 @@ msgstr "" msgid "You must be logged in to join a group." msgstr "Devi eseguire l'accesso per iscriverti a un gruppo." -#: actions/joingroup.php:90 lib/command.php:217 -msgid "You are already a member of that group" -msgstr "Fai già parte di quel gruppo" - -#: actions/joingroup.php:128 lib/command.php:234 -#, php-format -msgid "Could not join user %s to group %s" -msgstr "Impossibile iscrivere l'utente %s al gruppo %s" - #: actions/joingroup.php:135 lib/command.php:239 -#, php-format -msgid "%s joined group %s" -msgstr "%s fa ora parte del gruppo %s" +#, fuzzy, php-format +msgid "%1$s joined group %2$s" +msgstr "%1$s fa ora parte del gruppo %2$s" #: actions/leavegroup.php:60 msgid "You must be logged in to leave a group." @@ -1847,15 +1820,10 @@ msgstr "Non fai parte di quel gruppo." msgid "Could not find membership record." msgstr "Impossibile trovare il record della membership." -#: actions/leavegroup.php:127 lib/command.php:284 -#, php-format -msgid "Could not remove user %s to group %s" -msgstr "Impossibile rimuovere l'utente %s dal gruppo %s" - #: actions/leavegroup.php:134 lib/command.php:289 -#, php-format -msgid "%s left group %s" -msgstr "%s ha lasciato il gruppo %s" +#, fuzzy, php-format +msgid "%1$s left group %2$s" +msgstr "%1$s ha lasciato il gruppo %2$s" #: actions/login.php:83 actions/register.php:137 msgid "Already logged in." @@ -1873,7 +1841,7 @@ msgstr "Nome utente o password non corretto." msgid "Error setting user. You are probably not authorized." msgstr "Errore nell'impostare l'utente. Forse non hai l'autorizzazione." -#: actions/login.php:208 actions/login.php:261 lib/action.php:459 +#: actions/login.php:208 actions/login.php:261 lib/action.php:460 #: lib/logingroupnav.php:79 msgid "Login" msgstr "Accedi" @@ -1928,19 +1896,19 @@ msgstr "" "Solo gli amministratori possono rendere un altro utente amministratori." #: actions/makeadmin.php:95 -#, php-format -msgid "%s is already an admin for group \"%s\"." -msgstr "%s è già amministratore per il gruppo \"%s\"." +#, fuzzy, php-format +msgid "%1$s is already an admin for group \"%2$s\"." +msgstr "%1$s è già amministratore del gruppo \"%2$s\"." #: actions/makeadmin.php:132 -#, php-format -msgid "Can't get membership record for %s in group %s" -msgstr "Impossibile recuperare la membership per %s nel gruppo %s" +#, fuzzy, php-format +msgid "Can't get membership record for %1$s in group %2$s." +msgstr "Impossibile recuperare la membership per %1$s nel gruppo %2$s" #: actions/makeadmin.php:145 -#, php-format -msgid "Can't make %s an admin for group %s" -msgstr "Impossibile rendere %s un amministratore per il gruppo %s" +#, fuzzy, php-format +msgid "Can't make %1$s an admin for group %2$s." +msgstr "Impossibile rendere %1$s un amministratore del gruppo %2$s" #: actions/microsummary.php:69 msgid "No current status" @@ -1981,9 +1949,9 @@ msgid "Message sent" msgstr "Messaggio inviato" #: actions/newmessage.php:185 lib/command.php:376 -#, php-format -msgid "Direct message to %s sent" -msgstr "Messaggio diretto a %s inviato" +#, fuzzy, php-format +msgid "Direct message to %s sent." +msgstr "Messaggio diretto a %s inviato." #: actions/newmessage.php:210 actions/newnotice.php:245 lib/channel.php:170 msgid "Ajax Error" @@ -2011,9 +1979,9 @@ msgid "Text search" msgstr "Cerca testo" #: actions/noticesearch.php:91 -#, php-format -msgid "Search results for \"%s\" on %s" -msgstr "Risultati della ricerca per \"%s\" su %s" +#, fuzzy, php-format +msgid "Search results for \"%1$s\" on %2$s" +msgstr "Risultati della ricerca per \"%1$s\" su %2$s" #: actions/noticesearch.php:121 #, php-format @@ -2120,11 +2088,6 @@ msgstr "Mostra o nasconde gli aspetti del profilo." msgid "URL shortening service is too long (max 50 chars)." msgstr "Il servizio di riduzione degli URL è troppo lungo (max 50 caratteri)." -#: actions/outbox.php:58 -#, php-format -msgid "Outbox for %s - page %d" -msgstr "Casella posta inviata di %s - pagina %d" - #: actions/outbox.php:61 #, php-format msgid "Outbox for %s" @@ -2197,7 +2160,7 @@ msgstr "Impossibile salvare la nuova password." msgid "Password saved." msgstr "Password salvata." -#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:308 +#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:326 msgid "Paths" msgstr "Percorsi" @@ -2230,7 +2193,7 @@ msgid "Invalid SSL server. The maximum length is 255 characters." msgstr "Server SSL non valido. La lunghezza massima è di 255 caratteri." #: actions/pathsadminpanel.php:217 actions/siteadminpanel.php:58 -#: lib/adminpanelaction.php:299 +#: lib/adminpanelaction.php:311 msgid "Site" msgstr "Sito" @@ -2323,7 +2286,8 @@ msgid "When to use SSL" msgstr "Quando usare SSL" #: actions/pathsadminpanel.php:308 -msgid "SSL Server" +#, fuzzy +msgid "SSL server" msgstr "Server SSL" #: actions/pathsadminpanel.php:309 @@ -2353,20 +2317,20 @@ msgid "Not a valid people tag: %s" msgstr "Non è un'etichetta valida di persona: %s" #: actions/peopletag.php:144 -#, php-format -msgid "Users self-tagged with %s - page %d" -msgstr "Utenti auto-etichettati con %s - pagina %d" +#, fuzzy, php-format +msgid "Users self-tagged with %1$s - page %2$d" +msgstr "Utenti auto-etichettati con %1$s - pagina %2$d" #: actions/postnotice.php:84 msgid "Invalid notice content" msgstr "Contenuto del messaggio non valido" #: actions/postnotice.php:90 -#, php-format -msgid "Notice license ‘%s’ is not compatible with site license ‘%s’." +#, fuzzy, php-format +msgid "Notice license ‘%1$s’ is not compatible with site license ‘%2$s’." msgstr "" -"La licenza \"%s\" del messaggio non è compatibile con la licenza del sito \"%" -"s\"." +"La licenza \"%1$s\" del messaggio non è compatibile con la licenza del sito " +"\"%2$s\"." #: actions/profilesettings.php:60 msgid "Profile settings" @@ -2429,7 +2393,7 @@ msgstr "Dove ti trovi, tipo \"città , regione, stato\"" #: actions/profilesettings.php:138 msgid "Share my current location when posting notices" -msgstr "" +msgstr "Condividi la mia posizione attuale quando invio messaggi" #: actions/profilesettings.php:145 actions/tagother.php:149 #: actions/tagother.php:209 lib/subscriptionlist.php:106 @@ -2488,20 +2452,20 @@ msgstr "Etichetta non valida: \"%s\"" msgid "Couldn't update user for autosubscribe." msgstr "Impossibile aggiornare l'utente per auto-abbonarsi." -#: actions/profilesettings.php:354 +#: actions/profilesettings.php:359 #, fuzzy msgid "Couldn't save location prefs." -msgstr "Impossibile salvare le etichette." +msgstr "Impossibile salvare le preferenze della posizione." -#: actions/profilesettings.php:366 +#: actions/profilesettings.php:371 msgid "Couldn't save profile." msgstr "Impossibile salvare il profilo." -#: actions/profilesettings.php:374 +#: actions/profilesettings.php:379 msgid "Couldn't save tags." msgstr "Impossibile salvare le etichette." -#: actions/profilesettings.php:382 lib/adminpanelaction.php:126 +#: actions/profilesettings.php:387 lib/adminpanelaction.php:137 msgid "Settings saved." msgstr "Impostazioni salvate." @@ -2604,7 +2568,7 @@ msgid "" "one!" msgstr "Perché non [crei un accout](%%action.register%%) e ne scrivi uno tu!" -#: actions/publictagcloud.php:135 +#: actions/publictagcloud.php:131 msgid "Tag cloud" msgstr "Insieme delle etichette" @@ -2745,7 +2709,7 @@ msgstr "Codice di invito non valido." msgid "Registration successful" msgstr "Registrazione riuscita" -#: actions/register.php:114 actions/register.php:502 lib/action.php:456 +#: actions/register.php:114 actions/register.php:502 lib/action.php:457 #: lib/logingroupnav.php:85 msgid "Register" msgstr "Registra" @@ -2758,10 +2722,6 @@ msgstr "Registrazione non consentita." msgid "You can't register if you don't agree to the license." msgstr "Non puoi registrarti se non accetti la licenza." -#: actions/register.php:201 -msgid "Not a valid email address." -msgstr "Non è un indirizzo email valido." - #: actions/register.php:212 msgid "Email address already exists." msgstr "Indirizzo email già esistente." @@ -2822,12 +2782,12 @@ msgstr "" "messaggistica istantanea e numero di telefono." #: actions/register.php:537 -#, php-format +#, fuzzy, php-format msgid "" -"Congratulations, %s! And welcome to %%%%site.name%%%%. From here, you may " +"Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may " "want to...\n" "\n" -"* Go to [your profile](%s) and post your first message.\n" +"* Go to [your profile](%2$s) and post your first message.\n" "* Add a [Jabber/GTalk address](%%%%action.imsettings%%%%) so you can send " "notices through instant messages.\n" "* [Search for people](%%%%action.peoplesearch%%%%) that you may know or that " @@ -2839,9 +2799,10 @@ msgid "" "\n" "Thanks for signing up and we hope you enjoy using this service." msgstr "" -"Congratulazioni %s! Benvenuti in %%%%site.name%%%%. Da qui ora puoi...\n" +"Congratulazioni %1$s! Ti diamo il benvenuto in %%%%site.name%%%%. Da qui ora " +"puoi...\n" "\n" -"* Visitare il [tuo profilo](%s) e inviare il tuo primo messaggio.\n" +"* Visitare il [tuo profilo](%2$s) e inviare il tuo primo messaggio.\n" "*Aggiungere un [indirizzo Jabber/GTalk](%%%%action.imsettings%%%%) per usare " "quel servizio per inviare messaggi.\n" "*[Cercare persone](%%%%action.peoplesearch%%%%) che potresti conoscere o che " @@ -2951,11 +2912,6 @@ msgstr "Ripetuti!" msgid "Replies to %s" msgstr "Risposte a %s" -#: actions/replies.php:127 -#, php-format -msgid "Replies to %s, page %d" -msgstr "Risposte a %s, pagina %d" - #: actions/replies.php:144 #, php-format msgid "Replies feed for %s (RSS 1.0)" @@ -2972,10 +2928,10 @@ msgid "Replies feed for %s (Atom)" msgstr "Feed delle risposte di %s (Atom)" #: actions/replies.php:198 -#, php-format +#, fuzzy, php-format msgid "" -"This is the timeline showing replies to %s but %s hasn't received a notice " -"to his attention yet." +"This is the timeline showing replies to %1$s but %2$s hasn't received a " +"notice to his attention yet." msgstr "" "Questa è l'attività delle risposte a %s, ma %s non ha ricevuto ancora alcun " "messaggio." @@ -2990,10 +2946,10 @@ msgstr "" "[entrare in qualche gruppo](%%action.groups%%)." #: actions/replies.php:205 -#, php-format +#, fuzzy, php-format msgid "" -"You can try to [nudge %s](../%s) or [post something to his or her attention]" -"(%%%%action.newnotice%%%%?status_textarea=%s)." +"You can try to [nudge %1$s](../%2$s) or [post something to his or her " +"attention](%%%%action.newnotice%%%%?status_textarea=%3$s)." msgstr "" "Puoi provare a [richiamare %s](../%s) o [scrivere qualche cosa alla sua " "attenzione](%%%%action.newnotice%%%%?status_textarea=%s)." @@ -3011,11 +2967,6 @@ msgstr "Non puoi mettere in \"sandbox\" gli utenti su questo sito." msgid "User is already sandboxed." msgstr "L'utente è già nella \"sandbox\"." -#: actions/showfavorites.php:79 -#, php-format -msgid "%s's favorite notices, page %d" -msgstr "Messaggi preferiti di %s, pagina %d" - #: actions/showfavorites.php:132 msgid "Could not retrieve favorite notices." msgstr "Impossibile recuperare i messaggi preferiti." @@ -3072,11 +3023,6 @@ msgstr "Questo è un modo per condividere ciò che ti piace." msgid "%s group" msgstr "Gruppi di %s" -#: actions/showgroup.php:84 -#, php-format -msgid "%s group, page %d" -msgstr "Gruppi di %s, pagina %d" - #: actions/showgroup.php:218 msgid "Group profile" msgstr "Profilo del gruppo" @@ -3125,7 +3071,7 @@ msgstr "Membri" #: actions/showgroup.php:386 lib/profileaction.php:117 #: lib/profileaction.php:148 lib/profileaction.php:236 lib/section.php:95 -#: lib/tagcloudsection.php:71 +#: lib/subscriptionlist.php:126 lib/tagcloudsection.php:71 msgid "(None)" msgstr "(nessuno)" @@ -3200,14 +3146,9 @@ msgstr "Messaggio eliminato." msgid " tagged %s" msgstr " etichettati con %s" -#: actions/showstream.php:79 -#, php-format -msgid "%s, page %d" -msgstr "%s, pagina %d" - #: actions/showstream.php:122 -#, php-format -msgid "Notice feed for %s tagged %s (RSS 1.0)" +#, fuzzy, php-format +msgid "Notice feed for %1$s tagged %2$s (RSS 1.0)" msgstr "Feed dei messaggi per %s etichettati con %s (RSS 1.0)" #: actions/showstream.php:129 @@ -3231,8 +3172,8 @@ msgid "FOAF for %s" msgstr "FOAF per %s" #: actions/showstream.php:191 -#, php-format -msgid "This is the timeline for %s but %s hasn't posted anything yet." +#, fuzzy, php-format +msgid "This is the timeline for %1$s but %2$s hasn't posted anything yet." msgstr "Questa è l'attività di %s, ma %s non ha ancora scritto nulla." #: actions/showstream.php:196 @@ -3244,10 +3185,10 @@ msgstr "" "potrebbe essere un buon momento per iniziare! :)" #: actions/showstream.php:198 -#, php-format +#, fuzzy, php-format msgid "" -"You can try to nudge %s or [post something to his or her attention](%%%%" -"action.newnotice%%%%?status_textarea=%s)." +"You can try to nudge %1$s or [post something to his or her attention](%%%%" +"action.newnotice%%%%?status_textarea=%2$s)." msgstr "" "Puoi provare a richiamare %s o [scrivere qualche cosa che attiri la sua " "attenzione](%%%%action.newnotice%%%%?status_textarea=%s)." @@ -3299,12 +3240,13 @@ msgid "Site name must have non-zero length." msgstr "Il nome del sito non deve avere lunghezza parti a zero." #: actions/siteadminpanel.php:154 -msgid "You must have a valid contact email address" +#, fuzzy +msgid "You must have a valid contact email address." msgstr "Devi avere un'email di contatto valida." #: actions/siteadminpanel.php:172 -#, php-format -msgid "Unknown language \"%s\"" +#, fuzzy, php-format +msgid "Unknown language \"%s\"." msgstr "Lingua \"%s\" sconosciuta" #: actions/siteadminpanel.php:179 @@ -3488,7 +3430,8 @@ msgid "Save site settings" msgstr "Salva impostazioni" #: actions/smssettings.php:58 -msgid "SMS Settings" +#, fuzzy +msgid "SMS settings" msgstr "Impostazioni SMS" #: actions/smssettings.php:69 @@ -3517,7 +3460,8 @@ msgid "Enter the code you received on your phone." msgstr "Inserisci il codice che hai ricevuto sul tuo telefono." #: actions/smssettings.php:138 -msgid "SMS Phone number" +#, fuzzy +msgid "SMS phone number" msgstr "Numero di telefono per SMS" #: actions/smssettings.php:140 @@ -3608,8 +3552,8 @@ msgid "%s subscribers" msgstr "Abbonati a %s" #: actions/subscribers.php:52 -#, php-format -msgid "%s subscribers, page %d" +#, fuzzy, php-format +msgid "%1$s subscribers, page %2$d" msgstr "Abbonati a %s, pagina %d" #: actions/subscribers.php:63 @@ -3649,8 +3593,8 @@ msgid "%s subscriptions" msgstr "Abbonamenti di %s" #: actions/subscriptions.php:54 -#, php-format -msgid "%s subscriptions, page %d" +#, fuzzy, php-format +msgid "%1$s subscriptions, page %2$d" msgstr "Abbonamenti di %s, pagina %d" #: actions/subscriptions.php:65 @@ -3690,11 +3634,6 @@ msgstr "Jabber" msgid "SMS" msgstr "SMS" -#: actions/tag.php:68 -#, php-format -msgid "Notices tagged with %s, page %d" -msgstr "Messaggi etichettati con %s, pagina %d" - #: actions/tag.php:86 #, php-format msgid "Notice feed for tag %s (RSS 1.0)" @@ -3780,22 +3719,19 @@ msgstr "L'utente non è zittito." msgid "No profile id in request." msgstr "Nessun ID di profilo nella richiesta." -#: actions/unsubscribe.php:84 -msgid "No profile with that id." -msgstr "Nessun profilo con quel ID." - #: actions/unsubscribe.php:98 msgid "Unsubscribed" msgstr "Abbonamento annullato" #: actions/updateprofile.php:62 actions/userauthorization.php:330 -#, php-format -msgid "Listenee stream license ‘%s’ is not compatible with site license ‘%s’." +#, fuzzy, php-format +msgid "" +"Listenee stream license ‘%1$s’ is not compatible with site license ‘%2$s’." msgstr "" "La licenza \"%s\" dello stream di chi ascolti non è compatibile con la " "licenza \"%s\" di questo sito." -#: actions/useradminpanel.php:58 lib/adminpanelaction.php:305 +#: actions/useradminpanel.php:58 lib/adminpanelaction.php:321 #: lib/personalgroupnav.php:115 msgid "User" msgstr "Utente" @@ -3896,7 +3832,7 @@ msgstr "" "Controlla i dettagli seguenti per essere sicuro di volerti abbonare ai " "messaggi di questo utente. Se non hai richiesto ciò, fai clic su \"Rifiuta\"." -#: actions/userauthorization.php:188 +#: actions/userauthorization.php:188 actions/version.php:165 msgid "License" msgstr "Licenza" @@ -3950,8 +3886,8 @@ msgstr "" "completamente l'abbonamento." #: actions/userauthorization.php:296 -#, php-format -msgid "Listener URI ‘%s’ not found here" +#, fuzzy, php-format +msgid "Listener URI ‘%s’ not found here." msgstr "URL \"%s\" dell'ascoltatore non trovato qui." #: actions/userauthorization.php:301 @@ -3984,10 +3920,6 @@ msgstr "Impossibile leggere l'URL \"%s\" dell'immagine." msgid "Wrong image type for avatar URL ‘%s’." msgstr "Tipo di immagine errata per l'URL \"%s\"." -#: actions/userbyid.php:70 -msgid "No ID." -msgstr "Nessun ID." - #: actions/userdesignsettings.php:76 lib/designsettings.php:65 msgid "Profile design" msgstr "Aspetto del profilo" @@ -4004,11 +3936,6 @@ msgstr "" msgid "Enjoy your hotdog!" msgstr "Gustati il tuo hotdog!" -#: actions/usergroups.php:64 -#, php-format -msgid "%s groups, page %d" -msgstr "Gruppi di %s, pagina %d" - #: actions/usergroups.php:130 msgid "Search for more groups" msgstr "Cerca altri gruppi" @@ -4023,6 +3950,73 @@ msgstr "%s non fa parte di alcun gruppo." msgid "Try [searching for groups](%%action.groupsearch%%) and joining them." msgstr "Prova a [cercare dei gruppi](%%action.groupsearch%%) e iscriviti." +#: actions/version.php:73 +#, fuzzy, php-format +msgid "StatusNet %s" +msgstr "Statistiche" + +#: actions/version.php:153 +#, php-format +msgid "" +"This site is powered by %1$s version %2$s, Copyright 2008-2010 StatusNet, " +"Inc. and contributors." +msgstr "" + +#: actions/version.php:157 +#, fuzzy +msgid "StatusNet" +msgstr "Messaggio eliminato." + +#: actions/version.php:161 +msgid "Contributors" +msgstr "" + +#: actions/version.php:168 +msgid "" +"StatusNet is free software: you can redistribute it and/or modify it under " +"the terms of the GNU Affero General Public License as published by the Free " +"Software Foundation, either version 3 of the License, or (at your option) " +"any later version. " +msgstr "" + +#: actions/version.php:174 +msgid "" +"This program is distributed in the hope that it will be useful, but WITHOUT " +"ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or " +"FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License " +"for more details. " +msgstr "" + +#: actions/version.php:180 +#, php-format +msgid "" +"You should have received a copy of the GNU Affero General Public License " +"along with this program. If not, see %s." +msgstr "" + +#: actions/version.php:189 +msgid "Plugins" +msgstr "" + +#: actions/version.php:195 +#, fuzzy +msgid "Name" +msgstr "Soprannome" + +#: actions/version.php:196 lib/action.php:741 +#, fuzzy +msgid "Version" +msgstr "Sessioni" + +#: actions/version.php:197 +#, fuzzy +msgid "Author(s)" +msgstr "Autore" + +#: actions/version.php:198 lib/groupeditform.php:172 +msgid "Description" +msgstr "Descrizione" + #: classes/File.php:137 #, php-format msgid "" @@ -4097,7 +4091,7 @@ msgstr "Problema nel salvare il messaggio." msgid "DB error inserting reply: %s" msgstr "Errore del DB nell'inserire la risposta: %s" -#: classes/Notice.php:1361 +#: classes/Notice.php:1359 #, php-format msgid "RT @%1$s %2$s" msgstr "RT @%1$s %2$s" @@ -4143,137 +4137,132 @@ msgstr "Altro" msgid "Other options" msgstr "Altre opzioni" -#: lib/action.php:144 -#, php-format -msgid "%s - %s" -msgstr "%s - %s" - #: lib/action.php:159 msgid "Untitled page" msgstr "Pagina senza nome" -#: lib/action.php:426 +#: lib/action.php:427 msgid "Primary site navigation" msgstr "Esplorazione sito primaria" -#: lib/action.php:432 +#: lib/action.php:433 msgid "Home" msgstr "Home" -#: lib/action.php:432 +#: lib/action.php:433 msgid "Personal profile and friends timeline" msgstr "Profilo personale e attività degli amici" -#: lib/action.php:434 +#: lib/action.php:435 msgid "Account" msgstr "Account" -#: lib/action.php:434 +#: lib/action.php:435 msgid "Change your email, avatar, password, profile" msgstr "Modifica la tua email, immagine, password o il tuo profilo" -#: lib/action.php:437 +#: lib/action.php:438 msgid "Connect" msgstr "Connetti" -#: lib/action.php:437 +#: lib/action.php:438 msgid "Connect to services" msgstr "Connettiti con altri servizi" -#: lib/action.php:441 +#: lib/action.php:442 msgid "Change site configuration" msgstr "Modifica la configurazione del sito" -#: lib/action.php:445 lib/subgroupnav.php:105 +#: lib/action.php:446 lib/subgroupnav.php:105 msgid "Invite" msgstr "Invita" -#: lib/action.php:446 lib/subgroupnav.php:106 +#: lib/action.php:447 lib/subgroupnav.php:106 #, php-format msgid "Invite friends and colleagues to join you on %s" msgstr "Invita amici e colleghi a seguirti su %s" -#: lib/action.php:451 +#: lib/action.php:452 msgid "Logout" msgstr "Esci" -#: lib/action.php:451 +#: lib/action.php:452 msgid "Logout from the site" msgstr "Termina la tua sessione sul sito" -#: lib/action.php:456 +#: lib/action.php:457 msgid "Create an account" msgstr "Crea un account" -#: lib/action.php:459 +#: lib/action.php:460 msgid "Login to the site" msgstr "Accedi al sito" -#: lib/action.php:462 lib/action.php:725 +#: lib/action.php:463 lib/action.php:726 msgid "Help" msgstr "Aiuto" -#: lib/action.php:462 +#: lib/action.php:463 msgid "Help me!" msgstr "Aiutami!" -#: lib/action.php:465 lib/searchaction.php:127 +#: lib/action.php:466 lib/searchaction.php:127 msgid "Search" msgstr "Cerca" -#: lib/action.php:465 +#: lib/action.php:466 msgid "Search for people or text" msgstr "Cerca persone o del testo" -#: lib/action.php:486 +#: lib/action.php:487 msgid "Site notice" msgstr "Messaggio del sito" -#: lib/action.php:552 +#: lib/action.php:553 msgid "Local views" msgstr "Viste locali" -#: lib/action.php:618 +#: lib/action.php:619 msgid "Page notice" msgstr "Pagina messaggio" -#: lib/action.php:720 +#: lib/action.php:721 msgid "Secondary site navigation" msgstr "Esplorazione secondaria del sito" -#: lib/action.php:727 +#: lib/action.php:728 msgid "About" msgstr "Informazioni" -#: lib/action.php:729 +#: lib/action.php:730 msgid "FAQ" msgstr "FAQ" -#: lib/action.php:733 +#: lib/action.php:734 msgid "TOS" msgstr "TOS" -#: lib/action.php:736 +#: lib/action.php:737 msgid "Privacy" msgstr "Privacy" -#: lib/action.php:738 +#: lib/action.php:739 msgid "Source" msgstr "Sorgenti" -#: lib/action.php:740 +#: lib/action.php:743 msgid "Contact" msgstr "Contatti" -#: lib/action.php:742 +#: lib/action.php:745 msgid "Badge" msgstr "Badge" -#: lib/action.php:770 +#: lib/action.php:773 msgid "StatusNet software license" msgstr "Licenza del software StatusNet" -#: lib/action.php:773 +#: lib/action.php:776 #, php-format msgid "" "**%%site.name%%** is a microblogging service brought to you by [%%site." @@ -4282,12 +4271,12 @@ msgstr "" "**%%site.name%%** è un servizio di microblog offerto da [%%site.broughtby%%]" "(%%site.broughtbyurl%%). " -#: lib/action.php:775 +#: lib/action.php:778 #, php-format msgid "**%%site.name%%** is a microblogging service. " msgstr "**%%site.name%%** è un servizio di microblog. " -#: lib/action.php:777 +#: lib/action.php:780 #, php-format msgid "" "It runs the [StatusNet](http://status.net/) microblogging software, version %" @@ -4298,31 +4287,31 @@ msgstr "" "s, disponibile nei termini della licenza [GNU Affero General Public License]" "(http://www.fsf.org/licensing/licenses/agpl-3.0.html)." -#: lib/action.php:791 +#: lib/action.php:794 msgid "Site content license" msgstr "Licenza del contenuto del sito" -#: lib/action.php:800 +#: lib/action.php:803 msgid "All " msgstr "Tutti " -#: lib/action.php:805 +#: lib/action.php:808 msgid "license." msgstr "licenza." -#: lib/action.php:1099 +#: lib/action.php:1102 msgid "Pagination" msgstr "Paginazione" -#: lib/action.php:1108 +#: lib/action.php:1111 msgid "After" msgstr "Successivi" -#: lib/action.php:1116 +#: lib/action.php:1119 msgid "Before" msgstr "Precedenti" -#: lib/action.php:1164 +#: lib/action.php:1167 msgid "There was a problem with your session token." msgstr "Si è verificato un problema con il tuo token di sessione." @@ -4330,27 +4319,32 @@ msgstr "Si è verificato un problema con il tuo token di sessione." msgid "You cannot make changes to this site." msgstr "Non puoi apportare modifiche al sito." -#: lib/adminpanelaction.php:195 +#: lib/adminpanelaction.php:107 +#, fuzzy +msgid "Changes to that panel are not allowed." +msgstr "Registrazione non consentita." + +#: lib/adminpanelaction.php:206 msgid "showForm() not implemented." msgstr "showForm() non implementata." -#: lib/adminpanelaction.php:224 +#: lib/adminpanelaction.php:235 msgid "saveSettings() not implemented." msgstr "saveSettings() non implementata." -#: lib/adminpanelaction.php:247 +#: lib/adminpanelaction.php:258 msgid "Unable to delete design setting." msgstr "Impossibile eliminare le impostazioni dell'aspetto." -#: lib/adminpanelaction.php:300 +#: lib/adminpanelaction.php:312 msgid "Basic site configuration" msgstr "Configurazione di base" -#: lib/adminpanelaction.php:303 +#: lib/adminpanelaction.php:317 msgid "Design configuration" msgstr "Configurazione aspetto" -#: lib/adminpanelaction.php:306 lib/adminpanelaction.php:309 +#: lib/adminpanelaction.php:322 lib/adminpanelaction.php:327 msgid "Paths configuration" msgstr "Configurazione percorsi" @@ -4374,11 +4368,21 @@ msgstr "Messaggi in cui appare questo allegato" msgid "Tags for this attachment" msgstr "Etichette per questo allegato" +#: lib/authenticationplugin.php:182 lib/authenticationplugin.php:187 +#, fuzzy +msgid "Password changing failed" +msgstr "Modifica della password non riuscita" + +#: lib/authenticationplugin.php:197 +#, fuzzy +msgid "Password changing is not allowed" +msgstr "La modifica della password non è permessa" + #: lib/channel.php:138 lib/channel.php:158 msgid "Command results" msgstr "Risultati comando" -#: lib/channel.php:210 +#: lib/channel.php:210 lib/mailhandler.php:142 msgid "Command complete" msgstr "Comando completato" @@ -4391,8 +4395,8 @@ msgid "Sorry, this command is not yet implemented." msgstr "Questo comando non è ancora implementato." #: lib/command.php:88 -#, php-format -msgid "Could not find a user with nickname %s" +#, fuzzy, php-format +msgid "Could not find a user with nickname %s." msgstr "Impossibile trovare un utente col soprannome %s" #: lib/command.php:92 @@ -4400,8 +4404,8 @@ msgid "It does not make a lot of sense to nudge yourself!" msgstr "Non ha molto senso se cerchi di richiamarti!" #: lib/command.php:99 -#, php-format -msgid "Nudge sent to %s" +#, fuzzy, php-format +msgid "Nudge sent to %s." msgstr "Richiamo inviato a %s" #: lib/command.php:126 @@ -4416,34 +4420,36 @@ msgstr "" "Messaggi: %3$s" #: lib/command.php:152 lib/command.php:399 lib/command.php:460 -msgid "Notice with that id does not exist" +#, fuzzy +msgid "Notice with that id does not exist." msgstr "Un messaggio con quel ID non esiste" #: lib/command.php:168 lib/command.php:415 lib/command.php:476 #: lib/command.php:532 -msgid "User has no last notice" +#, fuzzy +msgid "User has no last notice." msgstr "L'utente non ha un ultimo messaggio" #: lib/command.php:190 msgid "Notice marked as fave." msgstr "Messaggio indicato come preferito." -#: lib/command.php:315 -#, php-format -msgid "%1$s (%2$s)" -msgstr "%1$s (%2$s)" +#: lib/command.php:284 +#, fuzzy, php-format +msgid "Could not remove user %1$s to group %2$s." +msgstr "Impossibile rimuovere l'utente %s dal gruppo %s" #: lib/command.php:318 -#, php-format -msgid "Fullname: %s" +#, fuzzy, php-format +msgid "Full name: %s" msgstr "Nome completo: %s" -#: lib/command.php:321 +#: lib/command.php:321 lib/mail.php:254 #, php-format msgid "Location: %s" msgstr "Ubicazione: %s" -#: lib/command.php:324 +#: lib/command.php:324 lib/mail.php:256 #, php-format msgid "Homepage: %s" msgstr "Pagina web: %s" @@ -4454,25 +4460,17 @@ msgid "About: %s" msgstr "Informazioni: %s" #: lib/command.php:358 scripts/xmppdaemon.php:301 -#, php-format -msgid "Message too long - maximum is %d characters, you sent %d" +#, fuzzy, php-format +msgid "Message too long - maximum is %1$d characters, you sent %2$d." msgstr "Messaggio troppo lungo: massimo %d caratteri, inviati %d" #: lib/command.php:378 msgid "Error sending direct message." msgstr "Errore nell'inviare il messaggio diretto." -#: lib/command.php:422 -msgid "Cannot repeat your own notice" -msgstr "Impossibile ripetere un proprio messaggio" - -#: lib/command.php:427 -msgid "Already repeated that notice" -msgstr "Hai già ripetuto quel messaggio" - #: lib/command.php:435 -#, php-format -msgid "Notice from %s repeated" +#, fuzzy, php-format +msgid "Notice from %s repeated." msgstr "Messaggio da %s ripetuto" #: lib/command.php:437 @@ -4480,13 +4478,13 @@ msgid "Error repeating notice." msgstr "Errore nel ripetere il messaggio." #: lib/command.php:491 -#, php-format -msgid "Notice too long - maximum is %d characters, you sent %d" +#, fuzzy, php-format +msgid "Notice too long - maximum is %1$d characters, you sent %2$d." msgstr "Messaggio troppo lungo: massimo %d caratteri, inviati %d" #: lib/command.php:500 -#, php-format -msgid "Reply to %s sent" +#, fuzzy, php-format +msgid "Reply to %s sent." msgstr "Risposta a %s inviata" #: lib/command.php:502 @@ -4494,7 +4492,8 @@ msgid "Error saving notice." msgstr "Errore nel salvare il messaggio." #: lib/command.php:556 -msgid "Specify the name of the user to subscribe to" +#, fuzzy +msgid "Specify the name of the user to subscribe to." msgstr "Specifica il nome dell'utente a cui abbonarti" #: lib/command.php:563 @@ -4503,7 +4502,8 @@ msgid "Subscribed to %s" msgstr "Abbonati a %s" #: lib/command.php:584 -msgid "Specify the name of the user to unsubscribe from" +#, fuzzy +msgid "Specify the name of the user to unsubscribe from." msgstr "Specifica il nome dell'utente da cui annullare l'abbonamento" #: lib/command.php:591 @@ -4532,17 +4532,18 @@ msgid "Can't turn on notification." msgstr "Impossibile attivare le notifiche." #: lib/command.php:650 -msgid "Login command is disabled" +#, fuzzy +msgid "Login command is disabled." msgstr "Il comando di accesso è disabilitato" #: lib/command.php:664 -#, php-format -msgid "Could not create login token for %s" +#, fuzzy, php-format +msgid "Could not create login token for %s." msgstr "Impossibile creare il token di accesso per %s" #: lib/command.php:669 -#, php-format -msgid "This link is useable only once, and is good for only 2 minutes: %s" +#, fuzzy, php-format +msgid "This link is useable only once, and is good for only 2 minutes: %s." msgstr "" "Questo collegamento è utilizzabile una sola volta ed è valido solo per 2 " "minuti: %s" @@ -4775,10 +4776,6 @@ msgstr "Descrivi il gruppo o l'argomento" msgid "Describe the group or topic in %d characters" msgstr "Descrivi il gruppo o l'argomento in %d caratteri" -#: lib/groupeditform.php:172 -msgid "Description" -msgstr "Descrizione" - #: lib/groupeditform.php:179 msgid "" "Location for the group, if any, like \"City, State (or Region), Country\"" @@ -4961,21 +4958,9 @@ msgstr "" "----\n" "Modifica il tuo indirizzo email o le opzioni di notifica presso %8$s\n" -#: lib/mail.php:254 -#, php-format -msgid "Location: %s\n" -msgstr "Ubicazione: %s\n" - -#: lib/mail.php:256 -#, php-format -msgid "Homepage: %s\n" -msgstr "Pagina web: %s\n" - #: lib/mail.php:258 -#, php-format -msgid "" -"Bio: %s\n" -"\n" +#, fuzzy, php-format +msgid "Bio: %s" msgstr "" "Biografia: %s\n" "\n" @@ -5175,6 +5160,27 @@ msgstr "" msgid "from" msgstr "via" +#: lib/mailhandler.php:37 +msgid "Could not parse message." +msgstr "Impossibile analizzare il messaggio." + +#: lib/mailhandler.php:42 +msgid "Not a registered user." +msgstr "Non è un utente registrato." + +#: lib/mailhandler.php:46 +msgid "Sorry, that is not your incoming email address." +msgstr "Quella non è la tua email di ricezione." + +#: lib/mailhandler.php:50 +msgid "Sorry, no incoming email allowed." +msgstr "Email di ricezione non consentita." + +#: lib/mailhandler.php:228 +#, fuzzy, php-format +msgid "Unsupported message type: %s" +msgstr "Formato file immagine non supportato." + #: lib/mediafile.php:98 lib/mediafile.php:123 msgid "There was a database error while saving your file. Please try again." msgstr "" @@ -5209,7 +5215,8 @@ msgid "File upload stopped by extension." msgstr "Caricamento del file bloccato dall'estensione." #: lib/mediafile.php:179 lib/mediafile.php:216 -msgid "File exceeds user's quota!" +#, fuzzy +msgid "File exceeds user's quota." msgstr "Il file supera la quota dell'utente." #: lib/mediafile.php:196 lib/mediafile.php:233 @@ -5217,7 +5224,8 @@ msgid "File could not be moved to destination directory." msgstr "Impossibile spostare il file nella directory di destinazione." #: lib/mediafile.php:201 lib/mediafile.php:237 -msgid "Could not determine file's mime-type!" +#, fuzzy +msgid "Could not determine file's MIME type." msgstr "Impossibile determinare il tipo MIME del file." #: lib/mediafile.php:270 @@ -5226,8 +5234,8 @@ msgid " Try using another %s format." msgstr "Prova a usare un altro formato per %s." #: lib/mediafile.php:275 -#, php-format -msgid "%s is not a supported filetype on this server." +#, fuzzy, php-format +msgid "%s is not a supported file type on this server." msgstr "%s non è un tipo di file supportato da questo server." #: lib/messageform.php:120 @@ -5260,7 +5268,17 @@ msgid "Attach a file" msgstr "Allega un file" #: lib/noticeform.php:212 -msgid "Share your location" +#, fuzzy +msgid "Share my location." +msgstr "Impossibile salvare le etichette." + +#: lib/noticeform.php:214 +#, fuzzy +msgid "Do not share my location." +msgstr "Impossibile salvare le etichette." + +#: lib/noticeform.php:215 +msgid "Hide this info" msgstr "" #: lib/noticelist.php:428 @@ -5377,6 +5395,11 @@ msgstr "I tuoi messaggi inviati" msgid "Tags in %s's notices" msgstr "Etichette nei messaggi di %s" +#: lib/plugin.php:114 +#, fuzzy +msgid "Unknown" +msgstr "Azione sconosciuta" + #: lib/profileaction.php:109 lib/profileaction.php:192 lib/subgroupnav.php:82 msgid "Subscriptions" msgstr "Abbonamenti" @@ -5436,7 +5459,7 @@ msgstr "Famosi" #: lib/repeatform.php:107 #, fuzzy msgid "Repeat this notice?" -msgstr "Ripeti questo messaggio" +msgstr "Ripetere questo messaggio?" #: lib/repeatform.php:132 msgid "Repeat this notice" @@ -5547,10 +5570,6 @@ msgstr "Insieme delle etichette delle persone come auto-etichettate" msgid "People Tagcloud as tagged" msgstr "Insieme delle etichette delle persone come etichettate" -#: lib/subscriptionlist.php:126 -msgid "(none)" -msgstr "(nessuna)" - #: lib/tagcloudsection.php:56 msgid "None" msgstr "Nessuno" @@ -5664,19 +5683,3 @@ msgstr "%s non è un colore valido." #, php-format msgid "%s is not a valid color! Use 3 or 6 hex chars." msgstr "%s non è un colore valido. Usa 3 o 6 caratteri esadecimali." - -#: scripts/maildaemon.php:48 -msgid "Could not parse message." -msgstr "Impossibile analizzare il messaggio." - -#: scripts/maildaemon.php:53 -msgid "Not a registered user." -msgstr "Non è un utente registrato." - -#: scripts/maildaemon.php:57 -msgid "Sorry, that is not your incoming email address." -msgstr "Quella non è la tua email di ricezione." - -#: scripts/maildaemon.php:61 -msgid "Sorry, no incoming email allowed." -msgstr "Email di ricezione non consentita." diff --git a/locale/ja/LC_MESSAGES/statusnet.po b/locale/ja/LC_MESSAGES/statusnet.po index 9f8b7e590..97579cd09 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-01-03 10:37+0000\n" -"PO-Revision-Date: 2010-01-03 10:38:15+0000\n" +"POT-Creation-Date: 2010-01-10 11:27+0000\n" +"PO-Revision-Date: 2010-01-10 11:28:32+0000\n" "Language-Team: Japanese\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha (r60575); Translate extension (2009-12-06)\n" +"X-Generator: MediaWiki 1.16alpha (r60888); Translate extension (2010-01-04)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: ja\n" "X-Message-Group: out-statusnet\n" @@ -53,11 +53,6 @@ msgstr "ãã®ã‚ˆã†ãªãƒšãƒ¼ã‚¸ã¯ã‚ã‚Šã¾ã›ã‚“。" msgid "No such user." msgstr "ãã®ã‚ˆã†ãªåˆ©ç”¨è€…ã¯ã„ã¾ã›ã‚“。" -#: actions/all.php:84 -#, php-format -msgid "%s and friends, page %d" -msgstr "%s ã¨å‹äººã€%dページ" - #: actions/all.php:86 actions/all.php:167 actions/allrss.php:115 #: actions/apitimelinefriends.php:115 actions/apitimelinehome.php:115 #: lib/personalgroupnav.php:100 @@ -96,10 +91,10 @@ msgstr "" "ã—ã¦ã¿ãŸã‚Šã€ä½•ã‹æŠ•ç¨¿ã—ã¦ã¿ã¾ã—ょã†ã€‚" #: actions/all.php:134 -#, php-format +#, fuzzy, php-format msgid "" -"You can try to [nudge %s](../%s) from his profile or [post something to his " -"or her attention](%%%%action.newnotice%%%%?status_textarea=%s)." +"You can try to [nudge %1$s](../%2$s) from his profile or [post something to " +"his or her attention](%%%%action.newnotice%%%%?status_textarea=%3$s)." msgstr "" "プãƒãƒ•ã‚£ãƒ¼ãƒ«ã‹ã‚‰ [%s ã•ã‚“ã«åˆå›³](../%s) ã—ãŸã‚Šã€[知らã›ãŸã„ã“ã¨ã«ã¤ã„ã¦æŠ•ç¨¿]" "(%%%%action.newnotice%%%%?status_textarea=%s) ã—ãŸã‚Šã§ãã¾ã™ã€‚" @@ -128,6 +123,23 @@ msgstr "%2$s ã« %1$s ã¨å‹äººã‹ã‚‰ã®æ›´æ–°ãŒã‚ã‚Šã¾ã™ï¼" #: actions/apiaccountupdateprofile.php:97 #: actions/apiaccountupdateprofilebackgroundimage.php:94 #: actions/apiaccountupdateprofilecolors.php:118 +#: actions/apidirectmessage.php:156 actions/apifavoritecreate.php:99 +#: actions/apifavoritedestroy.php:100 actions/apifriendshipscreate.php:100 +#: actions/apifriendshipsdestroy.php:100 actions/apifriendshipsshow.php:129 +#: actions/apigroupcreate.php:136 actions/apigroupismember.php:114 +#: actions/apigroupjoin.php:155 actions/apigroupleave.php:141 +#: actions/apigrouplist.php:132 actions/apigrouplistall.php:120 +#: actions/apigroupmembership.php:106 actions/apigroupshow.php:105 +#: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102 +#: actions/apistatusesretweets.php:112 actions/apistatusesshow.php:108 +#: actions/apistatusnetconfig.php:133 actions/apistatusnetversion.php:93 +#: actions/apisubscriptions.php:111 actions/apitimelinefavorites.php:146 +#: actions/apitimelinefriends.php:156 actions/apitimelinegroup.php:150 +#: actions/apitimelinehome.php:156 actions/apitimelinementions.php:151 +#: actions/apitimelinepublic.php:131 actions/apitimelineretweetedbyme.php:122 +#: actions/apitimelineretweetedtome.php:121 +#: actions/apitimelineretweetsofme.php:122 actions/apitimelinetag.php:141 +#: actions/apitimelineuser.php:165 actions/apiusershow.php:101 msgid "API method not found." msgstr "API メソッドãŒè¦‹ã¤ã‹ã‚Šã¾ã›ã‚“。" @@ -187,6 +199,9 @@ msgstr "" #: actions/apiaccountupdateprofilebackgroundimage.php:146 #: actions/apiaccountupdateprofilecolors.php:164 #: actions/apiaccountupdateprofilecolors.php:174 +#: actions/groupdesignsettings.php:287 actions/groupdesignsettings.php:297 +#: actions/userdesignsettings.php:210 actions/userdesignsettings.php:220 +#: actions/userdesignsettings.php:263 actions/userdesignsettings.php:273 msgid "Unable to save your design settings." msgstr "ã‚ãªãŸã®ãƒ‡ã‚¶ã‚¤ãƒ³è¨å®šã‚’ä¿å˜ã§ãã¾ã›ã‚“。" @@ -227,26 +242,6 @@ msgstr "%s ã¸ã®ãƒ€ã‚¤ãƒ¬ã‚¯ãƒˆãƒ¡ãƒƒã‚»ãƒ¼ã‚¸" msgid "All the direct messages sent to %s" msgstr "%s ã¸é€ã£ãŸå…¨ã¦ã®ãƒ€ã‚¤ãƒ¬ã‚¯ãƒˆãƒ¡ãƒƒã‚»ãƒ¼ã‚¸" -#: actions/apidirectmessage.php:156 actions/apifavoritecreate.php:99 -#: actions/apifavoritedestroy.php:100 actions/apifriendshipscreate.php:100 -#: actions/apifriendshipsdestroy.php:100 actions/apifriendshipsshow.php:129 -#: actions/apigroupcreate.php:136 actions/apigroupismember.php:114 -#: actions/apigroupjoin.php:155 actions/apigroupleave.php:141 -#: actions/apigrouplist.php:132 actions/apigrouplistall.php:120 -#: actions/apigroupmembership.php:106 actions/apigroupshow.php:105 -#: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102 -#: actions/apistatusesretweets.php:112 actions/apistatusesshow.php:108 -#: actions/apistatusnetconfig.php:133 actions/apistatusnetversion.php:93 -#: actions/apisubscriptions.php:111 actions/apitimelinefavorites.php:146 -#: actions/apitimelinefriends.php:156 actions/apitimelinegroup.php:150 -#: actions/apitimelinehome.php:156 actions/apitimelinementions.php:151 -#: actions/apitimelinepublic.php:131 actions/apitimelineretweetedbyme.php:122 -#: actions/apitimelineretweetedtome.php:121 -#: actions/apitimelineretweetsofme.php:122 actions/apitimelinetag.php:141 -#: actions/apitimelineuser.php:165 actions/apiusershow.php:101 -msgid "API method not found!" -msgstr "API メソッドãŒè¦‹ã¤ã‹ã‚Šã¾ã›ã‚“ï¼" - #: actions/apidirectmessagenew.php:126 msgid "No message text!" msgstr "メッセージã®æœ¬æ–‡ãŒã‚ã‚Šã¾ã›ã‚“ï¼" @@ -270,7 +265,8 @@ msgid "No status found with that ID." msgstr "ãã®ï¼©ï¼¤ã®ã‚¹ãƒ†ãƒ¼ã‚¿ã‚¹ãŒè¦‹ã¤ã‹ã‚Šã¾ã›ã‚“。" #: actions/apifavoritecreate.php:119 -msgid "This status is already a favorite!" +#, fuzzy +msgid "This status is already a favorite." msgstr "ã“ã®ã‚¹ãƒ†ãƒ¼ã‚¿ã‚¹ã¯ã™ã§ã«ãŠæ°—ã«å…¥ã‚Šã§ã™!" #: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:176 @@ -278,7 +274,8 @@ msgid "Could not create favorite." msgstr "ãŠæ°—ã«å…¥ã‚Šã‚’作æˆã§ãã¾ã›ã‚“。" #: actions/apifavoritedestroy.php:122 -msgid "That status is not a favorite!" +#, fuzzy +msgid "That status is not a favorite." msgstr "ãã®ã‚¹ãƒ†ãƒ¼ã‚¿ã‚¹ã¯ãŠæ°—ã«å…¥ã‚Šã§ã¯ã‚ã‚Šã¾ã›ã‚“!" #: actions/apifavoritedestroy.php:134 actions/disfavor.php:87 @@ -300,7 +297,8 @@ msgid "Could not unfollow user: User not found." msgstr "利用者ã®ãƒ•ã‚©ãƒãƒ¼ã‚’åœæ¢ã§ãã¾ã›ã‚“ã§ã—ãŸ: 利用者ãŒè¦‹ã¤ã‹ã‚Šã¾ã›ã‚“。" #: actions/apifriendshipsdestroy.php:120 -msgid "You cannot unfollow yourself!" +#, fuzzy +msgid "You cannot unfollow yourself." msgstr "自分自身をフォãƒãƒ¼åœæ¢ã™ã‚‹ã“ã¨ã¯ã§ãã¾ã›ã‚“ï¼" #: actions/apifriendshipsexists.php:94 @@ -387,7 +385,7 @@ msgstr "別åã¯ãƒ‹ãƒƒã‚¯ãƒãƒ¼ãƒ ã¨åŒã˜ã§ã¯ã„ã‘ã¾ã›ã‚“。" msgid "Group not found!" msgstr "グループãŒè¦‹ã¤ã‹ã‚Šã¾ã›ã‚“!" -#: actions/apigroupjoin.php:110 +#: actions/apigroupjoin.php:110 actions/joingroup.php:90 lib/command.php:217 msgid "You are already a member of that group." msgstr "ã™ã§ã«ã“ã®ã‚°ãƒ«ãƒ¼ãƒ—ã®ãƒ¡ãƒ³ãƒãƒ¼ã§ã™ã€‚" @@ -395,18 +393,18 @@ msgstr "ã™ã§ã«ã“ã®ã‚°ãƒ«ãƒ¼ãƒ—ã®ãƒ¡ãƒ³ãƒãƒ¼ã§ã™ã€‚" msgid "You have been blocked from that group by the admin." msgstr "管ç†è€…ã«ã‚ˆã£ã¦ã“ã®ã‚°ãƒ«ãƒ¼ãƒ—ã‹ã‚‰ãƒ–ãƒãƒƒã‚¯ã•ã‚Œã¦ã„ã¾ã™ã€‚" -#: actions/apigroupjoin.php:138 -#, php-format -msgid "Could not join user %s to group %s." +#: actions/apigroupjoin.php:138 actions/joingroup.php:128 lib/command.php:234 +#, fuzzy, php-format +msgid "Could not join user %1$s to group %2$s." msgstr "利用者 %s ã¯ã‚°ãƒ«ãƒ¼ãƒ— %s ã«å‚åŠ ã§ãã¾ã›ã‚“。" #: actions/apigroupleave.php:114 msgid "You are not a member of this group." msgstr "ã“ã®ã‚°ãƒ«ãƒ¼ãƒ—ã®ãƒ¡ãƒ³ãƒãƒ¼ã§ã¯ã‚ã‚Šã¾ã›ã‚“。" -#: actions/apigroupleave.php:124 -#, php-format -msgid "Could not remove user %s to group %s." +#: actions/apigroupleave.php:124 actions/leavegroup.php:127 +#, fuzzy, php-format +msgid "Could not remove user %1$s from group %2$s." msgstr "利用者 %s をグループ %s ã‹ã‚‰å‰Šé™¤ã§ãã¾ã›ã‚“。" #: actions/apigrouplist.php:95 @@ -414,11 +412,6 @@ msgstr "利用者 %s をグループ %s ã‹ã‚‰å‰Šé™¤ã§ãã¾ã›ã‚“。" msgid "%s's groups" msgstr "%s ã®ã‚°ãƒ«ãƒ¼ãƒ—" -#: actions/apigrouplist.php:103 -#, php-format -msgid "Groups %s is a member of on %s." -msgstr "グループ %s 㯠%s 上ã®ãƒ¡ãƒ³ãƒãƒ¼ã§ã™ã€‚" - #: actions/apigrouplistall.php:90 actions/usergroups.php:62 #, php-format msgid "%s groups" @@ -442,11 +435,11 @@ msgstr "ä»–ã®åˆ©ç”¨è€…ã®ã‚¹ãƒ†ãƒ¼ã‚¿ã‚¹ã‚’消ã™ã“ã¨ã¯ã§ãã¾ã›ã‚“。" msgid "No such notice." msgstr "ãã®ã‚ˆã†ãªã¤ã¶ã‚„ãã¯ã‚ã‚Šã¾ã›ã‚“。" -#: actions/apistatusesretweet.php:83 +#: actions/apistatusesretweet.php:83 lib/command.php:422 msgid "Cannot repeat your own notice." msgstr "ã‚ãªãŸã®ã¤ã¶ã‚„ãã‚’ç¹°ã‚Šè¿”ã›ã¾ã›ã‚“。" -#: actions/apistatusesretweet.php:91 +#: actions/apistatusesretweet.php:91 lib/command.php:427 msgid "Already repeated that notice." msgstr "ã™ã§ã«ã¤ã¶ã‚„ãã‚’ç¹°ã‚Šè¿”ã—ã¦ã„ã¾ã™ã€‚" @@ -459,7 +452,7 @@ msgid "No status with that ID found." msgstr "ãã®ï¼©ï¼¤ã§ã®ã‚¹ãƒ†ãƒ¼ã‚¿ã‚¹ã¯ã‚ã‚Šã¾ã›ã‚“。" #: actions/apistatusesupdate.php:157 actions/newnotice.php:155 -#: scripts/maildaemon.php:71 +#: lib/mailhandler.php:60 #, php-format msgid "That's too long. Max notice size is %d chars." msgstr "é•·ã™ãŽã¾ã™ã€‚ã¤ã¶ã‚„ãã¯æœ€å¤§ 140 å—ã¾ã§ã§ã™ã€‚" @@ -478,13 +471,13 @@ msgid "Unsupported format." msgstr "サãƒãƒ¼ãƒˆå¤–ã®å½¢å¼ã§ã™ã€‚" #: actions/apitimelinefavorites.php:108 -#, php-format -msgid "%s / Favorites from %s" +#, fuzzy, php-format +msgid "%1$s / Favorites from %2$s" msgstr "%s / %s ã‹ã‚‰ã®ãŠæ°—ã«å…¥ã‚Š" #: actions/apitimelinefavorites.php:120 -#, php-format -msgid "%s updates favorited by %s / %s." +#, fuzzy, php-format +msgid "%1$s updates favorited by %2$s / %2$s." msgstr "%s 㯠%s ã§ãŠæ°—ã«å…¥ã‚Šã‚’æ›´æ–°ã—ã¾ã—㟠/ %s。" #: actions/apitimelinegroup.php:109 actions/apitimelineuser.php:118 @@ -552,8 +545,11 @@ msgstr "見ã¤ã‹ã‚Šã¾ã›ã‚“。" msgid "No such attachment." msgstr "ãã®ã‚ˆã†ãªæ·»ä»˜ã¯ã‚ã‚Šã¾ã›ã‚“。" -#: actions/avatarbynickname.php:59 actions/grouprss.php:91 -#: actions/leavegroup.php:76 +#: actions/avatarbynickname.php:59 actions/blockedfromgroup.php:73 +#: actions/editgroup.php:84 actions/groupdesignsettings.php:84 +#: actions/grouplogo.php:86 actions/groupmembers.php:76 +#: actions/grouprss.php:91 actions/joingroup.php:76 actions/leavegroup.php:76 +#: actions/showgroup.php:121 msgid "No nickname." msgstr "ニックãƒãƒ¼ãƒ ãŒã‚ã‚Šã¾ã›ã‚“。" @@ -576,8 +572,8 @@ msgid "You can upload your personal avatar. The maximum file size is %s." msgstr "自分ã®ã‚¢ãƒã‚¿ãƒ¼ã‚’アップãƒãƒ¼ãƒ‰ã§ãã¾ã™ã€‚最大サイズã¯%sã§ã™ã€‚" #: actions/avatarsettings.php:106 actions/avatarsettings.php:185 -#: actions/grouplogo.php:178 actions/remotesubscribe.php:191 -#: actions/userauthorization.php:72 actions/userrss.php:103 +#: actions/remotesubscribe.php:191 actions/userauthorization.php:72 +#: actions/userrss.php:103 msgid "User without matching profile" msgstr "åˆã£ã¦ã„るプãƒãƒ•ã‚£ãƒ¼ãƒ«ã®ãªã„利用者" @@ -609,9 +605,9 @@ msgstr "アップãƒãƒ¼ãƒ‰" msgid "Crop" msgstr "切りå–ã‚Š" -#: actions/avatarsettings.php:268 actions/disfavor.php:74 -#: actions/emailsettings.php:238 actions/favor.php:75 actions/geocode.php:50 -#: actions/groupblock.php:66 actions/grouplogo.php:309 +#: actions/avatarsettings.php:268 actions/deletenotice.php:157 +#: actions/disfavor.php:74 actions/emailsettings.php:238 actions/favor.php:75 +#: actions/geocode.php:50 actions/groupblock.php:66 actions/grouplogo.php:309 #: actions/groupunblock.php:66 actions/imsettings.php:206 #: actions/invite.php:56 actions/login.php:135 actions/makeadmin.php:66 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80 @@ -661,16 +657,20 @@ msgid "Block user" msgstr "ブãƒãƒƒã‚¯åˆ©ç”¨è€…" #: actions/block.php:130 +#, fuzzy msgid "" "Are you sure you want to block this user? Afterwards, they will be " "unsubscribed from you, unable to subscribe to you in the future, and you " "will not be notified of any @-replies from them." msgstr "" +"ã‚ãªãŸã¯ã“ã®ãƒ¦ãƒ¼ã‚¶ã‚’ブãƒãƒƒã‚¯ã—ãŸã„ã®ã‚’確信ã—ã¦ã„ã¾ã™ã‹? ãã®å¾Œã€ãれらã¯ã‚ãª" +"ãŸã‹ã‚‰ãƒ•ã‚©ãƒãƒ¼ã‚’外ã•ã‚Œã‚‹ã§ã—ょã†ã€å°†æ¥ã€ã‚ãªãŸã«ãƒ•ã‚©ãƒãƒ¼ã§ããªã„ã§ã€ã‚ãªãŸã¯" +"ã©ã‚“㪠@-返信 ã«ã¤ã„ã¦ã‚‚ãれらã‹ã‚‰é€šçŸ¥ã•ã‚Œãªã„ã§ã—ょã†ã€‚" #: actions/block.php:143 actions/deletenotice.php:145 #: actions/deleteuser.php:147 actions/groupblock.php:178 msgid "No" -msgstr "" +msgstr "No" #: actions/block.php:143 actions/deleteuser.php:147 msgid "Do not block this user" @@ -680,7 +680,7 @@ msgstr "ã“ã®ãƒ¦ãƒ¼ã‚¶ã‚’アンブãƒãƒƒã‚¯ã™ã‚‹" #: actions/deleteuser.php:148 actions/groupblock.php:179 #: lib/repeatform.php:132 msgid "Yes" -msgstr "" +msgstr "Yes" #: actions/block.php:144 actions/groupmembers.php:346 lib/blockform.php:80 msgid "Block this user" @@ -690,18 +690,14 @@ msgstr "ã“ã®ãƒ¦ãƒ¼ã‚¶ã‚’ブãƒãƒƒã‚¯ã™ã‚‹" msgid "Failed to save block information." msgstr "ブãƒãƒƒã‚¯æƒ…å ±ã®ä¿å˜ã«å¤±æ•—ã—ã¾ã—ãŸã€‚" -#: actions/blockedfromgroup.php:73 actions/editgroup.php:84 -#: actions/groupdesignsettings.php:84 actions/grouplogo.php:86 -#: actions/groupmembers.php:76 actions/joingroup.php:76 -#: actions/showgroup.php:121 -msgid "No nickname" -msgstr "ニックãƒãƒ¼ãƒ ãŒã‚ã‚Šã¾ã›ã‚“。" - #: actions/blockedfromgroup.php:80 actions/editgroup.php:96 +#: actions/foafgroup.php:44 actions/foafgroup.php:62 actions/groupblock.php:86 #: actions/groupbyid.php:83 actions/groupdesignsettings.php:97 #: actions/grouplogo.php:99 actions/groupmembers.php:83 -#: actions/joingroup.php:83 actions/showgroup.php:137 -msgid "No such group" +#: actions/grouprss.php:98 actions/groupunblock.php:86 +#: actions/joingroup.php:83 actions/leavegroup.php:83 actions/makeadmin.php:86 +#: actions/showgroup.php:137 lib/command.php:212 lib/command.php:263 +msgid "No such group." msgstr "ãã®ã‚ˆã†ãªã‚°ãƒ«ãƒ¼ãƒ—ã¯ã‚ã‚Šã¾ã›ã‚“。" #: actions/blockedfromgroup.php:90 @@ -710,8 +706,8 @@ msgid "%s blocked profiles" msgstr "%s ブãƒãƒƒã‚¯ã•ã‚ŒãŸãƒ—ãƒãƒ•ã‚¡ã‚¤ãƒ«" #: actions/blockedfromgroup.php:93 -#, php-format -msgid "%s blocked profiles, page %d" +#, fuzzy, php-format +msgid "%1$s blocked profiles, page %2$d" msgstr "%s ブãƒãƒƒã‚¯ã•ã‚ŒãŸãƒ—ãƒãƒ•ã‚¡ã‚¤ãƒ«ã€ãƒšãƒ¼ã‚¸ %d" #: actions/blockedfromgroup.php:108 @@ -805,6 +801,8 @@ msgid "" "You are about to permanently delete a notice. Once this is done, it cannot " "be undone." msgstr "" +"ã‚ãªãŸã¯æ°¸ä¹…ã«ã¤ã¶ã‚„ãを削除ã—よã†ã¨ã—ã¦ã„ã¾ã™ã€‚ ã“ã‚ŒãŒå®Œäº†ã™ã‚‹ã¨ãれを元ã«æˆ»" +"ã™ã“ã¨ã¯ã§ãã¾ã›ã‚“。" #: actions/deletenotice.php:109 actions/deletenotice.php:141 msgid "Delete notice" @@ -822,10 +820,6 @@ msgstr "ã“ã®ã¤ã¶ã‚„ãを削除ã§ãã¾ã›ã‚“。" msgid "Delete this notice" msgstr "ã“ã®ã¤ã¶ã‚„ãを削除" -#: actions/deletenotice.php:157 -msgid "There was a problem with your session token. Try again, please." -msgstr "ã‚ãªãŸã®ã‚»ãƒƒã‚·ãƒ§ãƒ³ãƒˆãƒ¼ã‚¯ãƒ³ã«å•é¡ŒãŒã‚ã‚Šã¾ã—ãŸã€‚å†åº¦ãŠè©¦ã—ãã ã•ã„。" - #: actions/deleteuser.php:67 msgid "You cannot delete users." msgstr "利用者を削除ã§ãã¾ã›ã‚“" @@ -843,13 +837,15 @@ msgid "" "Are you sure you want to delete this user? This will clear all data about " "the user from the database, without a backup." msgstr "" +"ã‚ãªãŸã¯æœ¬å½“ã«ã“ã®åˆ©ç”¨è€…を削除ã—ãŸã„ã§ã™ã‹? ã“ã‚Œã¯ãƒãƒƒã‚¯ã‚¢ãƒƒãƒ—ãªã—ã§ãƒ‡ãƒ¼ã‚¿" +"ベースã‹ã‚‰åˆ©ç”¨è€…ã«é–¢ã™ã‚‹ã™ã¹ã¦ã®ãƒ‡ãƒ¼ã‚¿ã‚’クリアã—ã¾ã™ã€‚" #: actions/deleteuser.php:148 lib/deleteuserform.php:77 msgid "Delete this user" msgstr "ã“ã®ãƒ¦ãƒ¼ã‚¶ãƒ¼ã‚’削除" #: actions/designadminpanel.php:62 lib/accountsettingsaction.php:124 -#: lib/adminpanelaction.php:302 lib/groupnav.php:119 +#: lib/adminpanelaction.php:316 lib/groupnav.php:119 msgid "Design" msgstr "デザイン" @@ -989,7 +985,8 @@ msgstr "グループを作るã«ã¯ãƒã‚°ã‚¤ãƒ³ã—ã¦ã„ãªã‘ã‚Œã°ãªã‚Šã¾ã› #: actions/editgroup.php:103 actions/editgroup.php:168 #: actions/groupdesignsettings.php:104 actions/grouplogo.php:106 -msgid "You must be an admin to edit the group" +#, fuzzy +msgid "You must be an admin to edit the group." msgstr "グループを編集ã™ã‚‹ã«ã¯ç®¡ç†è€…ã§ã‚ã‚‹å¿…è¦ãŒã‚ã‚Šã¾ã™ã€‚" #: actions/editgroup.php:154 @@ -1014,7 +1011,8 @@ msgid "Options saved." msgstr "オプションãŒä¿å˜ã•ã‚Œã¾ã—ãŸã€‚" #: actions/emailsettings.php:60 -msgid "Email Settings" +#, fuzzy +msgid "Email settings" msgstr "メールè¨å®š" #: actions/emailsettings.php:71 @@ -1051,7 +1049,8 @@ msgid "Cancel" msgstr "ä¸æ¢" #: actions/emailsettings.php:121 -msgid "Email Address" +#, fuzzy +msgid "Email address" msgstr "メールアドレス" #: actions/emailsettings.php:123 @@ -1077,7 +1076,7 @@ msgstr "投稿ã®ãŸã‚ã®æ–°ã—ã„Eメールアドレスを作りã¾ã™; å¤ã„ #: actions/emailsettings.php:148 actions/smssettings.php:164 msgid "New" -msgstr "" +msgstr "New" #: actions/emailsettings.php:153 actions/imsettings.php:139 #: actions/smssettings.php:169 @@ -1128,9 +1127,10 @@ msgstr "メールアドレスãŒã‚ã‚Šã¾ã›ã‚“。" msgid "Cannot normalize that email address" msgstr "ãã®ãƒ¡ãƒ¼ãƒ«ã‚¢ãƒ‰ãƒ¬ã‚¹ã‚’æ£è¦åŒ–ã§ãã¾ã›ã‚“" -#: actions/emailsettings.php:331 actions/siteadminpanel.php:157 -msgid "Not a valid email address" -msgstr "æ£ã—ã„メールアドレスã§ã¯ã‚ã‚Šã¾ã›ã‚“" +#: actions/emailsettings.php:331 actions/register.php:201 +#: actions/siteadminpanel.php:157 +msgid "Not a valid email address." +msgstr "有効ãªãƒ¡ãƒ¼ãƒ«ã‚¢ãƒ‰ãƒ¬ã‚¹ã§ã¯ã‚ã‚Šã¾ã›ã‚“。" #: actions/emailsettings.php:334 msgid "That is already your email address." @@ -1227,6 +1227,8 @@ msgid "" "Be the first to add a notice to your favorites by clicking the fave button " "next to any notice you like." msgstr "" +"ã‚ãªãŸã®å¥½ããªã¤ã¶ã‚„ãã‚’ã€ãŠæ°—ã«å…¥ã‚Šãƒœã‚¿ãƒ³ã‚’クリックã—ã¦ã‚ãªãŸã®ãŠæ°—ã«å…¥ã‚Šã«" +"åŠ ãˆã‚‹æœ€åˆã«ãªã£ã¦ãã ã•ã„。" #: actions/favorited.php:156 #, php-format @@ -1234,6 +1236,8 @@ msgid "" "Why not [register an account](%%action.register%%) and be the first to add a " "notice to your favorites!" msgstr "" +"ãªãœ [アカウント登録](%%action.register%%) ã—ãªã„ã®ã§ã™ã‹ã€ãã—ã¦ã€ã‚ãªãŸã®ãŠ" +"æ°—ã«å…¥ã‚Šã«ã¤ã¶ã‚„ãã‚’åŠ ãˆã‚‹æœ€åˆã«ãªã‚Šã¾ã—ょã†!" #: actions/favoritesrss.php:111 actions/showfavorites.php:77 #: lib/personalgroupnav.php:115 @@ -1310,18 +1314,11 @@ msgstr "" msgid "Error updating remote profile" msgstr "リモートプãƒãƒ•ã‚¡ã‚¤ãƒ«æ›´æ–°ã‚¨ãƒ©ãƒ¼" -#: actions/foafgroup.php:44 actions/foafgroup.php:62 actions/groupblock.php:86 -#: actions/grouprss.php:98 actions/groupunblock.php:86 -#: actions/leavegroup.php:83 actions/makeadmin.php:86 lib/command.php:212 -#: lib/command.php:263 -msgid "No such group." -msgstr "ãã®ã‚ˆã†ãªã‚°ãƒ«ãƒ¼ãƒ—ã¯ã‚ã‚Šã¾ã›ã‚“。" - -#: actions/getfile.php:75 +#: actions/getfile.php:79 msgid "No such file." msgstr "ãã®ã‚ˆã†ãªãƒ•ã‚¡ã‚¤ãƒ«ã¯ã‚ã‚Šã¾ã›ã‚“。" -#: actions/getfile.php:79 +#: actions/getfile.php:83 msgid "Cannot read file." msgstr "ファイルをèªã¿è¾¼ã‚ã¾ã›ã‚“。" @@ -1333,7 +1330,7 @@ msgstr "プãƒãƒ•ã‚¡ã‚¤ãƒ«è¨˜è¿°ãŒã‚ã‚Šã¾ã›ã‚“。" #: actions/groupblock.php:76 actions/groupunblock.php:76 #: actions/makeadmin.php:76 actions/subedit.php:53 actions/tagother.php:46 -#: lib/profileformaction.php:77 +#: actions/unsubscribe.php:84 lib/profileformaction.php:77 msgid "No profile with that ID." msgstr "ãã®ï¼©ï¼¤ã®ãƒ—ãƒãƒ•ã‚¡ã‚¤ãƒ«ãŒã‚ã‚Šã¾ã›ã‚“。" @@ -1359,11 +1356,11 @@ msgid "Block user from group" msgstr "グループã‹ã‚‰ãƒ–ãƒãƒƒã‚¯ã•ã‚ŒãŸåˆ©ç”¨è€…" #: actions/groupblock.php:162 -#, php-format +#, fuzzy, php-format msgid "" -"Are you sure you want to block user \"%s\" from the group \"%s\"? They will " -"be removed from the group, unable to post, and unable to subscribe to the " -"group in the future." +"Are you sure you want to block user \"%1$s\" from the group \"%2$s\"? They " +"will be removed from the group, unable to post, and unable to subscribe to " +"the group in the future." msgstr "" "本当ã«åˆ©ç”¨è€… %s をグループ %s ã‹ã‚‰ãƒ–ãƒãƒƒã‚¯ã—ã¾ã™ã‹? 彼らã¯ã‚°ãƒ«ãƒ¼ãƒ—ã‹ã‚‰å‰Šé™¤ã•" "れるã€æŠ•ç¨¿ã§ããªã„ã€ã‚°ãƒ«ãƒ¼ãƒ—をフォãƒãƒ¼ã§ããªããªã‚Šã¾ã™ã€‚" @@ -1380,9 +1377,9 @@ msgstr "ã“ã®ã‚°ãƒ«ãƒ¼ãƒ—ã‹ã‚‰ã“ã®ãƒ¦ãƒ¼ã‚¶ã‚’ブãƒãƒƒã‚¯" msgid "Database error blocking user from group." msgstr "グループã‹ã‚‰åˆ©ç”¨è€…ブãƒãƒƒã‚¯ã®ãƒ‡ãƒ¼ã‚¿ãƒ™ãƒ¼ã‚¹ã‚¨ãƒ©ãƒ¼" -#: actions/groupbyid.php:74 -msgid "No ID" -msgstr "ＩＤãŒã‚ã‚Šã¾ã›ã‚“" +#: actions/groupbyid.php:74 actions/userbyid.php:70 +msgid "No ID." +msgstr "ID ãŒã‚ã‚Šã¾ã›ã‚“。" #: actions/groupdesignsettings.php:68 msgid "You must be logged in to edit a group." @@ -1405,12 +1402,6 @@ msgstr "" msgid "Couldn't update your design." msgstr "ã‚ãªãŸã®ãƒ‡ã‚¶ã‚¤ãƒ³ã‚’æ›´æ–°ã§ãã¾ã›ã‚“。" -#: actions/groupdesignsettings.php:287 actions/groupdesignsettings.php:297 -#: actions/userdesignsettings.php:210 actions/userdesignsettings.php:220 -#: actions/userdesignsettings.php:263 actions/userdesignsettings.php:273 -msgid "Unable to save your design settings!" -msgstr "ã‚ãªãŸã®ãƒ‡ã‚¶ã‚¤ãƒ³è¨å®šã‚’ä¿å˜ã§ãã¾ã›ã‚“!" - #: actions/groupdesignsettings.php:308 actions/userdesignsettings.php:231 msgid "Design preferences saved." msgstr "デザインè¨å®šãŒä¿å˜ã•ã‚Œã¾ã—ãŸã€‚" @@ -1427,6 +1418,11 @@ msgstr "" "ã‚ãªãŸã®ã‚°ãƒ«ãƒ¼ãƒ—用ã«ãƒã‚´ã‚¤ãƒ¡ãƒ¼ã‚¸ã‚’アップãƒãƒ¼ãƒ‰ã§ãã¾ã™ã€‚最大ファイルサイズ㯠" "%s。" +#: actions/grouplogo.php:178 +#, fuzzy +msgid "User without matching profile." +msgstr "åˆã£ã¦ã„るプãƒãƒ•ã‚£ãƒ¼ãƒ«ã®ãªã„利用者" + #: actions/grouplogo.php:362 msgid "Pick a square area of the image to be the logo." msgstr "ãƒã‚´ã¨ãªã‚‹ã‚¤ãƒ¡ãƒ¼ã‚¸ã®æ£æ–¹å½¢ã‚’é¸æŠžã€‚" @@ -1445,15 +1441,15 @@ msgid "%s group members" msgstr "%s グループメンãƒãƒ¼" #: actions/groupmembers.php:96 -#, php-format -msgid "%s group members, page %d" +#, fuzzy, php-format +msgid "%1$s group members, page %2$d" msgstr "%s グループメンãƒãƒ¼ã€ãƒšãƒ¼ã‚¸ %d" #: actions/groupmembers.php:111 msgid "A list of the users in this group." msgstr "ã“ã®ã‚°ãƒ«ãƒ¼ãƒ—ã®åˆ©ç”¨è€…ã®ãƒªã‚¹ãƒˆã€‚" -#: actions/groupmembers.php:175 lib/action.php:441 lib/groupnav.php:107 +#: actions/groupmembers.php:175 lib/action.php:442 lib/groupnav.php:107 msgid "Admin" msgstr "管ç†è€…" @@ -1497,6 +1493,11 @@ msgid "" "for one](%%%%action.groupsearch%%%%) or [start your own!](%%%%action.newgroup" "%%%%)" msgstr "" +"%%%%site.name%%%% グループã¯ã€ã‚ãªãŸã¨åŒæ§˜ã®é–¢å¿ƒäº‹ã‚’ã‚‚ã¤äººã€…を見ã¤ã‘ã¦è©±ã‚’ã™" +"ã‚‹ã“ã¨ãŒã§ãã¾ã™ã€‚グループã«å…¥ã£ãŸå¾Œã€ã‚ãªãŸã¯ä»–ã®ãƒ¡ãƒ³ãƒãƒ¼ã« \"!groupname\" " +"文法を使ã£ã¦ãƒ¡ãƒƒã‚»ãƒ¼ã‚¸ã‚’é€ã‚‹ã“ã¨ãŒã§ãã¾ã™ã€‚ã‚ãªãŸãŒå¥½ããªã‚°ãƒ«ãƒ¼ãƒ—ãŒã‚ã‚‹ã‹ã©" +"ã†ã‹[探ã—ã¦ã¿ã‚‹](%%%%action.groupsearch%%%%)ã‹ã€ã‚ãªãŸè‡ªèº«ã§[始ã‚ã¦ãã ã•ã„!]" +"(%%%%action.newgroup%%%%)" #: actions/groups.php:107 actions/usergroups.php:124 lib/groupeditform.php:122 msgid "Create a new group" @@ -1551,7 +1552,8 @@ msgid "Error removing the block." msgstr "ブãƒãƒƒã‚¯ã®å‰Šé™¤ã‚¨ãƒ©ãƒ¼" #: actions/imsettings.php:59 -msgid "IM Settings" +#, fuzzy +msgid "IM settings" msgstr "IMè¨å®š" #: actions/imsettings.php:70 @@ -1581,7 +1583,8 @@ msgstr "" "ãŸãƒ¡ãƒƒã‚»ãƒ¼ã‚¸ã‚’確èªã—ã¦ãã ã•ã„。(%s ã‚’å‹äººãƒªã‚¹ãƒˆã«è¿½åŠ ã—ã¾ã—ãŸã‹ï¼Ÿ)" #: actions/imsettings.php:124 -msgid "IM Address" +#, fuzzy +msgid "IM address" msgstr "IMアドレス" #: actions/imsettings.php:126 @@ -1604,10 +1607,12 @@ msgstr "Jabber/GTalkã®ã‚¹ãƒ†ãƒ¼ã‚¿ã‚¹ãŒå¤‰æ›´ã•ã‚ŒãŸæ™‚ã«é€šçŸ¥ã‚’é€ã‚‹ã€‚ #: actions/imsettings.php:153 msgid "Send me replies through Jabber/GTalk from people I'm not subscribed to." msgstr "" +"Jabber/GTalkを通ã—ã¦å›žç”ã‚’ã€ç§ãŒãƒ•ã‚©ãƒãƒ¼ã•ã‚Œã¦ã„ãªã„人々ã‹ã‚‰ç§ã«é€ã£ã¦ãã ã•" +"ã„。" #: actions/imsettings.php:159 msgid "Publish a MicroID for my Jabber/GTalk address." -msgstr "" +msgstr "ç§ã®Jabber/GTalkアドレスã®ãŸã‚ã«MicroIDを発行ã—ã¦ãã ã•ã„。" #: actions/imsettings.php:285 msgid "No Jabber ID." @@ -1642,11 +1647,6 @@ msgstr "" msgid "That is not your Jabber ID." msgstr "ãã® Jabber ID ã¯ã‚ãªãŸã®ã‚‚ã®ã§ã¯ã‚ã‚Šã¾ã›ã‚“。" -#: actions/inbox.php:59 -#, php-format -msgid "Inbox for %s - page %d" -msgstr "%s ã®å—ä¿¡ç®± - ページ %d" - #: actions/inbox.php:62 #, php-format msgid "Inbox for %s" @@ -1683,10 +1683,10 @@ msgstr "æ–°ã—ã„利用者を招待" msgid "You are already subscribed to these users:" msgstr "ã™ã§ã«ã“れらã®åˆ©ç”¨è€…をフォãƒãƒ¼ã—ã¦ã„ã¾ã™:" -#: actions/invite.php:131 actions/invite.php:139 +#: actions/invite.php:131 actions/invite.php:139 lib/command.php:315 #, php-format -msgid "%s (%s)" -msgstr "%s (%s)" +msgid "%1$s (%2$s)" +msgstr "" #: actions/invite.php:136 msgid "" @@ -1729,7 +1729,7 @@ msgstr "パーソナルメッセージ" msgid "Optionally add a personal message to the invitation." msgstr "ä»»æ„ã«æ‹›å¾…ã«ãƒ‘ãƒ¼ã‚½ãƒŠãƒ«ãƒ¡ãƒƒã‚»ãƒ¼ã‚¸ã‚’åŠ ãˆã¦ãã ã•ã„。" -#: actions/invite.php:197 lib/messageform.php:178 lib/noticeform.php:232 +#: actions/invite.php:197 lib/messageform.php:178 lib/noticeform.php:234 msgid "Send" msgstr "é€ã‚‹" @@ -1799,18 +1799,9 @@ msgstr "" msgid "You must be logged in to join a group." msgstr "グループã«å…¥ã‚‹ãŸã‚ã«ã¯ãƒã‚°ã‚¤ãƒ³ã—ãªã‘ã‚Œã°ãªã‚Šã¾ã›ã‚“。" -#: actions/joingroup.php:90 lib/command.php:217 -msgid "You are already a member of that group" -msgstr "ã‚ãªãŸã¯æ—¢ã«ãã®ã‚°ãƒ«ãƒ¼ãƒ—ã«å‚åŠ ã—ã¦ã„ã¾ã™ã€‚" - -#: actions/joingroup.php:128 lib/command.php:234 -#, php-format -msgid "Could not join user %s to group %s" -msgstr "利用者 %s ã¯ã‚°ãƒ«ãƒ¼ãƒ— %s ã«å‚åŠ ã§ãã¾ã›ã‚“" - #: actions/joingroup.php:135 lib/command.php:239 -#, php-format -msgid "%s joined group %s" +#, fuzzy, php-format +msgid "%1$s joined group %2$s" msgstr "%s ã¯ã‚°ãƒ«ãƒ¼ãƒ— %s ã«å‚åŠ ã—ã¾ã—ãŸ" #: actions/leavegroup.php:60 @@ -1825,14 +1816,9 @@ msgstr "ã‚ãªãŸã¯ãã®ã‚°ãƒ«ãƒ¼ãƒ—ã®ãƒ¡ãƒ³ãƒãƒ¼ã§ã¯ã‚ã‚Šã¾ã›ã‚“。" msgid "Could not find membership record." msgstr "ä¼šå“¡è³‡æ ¼è¨˜éŒ²ã‚’è¦‹ã¤ã‘ã‚‹ã“ã¨ãŒã§ãã¾ã›ã‚“ã§ã—ãŸã€‚" -#: actions/leavegroup.php:127 lib/command.php:284 -#, php-format -msgid "Could not remove user %s to group %s" -msgstr "利用者 %s をグループ %s ã‹ã‚‰å‰Šé™¤ã™ã‚‹ã“ã¨ãŒã§ãã¾ã›ã‚“" - #: actions/leavegroup.php:134 lib/command.php:289 -#, php-format -msgid "%s left group %s" +#, fuzzy, php-format +msgid "%1$s left group %2$s" msgstr "%s ã¯ã‚°ãƒ«ãƒ¼ãƒ— %s ã«æ®‹ã‚Šã¾ã—ãŸã€‚" #: actions/login.php:83 actions/register.php:137 @@ -1851,7 +1837,7 @@ msgstr "ユーザåã¾ãŸã¯ãƒ‘スワードãŒé–“é•ã£ã¦ã„ã¾ã™ã€‚" msgid "Error setting user. You are probably not authorized." msgstr "ユーザè¨å®šã‚¨ãƒ©ãƒ¼ã€‚ ã‚ãªãŸã¯ãŸã¶ã‚“承èªã•ã‚Œã¦ã„ã¾ã›ã‚“。" -#: actions/login.php:208 actions/login.php:261 lib/action.php:459 +#: actions/login.php:208 actions/login.php:261 lib/action.php:460 #: lib/logingroupnav.php:79 msgid "Login" msgstr "ãƒã‚°ã‚¤ãƒ³" @@ -1905,18 +1891,18 @@ msgid "Only an admin can make another user an admin." msgstr "管ç†è€…ã ã‘ãŒåˆ¥ã®ãƒ¦ãƒ¼ã‚¶ã‚’管ç†è€…ã«ã™ã‚‹ã“ã¨ãŒã§ãã¾ã™ã€‚" #: actions/makeadmin.php:95 -#, php-format -msgid "%s is already an admin for group \"%s\"." +#, fuzzy, php-format +msgid "%1$s is already an admin for group \"%2$s\"." msgstr "%s ã¯ã™ã§ã«ã‚°ãƒ«ãƒ¼ãƒ— \"%s\" ã®ç®¡ç†è€…ã§ã™ã€‚" #: actions/makeadmin.php:132 -#, php-format -msgid "Can't get membership record for %s in group %s" +#, fuzzy, php-format +msgid "Can't get membership record for %1$s in group %2$s." msgstr "%s ã®ä¼šå“¡è³‡æ ¼è¨˜éŒ²ã‚’グループ %s ä¸ã‹ã‚‰å–å¾—ã§ãã¾ã›ã‚“。" #: actions/makeadmin.php:145 -#, php-format -msgid "Can't make %s an admin for group %s" +#, fuzzy, php-format +msgid "Can't make %1$s an admin for group %2$s." msgstr "%s をグループ %s ã®ç®¡ç†è€…ã«ã™ã‚‹ã“ã¨ã¯ã§ãã¾ã›ã‚“" #: actions/microsummary.php:69 @@ -1959,8 +1945,8 @@ msgid "Message sent" msgstr "メッセージをé€ã‚Šã¾ã—ãŸ" #: actions/newmessage.php:185 lib/command.php:376 -#, php-format -msgid "Direct message to %s sent" +#, fuzzy, php-format +msgid "Direct message to %s sent." msgstr "ダイレクトメッセージを %s ã«é€ã‚Šã¾ã—ãŸ" #: actions/newmessage.php:210 actions/newnotice.php:245 lib/channel.php:170 @@ -1988,8 +1974,8 @@ msgid "Text search" msgstr "テã‚スト検索" #: actions/noticesearch.php:91 -#, php-format -msgid "Search results for \"%s\" on %s" +#, fuzzy, php-format +msgid "Search results for \"%1$s\" on %2$s" msgstr "%s ã® %s 上ã®æ¤œç´¢çµæžœ" #: actions/noticesearch.php:121 @@ -2097,11 +2083,6 @@ msgstr "プãƒãƒ•ã‚¡ã‚¤ãƒ«ãƒ‡ã‚¶ã‚¤ãƒ³ã®è¡¨ç¤ºã¾ãŸã¯éžè¡¨ç¤º" msgid "URL shortening service is too long (max 50 chars)." msgstr "URL çŸç¸®ã‚µãƒ¼ãƒ“スãŒé•·ã™ãŽã¾ã™ã€‚（最大50å—）" -#: actions/outbox.php:58 -#, php-format -msgid "Outbox for %s - page %d" -msgstr "%s ã®é€ä¿¡ç®± - ページ %d" - #: actions/outbox.php:61 #, php-format msgid "Outbox for %s" @@ -2174,7 +2155,7 @@ msgstr "æ–°ã—ã„パスワードをä¿å˜ã§ãã¾ã›ã‚“。" msgid "Password saved." msgstr "パスワードãŒä¿å˜ã•ã‚Œã¾ã—ãŸã€‚" -#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:308 +#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:326 msgid "Paths" msgstr "パス" @@ -2207,7 +2188,7 @@ msgid "Invalid SSL server. The maximum length is 255 characters." msgstr "ä¸æ£ãª SSL サーãƒãƒ¼ã€‚最大 255 æ–‡å—ã¾ã§ã€‚" #: actions/pathsadminpanel.php:217 actions/siteadminpanel.php:58 -#: lib/adminpanelaction.php:299 +#: lib/adminpanelaction.php:311 msgid "Site" msgstr "サイト" @@ -2300,7 +2281,8 @@ msgid "When to use SSL" msgstr "SSL 使用時" #: actions/pathsadminpanel.php:308 -msgid "SSL Server" +#, fuzzy +msgid "SSL server" msgstr "SSLサーãƒ" #: actions/pathsadminpanel.php:309 @@ -2330,8 +2312,8 @@ msgid "Not a valid people tag: %s" msgstr "æ£ã—ã„ã‚¿ã‚°ã§ã¯ã‚ã‚Šã¾ã›ã‚“： %s" #: actions/peopletag.php:144 -#, php-format -msgid "Users self-tagged with %s - page %d" +#, fuzzy, php-format +msgid "Users self-tagged with %1$s - page %2$d" msgstr "ユーザãŒã¤ã‘ãŸã‚¿ã‚° %s - ページ %d" #: actions/postnotice.php:84 @@ -2339,8 +2321,8 @@ msgid "Invalid notice content" msgstr "ä¸æ£ãªã¤ã¶ã‚„ã内容" #: actions/postnotice.php:90 -#, php-format -msgid "Notice license ‘%s’ is not compatible with site license ‘%s’." +#, fuzzy, php-format +msgid "Notice license ‘%1$s’ is not compatible with site license ‘%2$s’." msgstr "ã¤ã¶ã‚„ãライセンス ‘%s’ ã¯ã‚µã‚¤ãƒˆãƒ©ã‚¤ã‚»ãƒ³ã‚¹ ‘%s’ ã¨äº’æ›æ€§ãŒã‚ã‚Šã¾ã›ã‚“。" #: actions/profilesettings.php:60 @@ -2403,7 +2385,7 @@ msgstr "自分ã®ã„ã‚‹å ´æ‰€ã€‚ä¾‹ï¼šã€Œéƒ½å¸‚, 都é“府県 (ã¾ãŸã¯åœ°åŸŸ), #: actions/profilesettings.php:138 msgid "Share my current location when posting notices" -msgstr "" +msgstr "ã¤ã¶ã‚„ãを投稿ã™ã‚‹ã¨ãã«ã¯ç§ã®ç¾åœ¨ã®å ´æ‰€ã‚’共有ã—ã¦ãã ã•ã„" #: actions/profilesettings.php:145 actions/tagother.php:149 #: actions/tagother.php:209 lib/subscriptionlist.php:106 @@ -2461,20 +2443,20 @@ msgstr "ä¸æ£ãªã‚¿ã‚°: \"%s\"" msgid "Couldn't update user for autosubscribe." msgstr "自動フォãƒãƒ¼ã®ãŸã‚ã®åˆ©ç”¨è€…ã‚’æ›´æ–°ã§ãã¾ã›ã‚“ã§ã—ãŸã€‚" -#: actions/profilesettings.php:354 +#: actions/profilesettings.php:359 #, fuzzy msgid "Couldn't save location prefs." -msgstr "ã‚¿ã‚°ã‚’ä¿å˜ã§ãã¾ã›ã‚“。" +msgstr "å ´æ‰€æƒ…å ±ã‚’ä¿å˜ã§ãã¾ã›ã‚“。" -#: actions/profilesettings.php:366 +#: actions/profilesettings.php:371 msgid "Couldn't save profile." msgstr "プãƒãƒ•ã‚¡ã‚¤ãƒ«ã‚’ä¿å˜ã§ãã¾ã›ã‚“" -#: actions/profilesettings.php:374 +#: actions/profilesettings.php:379 msgid "Couldn't save tags." msgstr "ã‚¿ã‚°ã‚’ä¿å˜ã§ãã¾ã›ã‚“。" -#: actions/profilesettings.php:382 lib/adminpanelaction.php:126 +#: actions/profilesettings.php:387 lib/adminpanelaction.php:137 msgid "Settings saved." msgstr "è¨å®šãŒä¿å˜ã•ã‚Œã¾ã—ãŸã€‚" @@ -2538,7 +2520,7 @@ msgid "" "friends, family, and colleagues! ([Read more](%%doc.help%%))" msgstr "" "ã“れ㯠%%site.name%% ã§ã™ã€‚フリーソフトウェアツール[StatusNet](http://status." -"net/)を基ã«ã—ãŸ[マイクãƒãƒ–ãƒã‚®ãƒ³ã‚°](http: //en.wikipedia.org/wiki/Micro-" +"net/)を基ã«ã—ãŸ[マイクãƒãƒ–ãƒã‚®ãƒ³ã‚°](http://en.wikipedia.org/wiki/Micro-" "blogging) サービス。[今ã™ãå‚åŠ ](%%action.register%%)ã—ã¦ã‚ãªãŸè‡ªèº«ã‚„å‹é”ã€å®¶" "æ—ãã—ã¦åŒåƒšãªã©ã«ã¤ã„ã¦ã®ã¤ã¶ã‚„ãを共有ã—ã¾ã—ょã†! ([ã‚‚ã£ã¨èªã‚€](%%doc.help%" "%))" @@ -2582,7 +2564,7 @@ msgstr "" "ãªãœ [アカウント登録](%%action.register%%) ã—ãªã„ã®ã§ã™ã‹ã€‚ãã—ã¦æœ€åˆã®æŠ•ç¨¿ã‚’" "ã—ã¦ãã ã•ã„!" -#: actions/publictagcloud.php:135 +#: actions/publictagcloud.php:131 msgid "Tag cloud" msgstr "タグクラウド" @@ -2720,7 +2702,7 @@ msgstr "ã™ã¿ã¾ã›ã‚“ã€ä¸æ£ãªæ‹›å¾…コード。" msgid "Registration successful" msgstr "登録æˆåŠŸ" -#: actions/register.php:114 actions/register.php:502 lib/action.php:456 +#: actions/register.php:114 actions/register.php:502 lib/action.php:457 #: lib/logingroupnav.php:85 msgid "Register" msgstr "登録" @@ -2733,10 +2715,6 @@ msgstr "登録ã¯è¨±å¯ã•ã‚Œã¦ã„ã¾ã›ã‚“。" msgid "You can't register if you don't agree to the license." msgstr "ライセンスã«åŒæ„é ‚ã‘ãªã„å ´åˆã¯ç™»éŒ²ã§ãã¾ã›ã‚“。" -#: actions/register.php:201 -msgid "Not a valid email address." -msgstr "有効ãªãƒ¡ãƒ¼ãƒ«ã‚¢ãƒ‰ãƒ¬ã‚¹ã§ã¯ã‚ã‚Šã¾ã›ã‚“。" - #: actions/register.php:212 msgid "Email address already exists." msgstr "メールアドレスãŒæ—¢ã«å˜åœ¨ã—ã¾ã™ã€‚" @@ -2794,12 +2772,12 @@ msgid "" msgstr "å€‹äººæƒ…å ±ã‚’é™¤ã: パスワードã€ãƒ¡ãƒ¼ãƒ«ã‚¢ãƒ‰ãƒ¬ã‚¹ã€IMアドレスã€é›»è©±ç•ªå·" #: actions/register.php:537 -#, php-format +#, fuzzy, php-format msgid "" -"Congratulations, %s! And welcome to %%%%site.name%%%%. From here, you may " +"Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may " "want to...\n" "\n" -"* Go to [your profile](%s) and post your first message.\n" +"* Go to [your profile](%2$s) and post your first message.\n" "* Add a [Jabber/GTalk address](%%%%action.imsettings%%%%) so you can send " "notices through instant messages.\n" "* [Search for people](%%%%action.peoplesearch%%%%) that you may know or that " @@ -2924,11 +2902,6 @@ msgstr "ç¹°ã‚Šè¿”ã•ã‚Œã¾ã—ãŸ!" msgid "Replies to %s" msgstr "%s ã¸ã®è¿”ä¿¡" -#: actions/replies.php:127 -#, php-format -msgid "Replies to %s, page %d" -msgstr "%s ã¸ã®è¿”ä¿¡ã€ãƒšãƒ¼ã‚¸ %d" - #: actions/replies.php:144 #, php-format msgid "Replies feed for %s (RSS 1.0)" @@ -2945,10 +2918,10 @@ msgid "Replies feed for %s (Atom)" msgstr "%s ã®è¿”信フィード (Atom)" #: actions/replies.php:198 -#, php-format +#, fuzzy, php-format msgid "" -"This is the timeline showing replies to %s but %s hasn't received a notice " -"to his attention yet." +"This is the timeline showing replies to %1$s but %2$s hasn't received a " +"notice to his attention yet." msgstr "" "ã“れ㯠%s ã¸ã®è¿”信を表示ã—ãŸã‚¿ã‚¤ãƒ ラインã§ã™ã€ã—ã‹ã— %s ã¯ã¾ã ã¤ã¶ã‚„ãã‚’å—ã‘" "å–ã£ã¦ã„ã¾ã›ã‚“。" @@ -2963,10 +2936,10 @@ msgstr "" "ループã«åŠ ã‚ã‚‹] (%%action.groups%%)ã“ã¨ãŒã§ãã¾ã™ã€‚" #: actions/replies.php:205 -#, php-format +#, fuzzy, php-format msgid "" -"You can try to [nudge %s](../%s) or [post something to his or her attention]" -"(%%%%action.newnotice%%%%?status_textarea=%s)." +"You can try to [nudge %1$s](../%2$s) or [post something to his or her " +"attention](%%%%action.newnotice%%%%?status_textarea=%3$s)." msgstr "" "ã‚ãªãŸã¯ [åˆå›³ %s](../%s) ã™ã‚‹ã‹ã€[ãã®äººå®›ã¦ã«ä½•ã‹ã‚’投稿](%%%%action." "newnotice%%%%?status_textarea=%s)ã—ã¦ãã ã•ã„。" @@ -2984,11 +2957,6 @@ msgstr "ã‚ãªãŸã¯ã“ã®ã‚µã‚¤ãƒˆã®ã‚µãƒ³ãƒ‰ãƒœãƒƒã‚¯ã‚¹ãƒ¦ãƒ¼ã‚¶ãŒã§ãã¾ msgid "User is already sandboxed." msgstr "利用者ã¯ã™ã§ã«ã‚µãƒ³ãƒ‰ãƒœãƒƒã‚¯ã‚¹ã§ã™ã€‚" -#: actions/showfavorites.php:79 -#, php-format -msgid "%s's favorite notices, page %d" -msgstr "%s ã®ãŠæ°—ã«å…¥ã‚Šã®ã¤ã¶ã‚„ãã€ãƒšãƒ¼ã‚¸ %d" - #: actions/showfavorites.php:132 msgid "Could not retrieve favorite notices." msgstr "ãŠæ°—ã«å…¥ã‚Šã®ã¤ã¶ã‚„ãを検索ã§ãã¾ã›ã‚“。" @@ -3046,11 +3014,6 @@ msgstr "ã“ã‚Œã¯ã€ã‚ãªãŸãŒå¥½ããªã“ã¨ã‚’共有ã™ã‚‹æ–¹æ³•ã§ã™ã€‚" msgid "%s group" msgstr "%s グループ" -#: actions/showgroup.php:84 -#, php-format -msgid "%s group, page %d" -msgstr "%s グループã€ãƒšãƒ¼ã‚¸ %d" - #: actions/showgroup.php:218 msgid "Group profile" msgstr "グループプãƒãƒ•ã‚¡ã‚¤ãƒ«" @@ -3058,7 +3021,7 @@ msgstr "グループプãƒãƒ•ã‚¡ã‚¤ãƒ«" #: actions/showgroup.php:263 actions/tagother.php:118 #: actions/userauthorization.php:167 lib/userprofile.php:177 msgid "URL" -msgstr "" +msgstr "URL" #: actions/showgroup.php:274 actions/tagother.php:128 #: actions/userauthorization.php:179 lib/userprofile.php:194 @@ -3099,7 +3062,7 @@ msgstr "メンãƒãƒ¼" #: actions/showgroup.php:386 lib/profileaction.php:117 #: lib/profileaction.php:148 lib/profileaction.php:236 lib/section.php:95 -#: lib/tagcloudsection.php:71 +#: lib/subscriptionlist.php:126 lib/tagcloudsection.php:71 msgid "(None)" msgstr "(ãªã—)" @@ -3125,7 +3088,7 @@ msgid "" "of this group and many more! ([Read more](%%%%doc.help%%%%))" msgstr "" "**%s** 㯠%%site.name%% 上ã®ãƒ¦ãƒ¼ã‚¶ã‚°ãƒ«ãƒ¼ãƒ—ã§ã™ã€‚フリーソフトウェアツール" -"[StatusNet](http://status.net/)を基ã«ã—ãŸ[マイクãƒãƒ–ãƒã‚®ãƒ³ã‚°] (http: //en." +"[StatusNet](http://status.net/)を基ã«ã—ãŸ[マイクãƒãƒ–ãƒã‚®ãƒ³ã‚°] (http://en." "wikipedia.org/wiki/Micro-blogging) サービス。メンãƒãƒ¼ã¯å½¼ã‚‰ã®æš®ã‚‰ã—ã¨èˆˆå‘³ã«é–¢" "ã™ã‚‹çŸã„メッセージを共有ã—ã¾ã™ã€‚[今ã™ãå‚åŠ ](%%%%action.register%%%%) ã—ã¦ã“" "ã®ã‚°ãƒ«ãƒ¼ãƒ—ã®ä¸€å“¡ã«ãªã‚Šã¾ã—ょã†! ([ã‚‚ã£ã¨èªã‚€](%%%%doc.help%%%%))" @@ -3139,7 +3102,7 @@ msgid "" "their life and interests. " msgstr "" "**%s** 㯠%%site.name%% 上ã®ãƒ¦ãƒ¼ã‚¶ã‚°ãƒ«ãƒ¼ãƒ—ã§ã™ã€‚フリーソフトウェアツール" -"[StatusNet](http://status.net/)を基ã«ã—ãŸ[マイクãƒãƒ–ãƒã‚®ãƒ³ã‚°](http: //en." +"[StatusNet](http://status.net/)を基ã«ã—ãŸ[マイクãƒãƒ–ãƒã‚®ãƒ³ã‚°](http://en." "wikipedia.org/wiki/Micro-blogging) サービス。メンãƒãƒ¼ã¯å½¼ã‚‰ã®æš®ã‚‰ã—ã¨èˆˆå‘³ã«é–¢" "ã™ã‚‹çŸã„メッセージを共有ã—ã¾ã™ã€‚" @@ -3174,14 +3137,9 @@ msgstr "ã¤ã¶ã‚„ãを削除ã—ã¾ã—ãŸã€‚" msgid " tagged %s" msgstr "タグ付ã‘ã•ã‚ŒãŸ %s" -#: actions/showstream.php:79 -#, php-format -msgid "%s, page %d" -msgstr "%sã€ãƒšãƒ¼ã‚¸ %d" - #: actions/showstream.php:122 -#, php-format -msgid "Notice feed for %s tagged %s (RSS 1.0)" +#, fuzzy, php-format +msgid "Notice feed for %1$s tagged %2$s (RSS 1.0)" msgstr "%sã®%sã¨ã‚¿ã‚°ä»˜ã‘ã•ã‚ŒãŸã¤ã¶ã‚„ãフィード (RSS 1.0)" #: actions/showstream.php:129 @@ -3205,8 +3163,8 @@ msgid "FOAF for %s" msgstr "%s ã® FOAF" #: actions/showstream.php:191 -#, php-format -msgid "This is the timeline for %s but %s hasn't posted anything yet." +#, fuzzy, php-format +msgid "This is the timeline for %1$s but %2$s hasn't posted anything yet." msgstr "ã“れ㯠%s ã®ã‚¿ã‚¤ãƒ ラインã§ã™ãŒã€%s ã¯ã¾ã ãªã«ã‚‚投稿ã—ã¦ã„ã¾ã›ã‚“。" #: actions/showstream.php:196 @@ -3218,10 +3176,10 @@ msgstr "" "ã„ã¾ã¯å§‹ã‚る良ã„時ã§ã—ょã†:)" #: actions/showstream.php:198 -#, php-format +#, fuzzy, php-format msgid "" -"You can try to nudge %s or [post something to his or her attention](%%%%" -"action.newnotice%%%%?status_textarea=%s)." +"You can try to nudge %1$s or [post something to his or her attention](%%%%" +"action.newnotice%%%%?status_textarea=%2$s)." msgstr "" "ã‚ãªãŸã¯ã€%s ã«åˆå›³ã™ã‚‹ã‹ã€[ã¾ãŸã¯ãã®äººå®›ã«ä½•ã‹ã‚’投稿](%%%%action.newnotice%" "%%%?status_textarea=%s) ã—よã†ã¨ã™ã‚‹ã“ã¨ãŒã§ãã¾ã™ã€‚" @@ -3235,7 +3193,7 @@ msgid "" "follow **%s**'s notices and many more! ([Read more](%%%%doc.help%%%%))" msgstr "" "**%s** 㯠%%site.name%% 上ã®ã‚¢ã‚«ã‚¦ãƒ³ãƒˆã§ã™ã€‚フリーソフトウェアツール" -"[StatusNet](http://status.net/)を基ã«ã—ãŸ[マイクãƒãƒ–ãƒã‚®ãƒ³ã‚°] (http: //en." +"[StatusNet](http://status.net/)を基ã«ã—ãŸ[マイクãƒãƒ–ãƒã‚®ãƒ³ã‚°] (http://en." "wikipedia.org/wiki/Micro-blogging) サービス。[今ã™ãå‚åŠ ](%%%%action.register" "%%%%)ã—ã¦ã€**%s** ã®ã¤ã¶ã‚„ããªã©ã‚’フォãƒãƒ¼ã—ã¾ã—ょã†! ([ã‚‚ã£ã¨èªã‚€](%%%%doc." "help%%%%))" @@ -3248,7 +3206,7 @@ msgid "" "[StatusNet](http://status.net/) tool. " msgstr "" "**%s** 㯠%%site.name%% 上ã®ã‚¢ã‚«ã‚¦ãƒ³ãƒˆã§ã™ã€‚フリーソフトウェアツール" -"[StatusNet](http://status.net/)を基ã«ã—ãŸ[マイクãƒãƒ–ãƒã‚®ãƒ³ã‚°] (http: //en." +"[StatusNet](http://status.net/)を基ã«ã—ãŸ[マイクãƒãƒ–ãƒã‚®ãƒ³ã‚°] (http://en." "wikipedia.org/wiki/Micro-blogging) サービス。" #: actions/showstream.php:313 @@ -3273,12 +3231,13 @@ msgid "Site name must have non-zero length." msgstr "サイトåã¯é•·ã•0ã§ã¯ã„ã‘ã¾ã›ã‚“。" #: actions/siteadminpanel.php:154 -msgid "You must have a valid contact email address" +#, fuzzy +msgid "You must have a valid contact email address." msgstr "有効ãªé€£çµ¡ç”¨ãƒ¡ãƒ¼ãƒ«ã‚¢ãƒ‰ãƒ¬ã‚¹ãŒãªã‘ã‚Œã°ãªã‚Šã¾ã›ã‚“。" #: actions/siteadminpanel.php:172 -#, php-format -msgid "Unknown language \"%s\"" +#, fuzzy, php-format +msgid "Unknown language \"%s\"." msgstr "ä¸æ˜Žãªè¨€èªž \"%s\"" #: actions/siteadminpanel.php:179 @@ -3463,7 +3422,8 @@ msgid "Save site settings" msgstr "サイトè¨å®šã®ä¿å˜" #: actions/smssettings.php:58 -msgid "SMS Settings" +#, fuzzy +msgid "SMS settings" msgstr "SMS è¨å®š" #: actions/smssettings.php:69 @@ -3493,7 +3453,8 @@ msgid "Enter the code you received on your phone." msgstr "ã‚ãªãŸãŒã‚ãªãŸã®é›»è©±ã§å—ã‘å–ã£ãŸã‚³ãƒ¼ãƒ‰ã‚’入れã¦ãã ã•ã„。" #: actions/smssettings.php:138 -msgid "SMS Phone number" +#, fuzzy +msgid "SMS phone number" msgstr "SMS 電話番å·" #: actions/smssettings.php:140 @@ -3584,8 +3545,8 @@ msgid "%s subscribers" msgstr "フォãƒãƒ¼ã•ã‚Œã¦ã„ã‚‹" #: actions/subscribers.php:52 -#, php-format -msgid "%s subscribers, page %d" +#, fuzzy, php-format +msgid "%1$s subscribers, page %2$d" msgstr "%s フォãƒãƒ¼ã•ã‚Œã¦ã„ã‚‹ã€ãƒšãƒ¼ã‚¸ %d" #: actions/subscribers.php:63 @@ -3625,8 +3586,8 @@ msgid "%s subscriptions" msgstr "%s フォãƒãƒ¼ã—ã¦ã„ã‚‹" #: actions/subscriptions.php:54 -#, php-format -msgid "%s subscriptions, page %d" +#, fuzzy, php-format +msgid "%1$s subscriptions, page %2$d" msgstr "%s フォãƒãƒ¼ã—ã¦ã„ã‚‹ã€ãƒšãƒ¼ã‚¸ %d" #: actions/subscriptions.php:65 @@ -3647,6 +3608,12 @@ msgid "" "featured%%). If you're a [Twitter user](%%action.twittersettings%%), you can " "automatically subscribe to people you already follow there." msgstr "" +"今ã€ã ã‚Œã®ã¤ã¶ã‚„ãã‚‚èžã„ã¦ã„ãªã„ãªã‚‰ã€ã‚ãªãŸãŒçŸ¥ã£ã¦ã„る人々をフォãƒãƒ¼ã—ã¦ã¿" +"ã¦ãã ã•ã„。[ピープル検索](%%action.peoplesearch%%)を試ã—ã¦ãã ã•ã„。ãã—ã¦ã€" +"ã‚ãªãŸãŒèˆˆå‘³ã‚’æŒã£ã¦ã„るグループã¨ç§ãŸã¡ã®[フィーãƒãƒ£ãƒ¼ã•ã‚ŒãŸåˆ©ç”¨è€…](%%" +"action.featured%%)ã®ãƒ¡ãƒ³ãƒãƒ¼ã‚’探ã—ã¦ãã ã•ã„。もã—[Twitterユーザ](%%action." +"twittersettings%%)ã§ã‚ã‚Œã°ã€ã‚ãªãŸã¯è‡ªå‹•çš„ã«æ—¢ã«ãƒ•ã‚©ãƒãƒ¼ã—ã¦ã„る人々をフォ" +"ãƒãƒ¼ã§ãã¾ã™ã€‚" #: actions/subscriptions.php:123 actions/subscriptions.php:127 #, php-format @@ -3655,16 +3622,11 @@ msgstr "%s ã¯ã れも言ã†ã“ã¨ã‚’èžã„ã¦ã„ã¾ã›ã‚“。" #: actions/subscriptions.php:194 msgid "Jabber" -msgstr "" +msgstr "Jabber" #: actions/subscriptions.php:199 lib/connectsettingsaction.php:115 msgid "SMS" -msgstr "" - -#: actions/tag.php:68 -#, php-format -msgid "Notices tagged with %s, page %d" -msgstr "%s ã¨ã‚¿ã‚°ä»˜ã‘ã•ã‚ŒãŸã¤ã¶ã‚„ãã€ãƒšãƒ¼ã‚¸ %d" +msgstr "SMS" #: actions/tag.php:86 #, php-format @@ -3741,48 +3703,46 @@ msgid "User is not sandboxed." msgstr "利用者ã¯ã‚µãƒ³ãƒ‰ãƒœãƒƒã‚¯ã‚¹ã§ã¯ã‚ã‚Šã¾ã›ã‚“。" #: actions/unsilence.php:72 -#, fuzzy msgid "User is not silenced." -msgstr "プãƒãƒ•ã‚¡ã‚¤ãƒ«ãŒã‚ã‚Šã¾ã›ã‚“。" +msgstr "利用者ã¯ã‚µã‚¤ãƒ¬ãƒ³ã‚¹ã§ã¯ã‚ã‚Šã¾ã›ã‚“。" #: actions/unsubscribe.php:77 msgid "No profile id in request." msgstr "リクエスト内ã«ãƒ—ãƒãƒ•ã‚¡ã‚¤ãƒ«IDãŒã‚ã‚Šã¾ã›ã‚“。" -#: actions/unsubscribe.php:84 -msgid "No profile with that id." -msgstr "ãã®IDã¯ãƒ—ãƒãƒ•ã‚¡ã‚¤ãƒ«ã§ã¯ã‚ã‚Šã¾ã›ã‚“。" - #: actions/unsubscribe.php:98 msgid "Unsubscribed" msgstr "フォãƒãƒ¼è§£é™¤æ¸ˆã¿" #: actions/updateprofile.php:62 actions/userauthorization.php:330 -#, php-format -msgid "Listenee stream license ‘%s’ is not compatible with site license ‘%s’." +#, fuzzy, php-format +msgid "" +"Listenee stream license ‘%1$s’ is not compatible with site license ‘%2$s’." msgstr "" +"リスニーストリームライセンス ‘%s’ ã¯ã€ã‚µã‚¤ãƒˆãƒ©ã‚¤ã‚»ãƒ³ã‚¹ ‘%s’ ã¨äº’æ›æ€§ãŒã‚ã‚Šã¾" +"ã›ã‚“。" -#: actions/useradminpanel.php:58 lib/adminpanelaction.php:305 +#: actions/useradminpanel.php:58 lib/adminpanelaction.php:321 #: lib/personalgroupnav.php:115 msgid "User" -msgstr "" +msgstr "利用者" #: actions/useradminpanel.php:69 msgid "User settings for this StatusNet site." -msgstr "" +msgstr "ã“ã® StatusNet サイトã®åˆ©ç”¨è€…è¨å®šã€‚" #: actions/useradminpanel.php:149 msgid "Invalid bio limit. Must be numeric." -msgstr "" +msgstr "ä¸æ£ãªè‡ªå·±ç´¹ä»‹åˆ¶é™ã€‚æ•°å—ã§ã‚ã‚‹å¿…è¦ãŒã‚ã‚Šã¾ã™ã€‚" #: actions/useradminpanel.php:155 msgid "Invalid welcome text. Max length is 255 characters." -msgstr "" +msgstr "ä¸æ£ãªã‚¦ã‚§ãƒ«ã‚«ãƒ テã‚スト。最大長ã¯255å—ã§ã™ã€‚" #: actions/useradminpanel.php:165 #, php-format msgid "Invalid default subscripton: '%1$s' is not user." -msgstr "" +msgstr "ä¸æ£ãªãƒ‡ãƒ•ã‚©ãƒ«ãƒˆãƒ•ã‚©ãƒãƒ¼ã§ã™: '%1$s' ã¯åˆ©ç”¨è€…ã§ã¯ã‚ã‚Šã¾ã›ã‚“。" #: actions/useradminpanel.php:218 lib/accountsettingsaction.php:108 #: lib/personalgroupnav.php:109 @@ -3791,86 +3751,80 @@ msgstr "プãƒãƒ•ã‚¡ã‚¤ãƒ«" #: actions/useradminpanel.php:222 msgid "Bio Limit" -msgstr "" +msgstr "自己紹介制é™" #: actions/useradminpanel.php:223 msgid "Maximum length of a profile bio in characters." -msgstr "" +msgstr "プãƒãƒ•ã‚¡ã‚¤ãƒ«è‡ªå·±ç´¹ä»‹ã®æœ€å¤§æ–‡å—長。" #: actions/useradminpanel.php:231 -#, fuzzy msgid "New users" -msgstr "削除" +msgstr "æ–°ã—ã„利用者" #: actions/useradminpanel.php:235 msgid "New user welcome" -msgstr "" +msgstr "æ–°ã—ã„利用者をæ“è¿Ž" #: actions/useradminpanel.php:236 msgid "Welcome text for new users (Max 255 chars)." -msgstr "" +msgstr "æ–°ã—ã„利用者ã¸ã®ã‚¦ã‚§ãƒ«ã‚«ãƒ テã‚スト (最大255å—)。" #: actions/useradminpanel.php:241 -#, fuzzy msgid "Default subscription" -msgstr "ã™ã¹ã¦ã®è³¼èª" +msgstr "デフォルトフォãƒãƒ¼" #: actions/useradminpanel.php:242 -#, fuzzy msgid "Automatically subscribe new users to this user." -msgstr "自分を購èªã—ã¦ã„る者を自動的ã«è³¼èªã™ã‚‹ (éžäººé–“ã«æœ€é©)" +msgstr "自動的ã«ã“ã®åˆ©ç”¨è€…ã«æ–°ã—ã„利用者をフォãƒãƒ¼ã—ã¦ãã ã•ã„。" #: actions/useradminpanel.php:251 -#, fuzzy msgid "Invitations" -msgstr "確èªã‚³ãƒ¼ãƒ‰" +msgstr "招待" #: actions/useradminpanel.php:256 msgid "Invitations enabled" -msgstr "" +msgstr "招待ãŒå¯èƒ½" #: actions/useradminpanel.php:258 msgid "Whether to allow users to invite new users." -msgstr "" +msgstr "利用者ãŒæ–°ã—ã„利用者を招待ã™ã‚‹ã®ã‚’許容ã™ã‚‹ã‹ã©ã†ã‹ã€‚" #: actions/useradminpanel.php:265 msgid "Sessions" -msgstr "" +msgstr "セッション" #: actions/useradminpanel.php:270 msgid "Handle sessions" -msgstr "" +msgstr "セッションã®æ‰±ã„" #: actions/useradminpanel.php:272 msgid "Whether to handle sessions ourselves." -msgstr "" +msgstr "自分é”ã§ã‚»ãƒƒã‚·ãƒ§ãƒ³ã‚’扱ã†ã®ã§ã‚ã‚‹ã‹ã©ã†ã‹ã€‚" #: actions/useradminpanel.php:276 msgid "Session debugging" -msgstr "" +msgstr "セッションデãƒãƒƒã‚°" #: actions/useradminpanel.php:278 msgid "Turn on debugging output for sessions." -msgstr "" +msgstr "セッションã®ãŸã‚ã®ãƒ‡ãƒãƒƒã‚°å‡ºåŠ›ã‚’オン。" #: actions/userauthorization.php:105 msgid "Authorize subscription" msgstr "フォãƒãƒ¼ã‚’承èª" #: actions/userauthorization.php:110 -#, fuzzy msgid "" "Please check these details to make sure that you want to subscribe to this " "user’s notices. If you didn’t just ask to subscribe to someone’s notices, " "click “Rejectâ€." msgstr "" -"ユーザã®é€šçŸ¥ã‚’è³¼èªã™ã‚‹ã«ã¯è©³ç´°ã‚’確èªã—ã¦ä¸‹ã•ã„。購èªã—ãªã„å ´åˆã¯ã€\"Cancel\" " -"ã‚ャンセルをクリックã—ã¦ä¸‹ã•ã„。" +"ユーザã®ã¤ã¶ã‚„ãをフォãƒãƒ¼ã™ã‚‹ã«ã¯è©³ç´°ã‚’確èªã—ã¦ä¸‹ã•ã„。ã ã‚Œã‹ã®ã¤ã¶ã‚„ãã‚’" +"フォãƒãƒ¼ã™ã‚‹ãŸã‚ã«å°‹ããªã„å ´åˆã¯ã€\"Reject\" をクリックã—ã¦ä¸‹ã•ã„。" -#: actions/userauthorization.php:188 -#, fuzzy +#: actions/userauthorization.php:188 actions/version.php:165 msgid "License" -msgstr "ライセンス。" +msgstr "ライセンス" #: actions/userauthorization.php:209 msgid "Accept" @@ -3886,9 +3840,8 @@ msgid "Reject" msgstr "æ‹’å¦" #: actions/userauthorization.php:212 -#, fuzzy msgid "Reject this subscription" -msgstr "å…¨ã¦ã®ã‚µãƒ–スクリプション" +msgstr "ã“ã®ãƒ•ã‚©ãƒãƒ¼ã‚’æ‹’å¦" #: actions/userauthorization.php:225 msgid "No authorization request!" @@ -3904,6 +3857,9 @@ msgid "" "with the site’s instructions for details on how to authorize the " "subscription. Your subscription token is:" msgstr "" +"フォãƒãƒ¼ã¯æ‰¿èªã•ã‚Œã¾ã—ãŸãŒã€ã‚³ãƒ¼ãƒ«ãƒãƒƒã‚¯ï¼µï¼²ï¼¬ãŒé€šéŽã§ãã¾ã›ã‚“ã§ã—ãŸã€‚ã©ã†" +"フォãƒãƒ¼ã‚’承èªã™ã‚‹ã‹ã«é–¢ã™ã‚‹è©³ç´°ã®ãŸã‚ã®ã‚µã‚¤ãƒˆã®æŒ‡ç¤ºã‚’ãƒã‚§ãƒƒã‚¯ã—ã¦ãã ã•ã„。" +"ã‚ãªãŸã®ãƒ•ã‚©ãƒãƒ¼ãƒˆãƒ¼ã‚¯ãƒ³ã¯:" #: actions/userauthorization.php:259 msgid "Subscription rejected" @@ -3915,115 +3871,181 @@ msgid "" "with the site’s instructions for details on how to fully reject the " "subscription." msgstr "" +"フォãƒãƒ¼ã¯æ‹’絶ã•ã‚Œã¾ã—ãŸãŒã€ã‚³ãƒ¼ãƒ«ãƒãƒƒã‚¯URLã¯å…¨ã通éŽã•ã‚Œã¾ã›ã‚“ã§ã—ãŸã€‚ ã©ã†" +"フォãƒãƒ¼ã‚’完全ã«æ‹’絶ã™ã‚‹ã‹ã«é–¢ã™ã‚‹è©³ç´°ã®ãŸã‚ã®ã‚µã‚¤ãƒˆã®æŒ‡ç¤ºã‚’ãƒã‚§ãƒƒã‚¯ã—ã¦ãã " +"ã•ã„。" #: actions/userauthorization.php:296 -#, php-format -msgid "Listener URI ‘%s’ not found here" -msgstr "" +#, fuzzy, php-format +msgid "Listener URI ‘%s’ not found here." +msgstr "リスナー URI ‘%s’ ã¯ã“ã“ã§ã¯è¦‹ã¤ã‹ã‚Šã¾ã›ã‚“" #: actions/userauthorization.php:301 #, php-format msgid "Listenee URI ‘%s’ is too long." -msgstr "" +msgstr "リスニー URI ‘%s’ ãŒé•·ã™ãŽã¾ã™ã€‚" #: actions/userauthorization.php:307 #, php-format msgid "Listenee URI ‘%s’ is a local user." -msgstr "" +msgstr "リスニー URI ‘%s’ ã¯ãƒãƒ¼ã‚«ãƒ«ãƒ¦ãƒ¼ã‚¶ãƒ¼ã§ã¯ã‚ã‚Šã¾ã›ã‚“。" #: actions/userauthorization.php:322 #, php-format msgid "Profile URL ‘%s’ is for a local user." -msgstr "" +msgstr "プãƒãƒ•ã‚¡ã‚¤ãƒ« URL ‘%s’ ã¯ãƒãƒ¼ã‚«ãƒ«ãƒ¦ãƒ¼ã‚¶ãƒ¼ã§ã¯ã‚ã‚Šã¾ã›ã‚“。" #: actions/userauthorization.php:338 #, php-format msgid "Avatar URL ‘%s’ is not valid." -msgstr "" +msgstr "ã‚¢ãƒã‚¿ãƒ¼ URL ‘%s’ ãŒæ£ã—ãã‚ã‚Šã¾ã›ã‚“。" #: actions/userauthorization.php:343 -#, fuzzy, php-format +#, php-format msgid "Can’t read avatar URL ‘%s’." msgstr "ã‚¢ãƒã‚¿ãƒ¼URL　をèªã¿å–ã‚Œã¾ã›ã‚“ '%s'" #: actions/userauthorization.php:348 -#, fuzzy, php-format +#, php-format msgid "Wrong image type for avatar URL ‘%s’." -msgstr "ä¸æ£ãªç”»åƒå½¢å¼ã€‚'%s'" - -#: actions/userbyid.php:70 -#, fuzzy -msgid "No ID." -msgstr "id ãŒã‚ã‚Šã¾ã›ã‚“。" +msgstr "ã‚¢ãƒã‚¿ãƒ¼ URL '%s' ã¯ä¸æ£ãªç”»åƒå½¢å¼ã€‚" #: actions/userdesignsettings.php:76 lib/designsettings.php:65 -#, fuzzy msgid "Profile design" -msgstr "プãƒãƒ•ã‚¡ã‚¤ãƒ«è¨å®š" +msgstr "プãƒãƒ•ã‚¡ã‚¤ãƒ«ãƒ‡ã‚¶ã‚¤ãƒ³" #: actions/userdesignsettings.php:87 lib/designsettings.php:76 msgid "" "Customize the way your profile looks with a background image and a colour " "palette of your choice." msgstr "" +"ã‚ãªãŸã®ãƒ—ãƒãƒ•ã‚£ãƒ¼ãƒ«ãŒãƒãƒƒã‚¯ã‚°ãƒ©ã‚¦ãƒ³ãƒ‰ç”»åƒã¨ã‚ãªãŸã®é¸æŠžã®è‰²ã®ãƒ‘レットã§è¦‹ã‚‹" +"方法をカスタマイズã—ã¦ãã ã•ã„。" #: actions/userdesignsettings.php:282 +#, fuzzy msgid "Enjoy your hotdog!" -msgstr "" - -#: actions/usergroups.php:64 -#, php-format -msgid "%s groups, page %d" -msgstr "%s グループ, %d ページ" +msgstr "ã‚ãªãŸã®hotdogを楽ã—ã‚“ã§ãã ã•ã„!" #: actions/usergroups.php:130 -#, fuzzy msgid "Search for more groups" -msgstr "人々ã‹ãƒ†ã‚ストを検索" +msgstr "ã‚‚ã£ã¨ã‚°ãƒ«ãƒ¼ãƒ—を検索" #: actions/usergroups.php:153 -#, fuzzy, php-format +#, php-format msgid "%s is not a member of any group." -msgstr "ãã®ãƒ—ãƒãƒ•ã‚¡ã‚¤ãƒ«ã¯é€ä¿¡ã•ã‚Œã¦ã„ã¾ã›ã‚“。" +msgstr "%s ã¯ã©ã®ã‚°ãƒ«ãƒ¼ãƒ—ã®ãƒ¡ãƒ³ãƒãƒ¼ã§ã‚‚ã‚ã‚Šã¾ã›ã‚“。" #: actions/usergroups.php:158 #, php-format msgid "Try [searching for groups](%%action.groupsearch%%) and joining them." +msgstr "[グループを探ã—ã¦](%%action.groupsearch%%)ãã‚Œã«åŠ å…¥ã—ã¦ãã ã•ã„。" + +#: actions/version.php:73 +#, fuzzy, php-format +msgid "StatusNet %s" +msgstr "統計データ" + +#: actions/version.php:153 +#, php-format +msgid "" +"This site is powered by %1$s version %2$s, Copyright 2008-2010 StatusNet, " +"Inc. and contributors." +msgstr "" + +#: actions/version.php:157 +#, fuzzy +msgid "StatusNet" +msgstr "ステータスを削除ã—ã¾ã—ãŸã€‚" + +#: actions/version.php:161 +msgid "Contributors" +msgstr "" + +#: actions/version.php:168 +msgid "" +"StatusNet is free software: you can redistribute it and/or modify it under " +"the terms of the GNU Affero General Public License as published by the Free " +"Software Foundation, either version 3 of the License, or (at your option) " +"any later version. " +msgstr "" + +#: actions/version.php:174 +msgid "" +"This program is distributed in the hope that it will be useful, but WITHOUT " +"ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or " +"FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License " +"for more details. " +msgstr "" + +#: actions/version.php:180 +#, php-format +msgid "" +"You should have received a copy of the GNU Affero General Public License " +"along with this program. If not, see %s." msgstr "" +#: actions/version.php:189 +msgid "Plugins" +msgstr "" + +#: actions/version.php:195 +#, fuzzy +msgid "Name" +msgstr "ニックãƒãƒ¼ãƒ " + +#: actions/version.php:196 lib/action.php:741 +#, fuzzy +msgid "Version" +msgstr "セッション" + +#: actions/version.php:197 +#, fuzzy +msgid "Author(s)" +msgstr "作者" + +#: actions/version.php:198 lib/groupeditform.php:172 +msgid "Description" +msgstr "概è¦" + #: classes/File.php:137 #, php-format msgid "" "No file may be larger than %d bytes and the file you sent was %d bytes. Try " "to upload a smaller version." msgstr "" +"ã©ã‚“ãªãƒ•ã‚¡ã‚¤ãƒ«ã‚‚ %d ãƒã‚¤ãƒˆã‚ˆã‚Šå¤§ããã¦ã¯ã„ã‘ã¾ã›ã‚“ã€ãã—ã¦ã€ã‚ãªãŸãŒé€ã£ãŸ" +"ファイル㯠%d ãƒã‚¤ãƒˆã§ã—ãŸã€‚よりå°ã•ã„ãƒãƒ¼ã‚¸ãƒ§ãƒ³ã‚’アップãƒãƒ¼ãƒ‰ã™ã‚‹ã‚ˆã†ã«ã—ã¦" +"ãã ã•ã„。" #: classes/File.php:147 #, php-format msgid "A file this large would exceed your user quota of %d bytes." msgstr "" +"ã“ã‚Œã»ã©å¤§ãã„ファイルã¯ã‚ãªãŸã®%dãƒã‚¤ãƒˆã®ãƒ¦ãƒ¼ã‚¶å‰²å½“ã¦ã‚’超ãˆã¦ã„ã‚‹ã§ã—ょã†ã€‚" #: classes/File.php:154 #, php-format msgid "A file this large would exceed your monthly quota of %d bytes." msgstr "" +"ã“ã‚Œã»ã©å¤§ãã„ファイルã¯ã‚ãªãŸã®%dãƒã‚¤ãƒˆã®æ¯Žæœˆã®å‰²å½“ã¦ã‚’超ãˆã¦ã„ã‚‹ã§ã—ょã†ã€‚" #: classes/Message.php:45 msgid "You are banned from sending direct messages." -msgstr "" +msgstr "ã‚ãªãŸã¯ãƒ€ã‚¤ãƒ¬ã‚¯ãƒˆãƒ¡ãƒƒã‚»ãƒ¼ã‚¸ã‚’é€ã‚‹ã®ãŒç¦æ¢ã•ã‚Œã¦ã„ã¾ã™ã€‚" #: classes/Message.php:61 msgid "Could not insert message." -msgstr "" +msgstr "ãƒ¡ãƒƒã‚»ãƒ¼ã‚¸ã‚’è¿½åŠ ã§ãã¾ã›ã‚“。" #: classes/Message.php:71 msgid "Could not update message with new URI." -msgstr "" +msgstr "æ–°ã—ã„URIã§ãƒ¡ãƒƒã‚»ãƒ¼ã‚¸ã‚’アップデートã§ãã¾ã›ã‚“ã§ã—ãŸã€‚" #: classes/Notice.php:172 #, php-format msgid "DB error inserting hashtag: %s" -msgstr "" +msgstr "ãƒãƒƒã‚·ãƒ¥ã‚¿ã‚°è¿½åŠ ＤＢ エラー: %s" #: classes/Notice.php:226 msgid "Problem saving notice. Too long." @@ -4037,16 +4059,19 @@ msgstr "ã¤ã¶ã‚„ãã‚’ä¿å˜ã™ã‚‹éš›ã«å•é¡ŒãŒç™ºç”Ÿã—ã¾ã—ãŸã€‚ä¸æ˜Žãª msgid "" "Too many notices too fast; take a breather and post again in a few minutes." msgstr "" +"多ã™ãŽã‚‹ã¤ã¶ã‚„ããŒé€Ÿã™ãŽã¾ã™; 数分間ã®ä¼‘ã¿ã‚’å–ã£ã¦ã‹ã‚‰å†æŠ•ç¨¿ã—ã¦ãã ã•ã„。" #: classes/Notice.php:241 msgid "" "Too many duplicate messages too quickly; take a breather and post again in a " "few minutes." msgstr "" +"多ã™ãŽã‚‹é‡è¤‡ãƒ¡ãƒƒã‚»ãƒ¼ã‚¸ãŒé€Ÿã™ãŽã¾ã™; 数分間休ã¿ã‚’å–ã£ã¦ã‹ã‚‰å†åº¦æŠ•ç¨¿ã—ã¦ãã ã•" +"ã„。" #: classes/Notice.php:247 msgid "You are banned from posting notices on this site." -msgstr "" +msgstr "ã‚ãªãŸã¯ã“ã®ã‚µã‚¤ãƒˆã§ã¤ã¶ã‚„ãを投稿ã™ã‚‹ã®ãŒç¦æ¢ã•ã‚Œã¦ã„ã¾ã™ã€‚" #: classes/Notice.php:309 classes/Notice.php:334 msgid "Problem saving notice." @@ -4057,7 +4082,7 @@ msgstr "ã¤ã¶ã‚„ãã‚’ä¿å˜ã™ã‚‹éš›ã«å•é¡ŒãŒç™ºç”Ÿã—ã¾ã—ãŸã€‚" msgid "DB error inserting reply: %s" msgstr "è¿”ä¿¡ã‚’è¿½åŠ ã™ã‚‹éš›ã«ãƒ‡ãƒ¼ã‚¿ãƒ™ãƒ¼ã‚¹ã‚¨ãƒ©ãƒ¼ : %s" -#: classes/Notice.php:1361 +#: classes/Notice.php:1359 #, php-format msgid "RT @%1$s %2$s" msgstr "" @@ -4065,17 +4090,15 @@ msgstr "" #: classes/User.php:368 #, php-format msgid "Welcome to %1$s, @%2$s!" -msgstr "" +msgstr "よã†ã“ã %1$sã€@%2$s!" #: classes/User_group.php:380 -#, fuzzy msgid "Could not create group." -msgstr "ã‚¢ãƒã‚¿ãƒ¼ã‚’ä¿å˜ã§ãã¾ã›ã‚“" +msgstr "グループを作æˆã§ãã¾ã›ã‚“。" #: classes/User_group.php:409 -#, fuzzy msgid "Could not set group membership." -msgstr "サブスクリプションを作æˆã§ãã¾ã›ã‚“" +msgstr "グループメンãƒãƒ¼ã‚·ãƒƒãƒ—をセットã§ãã¾ã›ã‚“。" #: lib/accountsettingsaction.php:108 msgid "Change your profile settings" @@ -4094,9 +4117,8 @@ msgid "Change email handling" msgstr "メールã®æ‰±ã„を変更" #: lib/accountsettingsaction.php:124 -#, fuzzy msgid "Design your profile" -msgstr "プãƒãƒ•ã‚¡ã‚¤ãƒ«ãŒã‚ã‚Šã¾ã›ã‚“。" +msgstr "ã‚ãªãŸã®ãƒ—ãƒãƒ•ã‚¡ã‚¤ãƒ«ã‚’デザイン" #: lib/accountsettingsaction.php:128 msgid "Other" @@ -4106,140 +4128,132 @@ msgstr "ãã®ä»–" msgid "Other options" msgstr "ãã®ä»–ã®ã‚ªãƒ—ション" -#: lib/action.php:144 -#, php-format -msgid "%s - %s" -msgstr "" - #: lib/action.php:159 msgid "Untitled page" msgstr "å称未è¨å®šãƒšãƒ¼ã‚¸" -#: lib/action.php:426 +#: lib/action.php:427 msgid "Primary site navigation" -msgstr "" +msgstr "プライマリサイトナビゲーション" -#: lib/action.php:432 +#: lib/action.php:433 msgid "Home" msgstr "ホーム" -#: lib/action.php:432 +#: lib/action.php:433 msgid "Personal profile and friends timeline" -msgstr "" +msgstr "パーソナルプãƒãƒ•ã‚¡ã‚¤ãƒ«ã¨å‹äººã®ã‚¿ã‚¤ãƒ ライン" -#: lib/action.php:434 +#: lib/action.php:435 msgid "Account" msgstr "アカウント" -#: lib/action.php:434 +#: lib/action.php:435 msgid "Change your email, avatar, password, profile" msgstr "メールアドレスã€ã‚¢ãƒã‚¿ãƒ¼ã€ãƒ‘スワードã€ãƒ—ãƒãƒ‘ティã®å¤‰æ›´" -#: lib/action.php:437 +#: lib/action.php:438 msgid "Connect" msgstr "接続" -#: lib/action.php:437 -#, fuzzy +#: lib/action.php:438 msgid "Connect to services" -msgstr "サーãƒã¸ãƒªãƒ€ã‚¤ãƒ¬ã‚¯ãƒˆã§ãã¾ã›ã‚“ : %s" +msgstr "サービスã¸æŽ¥ç¶š" -#: lib/action.php:441 -#, fuzzy +#: lib/action.php:442 msgid "Change site configuration" -msgstr "サブスクリプション" +msgstr "サイトè¨å®šã®å¤‰æ›´" -#: lib/action.php:445 lib/subgroupnav.php:105 +#: lib/action.php:446 lib/subgroupnav.php:105 msgid "Invite" msgstr "招待" -#: lib/action.php:446 lib/subgroupnav.php:106 +#: lib/action.php:447 lib/subgroupnav.php:106 #, php-format msgid "Invite friends and colleagues to join you on %s" msgstr "å‹äººã‚„åŒåƒšãŒ %s ã§åŠ ã‚るよã†èª˜ã£ã¦ãã ã•ã„。" -#: lib/action.php:451 +#: lib/action.php:452 msgid "Logout" msgstr "ãƒã‚°ã‚¢ã‚¦ãƒˆ" -#: lib/action.php:451 +#: lib/action.php:452 msgid "Logout from the site" msgstr "サイトã‹ã‚‰ãƒã‚°ã‚¢ã‚¦ãƒˆ" -#: lib/action.php:456 +#: lib/action.php:457 msgid "Create an account" msgstr "アカウントを作æˆ" -#: lib/action.php:459 +#: lib/action.php:460 msgid "Login to the site" msgstr "サイトã¸ãƒã‚°ã‚¤ãƒ³" -#: lib/action.php:462 lib/action.php:725 +#: lib/action.php:463 lib/action.php:726 msgid "Help" msgstr "ヘルプ" -#: lib/action.php:462 +#: lib/action.php:463 msgid "Help me!" msgstr "助ã‘ã¦ï¼" -#: lib/action.php:465 lib/searchaction.php:127 +#: lib/action.php:466 lib/searchaction.php:127 msgid "Search" msgstr "検索" -#: lib/action.php:465 +#: lib/action.php:466 msgid "Search for people or text" msgstr "人々ã‹ãƒ†ã‚ストを検索" -#: lib/action.php:486 +#: lib/action.php:487 msgid "Site notice" msgstr "サイトã¤ã¶ã‚„ã" -#: lib/action.php:552 +#: lib/action.php:553 msgid "Local views" msgstr "ãƒãƒ¼ã‚«ãƒ«ãƒ“ュー" -#: lib/action.php:618 +#: lib/action.php:619 msgid "Page notice" msgstr "ページã¤ã¶ã‚„ã" -#: lib/action.php:720 -#, fuzzy +#: lib/action.php:721 msgid "Secondary site navigation" -msgstr "サブスクリプション" +msgstr "セカンダリサイトナビゲーション" -#: lib/action.php:727 +#: lib/action.php:728 msgid "About" -msgstr "解説" +msgstr "About" -#: lib/action.php:729 +#: lib/action.php:730 msgid "FAQ" msgstr "よãã‚る質å•" -#: lib/action.php:733 +#: lib/action.php:734 msgid "TOS" msgstr "" -#: lib/action.php:736 +#: lib/action.php:737 msgid "Privacy" msgstr "プライãƒã‚·ãƒ¼" -#: lib/action.php:738 +#: lib/action.php:739 msgid "Source" msgstr "ソース" -#: lib/action.php:740 +#: lib/action.php:743 msgid "Contact" msgstr "連絡先" -#: lib/action.php:742 +#: lib/action.php:745 msgid "Badge" msgstr "ãƒãƒƒã‚¸" -#: lib/action.php:770 +#: lib/action.php:773 msgid "StatusNet software license" -msgstr "" +msgstr "StatusNet ソフトウェアライセンス" -#: lib/action.php:773 +#: lib/action.php:776 #, php-format msgid "" "**%%site.name%%** is a microblogging service brought to you by [%%site." @@ -4248,12 +4262,12 @@ msgstr "" "**%%site.name%%** 㯠[%%site.broughtby%%](%%site.broughtbyurl%%) ãŒæä¾›ã™ã‚‹ãƒž" "イクãƒãƒ–ãƒã‚°ã‚µãƒ¼ãƒ“スã§ã™ã€‚ " -#: lib/action.php:775 +#: lib/action.php:778 #, php-format msgid "**%%site.name%%** is a microblogging service. " msgstr "**%%site.name%%** ã¯ãƒžã‚¤ã‚¯ãƒãƒ–ãƒã‚°ã‚µãƒ¼ãƒ“スã§ã™ã€‚ " -#: lib/action.php:777 +#: lib/action.php:780 #, php-format msgid "" "It runs the [StatusNet](http://status.net/) microblogging software, version %" @@ -4264,67 +4278,66 @@ msgstr "" "ã„ã¦ã„ã¾ã™ã€‚ ライセンス [GNU Affero General Public License](http://www.fsf." "org/licensing/licenses/agpl-3.0.html)。" -#: lib/action.php:791 -#, fuzzy +#: lib/action.php:794 msgid "Site content license" -msgstr "æ–°ã—ã„通知" +msgstr "サイト内容ライセンス" -#: lib/action.php:800 +#: lib/action.php:803 msgid "All " msgstr "全㦠" -#: lib/action.php:805 +#: lib/action.php:808 msgid "license." msgstr "ライセンス。" -#: lib/action.php:1099 +#: lib/action.php:1102 msgid "Pagination" msgstr "ページ化" -#: lib/action.php:1108 -#, fuzzy +#: lib/action.php:1111 msgid "After" -msgstr "<< å‰" +msgstr "<<後" -#: lib/action.php:1116 -#, fuzzy +#: lib/action.php:1119 msgid "Before" -msgstr "å‰ >>" +msgstr "å‰>>" -#: lib/action.php:1164 +#: lib/action.php:1167 msgid "There was a problem with your session token." -msgstr "" +msgstr "ã‚ãªãŸã®ã‚»ãƒƒã‚·ãƒ§ãƒ³ãƒˆãƒ¼ã‚¯ãƒ³ã«é–¢ã™ã‚‹å•é¡ŒãŒã‚ã‚Šã¾ã—ãŸã€‚" #: lib/adminpanelaction.php:96 msgid "You cannot make changes to this site." -msgstr "" +msgstr "ã‚ãªãŸã¯ã“ã®ã‚µã‚¤ãƒˆã¸ã®å¤‰æ›´ã‚’è¡Œã†ã“ã¨ãŒã§ãã¾ã›ã‚“。" -#: lib/adminpanelaction.php:195 +#: lib/adminpanelaction.php:107 +#, fuzzy +msgid "Changes to that panel are not allowed." +msgstr "登録ã¯è¨±å¯ã•ã‚Œã¦ã„ã¾ã›ã‚“。" + +#: lib/adminpanelaction.php:206 msgid "showForm() not implemented." -msgstr "" +msgstr "showForm() ã¯å®Ÿè£…ã•ã‚Œã¦ã„ã¾ã›ã‚“。" -#: lib/adminpanelaction.php:224 +#: lib/adminpanelaction.php:235 msgid "saveSettings() not implemented." -msgstr "" +msgstr "saveSettings() ã¯å®Ÿè£…ã•ã‚Œã¦ã„ã¾ã›ã‚“。" -#: lib/adminpanelaction.php:247 +#: lib/adminpanelaction.php:258 msgid "Unable to delete design setting." -msgstr "" +msgstr "デザインè¨å®šã‚’削除ã§ãã¾ã›ã‚“。" -#: lib/adminpanelaction.php:300 -#, fuzzy +#: lib/adminpanelaction.php:312 msgid "Basic site configuration" -msgstr "メールアドレス確èª" +msgstr "基本サイトè¨å®š" -#: lib/adminpanelaction.php:303 -#, fuzzy +#: lib/adminpanelaction.php:317 msgid "Design configuration" -msgstr "メールアドレス確èª" +msgstr "デザインè¨å®š" -#: lib/adminpanelaction.php:306 lib/adminpanelaction.php:309 -#, fuzzy +#: lib/adminpanelaction.php:322 lib/adminpanelaction.php:327 msgid "Paths configuration" -msgstr "メールアドレス確èª" +msgstr "パスè¨å®š" #: lib/attachmentlist.php:87 msgid "Attachments" @@ -4335,23 +4348,30 @@ msgid "Author" msgstr "作者" #: lib/attachmentlist.php:278 -#, fuzzy msgid "Provider" -msgstr "プãƒãƒ•ã‚¡ã‚¤ãƒ«" +msgstr "プãƒãƒã‚¤ãƒ€" #: lib/attachmentnoticesection.php:67 msgid "Notices where this attachment appears" -msgstr "" +msgstr "ã“ã®æ·»ä»˜ãŒç¾ã‚Œã‚‹ã¤ã¶ã‚„ã" #: lib/attachmenttagcloudsection.php:48 msgid "Tags for this attachment" -msgstr "" +msgstr "ã“ã®æ·»ä»˜ã®ã‚¿ã‚°" + +#: lib/authenticationplugin.php:182 lib/authenticationplugin.php:187 +msgid "Password changing failed" +msgstr "パスワード変更ã«å¤±æ•—ã—ã¾ã—ãŸ" + +#: lib/authenticationplugin.php:197 +msgid "Password changing is not allowed" +msgstr "パスワード変更ã¯è¨±å¯ã•ã‚Œã¦ã„ã¾ã›ã‚“" #: lib/channel.php:138 lib/channel.php:158 msgid "Command results" msgstr "コマンドçµæžœ" -#: lib/channel.php:210 +#: lib/channel.php:210 lib/mailhandler.php:142 msgid "Command complete" msgstr "コマンド完了" @@ -4361,20 +4381,20 @@ msgstr "コマンド失敗" #: lib/command.php:44 msgid "Sorry, this command is not yet implemented." -msgstr "" +msgstr "ã™ã¿ã¾ã›ã‚“ã€ã“ã®ã‚³ãƒžãƒ³ãƒ‰ã¯ã¾ã 実装ã•ã‚Œã¦ã„ã¾ã›ã‚“。" #: lib/command.php:88 -#, php-format -msgid "Could not find a user with nickname %s" +#, fuzzy, php-format +msgid "Could not find a user with nickname %s." msgstr "ユーザを更新ã§ãã¾ã›ã‚“" #: lib/command.php:92 msgid "It does not make a lot of sense to nudge yourself!" -msgstr "" +msgstr "ãã‚Œã¯è‡ªåˆ†è‡ªèº«ã¸ã®åˆå›³ã§å¤šãã¯æ„味ãŒã‚ã‚Šã¾ã›ã‚“!" #: lib/command.php:99 -#, php-format -msgid "Nudge sent to %s" +#, fuzzy, php-format +msgid "Nudge sent to %s." msgstr "%s ã¸åˆå›³ã‚’é€ã‚Šã¾ã—ãŸ" #: lib/command.php:126 @@ -4389,34 +4409,36 @@ msgstr "" "ã¤ã¶ã‚„ã: %3$s" #: lib/command.php:152 lib/command.php:399 lib/command.php:460 -msgid "Notice with that id does not exist" -msgstr "" +#, fuzzy +msgid "Notice with that id does not exist." +msgstr "ãã® ID ã«ã‚ˆã‚‹ã¤ã¶ã‚„ãã¯å˜åœ¨ã—ã¦ã„ã¾ã›ã‚“" #: lib/command.php:168 lib/command.php:415 lib/command.php:476 #: lib/command.php:532 -msgid "User has no last notice" -msgstr "" +#, fuzzy +msgid "User has no last notice." +msgstr "利用者ã¯ã¾ã ã¤ã¶ã‚„ã„ã¦ã„ã¾ã›ã‚“" #: lib/command.php:190 msgid "Notice marked as fave." -msgstr "" +msgstr "ãŠæ°—ã«å…¥ã‚Šã«ã•ã‚Œã¦ã„ã‚‹ã¤ã¶ã‚„ã。" -#: lib/command.php:315 -#, php-format -msgid "%1$s (%2$s)" -msgstr "" +#: lib/command.php:284 +#, fuzzy, php-format +msgid "Could not remove user %1$s to group %2$s." +msgstr "利用者 %s をグループ %s ã‹ã‚‰å‰Šé™¤ã™ã‚‹ã“ã¨ãŒã§ãã¾ã›ã‚“" #: lib/command.php:318 -#, php-format -msgid "Fullname: %s" +#, fuzzy, php-format +msgid "Full name: %s" msgstr "フルãƒãƒ¼ãƒ ： %s" -#: lib/command.php:321 +#: lib/command.php:321 lib/mail.php:254 #, php-format msgid "Location: %s" msgstr "å ´æ‰€: %s" -#: lib/command.php:324 +#: lib/command.php:324 lib/mail.php:256 #, php-format msgid "Homepage: %s" msgstr "ホームページ: %s" @@ -4424,132 +4446,121 @@ msgstr "ホームページ: %s" #: lib/command.php:327 #, php-format msgid "About: %s" -msgstr "" +msgstr "About: %s" #: lib/command.php:358 scripts/xmppdaemon.php:301 -#, php-format -msgid "Message too long - maximum is %d characters, you sent %d" -msgstr "" +#, fuzzy, php-format +msgid "Message too long - maximum is %1$d characters, you sent %2$d." +msgstr "メッセージãŒé•·ã™ãŽã¾ã™ - 最大 %d å—ã€ã‚ãªãŸãŒé€ã£ãŸã®ã¯ %d" #: lib/command.php:378 msgid "Error sending direct message." -msgstr "" - -#: lib/command.php:422 -msgid "Cannot repeat your own notice" -msgstr "" - -#: lib/command.php:427 -#, fuzzy -msgid "Already repeated that notice" -msgstr "ã“ã®é€šçŸ¥ã‚’削除" +msgstr "ダイレクトメッセージé€ä¿¡ã‚¨ãƒ©ãƒ¼ã€‚" #: lib/command.php:435 #, fuzzy, php-format -msgid "Notice from %s repeated" -msgstr "通知" +msgid "Notice from %s repeated." +msgstr "%s ã‹ã‚‰ã¤ã¶ã‚„ããŒç¹°ã‚Šè¿”ã•ã‚Œã¦ã„ã¾ã™" #: lib/command.php:437 -#, fuzzy msgid "Error repeating notice." -msgstr "通知をä¿å˜ã™ã‚‹éš›ã«å•é¡ŒãŒç™ºç”Ÿã—ã¾ã—ãŸã€‚" +msgstr "ã¤ã¶ã‚„ãç¹°ã‚Šè¿”ã—エラー" #: lib/command.php:491 -#, php-format -msgid "Notice too long - maximum is %d characters, you sent %d" -msgstr "" +#, fuzzy, php-format +msgid "Notice too long - maximum is %1$d characters, you sent %2$d." +msgstr "ã¤ã¶ã‚„ããŒé•·ã™ãŽã¾ã™ - 最大 %d å—ã€ã‚ãªãŸãŒé€ã£ãŸã®ã¯ %d" #: lib/command.php:500 #, fuzzy, php-format -msgid "Reply to %s sent" -msgstr "ã“ã®é€šçŸ¥ã¸è¿”ä¿¡" +msgid "Reply to %s sent." +msgstr "%s ã¸è¿”ä¿¡ã‚’é€ã‚Šã¾ã—ãŸ" #: lib/command.php:502 -#, fuzzy msgid "Error saving notice." -msgstr "通知をä¿å˜ã™ã‚‹éš›ã«å•é¡ŒãŒç™ºç”Ÿã—ã¾ã—ãŸã€‚" +msgstr "ã¤ã¶ã‚„ãä¿å˜ã‚¨ãƒ©ãƒ¼ã€‚" #: lib/command.php:556 -msgid "Specify the name of the user to subscribe to" -msgstr "" +#, fuzzy +msgid "Specify the name of the user to subscribe to." +msgstr "フォãƒãƒ¼ã™ã‚‹åˆ©ç”¨è€…ã®åå‰ã‚’指定ã—ã¦ãã ã•ã„" #: lib/command.php:563 #, php-format msgid "Subscribed to %s" -msgstr "" +msgstr "%s をフォãƒãƒ¼ã—ã¾ã—ãŸ" #: lib/command.php:584 -msgid "Specify the name of the user to unsubscribe from" -msgstr "" +#, fuzzy +msgid "Specify the name of the user to unsubscribe from." +msgstr "フォãƒãƒ¼ã‚’ã‚„ã‚るユーザã®åå‰ã‚’指定ã—ã¦ãã ã•ã„" #: lib/command.php:591 #, php-format msgid "Unsubscribed from %s" -msgstr "" +msgstr "%s ã®ãƒ•ã‚©ãƒãƒ¼ã‚’ã‚„ã‚ã‚‹" #: lib/command.php:609 lib/command.php:632 msgid "Command not yet implemented." -msgstr "" +msgstr "コマンドã¯ã¾ã 実装ã•ã‚Œã¦ã„ã¾ã›ã‚“。" #: lib/command.php:612 msgid "Notification off." -msgstr "" +msgstr "通知オフ。" #: lib/command.php:614 msgid "Can't turn off notification." -msgstr "" +msgstr "通知をオフã§ãã¾ã›ã‚“。" #: lib/command.php:635 msgid "Notification on." -msgstr "" +msgstr "通知オン。" #: lib/command.php:637 msgid "Can't turn on notification." -msgstr "" +msgstr "通知をオンã§ãã¾ã›ã‚“。" #: lib/command.php:650 -msgid "Login command is disabled" -msgstr "" +#, fuzzy +msgid "Login command is disabled." +msgstr "ãƒã‚°ã‚¤ãƒ³ã‚³ãƒžãƒ³ãƒ‰ãŒç„¡åŠ¹ã«ãªã£ã¦ã„ã¾ã™ã€‚" #: lib/command.php:664 -#, php-format -msgid "Could not create login token for %s" +#, fuzzy, php-format +msgid "Could not create login token for %s." msgstr "%s 用ã®ãƒã‚°ã‚¤ãƒ³ãƒ»ãƒˆãƒ¼ã‚¯ãƒ³ã‚’作æˆã§ãã¾ã›ã‚“ã§ã—ãŸ" #: lib/command.php:669 -#, php-format -msgid "This link is useable only once, and is good for only 2 minutes: %s" -msgstr "" +#, fuzzy, php-format +msgid "This link is useable only once, and is good for only 2 minutes: %s." +msgstr "ã“ã®ãƒªãƒ³ã‚¯ã¯ã€ã‹ã¤ã¦ã ã‘使用å¯èƒ½ã§ã‚ã‚Šã€2分間ã ã‘良ã„ã§ã™: %s" #: lib/command.php:685 -#, fuzzy msgid "You are not subscribed to anyone." -msgstr "ãã®ãƒ—ãƒãƒ•ã‚¡ã‚¤ãƒ«ã¯é€ä¿¡ã•ã‚Œã¦ã„ã¾ã›ã‚“。" +msgstr "ã‚ãªãŸã¯ã ã‚Œã«ã‚‚フォãƒãƒ¼ã•ã‚Œã¦ã„ã¾ã›ã‚“。" #: lib/command.php:687 msgid "You are subscribed to this person:" msgid_plural "You are subscribed to these people:" -msgstr[0] "ãã®ãƒ—ãƒãƒ•ã‚¡ã‚¤ãƒ«ã¯é€ä¿¡ã•ã‚Œã¦ã„ã¾ã›ã‚“。" +msgstr[0] "ã‚ãªãŸã¯ã“ã®äººã«ãƒ•ã‚©ãƒãƒ¼ã•ã‚Œã¦ã„ã¾ã™:" #: lib/command.php:707 -#, fuzzy msgid "No one is subscribed to you." -msgstr "リモートサブスクライブ" +msgstr "誰もフォãƒãƒ¼ã—ã¦ã„ã¾ã›ã‚“。" #: lib/command.php:709 msgid "This person is subscribed to you:" msgid_plural "These people are subscribed to you:" -msgstr[0] "リモートサブスクライブ" +msgstr[0] "ã“ã®äººã¯ã‚ãªãŸã«ãƒ•ã‚©ãƒãƒ¼ã•ã‚Œã¦ã„ã‚‹:" #: lib/command.php:729 -#, fuzzy msgid "You are not a member of any groups." -msgstr "ãã®ãƒ—ãƒãƒ•ã‚¡ã‚¤ãƒ«ã¯é€ä¿¡ã•ã‚Œã¦ã„ã¾ã›ã‚“。" +msgstr "ã‚ãªãŸã¯ã©ã®ã‚°ãƒ«ãƒ¼ãƒ—ã®ãƒ¡ãƒ³ãƒãƒ¼ã§ã‚‚ã‚ã‚Šã¾ã›ã‚“。" #: lib/command.php:731 msgid "You are a member of this group:" msgid_plural "You are a member of these groups:" -msgstr[0] "ãã®ãƒ—ãƒãƒ•ã‚¡ã‚¤ãƒ«ã¯é€ä¿¡ã•ã‚Œã¦ã„ã¾ã›ã‚“。" +msgstr[0] "ã‚ãªãŸã¯ã“ã®ã‚°ãƒ«ãƒ¼ãƒ—ã®ãƒ¡ãƒ³ãƒãƒ¼ã§ã¯ã‚ã‚Šã¾ã›ã‚“:" #: lib/command.php:745 msgid "" @@ -4593,57 +4604,57 @@ msgid "" msgstr "" #: lib/common.php:199 -#, fuzzy msgid "No configuration file found. " -msgstr "確èªã‚³ãƒ¼ãƒ‰ãŒã‚ã‚Šã¾ã›ã‚“。" +msgstr "コンフィギュレーションファイルãŒã‚ã‚Šã¾ã›ã‚“。 " #: lib/common.php:200 msgid "I looked for configuration files in the following places: " -msgstr "" +msgstr "ç§ã¯ä»¥ä¸‹ã®å ´æ‰€ã§ã‚³ãƒ³ãƒ•ã‚£ã‚®ãƒ¥ãƒ¬ãƒ¼ã‚·ãƒ§ãƒ³ãƒ•ã‚¡ã‚¤ãƒ«ã‚’探ã—ã¾ã—ãŸ: " #: lib/common.php:201 msgid "You may wish to run the installer to fix this." msgstr "" +"ã‚ãªãŸã¯ã€ã“れを修ç†ã™ã‚‹ãŸã‚ã«ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ©ã‚’å‹•ã‹ã—ãŸãŒã£ã¦ã„ã‚‹ã‹ã‚‚ã—ã‚Œã¾ã›" +"ん。" #: lib/common.php:202 -#, fuzzy msgid "Go to the installer." -msgstr "サイトã¸ãƒã‚°ã‚¤ãƒ³" +msgstr "インストーラã¸ã€‚" #: lib/connectsettingsaction.php:110 msgid "IM" -msgstr "" +msgstr "IM" #: lib/connectsettingsaction.php:111 msgid "Updates by instant messenger (IM)" -msgstr "" +msgstr "インスタントメッセンジャー(IM)ã§ã®æ›´æ–°" #: lib/connectsettingsaction.php:116 msgid "Updates by SMS" -msgstr "" +msgstr "SMSã§ã®æ›´æ–°" #: lib/dberroraction.php:60 msgid "Database error" -msgstr "" +msgstr "データベースエラー" #: lib/designsettings.php:105 -#, fuzzy msgid "Upload file" -msgstr "アップãƒãƒ¼ãƒ‰" +msgstr "ファイルアップãƒãƒ¼ãƒ‰" #: lib/designsettings.php:109 -#, fuzzy msgid "" "You can upload your personal background image. The maximum file size is 2MB." -msgstr "é•·ã™ãŽã¾ã™ã€‚通知ã¯æœ€å¤§ 140 å—ã¾ã§ã§ã™ã€‚" +msgstr "" +"自分ã®ãƒãƒƒã‚¯ã‚°ãƒ©ã‚¦ãƒ³ãƒ‰ç”»åƒã‚’アップãƒãƒ¼ãƒ‰ã§ãã¾ã™ã€‚最大ファイルサイズ㯠2MB ã§" +"ã™ã€‚" #: lib/designsettings.php:418 msgid "Design defaults restored." -msgstr "" +msgstr "デフォルトã®ãƒ‡ã‚¶ã‚¤ãƒ³ã‚’回復。" #: lib/disfavorform.php:114 lib/disfavorform.php:140 msgid "Disfavor this notice" -msgstr "" +msgstr "ã“ã®ã¤ã¶ã‚„ãã®ãŠæ°—ã«å…¥ã‚Šã‚’ã‚„ã‚ã‚‹" #: lib/favorform.php:114 lib/favorform.php:140 msgid "Favor this notice" @@ -4651,23 +4662,23 @@ msgstr "ã“ã®ã¤ã¶ã‚„ãã‚’ãŠæ°—ã«å…¥ã‚Šã«ã™ã‚‹" #: lib/favorform.php:140 msgid "Favor" -msgstr "" +msgstr "ãŠæ°—ã«å…¥ã‚Š" #: lib/feed.php:85 msgid "RSS 1.0" -msgstr "" +msgstr "RSS 1.0" #: lib/feed.php:87 msgid "RSS 2.0" -msgstr "" +msgstr "RSS 2.0" #: lib/feed.php:89 msgid "Atom" -msgstr "" +msgstr "Atom" #: lib/feed.php:91 msgid "FOAF" -msgstr "" +msgstr "FOAF" #: lib/feedlist.php:64 msgid "Export data" @@ -4679,11 +4690,11 @@ msgstr "ã‚¿ã‚°ã®ãƒ•ã‚£ãƒ«ã‚¿ãƒ¼" #: lib/galleryaction.php:131 msgid "All" -msgstr "" +msgstr "å…¨ã¦" #: lib/galleryaction.php:139 msgid "Select tag to filter" -msgstr "" +msgstr "フィルターã«ã‹ã‘ã‚‹ã‚¿ã‚°ã‚’é¸æŠž" #: lib/galleryaction.php:140 msgid "Tag" @@ -4691,7 +4702,7 @@ msgstr "ã‚¿ã‚°" #: lib/galleryaction.php:141 msgid "Choose a tag to narrow list" -msgstr "" +msgstr "ã‚¿ã‚°ã‚’é¸ã‚“ã§ã€ãƒªã‚¹ãƒˆã‚’ç‹ãã—ã¦ãã ã•ã„" #: lib/galleryaction.php:143 msgid "Go" @@ -4702,43 +4713,36 @@ msgid "URL of the homepage or blog of the group or topic" msgstr "グループやトピックã®ãƒ›ãƒ¼ãƒ ページやブãƒã‚°ã® URL" #: lib/groupeditform.php:168 -#, fuzzy msgid "Describe the group or topic" -msgstr "グループやトピックを140å—以内記述" +msgstr "グループやトピックを記述" #: lib/groupeditform.php:170 -#, fuzzy, php-format +#, php-format msgid "Describe the group or topic in %d characters" -msgstr "グループやトピックを140å—以内記述" - -#: lib/groupeditform.php:172 -msgid "Description" -msgstr "概è¦" +msgstr "グループやトピックを %d å—以内記述" #: lib/groupeditform.php:179 -#, fuzzy msgid "" "Location for the group, if any, like \"City, State (or Region), Country\"" -msgstr "ã„ã‚‹å ´æ‰€, 例ãˆã° \"City, State (or Region), Country\"" +msgstr "グループã®å ´æ‰€, 例ãˆã° \"都市, 都é“府県 (ã¾ãŸã¯ 地域), 国\"" #: lib/groupeditform.php:187 #, php-format msgid "Extra nicknames for the group, comma- or space- separated, max %d" -msgstr "" +msgstr "グループã®ã‚¨ã‚¯ã‚¹ãƒˆãƒ©ãƒ‹ãƒƒã‚¯ãƒãƒ¼ãƒ ã€ã‚«ãƒ³ãƒžã¾ãŸã¯ã‚¹ãƒšãƒ¼ã‚¹åŒºåˆ‡ã‚Šã€æœ€å¤§ %d" #: lib/groupnav.php:85 msgid "Group" msgstr "グループ" #: lib/groupnav.php:101 -#, fuzzy msgid "Blocked" msgstr "ブãƒãƒƒã‚¯" #: lib/groupnav.php:102 -#, fuzzy, php-format +#, php-format msgid "%s blocked users" -msgstr "ãã®ã‚ˆã†ãªãƒ¦ãƒ¼ã‚¶ã¯ã„ã¾ã›ã‚“。" +msgstr "%s ブãƒãƒƒã‚¯åˆ©ç”¨è€…" #: lib/groupnav.php:108 #, php-format @@ -4755,9 +4759,9 @@ msgid "Add or edit %s logo" msgstr "%s ãƒã‚´ã®è¿½åŠ や編集" #: lib/groupnav.php:120 -#, fuzzy, php-format +#, php-format msgid "Add or edit %s design" -msgstr "%s ãƒã‚´ã®è¿½åŠ や編集" +msgstr "%s デザインã®è¿½åŠ や編集" #: lib/groupsbymemberssection.php:71 msgid "Groups with most members" @@ -4777,9 +4781,9 @@ msgid "This page is not available in a media type you accept" msgstr "ã“ã®ãƒšãƒ¼ã‚¸ã¯ã‚ãªãŸãŒæ‰¿èªã—ãŸãƒ¡ãƒ‡ã‚£ã‚¢ã‚¿ã‚¤ãƒ—ã§ã¯åˆ©ç”¨ã§ãã¾ã›ã‚“。" #: lib/imagefile.php:75 -#, fuzzy, php-format +#, php-format msgid "That file is too big. The maximum file size is %s." -msgstr "é•·ã™ãŽã¾ã™ã€‚通知ã¯æœ€å¤§ 140 å—ã¾ã§ã§ã™ã€‚" +msgstr "ファイルãŒå¤§ãã™ãŽã¾ã™ã€‚最大ファイルサイズ㯠%s 。" #: lib/imagefile.php:80 msgid "Partial upload." @@ -4798,21 +4802,20 @@ msgid "Unsupported image file format." msgstr "サãƒãƒ¼ãƒˆå¤–ã®ç”»åƒå½¢å¼ã§ã™ã€‚" #: lib/imagefile.php:118 -#, fuzzy msgid "Lost our file." -msgstr "ãã®ã‚ˆã†ãªé€šçŸ¥ã¯ã‚ã‚Šã¾ã›ã‚“。" +msgstr "ファイルを紛失。" #: lib/imagefile.php:150 lib/imagefile.php:197 msgid "Unknown file type" -msgstr "" +msgstr "ä¸æ˜Žãªãƒ•ã‚¡ã‚¤ãƒ«ã‚¿ã‚¤ãƒ—" #: lib/imagefile.php:217 msgid "MB" -msgstr "" +msgstr "MB" #: lib/imagefile.php:219 msgid "kB" -msgstr "" +msgstr "kB" #: lib/jabber.php:191 #, php-format @@ -4855,11 +4858,23 @@ msgid "" "Thanks for your time, \n" "%s\n" msgstr "" +"ã“ã‚“ã«ã¡ã¯ã€%s\n" +"\n" +"ã ã‚Œã‹ãŒã“ã®ãƒ¡ãƒ¼ãƒ«ã‚¢ãƒ‰ãƒ¬ã‚¹ã‚’ %s ã«å…¥åŠ›ã—ã¾ã—ãŸã€‚\n" +"\n" +"ã‚‚ã—エントリーを確èªã—ãŸã„ãªã‚‰ã€ä»¥ä¸‹ã®URLを使用ã—ã¦ãã ã•ã„:\n" +"\n" +"%s\n" +"\n" +"ã‚‚ã—ãã†ã§ãªã‘ã‚Œã°ã€ã“ã®ãƒ¡ãƒƒã‚»ãƒ¼ã‚¸ã‚’無視ã—ã¦ãã ã•ã„。\n" +"\n" +"ã‚ã‚ŠãŒã¨ã†ã”ã–ã„ã¾ã™ã€‚\n" +"%s\n" #: lib/mail.php:236 #, php-format msgid "%1$s is now listening to your notices on %2$s." -msgstr "%1$s 㯠%2$s ã§ã‚ãªãŸã®é€šçŸ¥ã‚’è³¼èªã—ã¦ã„ã¾ã™ã€‚" +msgstr "%1$s 㯠%2$s ã§ã‚ãªãŸã®ã¤ã¶ã‚„ãã‚’èžã„ã¦ã„ã¾ã™ã€‚" #: lib/mail.php:241 #, fuzzy, php-format @@ -4875,37 +4890,31 @@ msgid "" "----\n" "Change your email address or notification options at %8$s\n" msgstr "" -"%1$s 㯠%2$s ã§ã‚ãªãŸã®é€šçŸ¥ã‚’èžã„ã¦ã„ã¾ã™ã€‚\n" +"%1$s 㯠%2$s ã§ã‚ãªãŸã®ã¤ã¶ã‚„ãã‚’èžã„ã¦ã„ã¾ã™ã€‚\n" "\n" -"\t%3$s\n" +"%3$s\n" "\n" -"確ã‹ã«ã‚ãªãŸã®,\n" -"%4$s.\n" - -#: lib/mail.php:254 -#, php-format -msgid "Location: %s\n" -msgstr "å ´æ‰€: %s\n" - -#: lib/mail.php:256 -#, php-format -msgid "Homepage: %s\n" -msgstr "ホームページ: %s\n" +"%4$s%5$s%6$s\n" +"å¿ å®Ÿã§ã‚ã‚‹ã€ã‚ãªãŸã®ã‚‚ã®ã€\n" +"%7$s.\n" +"\n" +"----\n" +"%8$s ã§ãƒ¡ãƒ¼ãƒ«ã‚¢ãƒ‰ãƒ¬ã‚¹ã‹é€šçŸ¥ã‚ªãƒ—ションを変ãˆã¦ãã ã•ã„。\n" #: lib/mail.php:258 -#, php-format -msgid "" -"Bio: %s\n" -"\n" +#, fuzzy, php-format +msgid "Bio: %s" msgstr "" +"自己紹介: %s\n" +"\n" #: lib/mail.php:286 #, php-format msgid "New email address for posting to %s" -msgstr "" +msgstr "%s ã¸æŠ•ç¨¿ã®ãŸã‚ã®æ–°ã—ã„メールアドレス" #: lib/mail.php:289 -#, php-format +#, fuzzy, php-format msgid "" "You have a new posting address on %1$s.\n" "\n" @@ -4916,6 +4925,14 @@ msgid "" "Faithfully yours,\n" "%4$s" msgstr "" +"ã‚ãªãŸã¯ %1$s ã«é–¢ã™ã‚‹æ–°ã—ã„投稿アドレスをæŒã£ã¦ã„ã¾ã™ã€‚\n" +"\n" +"%2$s ã«ãƒ¡ãƒ¼ãƒ«ã‚’é€ã£ã¦ã€æ–°ã—ã„メッセージを投稿ã—ã¦ãã ã•ã„。\n" +"\n" +"%3$s ã§ã‚ˆã‚Šå¤šãã®ãƒ¡ãƒ¼ãƒ«æŒ‡ç¤ºã€‚\n" +"\n" +"å¿ å®Ÿã§ã‚ã‚‹ã€ã‚ãªãŸã®ã‚‚ã®ã€\n" +"%4$s" #: lib/mail.php:413 #, php-format @@ -4924,15 +4941,15 @@ msgstr "%s ã®çŠ¶æ…‹" #: lib/mail.php:439 msgid "SMS confirmation" -msgstr "" +msgstr "SMS確èª" #: lib/mail.php:463 #, php-format msgid "You've been nudged by %s" -msgstr "ã‚ãªãŸã¯ %s ã«çªã‹ã‚Œã¦ã„ã¾ã™" +msgstr "ã‚ãªãŸã¯ %s ã«åˆå›³ã•ã‚Œã¦ã„ã¾ã™" #: lib/mail.php:467 -#, php-format +#, fuzzy, php-format msgid "" "%1$s (%2$s) is wondering what you are up to these days and is inviting you " "to post some news.\n" @@ -4946,14 +4963,25 @@ msgid "" "With kind regards,\n" "%4$s\n" msgstr "" +"%1$s ($2$s) ã¯ã€æœ€è¿‘ã¾ã§ã‚ãªãŸãŒä½•ã§ã‚ã‚‹ã‹ã¨æ€ã£ã¦ã„ã¦ã€ã‚ãªãŸãŒä½•ã‚‰ã‹ã®" +"ニュースを投稿ã™ã‚‹ã‚ˆã†èª˜ã£ã¦ã„ã¾ã™ã€‚\n" +"\n" +"ãã‚Œã§ã€ã‚ãªãŸã‹ã‚‰ã€é€£çµ¡ã‚’ã„ãŸã ãã¾ã—ょㆠ:)\n" +"\n" +"%3$s\n" +"\n" +"ã“ã®ãƒ¡ãƒ¼ãƒ«ã«ç”ãˆãªã„ã§ãã ã•ã„。 ãã‚Œã¯ãれらを始ã‚ãªã„ã§ã—ょã†ã€‚\n" +"\n" +"敬具\n" +"%4$s\n" #: lib/mail.php:510 #, php-format msgid "New private message from %s" -msgstr "" +msgstr "%s ã‹ã‚‰ã®æ–°ã—ã„プライベートメッセージ" #: lib/mail.php:514 -#, php-format +#, fuzzy, php-format msgid "" "%1$s (%2$s) sent you a private message:\n" "\n" @@ -4970,14 +4998,28 @@ msgid "" "With kind regards,\n" "%5$s\n" msgstr "" +"%1$s (%2$s) ã¯ã‚ãªãŸã«ãƒ—ライベートメッセージをé€ã‚Šã¾ã—ãŸï¼š\n" +"\n" +"------------------------------------------------------\n" +"%3$s\n" +"------------------------------------------------------\n" +"\n" +"ã‚ãªãŸã¯ã“ã“ã§ãれらã®ãƒ¡ãƒƒã‚»ãƒ¼ã‚¸ã«ç”ãˆã‚‹ã“ã¨ãŒã§ãã¾ã™:\n" +"\n" +"%4$s\n" +"\n" +"ã“ã®ãƒ¡ãƒ¼ãƒ«ã«ç”ãˆãªã„ã§ãã ã•ã„。 ãã‚Œã¯ãれらを始ã‚ãªã„ã§ã—ょã†ã€‚\n" +"\n" +"敬具\n" +"%5$s\n" #: lib/mail.php:559 -#, fuzzy, php-format +#, php-format msgid "%s (@%s) added your notice as a favorite" -msgstr "%1$s 㯠%2$s ã§ã‚ãªãŸã®é€šçŸ¥ã‚’èžã„ã¦ã„ã¾ã™ã€‚" +msgstr "%s (@%s) ã¯ãŠæ°—ã«å…¥ã‚Šã¨ã—ã¦ã‚ãªãŸã®ã¤ã¶ã‚„ãã‚’åŠ ãˆã¾ã—ãŸ" #: lib/mail.php:561 -#, php-format +#, fuzzy, php-format msgid "" "%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n" "\n" @@ -4996,11 +5038,28 @@ msgid "" "Faithfully yours,\n" "%6$s\n" msgstr "" +"%1$s (@%7$s) ã¯å½¼ã‚‰ã®ãŠæ°—ã«å…¥ã‚Šã®ã²ã¨ã‚Šã¨ã—㦠%2$s ã‹ã‚‰ã‚ãªãŸã®ã¤ã¶ã‚„ãã‚’åŠ ãˆ" +"ã¾ã—ãŸã€‚\n" +"\n" +"ã‚ãªãŸã®ã¤ã¶ã‚„ãã®ï¼µï¼²ï¼¬:\n" +"\n" +"%3$s\n" +"\n" +"ã‚ãªãŸã®ã¤ã¶ã‚„ãã®ãƒ†ã‚スト:\n" +"\n" +"%4$s\n" +"\n" +"ã‚ãªãŸã¯ã“ã“㧠%1$s ã®ãŠæ°—ã«å…¥ã‚Šã®ãƒªã‚¹ãƒˆã‚’見るã“ã¨ãŒã§ãã¾ã™:\n" +"\n" +"%5$s\n" +"\n" +"å¿ å®Ÿã§ã‚ã‚‹ã€ã‚ãªãŸã®ã‚‚ã®ã€\n" +"%6%s\n" #: lib/mail.php:624 #, php-format msgid "%s (@%s) sent a notice to your attention" -msgstr "" +msgstr "%s (@%s) ã¯ã‚ãªãŸå®›ã¦ã«ã¤ã¶ã‚„ãã‚’é€ã‚Šã¾ã—ãŸ" #: lib/mail.php:626 #, php-format @@ -5016,72 +5075,114 @@ msgid "" "\t%4$s\n" "\n" msgstr "" +"%1$s (@%9$s) ã¯ã‚ãªãŸå®›ã¦ã«(@-返信) %2$s ã§ã¤ã¶ã‚„ãã‚’é€ã‚Šã¾ã—ãŸã€‚\n" +"\n" +"ã¤ã¶ã‚„ãã¯ã“ã“:\n" +"\n" +"%3$s\n" +"\n" +"ã“れをèªã‚€:\n" +"\n" +"%4$s\n" +"\n" #: lib/mailbox.php:89 msgid "Only the user can read their own mailboxes." -msgstr "" +msgstr "利用者ã ã‘ãŒãれら自身ã®ãƒ¡ãƒ¼ãƒ«ãƒœãƒƒã‚¯ã‚¹ã‚’èªã‚€ã“ã¨ãŒã§ãã¾ã™ã€‚" #: lib/mailbox.php:139 msgid "" "You have no private messages. You can send private message to engage other " "users in conversation. People can send you messages for your eyes only." msgstr "" +"ã‚ãªãŸã«ã¯ã€ãƒ—ライベートメッセージãŒå…¨ãã‚ã‚Šã¾ã›ã‚“。ã‚ãªãŸã¯ä»–ã®åˆ©ç”¨è€…を会話" +"ã«å¼•ã込むプライベートメッセージをé€ã‚‹ã“ã¨ãŒã§ãã¾ã™ã€‚人々ã¯ã‚ãªãŸã ã‘ã¸ã®" +"メッセージをé€ã‚‹ã“ã¨ãŒã§ãã¾ã™ã€‚" #: lib/mailbox.php:227 lib/noticelist.php:477 msgid "from" -msgstr "ã‹ã‚‰ " +msgstr "from" + +#: lib/mailhandler.php:37 +msgid "Could not parse message." +msgstr "メッセージを分æžã§ãã¾ã›ã‚“ã§ã—ãŸã€‚" + +#: lib/mailhandler.php:42 +msgid "Not a registered user." +msgstr "登録ユーザã§ã¯ã‚ã‚Šã¾ã›ã‚“。" + +#: lib/mailhandler.php:46 +msgid "Sorry, that is not your incoming email address." +msgstr "ã™ã¿ã¾ã›ã‚“ã€ãã‚Œã¯ã‚ãªãŸã®å…¥ã£ã¦æ¥ã‚‹ãƒ¡ãƒ¼ãƒ«ã‚¢ãƒ‰ãƒ¬ã‚¹ã§ã¯ã‚ã‚Šã¾ã›ã‚“。" + +#: lib/mailhandler.php:50 +msgid "Sorry, no incoming email allowed." +msgstr "ã™ã¿ã¾ã›ã‚“ã€å…¥ã£ã¦ãるメールã¯è¨±å¯ã•ã‚Œã¦ã„ã¾ã›ã‚“。" + +#: lib/mailhandler.php:228 +#, fuzzy, php-format +msgid "Unsupported message type: %s" +msgstr "サãƒãƒ¼ãƒˆå¤–ã®ç”»åƒå½¢å¼ã§ã™ã€‚" #: lib/mediafile.php:98 lib/mediafile.php:123 msgid "There was a database error while saving your file. Please try again." msgstr "" +"データベースエラーãŒã‚ãªãŸã®ãƒ•ã‚¡ã‚¤ãƒ«ã‚’ä¿å˜ã—ã¦ã„ã‚‹ã¨ãã«ã‚ã‚Šã¾ã—ãŸã€‚ å†è©¦è¡Œã—" +"ã¦ãã ã•ã„。" #: lib/mediafile.php:142 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini." msgstr "" +"アップãƒãƒ¼ãƒ‰ã•ã‚ŒãŸãƒ•ã‚¡ã‚¤ãƒ«ã¯ php.ini ã® upload_max_filesize ディレクティブを" +"超ãˆã¦ã„ã¾ã™ã€‚" #: lib/mediafile.php:147 msgid "" "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in " "the HTML form." msgstr "" +"アップãƒãƒ¼ãƒ‰ã•ã‚ŒãŸãƒ•ã‚¡ã‚¤ãƒ«ã¯HTMLフォームã§æŒ‡å®šã•ã‚ŒãŸ MAX_FILE_SIZE ディレク" +"ティブを超ãˆã¦ã„ã¾ã™ã€‚" #: lib/mediafile.php:152 msgid "The uploaded file was only partially uploaded." -msgstr "" +msgstr "アップãƒãƒ¼ãƒ‰ã•ã‚ŒãŸãƒ•ã‚¡ã‚¤ãƒ«ã¯éƒ¨åˆ†çš„ã«ã‚¢ãƒƒãƒ—ãƒãƒ¼ãƒ‰ã•ã‚Œã¦ã„ãŸã ã‘ã§ã™ã€‚" #: lib/mediafile.php:159 msgid "Missing a temporary folder." -msgstr "" +msgstr "一時フォルダを失ã„ã¾ã—ãŸã€‚" #: lib/mediafile.php:162 msgid "Failed to write file to disk." -msgstr "" +msgstr "ディスクã¸ã®ãƒ•ã‚¡ã‚¤ãƒ«æ›¸ãè¾¼ã¿ã«å¤±æ•—ã—ã¾ã—ãŸã€‚" #: lib/mediafile.php:165 msgid "File upload stopped by extension." -msgstr "" +msgstr "エクステンションã«ã‚ˆã£ã¦ãƒ•ã‚¡ã‚¤ãƒ«ã‚¢ãƒƒãƒ—ãƒãƒ¼ãƒ‰ã‚’ä¸æ¢ã—ã¾ã—ãŸã€‚" #: lib/mediafile.php:179 lib/mediafile.php:216 -msgid "File exceeds user's quota!" -msgstr "" +#, fuzzy +msgid "File exceeds user's quota." +msgstr "ファイルã¯ãƒ¦ãƒ¼ã‚¶ã®å‰²å½“ã¦ã‚’超ãˆã¦ã„ã¾ã™!" #: lib/mediafile.php:196 lib/mediafile.php:233 msgid "File could not be moved to destination directory." -msgstr "" +msgstr "ファイルを目的ディレクトリã«å‹•ã‹ã™ã“ã¨ãŒã§ãã¾ã›ã‚“ã§ã—ãŸã€‚" #: lib/mediafile.php:201 lib/mediafile.php:237 -msgid "Could not determine file's mime-type!" +#, fuzzy +msgid "Could not determine file's MIME type." msgstr "ファイルã®MIMEタイプを決定ã§ãã¾ã›ã‚“" #: lib/mediafile.php:270 #, php-format msgid " Try using another %s format." -msgstr "" +msgstr "別㮠%s フォーマットを試ã—ã¦ãã ã•ã„。" #: lib/mediafile.php:275 -#, php-format -msgid "%s is not a supported filetype on this server." -msgstr "" +#, fuzzy, php-format +msgid "%s is not a supported file type on this server." +msgstr "%s ã¯ã“ã®ã‚µãƒ¼ãƒã®ã‚µãƒãƒ¼ãƒˆã—ã¦ã„るファイルタイプã§ã¯ã‚ã‚Šã¾ã›ã‚“。" #: lib/messageform.php:120 msgid "Send a direct notice" @@ -5089,7 +5190,7 @@ msgstr "直接ã¤ã¶ã‚„ãã‚’é€ã‚‹" #: lib/messageform.php:146 msgid "To" -msgstr "" +msgstr "To" #: lib/messageform.php:159 lib/noticeform.php:185 msgid "Available characters" @@ -5106,14 +5207,24 @@ msgstr "最近ã©ã† %s?" #: lib/noticeform.php:192 msgid "Attach" -msgstr "" +msgstr "添付" #: lib/noticeform.php:196 msgid "Attach a file" -msgstr "" +msgstr "ファイル添付" #: lib/noticeform.php:212 -msgid "Share your location" +#, fuzzy +msgid "Share my location." +msgstr "ã‚ãªãŸã®å ´æ‰€ã‚’共有" + +#: lib/noticeform.php:214 +#, fuzzy +msgid "Do not share my location." +msgstr "ã‚ãªãŸã®å ´æ‰€ã‚’共有" + +#: lib/noticeform.php:215 +msgid "Hide this info" msgstr "" #: lib/noticelist.php:428 @@ -5122,34 +5233,36 @@ msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s" msgstr "" #: lib/noticelist.php:429 +#, fuzzy msgid "N" -msgstr "" +msgstr "北" #: lib/noticelist.php:429 +#, fuzzy msgid "S" -msgstr "" +msgstr "å—" #: lib/noticelist.php:430 +#, fuzzy msgid "E" -msgstr "" +msgstr "æ±" #: lib/noticelist.php:430 +#, fuzzy msgid "W" -msgstr "" +msgstr "西" #: lib/noticelist.php:436 msgid "at" -msgstr "" +msgstr "at" #: lib/noticelist.php:531 -#, fuzzy msgid "in context" -msgstr "コンテンツãŒã‚ã‚Šã¾ã›ã‚“ï¼" +msgstr "" #: lib/noticelist.php:556 -#, fuzzy msgid "Repeated by" -msgstr "作æˆ" +msgstr "" #: lib/noticelist.php:585 msgid "Reply to this notice" @@ -5160,21 +5273,20 @@ msgid "Reply" msgstr "返信" #: lib/noticelist.php:628 -#, fuzzy msgid "Notice repeated" -msgstr "通知" +msgstr "ã¤ã¶ã‚„ãã‚’ç¹°ã‚Šè¿”ã—ã¾ã—ãŸ" #: lib/nudgeform.php:116 msgid "Nudge this user" -msgstr "ã“ã®ãƒ¦ãƒ¼ã‚¶ã‚’çªã" +msgstr "ã“ã®ãƒ¦ãƒ¼ã‚¶ã¸åˆå›³" #: lib/nudgeform.php:128 msgid "Nudge" -msgstr "çªã" +msgstr "åˆå›³" #: lib/nudgeform.php:128 msgid "Send a nudge to this user" -msgstr "ã“ã®ãƒ¦ãƒ¼ã‚¶ã¸çªãã‚’é€ã‚‹" +msgstr "ã“ã®ãƒ¦ãƒ¼ã‚¶ã¸åˆå›³ã‚’é€ã‚‹" #: lib/oauthstore.php:283 msgid "Error inserting new profile" @@ -5190,11 +5302,11 @@ msgstr "リモートプãƒãƒ•ã‚¡ã‚¤ãƒ«è¿½åŠ エラー" #: lib/oauthstore.php:345 msgid "Duplicate notice" -msgstr "é‡ãªã£ãŸã¤ã¶ã‚„ã" +msgstr "é‡è¤‡ã—ãŸã¤ã¶ã‚„ã" #: lib/oauthstore.php:466 lib/subs.php:48 msgid "You have been banned from subscribing." -msgstr "" +msgstr "ã‚ãªãŸã¯ãƒ•ã‚©ãƒãƒ¼ãŒç¦æ¢ã•ã‚Œã¾ã—ãŸã€‚" #: lib/oauthstore.php:491 msgid "Couldn't insert new subscription." @@ -5210,28 +5322,33 @@ msgstr "返信" #: lib/personalgroupnav.php:114 msgid "Favorites" -msgstr "" +msgstr "ãŠæ°—ã«å…¥ã‚Š" #: lib/personalgroupnav.php:124 msgid "Inbox" -msgstr "" +msgstr "å—ä¿¡ç®±" #: lib/personalgroupnav.php:125 msgid "Your incoming messages" -msgstr "" +msgstr "ã‚ãªãŸã®å…¥ã£ã¦ãるメッセージ" #: lib/personalgroupnav.php:129 msgid "Outbox" -msgstr "" +msgstr "é€ä¿¡ç®±" #: lib/personalgroupnav.php:130 msgid "Your sent messages" -msgstr "" +msgstr "ã‚ãªãŸãŒé€ã£ãŸãƒ¡ãƒƒã‚»ãƒ¼ã‚¸" #: lib/personaltagcloudsection.php:56 #, php-format msgid "Tags in %s's notices" -msgstr "" +msgstr "%s ã®ã¤ã¶ã‚„ãã®ã‚¿ã‚°" + +#: lib/plugin.php:114 +#, fuzzy +msgid "Unknown" +msgstr "ä¸æ˜Žãªã‚¢ã‚¯ã‚·ãƒ§ãƒ³" #: lib/profileaction.php:109 lib/profileaction.php:192 lib/subgroupnav.php:82 msgid "Subscriptions" @@ -5251,7 +5368,7 @@ msgstr "ã™ã¹ã¦ã®ãƒ•ã‚©ãƒãƒ¼ã•ã‚Œã¦ã„ã‚‹" #: lib/profileaction.php:178 msgid "User ID" -msgstr "" +msgstr "利用者ＩＤ" #: lib/profileaction.php:183 msgid "Member since" @@ -5259,16 +5376,15 @@ msgstr "ã‹ã‚‰ã®ãƒ¡ãƒ³ãƒãƒ¼" #: lib/profileaction.php:245 msgid "All groups" -msgstr "" +msgstr "å…¨ã¦ã®ã‚°ãƒ«ãƒ¼ãƒ—" #: lib/profileformaction.php:123 -#, fuzzy msgid "No return-to arguments." -msgstr "ãã®ã‚ˆã†ãªãƒ‰ã‚ュメントã¯ã‚ã‚Šã¾ã›ã‚“。" +msgstr "return-to 引数ãŒã‚ã‚Šã¾ã›ã‚“。" #: lib/profileformaction.php:137 msgid "Unimplemented method." -msgstr "" +msgstr "未実装ã®ãƒ¡ã‚½ãƒƒãƒ‰ã€‚" #: lib/publicgroupnav.php:78 msgid "Public" @@ -5284,56 +5400,51 @@ msgstr "最近ã®ã‚¿ã‚°" #: lib/publicgroupnav.php:88 msgid "Featured" -msgstr "" +msgstr "フィーãƒãƒ£ãƒ¼ã•ã‚ŒãŸ" #: lib/publicgroupnav.php:92 msgid "Popular" msgstr "人気" #: lib/repeatform.php:107 -#, fuzzy msgid "Repeat this notice?" -msgstr "ã“ã®é€šçŸ¥ã¸è¿”ä¿¡" +msgstr "ã“ã®ã¤ã¶ã‚„ãã‚’ç¹°ã‚Šè¿”ã—ã¾ã™ã‹?" #: lib/repeatform.php:132 -#, fuzzy msgid "Repeat this notice" -msgstr "ã“ã®é€šçŸ¥ã¸è¿”ä¿¡" +msgstr "ã“ã®ã¤ã¶ã‚„ãã‚’ç¹°ã‚Šè¿”ã™" #: lib/sandboxform.php:67 msgid "Sandbox" -msgstr "" +msgstr "サンドボックス" #: lib/sandboxform.php:78 -#, fuzzy msgid "Sandbox this user" -msgstr "ã“ã®ãƒ¦ãƒ¼ã‚¶ã‚’アンブãƒãƒƒã‚¯ã™ã‚‹" +msgstr "ã“ã®ãƒ¦ãƒ¼ã‚¶ã‚’サンドボックス" #: lib/searchaction.php:120 -#, fuzzy msgid "Search site" -msgstr "検索" +msgstr "サイト検索" #: lib/searchaction.php:126 msgid "Keyword(s)" -msgstr "" +msgstr "ã‚ーワード" #: lib/searchaction.php:162 -#, fuzzy msgid "Search help" -msgstr "検索" +msgstr "ヘルプ検索" #: lib/searchgroupnav.php:80 msgid "People" -msgstr "" +msgstr "人々" #: lib/searchgroupnav.php:81 msgid "Find people on this site" -msgstr "" +msgstr "ã“ã®ã‚µã‚¤ãƒˆã®äººã€…を探ã™" #: lib/searchgroupnav.php:83 msgid "Find content of notices" -msgstr "" +msgstr "ã¤ã¶ã‚„ãã®å†…容を探ã™" #: lib/searchgroupnav.php:85 msgid "Find groups on this site" @@ -5345,81 +5456,72 @@ msgstr "å称未è¨å®šã®ã‚»ã‚¯ã‚·ãƒ§ãƒ³" #: lib/section.php:106 msgid "More..." -msgstr "" +msgstr "ã•ã‚‰ã«..." #: lib/silenceform.php:67 -#, fuzzy msgid "Silence" -msgstr "æ–°ã—ã„通知" +msgstr "サイレンス" #: lib/silenceform.php:78 -#, fuzzy msgid "Silence this user" -msgstr "ã“ã®ãƒ¦ãƒ¼ã‚¶ã‚’ブãƒãƒƒã‚¯ã™ã‚‹" +msgstr "ã“ã®ãƒ¦ãƒ¼ã‚¶ã‚’サイレンスã«" #: lib/subgroupnav.php:83 -#, fuzzy, php-format +#, php-format msgid "People %s subscribes to" -msgstr "リモートサブスクライブ" +msgstr "人々 %s ã¯ãƒ•ã‚©ãƒãƒ¼" #: lib/subgroupnav.php:91 -#, fuzzy, php-format +#, php-format msgid "People subscribed to %s" -msgstr "リモートサブスクライブ" +msgstr "人々㯠%s をフォãƒãƒ¼ã—ã¾ã—ãŸã€‚" #: lib/subgroupnav.php:99 #, php-format msgid "Groups %s is a member of" -msgstr "" +msgstr "グループ %s ã¯ãƒ¡ãƒ³ãƒãƒ¼" #: lib/subs.php:52 msgid "Already subscribed!" -msgstr "" +msgstr "ã™ã§ã«ãƒ•ã‚©ãƒãƒ¼ã—ã¦ã„ã¾ã™!" #: lib/subs.php:56 -#, fuzzy msgid "User has blocked you." -msgstr "プãƒãƒ•ã‚¡ã‚¤ãƒ«ãŒã‚ã‚Šã¾ã›ã‚“。" +msgstr "利用者ã¯ã‚ãªãŸã‚’ブãƒãƒƒã‚¯ã—ã¾ã—ãŸã€‚" #: lib/subs.php:60 msgid "Could not subscribe." -msgstr "" +msgstr "フォãƒãƒ¼ã§ãã¾ã›ã‚“。" #: lib/subs.php:79 msgid "Could not subscribe other to you." -msgstr "" +msgstr "ä»–ã®äººãŒã‚ãªãŸã‚’フォãƒãƒ¼ã§ãã¾ã›ã‚“。" #: lib/subs.php:128 -#, fuzzy msgid "Not subscribed!" -msgstr "è³¼èªã—ã¦ã„ã¾ã›ã‚“ï¼" +msgstr "フォãƒãƒ¼ã—ã¦ã„ã¾ã›ã‚“ï¼" #: lib/subs.php:133 -#, fuzzy msgid "Couldn't delete self-subscription." -msgstr "サブスクリプションを削除ã§ãã¾ã›ã‚“" +msgstr "自己フォãƒãƒ¼ã‚’削除ã§ãã¾ã›ã‚“。" #: lib/subs.php:146 msgid "Couldn't delete subscription." -msgstr "サブスクリプションを削除ã§ãã¾ã›ã‚“" +msgstr "フォãƒãƒ¼ã‚’削除ã§ãã¾ã›ã‚“" #: lib/subscriberspeopleselftagcloudsection.php:48 #: lib/subscriptionspeopleselftagcloudsection.php:48 msgid "People Tagcloud as self-tagged" -msgstr "" +msgstr "自己タグã¥ã‘ã¨ã—ã¦ã®äººã€…タグクラウド" #: lib/subscriberspeopletagcloudsection.php:48 #: lib/subscriptionspeopletagcloudsection.php:48 msgid "People Tagcloud as tagged" -msgstr "" - -#: lib/subscriptionlist.php:126 -msgid "(none)" -msgstr "(ãªã—)" +msgstr "タグ付ã‘ã¨ã—ã¦ã®äººã€…タグクラウド" #: lib/tagcloudsection.php:56 msgid "None" -msgstr "" +msgstr "ãªã—" #: lib/topposterssection.php:74 msgid "Top posters" @@ -5427,29 +5529,27 @@ msgstr "上ä½æŠ•ç¨¿è€…" #: lib/unsandboxform.php:69 msgid "Unsandbox" -msgstr "" +msgstr "アンサンドボックス" #: lib/unsandboxform.php:80 -#, fuzzy msgid "Unsandbox this user" -msgstr "ã“ã®ãƒ¦ãƒ¼ã‚¶ã‚’アンブãƒãƒƒã‚¯ã™ã‚‹" +msgstr "ã“ã®åˆ©ç”¨è€…をアンサンドボックス" #: lib/unsilenceform.php:67 msgid "Unsilence" -msgstr "" +msgstr "アンサイレンス" #: lib/unsilenceform.php:78 -#, fuzzy msgid "Unsilence this user" -msgstr "ã“ã®ãƒ¦ãƒ¼ã‚¶ã‚’アンブãƒãƒƒã‚¯ã™ã‚‹" +msgstr "ã“ã®åˆ©ç”¨è€…をアンサイレンス" #: lib/unsubscribeform.php:113 lib/unsubscribeform.php:137 msgid "Unsubscribe from this user" -msgstr "ã“ã®ãƒ¦ãƒ¼ã‚¶ã‹ã‚‰ã®ã‚µãƒ–スクライブを解除ã™ã‚‹" +msgstr "ã“ã®ãƒ¦ãƒ¼ã‚¶ã‹ã‚‰ã®ãƒ•ã‚©ãƒãƒ¼ã‚’解除ã™ã‚‹" #: lib/unsubscribeform.php:137 msgid "Unsubscribe" -msgstr "フォãƒãƒ¼ä¸æ¢" +msgstr "フォãƒãƒ¼è§£é™¤" #: lib/userprofile.php:116 msgid "Edit Avatar" @@ -5457,28 +5557,28 @@ msgstr "ã‚¢ãƒã‚¿ãƒ¼ã‚’編集ã™ã‚‹" #: lib/userprofile.php:236 msgid "User actions" -msgstr "" +msgstr "利用者アクション" #: lib/userprofile.php:248 -#, fuzzy msgid "Edit profile settings" -msgstr "プãƒãƒ•ã‚¡ã‚¤ãƒ«è¨å®š" +msgstr "プãƒãƒ•ã‚¡ã‚¤ãƒ«è¨å®šç·¨é›†" #: lib/userprofile.php:249 msgid "Edit" -msgstr "" +msgstr "編集" #: lib/userprofile.php:272 msgid "Send a direct message to this user" -msgstr "" +msgstr "ã“ã®åˆ©ç”¨è€…ã«ãƒ€ã‚¤ãƒ¬ã‚¯ãƒˆãƒ¡ãƒƒã‚»ãƒ¼ã‚¸ã‚’é€ã‚‹" #: lib/userprofile.php:273 msgid "Message" -msgstr "" +msgstr "メッセージ" #: lib/userprofile.php:311 +#, fuzzy msgid "Moderate" -msgstr "" +msgstr "å¸ä¼š" #: lib/util.php:837 msgid "a few seconds ago" @@ -5525,27 +5625,11 @@ msgid "about a year ago" msgstr "ç´„ 1 å¹´å‰" #: lib/webcolor.php:82 -#, fuzzy, php-format +#, php-format msgid "%s is not a valid color!" -msgstr "ホームページã®URLãŒä¸é©åˆ‡ã§ã™ã€‚" +msgstr "%sã¯æœ‰åŠ¹ãªè‰²ã§ã¯ã‚ã‚Šã¾ã›ã‚“!" #: lib/webcolor.php:123 #, php-format msgid "%s is not a valid color! Use 3 or 6 hex chars." -msgstr "" - -#: scripts/maildaemon.php:48 -msgid "Could not parse message." -msgstr "" - -#: scripts/maildaemon.php:53 -msgid "Not a registered user." -msgstr "" - -#: scripts/maildaemon.php:57 -msgid "Sorry, that is not your incoming email address." -msgstr "" - -#: scripts/maildaemon.php:61 -msgid "Sorry, no incoming email allowed." -msgstr "" +msgstr "%s ã¯æœ‰åŠ¹ãªè‰²ã§ã¯ã‚ã‚Šã¾ã›ã‚“! 3ã‹6ã®16進数を使ã£ã¦ãã ã•ã„。" diff --git a/locale/ko/LC_MESSAGES/statusnet.po b/locale/ko/LC_MESSAGES/statusnet.po index 9493223b2..d04758a98 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-01-03 10:37+0000\n" -"PO-Revision-Date: 2010-01-03 10:38:18+0000\n" +"POT-Creation-Date: 2010-01-10 11:27+0000\n" +"PO-Revision-Date: 2010-01-10 11:28:35+0000\n" "Language-Team: Korean\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha (r60575); Translate extension (2009-12-06)\n" +"X-Generator: MediaWiki 1.16alpha (r60888); Translate extension (2010-01-04)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: ko\n" "X-Message-Group: out-statusnet\n" @@ -50,11 +50,6 @@ msgstr "그러한 태그가 없습니다." msgid "No such user." msgstr "그러한 사용ìžëŠ” 없습니다." -#: actions/all.php:84 -#, php-format -msgid "%s and friends, page %d" -msgstr "%s 와 친구들, %d 페ì´ì§€" - #: actions/all.php:86 actions/all.php:167 actions/allrss.php:115 #: actions/apitimelinefriends.php:115 actions/apitimelinehome.php:115 #: lib/personalgroupnav.php:100 @@ -93,8 +88,8 @@ msgstr "" #: actions/all.php:134 #, php-format msgid "" -"You can try to [nudge %s](../%s) from his profile or [post something to his " -"or her attention](%%%%action.newnotice%%%%?status_textarea=%s)." +"You can try to [nudge %1$s](../%2$s) from his profile or [post something to " +"his or her attention](%%%%action.newnotice%%%%?status_textarea=%3$s)." msgstr "" #: actions/all.php:137 actions/replies.php:209 actions/showstream.php:202 @@ -120,6 +115,23 @@ msgstr "%1$s ë° %2$sì— ìžˆëŠ” ì¹œêµ¬ë“¤ì˜ ì—…ë°ì´íŠ¸!" #: actions/apiaccountupdateprofile.php:97 #: actions/apiaccountupdateprofilebackgroundimage.php:94 #: actions/apiaccountupdateprofilecolors.php:118 +#: actions/apidirectmessage.php:156 actions/apifavoritecreate.php:99 +#: actions/apifavoritedestroy.php:100 actions/apifriendshipscreate.php:100 +#: actions/apifriendshipsdestroy.php:100 actions/apifriendshipsshow.php:129 +#: actions/apigroupcreate.php:136 actions/apigroupismember.php:114 +#: actions/apigroupjoin.php:155 actions/apigroupleave.php:141 +#: actions/apigrouplist.php:132 actions/apigrouplistall.php:120 +#: actions/apigroupmembership.php:106 actions/apigroupshow.php:105 +#: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102 +#: actions/apistatusesretweets.php:112 actions/apistatusesshow.php:108 +#: actions/apistatusnetconfig.php:133 actions/apistatusnetversion.php:93 +#: actions/apisubscriptions.php:111 actions/apitimelinefavorites.php:146 +#: actions/apitimelinefriends.php:156 actions/apitimelinegroup.php:150 +#: actions/apitimelinehome.php:156 actions/apitimelinementions.php:151 +#: actions/apitimelinepublic.php:131 actions/apitimelineretweetedbyme.php:122 +#: actions/apitimelineretweetedtome.php:121 +#: actions/apitimelineretweetsofme.php:122 actions/apitimelinetag.php:141 +#: actions/apitimelineuser.php:165 actions/apiusershow.php:101 #, fuzzy msgid "API method not found." msgstr "API 메서드를 ì°¾ì„ ìˆ˜ 없습니다." @@ -178,6 +190,9 @@ msgstr "" #: actions/apiaccountupdateprofilebackgroundimage.php:146 #: actions/apiaccountupdateprofilecolors.php:164 #: actions/apiaccountupdateprofilecolors.php:174 +#: actions/groupdesignsettings.php:287 actions/groupdesignsettings.php:297 +#: actions/userdesignsettings.php:210 actions/userdesignsettings.php:220 +#: actions/userdesignsettings.php:263 actions/userdesignsettings.php:273 #, fuzzy msgid "Unable to save your design settings." msgstr "트위터 í™˜ê²½ì„¤ì •ì„ ì €ìž¥í• ìˆ˜ 없습니다." @@ -221,26 +236,6 @@ msgstr "%sì—게 ì§ì ‘ 메시지" msgid "All the direct messages sent to %s" msgstr "%sì—게 ëª¨ë“ ì§ì ‘ 메시지" -#: actions/apidirectmessage.php:156 actions/apifavoritecreate.php:99 -#: actions/apifavoritedestroy.php:100 actions/apifriendshipscreate.php:100 -#: actions/apifriendshipsdestroy.php:100 actions/apifriendshipsshow.php:129 -#: actions/apigroupcreate.php:136 actions/apigroupismember.php:114 -#: actions/apigroupjoin.php:155 actions/apigroupleave.php:141 -#: actions/apigrouplist.php:132 actions/apigrouplistall.php:120 -#: actions/apigroupmembership.php:106 actions/apigroupshow.php:105 -#: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102 -#: actions/apistatusesretweets.php:112 actions/apistatusesshow.php:108 -#: actions/apistatusnetconfig.php:133 actions/apistatusnetversion.php:93 -#: actions/apisubscriptions.php:111 actions/apitimelinefavorites.php:146 -#: actions/apitimelinefriends.php:156 actions/apitimelinegroup.php:150 -#: actions/apitimelinehome.php:156 actions/apitimelinementions.php:151 -#: actions/apitimelinepublic.php:131 actions/apitimelineretweetedbyme.php:122 -#: actions/apitimelineretweetedtome.php:121 -#: actions/apitimelineretweetsofme.php:122 actions/apitimelinetag.php:141 -#: actions/apitimelineuser.php:165 actions/apiusershow.php:101 -msgid "API method not found!" -msgstr "API 메서드를 ì°¾ì„ ìˆ˜ 없습니다." - #: actions/apidirectmessagenew.php:126 msgid "No message text!" msgstr "메시지 ë‚´ìš©ì´ ì—†ìŠµë‹ˆë‹¤!" @@ -265,7 +260,7 @@ msgstr "ê·¸ IDë¡œ ë°œê²¬ëœ ìƒíƒœê°€ 없습니다." #: actions/apifavoritecreate.php:119 #, fuzzy -msgid "This status is already a favorite!" +msgid "This status is already a favorite." msgstr "ì´ ê²Œì‹œê¸€ì€ ì´ë¯¸ 좋아하는 게시글입니다." #: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:176 @@ -274,7 +269,7 @@ msgstr "좋아하는 ê²Œì‹œê¸€ì„ ìƒì„±í• 수 없습니다." #: actions/apifavoritedestroy.php:122 #, fuzzy -msgid "That status is not a favorite!" +msgid "That status is not a favorite." msgstr "ì´ ë©”ì‹œì§€ëŠ” favoriteì´ ì•„ë‹™ë‹ˆë‹¤." #: actions/apifavoritedestroy.php:134 actions/disfavor.php:87 @@ -296,8 +291,9 @@ msgid "Could not unfollow user: User not found." msgstr "ë”°ë¼ê°€ì‹¤ 수 없습니다 : 사용ìžê°€ 없습니다." #: actions/apifriendshipsdestroy.php:120 -msgid "You cannot unfollow yourself!" -msgstr "" +#, fuzzy +msgid "You cannot unfollow yourself." +msgstr "사용ìžë¥¼ ì—…ë°ì´íŠ¸ í• ìˆ˜ 없습니다." #: actions/apifriendshipsexists.php:94 msgid "Two user ids or screen_names must be supplied." @@ -386,7 +382,7 @@ msgstr "" msgid "Group not found!" msgstr "API 메서드를 ì°¾ì„ ìˆ˜ 없습니다." -#: actions/apigroupjoin.php:110 +#: actions/apigroupjoin.php:110 actions/joingroup.php:90 lib/command.php:217 #, fuzzy msgid "You are already a member of that group." msgstr "ë‹¹ì‹ ì€ ì´ë¯¸ ì´ ê·¸ë£¹ì˜ ë©¤ë²„ìž…ë‹ˆë‹¤." @@ -395,9 +391,9 @@ msgstr "ë‹¹ì‹ ì€ ì´ë¯¸ ì´ ê·¸ë£¹ì˜ ë©¤ë²„ìž…ë‹ˆë‹¤." msgid "You have been blocked from that group by the admin." msgstr "" -#: actions/apigroupjoin.php:138 +#: actions/apigroupjoin.php:138 actions/joingroup.php:128 lib/command.php:234 #, fuzzy, php-format -msgid "Could not join user %s to group %s." +msgid "Could not join user %1$s to group %2$s." msgstr "그룹 %sì— %s는 ê°€ìž…í• ìˆ˜ 없습니다." #: actions/apigroupleave.php:114 @@ -405,9 +401,9 @@ msgstr "그룹 %sì— %s는 ê°€ìž…í• ìˆ˜ 없습니다." msgid "You are not a member of this group." msgstr "ë‹¹ì‹ ì€ í•´ë‹¹ ê·¸ë£¹ì˜ ë©¤ë²„ê°€ 아닙니다." -#: actions/apigroupleave.php:124 +#: actions/apigroupleave.php:124 actions/leavegroup.php:127 #, fuzzy, php-format -msgid "Could not remove user %s to group %s." +msgid "Could not remove user %1$s from group %2$s." msgstr "그룹 %sì—ì„œ %s 사용ìžë¥¼ ì œê±°í• ìˆ˜ 없습니다." #: actions/apigrouplist.php:95 @@ -415,11 +411,6 @@ msgstr "그룹 %sì—ì„œ %s 사용ìžë¥¼ ì œê±°í• ìˆ˜ 없습니다." msgid "%s's groups" msgstr "%s 그룹" -#: actions/apigrouplist.php:103 -#, fuzzy, php-format -msgid "Groups %s is a member of on %s." -msgstr "%s ê·¸ë£¹ë“¤ì€ ì˜ ë©¤ë²„ìž…ë‹ˆë‹¤." - #: actions/apigrouplistall.php:90 actions/usergroups.php:62 #, php-format msgid "%s groups" @@ -443,12 +434,12 @@ msgstr "ë‹¹ì‹ ì€ ë‹¤ë¥¸ 사용ìžì˜ ìƒíƒœë¥¼ ì‚ì œí•˜ì§€ ì•Šì•„ë„ ëœë‹¤." msgid "No such notice." msgstr "그러한 통지는 없습니다." -#: actions/apistatusesretweet.php:83 +#: actions/apistatusesretweet.php:83 lib/command.php:422 #, fuzzy msgid "Cannot repeat your own notice." msgstr "ì•Œë¦¼ì„ ì¼¤ 수 없습니다." -#: actions/apistatusesretweet.php:91 +#: actions/apistatusesretweet.php:91 lib/command.php:427 #, fuzzy msgid "Already repeated that notice." msgstr "ì´ ê²Œì‹œê¸€ ì‚ì œí•˜ê¸°" @@ -463,7 +454,7 @@ msgid "No status with that ID found." msgstr "ë°œê²¬ëœ IDì˜ ìƒíƒœê°€ 없습니다." #: actions/apistatusesupdate.php:157 actions/newnotice.php:155 -#: scripts/maildaemon.php:71 +#: lib/mailhandler.php:60 #, fuzzy, php-format msgid "That's too long. Max notice size is %d chars." msgstr "너무 ê¹ë‹ˆë‹¤. í†µì§€ì˜ ìµœëŒ€ 길ì´ëŠ” 140ê¸€ìž ìž…ë‹ˆë‹¤." @@ -483,13 +474,13 @@ msgid "Unsupported format." msgstr "지ì›í•˜ì§€ 않는 그림 íŒŒì¼ í˜•ì‹ìž…니다." #: actions/apitimelinefavorites.php:108 -#, php-format -msgid "%s / Favorites from %s" +#, fuzzy, php-format +msgid "%1$s / Favorites from %2$s" msgstr "%s / %sì˜ ì¢‹ì•„í•˜ëŠ” 글들" #: actions/apitimelinefavorites.php:120 -#, php-format -msgid "%s updates favorited by %s / %s." +#, fuzzy, php-format +msgid "%1$s updates favorited by %2$s / %2$s." msgstr "%s 좋아하는 ê¸€ì´ ì—…ë°ì´íŠ¸ ë습니다. %Sì— ì˜í•´ / %s." #: actions/apitimelinegroup.php:109 actions/apitimelineuser.php:118 @@ -558,8 +549,11 @@ msgstr "ì°¾ì„ ìˆ˜ê°€ 없습니다." msgid "No such attachment." msgstr "그러한 문서는 없습니다." -#: actions/avatarbynickname.php:59 actions/grouprss.php:91 -#: actions/leavegroup.php:76 +#: actions/avatarbynickname.php:59 actions/blockedfromgroup.php:73 +#: actions/editgroup.php:84 actions/groupdesignsettings.php:84 +#: actions/grouplogo.php:86 actions/groupmembers.php:76 +#: actions/grouprss.php:91 actions/joingroup.php:76 actions/leavegroup.php:76 +#: actions/showgroup.php:121 msgid "No nickname." msgstr "ë³„ëª…ì´ ì—†ìŠµë‹ˆë‹¤." @@ -582,8 +576,8 @@ msgid "You can upload your personal avatar. The maximum file size is %s." msgstr "ë‹¹ì‹ ì˜ ê°œì¸ì ì¸ ì•„ë°”íƒ€ë¥¼ ì—…ë¡œë“œí• ìˆ˜ 있습니다." #: actions/avatarsettings.php:106 actions/avatarsettings.php:185 -#: actions/grouplogo.php:178 actions/remotesubscribe.php:191 -#: actions/userauthorization.php:72 actions/userrss.php:103 +#: actions/remotesubscribe.php:191 actions/userauthorization.php:72 +#: actions/userrss.php:103 msgid "User without matching profile" msgstr "프로필 매ì¹ì´ 없는 사용ìž" @@ -615,9 +609,9 @@ msgstr "올리기" msgid "Crop" msgstr "ìžë¥´ê¸°" -#: actions/avatarsettings.php:268 actions/disfavor.php:74 -#: actions/emailsettings.php:238 actions/favor.php:75 actions/geocode.php:50 -#: actions/groupblock.php:66 actions/grouplogo.php:309 +#: actions/avatarsettings.php:268 actions/deletenotice.php:157 +#: actions/disfavor.php:74 actions/emailsettings.php:238 actions/favor.php:75 +#: actions/geocode.php:50 actions/groupblock.php:66 actions/grouplogo.php:309 #: actions/groupunblock.php:66 actions/imsettings.php:206 #: actions/invite.php:56 actions/login.php:135 actions/makeadmin.php:66 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80 @@ -699,18 +693,14 @@ msgstr "ì´ ì‚¬ìš©ìž ì°¨ë‹¨í•˜ê¸°" msgid "Failed to save block information." msgstr "ì •ë³´ì°¨ë‹¨ì„ ì €ìž¥í•˜ëŠ”ë° ì‹¤íŒ¨í–ˆìŠµë‹ˆë‹¤." -#: actions/blockedfromgroup.php:73 actions/editgroup.php:84 -#: actions/groupdesignsettings.php:84 actions/grouplogo.php:86 -#: actions/groupmembers.php:76 actions/joingroup.php:76 -#: actions/showgroup.php:121 -msgid "No nickname" -msgstr "ë‹‰ë„¤ìž„ì´ ì—†ìŠµë‹ˆë‹¤" - #: actions/blockedfromgroup.php:80 actions/editgroup.php:96 +#: actions/foafgroup.php:44 actions/foafgroup.php:62 actions/groupblock.php:86 #: actions/groupbyid.php:83 actions/groupdesignsettings.php:97 #: actions/grouplogo.php:99 actions/groupmembers.php:83 -#: actions/joingroup.php:83 actions/showgroup.php:137 -msgid "No such group" +#: actions/grouprss.php:98 actions/groupunblock.php:86 +#: actions/joingroup.php:83 actions/leavegroup.php:83 actions/makeadmin.php:86 +#: actions/showgroup.php:137 lib/command.php:212 lib/command.php:263 +msgid "No such group." msgstr "그러한 ê·¸ë£¹ì´ ì—†ìŠµë‹ˆë‹¤." #: actions/blockedfromgroup.php:90 @@ -720,7 +710,7 @@ msgstr "ì´ìš©ìž 프로필" #: actions/blockedfromgroup.php:93 #, fuzzy, php-format -msgid "%s blocked profiles, page %d" +msgid "%1$s blocked profiles, page %2$d" msgstr "%s 와 친구들, %d 페ì´ì§€" #: actions/blockedfromgroup.php:108 @@ -838,11 +828,6 @@ msgstr "ì´ í†µì§€ë¥¼ 지울 수 없습니다." msgid "Delete this notice" msgstr "ì´ ê²Œì‹œê¸€ ì‚ì œí•˜ê¸°" -#: actions/deletenotice.php:157 -#, fuzzy -msgid "There was a problem with your session token. Try again, please." -msgstr "ì„¸ì…˜í† í°ì— ë¬¸ì œê°€ 있습니다. 다시 ì‹œë„해주세요." - #: actions/deleteuser.php:67 #, fuzzy msgid "You cannot delete users." @@ -870,7 +855,7 @@ msgid "Delete this user" msgstr "ì´ ê²Œì‹œê¸€ ì‚ì œí•˜ê¸°" #: actions/designadminpanel.php:62 lib/accountsettingsaction.php:124 -#: lib/adminpanelaction.php:302 lib/groupnav.php:119 +#: lib/adminpanelaction.php:316 lib/groupnav.php:119 msgid "Design" msgstr "" @@ -1018,7 +1003,8 @@ msgstr "ê·¸ë£¹ì„ ë§Œë“¤ê¸° 위해서는 로그ì¸í•´ì•¼ 합니다." #: actions/editgroup.php:103 actions/editgroup.php:168 #: actions/groupdesignsettings.php:104 actions/grouplogo.php:106 -msgid "You must be an admin to edit the group" +#, fuzzy +msgid "You must be an admin to edit the group." msgstr "관리ìžë§Œ ê·¸ë£¹ì„ íŽ¸ì§‘í• ìˆ˜ 있습니다." #: actions/editgroup.php:154 @@ -1044,7 +1030,8 @@ msgid "Options saved." msgstr "ì˜µì…˜ë“¤ì´ ì €ìž¥ë˜ì—ˆìŠµë‹ˆë‹¤." #: actions/emailsettings.php:60 -msgid "Email Settings" +#, fuzzy +msgid "Email settings" msgstr "ì´ë©”ì¼ ì„¸íŒ…" #: actions/emailsettings.php:71 @@ -1081,7 +1068,8 @@ msgid "Cancel" msgstr "취소" #: actions/emailsettings.php:121 -msgid "Email Address" +#, fuzzy +msgid "Email address" msgstr "ì´ë©”ì¼ ì£¼ì†Œ" #: actions/emailsettings.php:123 @@ -1156,8 +1144,9 @@ msgstr "ì´ë©”ì¼ì´ 추가 ë˜ì§€ 않았습니다." msgid "Cannot normalize that email address" msgstr "ê·¸ ì´ë©”ì¼ ì£¼ì†Œë¥¼ ì •ê·œí™” í• ìˆ˜ 없습니다." -#: actions/emailsettings.php:331 actions/siteadminpanel.php:157 -msgid "Not a valid email address" +#: actions/emailsettings.php:331 actions/register.php:201 +#: actions/siteadminpanel.php:157 +msgid "Not a valid email address." msgstr "ìœ íš¨í•œ ì´ë©”ì¼ ì£¼ì†Œê°€ 아닙니다." #: actions/emailsettings.php:334 @@ -1342,19 +1331,12 @@ msgstr "OMB í”„ë¡œí† ì½œì˜ ì•Œë ¤ì§€ì§€ ì•Šì€ ë²„ì „" msgid "Error updating remote profile" msgstr "리모트 프로필 ì—…ë°ì´íŠ¸ 오류" -#: actions/foafgroup.php:44 actions/foafgroup.php:62 actions/groupblock.php:86 -#: actions/grouprss.php:98 actions/groupunblock.php:86 -#: actions/leavegroup.php:83 actions/makeadmin.php:86 lib/command.php:212 -#: lib/command.php:263 -msgid "No such group." -msgstr "그러한 ê·¸ë£¹ì´ ì—†ìŠµë‹ˆë‹¤." - -#: actions/getfile.php:75 +#: actions/getfile.php:79 #, fuzzy msgid "No such file." msgstr "그러한 통지는 없습니다." -#: actions/getfile.php:79 +#: actions/getfile.php:83 #, fuzzy msgid "Cannot read file." msgstr "파ì¼ì„ ìžƒì–´ë²„ë ¸ìŠµë‹ˆë‹¤." @@ -1367,7 +1349,7 @@ msgstr "í”„ë¡œí•„ì„ ì§€ì •í•˜ì§€ 않았습니다." #: actions/groupblock.php:76 actions/groupunblock.php:76 #: actions/makeadmin.php:76 actions/subedit.php:53 actions/tagother.php:46 -#: lib/profileformaction.php:77 +#: actions/unsubscribe.php:84 lib/profileformaction.php:77 msgid "No profile with that ID." msgstr "해당 IDì˜ í”„ë¡œí•„ì´ ì—†ìŠµë‹ˆë‹¤." @@ -1399,9 +1381,9 @@ msgstr "사용ìžë¥¼ 차단합니다." #: actions/groupblock.php:162 #, php-format msgid "" -"Are you sure you want to block user \"%s\" from the group \"%s\"? They will " -"be removed from the group, unable to post, and unable to subscribe to the " -"group in the future." +"Are you sure you want to block user \"%1$s\" from the group \"%2$s\"? They " +"will be removed from the group, unable to post, and unable to subscribe to " +"the group in the future." msgstr "" #: actions/groupblock.php:178 @@ -1418,8 +1400,9 @@ msgstr "ì´ ê·¸ë£¹ì˜ íšŒì›ë¦¬ìŠ¤íŠ¸" msgid "Database error blocking user from group." msgstr "" -#: actions/groupbyid.php:74 -msgid "No ID" +#: actions/groupbyid.php:74 actions/userbyid.php:70 +#, fuzzy +msgid "No ID." msgstr "IDê°€ 없습니다." #: actions/groupdesignsettings.php:68 @@ -1444,13 +1427,6 @@ msgstr "" msgid "Couldn't update your design." msgstr "사용ìžë¥¼ ì—…ë°ì´íŠ¸ í• ìˆ˜ 없습니다." -#: actions/groupdesignsettings.php:287 actions/groupdesignsettings.php:297 -#: actions/userdesignsettings.php:210 actions/userdesignsettings.php:220 -#: actions/userdesignsettings.php:263 actions/userdesignsettings.php:273 -#, fuzzy -msgid "Unable to save your design settings!" -msgstr "트위터 í™˜ê²½ì„¤ì •ì„ ì €ìž¥í• ìˆ˜ 없습니다." - #: actions/groupdesignsettings.php:308 actions/userdesignsettings.php:231 #, fuzzy msgid "Design preferences saved." @@ -1466,6 +1442,11 @@ msgid "" "You can upload a logo image for your group. The maximum file size is %s." msgstr "ë‹¹ì‹ ê·¸ë£¹ì˜ ë¡œê³ ì´ë¯¸ì§€ë¥¼ ì—…ë¡œë“œí• ìˆ˜ 있습니다." +#: actions/grouplogo.php:178 +#, fuzzy +msgid "User without matching profile." +msgstr "프로필 매ì¹ì´ 없는 사용ìž" + #: actions/grouplogo.php:362 #, fuzzy msgid "Pick a square area of the image to be the logo." @@ -1485,15 +1466,15 @@ msgid "%s group members" msgstr "%s 그룹 회ì›" #: actions/groupmembers.php:96 -#, php-format -msgid "%s group members, page %d" +#, fuzzy, php-format +msgid "%1$s group members, page %2$d" msgstr "%s 그룹 회ì›, %d페ì´ì§€" #: actions/groupmembers.php:111 msgid "A list of the users in this group." msgstr "ì´ ê·¸ë£¹ì˜ íšŒì›ë¦¬ìŠ¤íŠ¸" -#: actions/groupmembers.php:175 lib/action.php:441 lib/groupnav.php:107 +#: actions/groupmembers.php:175 lib/action.php:442 lib/groupnav.php:107 msgid "Admin" msgstr "관리ìž" @@ -1591,7 +1572,8 @@ msgid "Error removing the block." msgstr "차단 ì œê±° ì—러!" #: actions/imsettings.php:59 -msgid "IM Settings" +#, fuzzy +msgid "IM settings" msgstr "ë©”ì‹ ì € ì„¤ì •" #: actions/imsettings.php:70 @@ -1622,7 +1604,8 @@ msgstr "" "ëª©ì„ ì¶”ê°€í•˜ì…¨ìŠµë‹ˆê¹Œ?)" #: actions/imsettings.php:124 -msgid "IM Address" +#, fuzzy +msgid "IM address" msgstr "ë©”ì‹ ì € 주소" #: actions/imsettings.php:126 @@ -1684,11 +1667,6 @@ msgstr "" msgid "That is not your Jabber ID." msgstr "ê·¸ Jabber ID는 ê·€í•˜ì˜ ê²ƒì´ ì•„ë‹™ë‹ˆë‹¤." -#: actions/inbox.php:59 -#, php-format -msgid "Inbox for %s - page %d" -msgstr "%sì˜ ë°›ì€ìª½ì§€í•¨ - %d 페ì´ì§€" - #: actions/inbox.php:62 #, php-format msgid "Inbox for %s" @@ -1724,10 +1702,10 @@ msgstr "새 사용ìžë¥¼ 초대" msgid "You are already subscribed to these users:" msgstr "ë‹¹ì‹ ì€ ë‹¤ìŒ ì‚¬ìš©ìžë¥¼ ì´ë¯¸ 구ë…í•˜ê³ ìžˆìŠµë‹ˆë‹¤." -#: actions/invite.php:131 actions/invite.php:139 +#: actions/invite.php:131 actions/invite.php:139 lib/command.php:315 #, php-format -msgid "%s (%s)" -msgstr "%s (%s)" +msgid "%1$s (%2$s)" +msgstr "%1$s (%2$s)" #: actions/invite.php:136 msgid "" @@ -1767,7 +1745,7 @@ msgstr "ê°œì¸ì ì¸ ë©”ì‹œì§€" msgid "Optionally add a personal message to the invitation." msgstr "ì´ˆëŒ€ìž¥ì— ë©”ì‹œì§€ 첨부하기." -#: actions/invite.php:197 lib/messageform.php:178 lib/noticeform.php:232 +#: actions/invite.php:197 lib/messageform.php:178 lib/noticeform.php:234 msgid "Send" msgstr "보내기" @@ -1832,18 +1810,9 @@ msgstr "" msgid "You must be logged in to join a group." msgstr "ê·¸ë£¹ê°€ìž…ì„ ìœ„í•´ì„œëŠ” 로그ì¸ì´ 필요합니다." -#: actions/joingroup.php:90 lib/command.php:217 -msgid "You are already a member of that group" -msgstr "ë‹¹ì‹ ì€ ì´ë¯¸ ì´ ê·¸ë£¹ì˜ ë©¤ë²„ìž…ë‹ˆë‹¤." - -#: actions/joingroup.php:128 lib/command.php:234 -#, php-format -msgid "Could not join user %s to group %s" -msgstr "그룹 %sì— %s는 ê°€ìž…í• ìˆ˜ 없습니다." - #: actions/joingroup.php:135 lib/command.php:239 -#, php-format -msgid "%s joined group %s" +#, fuzzy, php-format +msgid "%1$s joined group %2$s" msgstr "%s 는 그룹 %sì— ê°€ìž…í–ˆìŠµë‹ˆë‹¤." #: actions/leavegroup.php:60 @@ -1858,14 +1827,9 @@ msgstr "ë‹¹ì‹ ì€ í•´ë‹¹ ê·¸ë£¹ì˜ ë©¤ë²„ê°€ 아닙니다." msgid "Could not find membership record." msgstr "ë©¤ë²„ì‹ ê¸°ë¡ì„ ë°œê²¬í• ìˆ˜ 없습니다." -#: actions/leavegroup.php:127 lib/command.php:284 -#, php-format -msgid "Could not remove user %s to group %s" -msgstr "그룹 %sì—ì„œ %s 사용ìžë¥¼ ì œê±°í• ìˆ˜ 없습니다." - #: actions/leavegroup.php:134 lib/command.php:289 -#, php-format -msgid "%s left group %s" +#, fuzzy, php-format +msgid "%1$s left group %2$s" msgstr "%sê°€ 그룹%s를 ë– ë‚¬ìŠµë‹ˆë‹¤." #: actions/login.php:83 actions/register.php:137 @@ -1886,7 +1850,7 @@ msgstr "틀린 ê³„ì • ë˜ëŠ” 비밀 번호" msgid "Error setting user. You are probably not authorized." msgstr "ì¸ì¦ì´ ë˜ì§€ 않았습니다." -#: actions/login.php:208 actions/login.php:261 lib/action.php:459 +#: actions/login.php:208 actions/login.php:261 lib/action.php:460 #: lib/logingroupnav.php:79 msgid "Login" msgstr "로그ì¸" @@ -1940,19 +1904,19 @@ msgid "Only an admin can make another user an admin." msgstr "" #: actions/makeadmin.php:95 -#, php-format -msgid "%s is already an admin for group \"%s\"." -msgstr "" +#, fuzzy, php-format +msgid "%1$s is already an admin for group \"%2$s\"." +msgstr "회ì›ì´ ë‹¹ì‹ ì„ ì°¨ë‹¨í•´ì™”ìŠµë‹ˆë‹¤." #: actions/makeadmin.php:132 -#, php-format -msgid "Can't get membership record for %s in group %s" -msgstr "" +#, fuzzy, php-format +msgid "Can't get membership record for %1$s in group %2$s." +msgstr "그룹 %sì—ì„œ %s 사용ìžë¥¼ ì œê±°í• ìˆ˜ 없습니다." #: actions/makeadmin.php:145 -#, php-format -msgid "Can't make %s an admin for group %s" -msgstr "" +#, fuzzy, php-format +msgid "Can't make %1$s an admin for group %2$s." +msgstr "관리ìžë§Œ ê·¸ë£¹ì„ íŽ¸ì§‘í• ìˆ˜ 있습니다." #: actions/microsummary.php:69 msgid "No current status" @@ -1995,8 +1959,8 @@ msgid "Message sent" msgstr "메시지" #: actions/newmessage.php:185 lib/command.php:376 -#, php-format -msgid "Direct message to %s sent" +#, fuzzy, php-format +msgid "Direct message to %s sent." msgstr "%sì—게 보낸 ì§ì ‘ 메시지" #: actions/newmessage.php:210 actions/newnotice.php:245 lib/channel.php:170 @@ -2026,7 +1990,7 @@ msgstr "ë¬¸ìž ê²€ìƒ‰" #: actions/noticesearch.php:91 #, fuzzy, php-format -msgid "Search results for \"%s\" on %s" +msgid "Search results for \"%1$s\" on %2$s" msgstr "스트림ì—ì„œ \"%s\" 검색" #: actions/noticesearch.php:121 @@ -2131,11 +2095,6 @@ msgstr "" msgid "URL shortening service is too long (max 50 chars)." msgstr "URL 줄ì´ê¸° 서비스 너무 ê¹ë‹ˆë‹¤. (최대 50글ìž)" -#: actions/outbox.php:58 -#, php-format -msgid "Outbox for %s - page %d" -msgstr "%sì˜ ë³´ë‚¸ìª½ì§€í•¨ - page %d" - #: actions/outbox.php:61 #, php-format msgid "Outbox for %s" @@ -2206,7 +2165,7 @@ msgstr "새 비밀번호를 ì €ìž¥ í• ìˆ˜ 없습니다." msgid "Password saved." msgstr "비밀 번호 ì €ìž¥" -#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:308 +#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:326 msgid "Paths" msgstr "" @@ -2239,7 +2198,7 @@ msgid "Invalid SSL server. The maximum length is 255 characters." msgstr "" #: actions/pathsadminpanel.php:217 actions/siteadminpanel.php:58 -#: lib/adminpanelaction.php:299 +#: lib/adminpanelaction.php:311 #, fuzzy msgid "Site" msgstr "초대" @@ -2341,8 +2300,9 @@ msgid "When to use SSL" msgstr "" #: actions/pathsadminpanel.php:308 -msgid "SSL Server" -msgstr "" +#, fuzzy +msgid "SSL server" +msgstr "복구" #: actions/pathsadminpanel.php:309 msgid "Server to direct SSL requests to" @@ -2372,8 +2332,8 @@ msgid "Not a valid people tag: %s" msgstr "ìœ íš¨í•œ 태그가 아닙니다: %s" #: actions/peopletag.php:144 -#, php-format -msgid "Users self-tagged with %s - page %d" +#, fuzzy, php-format +msgid "Users self-tagged with %1$s - page %2$d" msgstr "ì´ìš©ìž 셀프 í…Œí¬ %s - %d 페ì´ì§€" #: actions/postnotice.php:84 @@ -2382,7 +2342,7 @@ msgstr "옳지 ì•Šì€ í†µì§€ ë‚´ìš©" #: actions/postnotice.php:90 #, php-format -msgid "Notice license ‘%s’ is not compatible with site license ‘%s’." +msgid "Notice license ‘%1$s’ is not compatible with site license ‘%2$s’." msgstr "" #: actions/profilesettings.php:60 @@ -2502,20 +2462,20 @@ msgstr "ìœ íš¨í•˜ì§€ ì•Šì€íƒœê·¸: \"%s\"" msgid "Couldn't update user for autosubscribe." msgstr "ìžë™êµ¬ë…ì— ì‚¬ìš©ìžë¥¼ ì—…ë°ì´íŠ¸ í• ìˆ˜ 없습니다." -#: actions/profilesettings.php:354 +#: actions/profilesettings.php:359 #, fuzzy msgid "Couldn't save location prefs." msgstr "태그를 ì €ìž¥í• ìˆ˜ 없습니다." -#: actions/profilesettings.php:366 +#: actions/profilesettings.php:371 msgid "Couldn't save profile." msgstr "í”„ë¡œí•„ì„ ì €ìž¥ í• ìˆ˜ 없습니다." -#: actions/profilesettings.php:374 +#: actions/profilesettings.php:379 msgid "Couldn't save tags." msgstr "태그를 ì €ìž¥í• ìˆ˜ 없습니다." -#: actions/profilesettings.php:382 lib/adminpanelaction.php:126 +#: actions/profilesettings.php:387 lib/adminpanelaction.php:137 msgid "Settings saved." msgstr "ì„¤ì • ì €ìž¥" @@ -2613,7 +2573,7 @@ msgid "" "one!" msgstr "" -#: actions/publictagcloud.php:135 +#: actions/publictagcloud.php:131 msgid "Tag cloud" msgstr "태그 í´ë¼ìš°ë“œ" @@ -2751,7 +2711,7 @@ msgstr "í™•ì¸ ì½”ë“œ 오류" msgid "Registration successful" msgstr "íšŒì› ê°€ìž…ì´ ì„±ê³µì 입니다." -#: actions/register.php:114 actions/register.php:502 lib/action.php:456 +#: actions/register.php:114 actions/register.php:502 lib/action.php:457 #: lib/logingroupnav.php:85 msgid "Register" msgstr "회ì›ê°€ìž…" @@ -2764,10 +2724,6 @@ msgstr "ê°€ìž…ì´ í—ˆìš©ë˜ì§€ 않습니다." msgid "You can't register if you don't agree to the license." msgstr "ë¼ì´ì„ ìŠ¤ì— ë™ì˜í•˜ì§€ 않는다면 등ë¡í• 수 없습니다." -#: actions/register.php:201 -msgid "Not a valid email address." -msgstr "ìœ íš¨í•œ ì´ë©”ì¼ ì£¼ì†Œê°€ 아닙니다." - #: actions/register.php:212 msgid "Email address already exists." msgstr "ì´ë©”ì¼ ì£¼ì†Œê°€ ì´ë¯¸ 존재 합니다." @@ -2825,12 +2781,12 @@ msgid "" msgstr "ë‹¤ìŒ ê°œì¸ì •ë³´ ì œì™¸: 비밀 번호, ë©”ì¼ ì£¼ì†Œ, ë©”ì‹ ì € 주소, ì „í™” 번호" #: actions/register.php:537 -#, php-format +#, fuzzy, php-format msgid "" -"Congratulations, %s! And welcome to %%%%site.name%%%%. From here, you may " +"Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may " "want to...\n" "\n" -"* Go to [your profile](%s) and post your first message.\n" +"* Go to [your profile](%2$s) and post your first message.\n" "* Add a [Jabber/GTalk address](%%%%action.imsettings%%%%) so you can send " "notices through instant messages.\n" "* [Search for people](%%%%action.peoplesearch%%%%) that you may know or that " @@ -2961,11 +2917,6 @@ msgstr "ìƒì„±" msgid "Replies to %s" msgstr "%sì— ë‹µì‹ " -#: actions/replies.php:127 -#, php-format -msgid "Replies to %s, page %d" -msgstr "%sì— ë‹µìž¥, %d 페ì´ì§€" - #: actions/replies.php:144 #, fuzzy, php-format msgid "Replies feed for %s (RSS 1.0)" @@ -2984,8 +2935,8 @@ msgstr "%sì˜ í†µì§€ 피드" #: actions/replies.php:198 #, php-format msgid "" -"This is the timeline showing replies to %s but %s hasn't received a notice " -"to his attention yet." +"This is the timeline showing replies to %1$s but %2$s hasn't received a " +"notice to his attention yet." msgstr "" #: actions/replies.php:203 @@ -2998,8 +2949,8 @@ msgstr "" #: actions/replies.php:205 #, php-format msgid "" -"You can try to [nudge %s](../%s) or [post something to his or her attention]" -"(%%%%action.newnotice%%%%?status_textarea=%s)." +"You can try to [nudge %1$s](../%2$s) or [post something to his or her " +"attention](%%%%action.newnotice%%%%?status_textarea=%3$s)." msgstr "" #: actions/repliesrss.php:72 @@ -3017,11 +2968,6 @@ msgstr "ë‹¹ì‹ ì€ ì´ ì‚¬ìš©ìžì—게 메시지를 보낼 수 없습니다." msgid "User is already sandboxed." msgstr "회ì›ì´ ë‹¹ì‹ ì„ ì°¨ë‹¨í•´ì™”ìŠµë‹ˆë‹¤." -#: actions/showfavorites.php:79 -#, fuzzy, php-format -msgid "%s's favorite notices, page %d" -msgstr "%s 좋아하는 게시글, %d 페ì´ì§€" - #: actions/showfavorites.php:132 msgid "Could not retrieve favorite notices." msgstr "좋아하는 ê²Œì‹œê¸€ì„ ë³µêµ¬í• ìˆ˜ 없습니다." @@ -3071,11 +3017,6 @@ msgstr "" msgid "%s group" msgstr "%s 그룹" -#: actions/showgroup.php:84 -#, php-format -msgid "%s group, page %d" -msgstr "%s 그룹, %d 페ì´ì§€" - #: actions/showgroup.php:218 msgid "Group profile" msgstr "그룹 프로필" @@ -3124,7 +3065,7 @@ msgstr "회ì›" #: actions/showgroup.php:386 lib/profileaction.php:117 #: lib/profileaction.php:148 lib/profileaction.php:236 lib/section.php:95 -#: lib/tagcloudsection.php:71 +#: lib/subscriptionlist.php:126 lib/tagcloudsection.php:71 msgid "(None)" msgstr "(없습니다.)" @@ -3195,14 +3136,9 @@ msgstr "ê²Œì‹œê¸€ì´ ë“±ë¡ë˜ì—ˆìŠµë‹ˆë‹¤." msgid " tagged %s" msgstr "%s íƒœê·¸ëœ í†µì§€" -#: actions/showstream.php:79 -#, php-format -msgid "%s, page %d" -msgstr "%s, %d 페ì´ì§€" - #: actions/showstream.php:122 #, fuzzy, php-format -msgid "Notice feed for %s tagged %s (RSS 1.0)" +msgid "Notice feed for %1$s tagged %2$s (RSS 1.0)" msgstr "%s ê·¸ë£¹ì„ ìœ„í•œ 공지피드" #: actions/showstream.php:129 @@ -3227,7 +3163,7 @@ msgstr "%sì˜ ë³´ë‚¸ìª½ì§€í•¨" #: actions/showstream.php:191 #, php-format -msgid "This is the timeline for %s but %s hasn't posted anything yet." +msgid "This is the timeline for %1$s but %2$s hasn't posted anything yet." msgstr "" #: actions/showstream.php:196 @@ -3239,8 +3175,8 @@ msgstr "" #: actions/showstream.php:198 #, php-format msgid "" -"You can try to nudge %s or [post something to his or her attention](%%%%" -"action.newnotice%%%%?status_textarea=%s)." +"You can try to nudge %1$s or [post something to his or her attention](%%%%" +"action.newnotice%%%%?status_textarea=%2$s)." msgstr "" #: actions/showstream.php:234 @@ -3287,12 +3223,12 @@ msgstr "" #: actions/siteadminpanel.php:154 #, fuzzy -msgid "You must have a valid contact email address" +msgid "You must have a valid contact email address." msgstr "ìœ íš¨í•œ ì´ë©”ì¼ ì£¼ì†Œê°€ 아닙니다." #: actions/siteadminpanel.php:172 #, php-format -msgid "Unknown language \"%s\"" +msgid "Unknown language \"%s\"." msgstr "" #: actions/siteadminpanel.php:179 @@ -3483,7 +3419,8 @@ msgid "Save site settings" msgstr "아바타 ì„¤ì •" #: actions/smssettings.php:58 -msgid "SMS Settings" +#, fuzzy +msgid "SMS settings" msgstr "SMS 세팅" #: actions/smssettings.php:69 @@ -3514,7 +3451,8 @@ msgid "Enter the code you received on your phone." msgstr "휴대í°ìœ¼ë¡œ ë°›ìœ¼ì‹ ì¸ì¦ë²ˆí˜¸ë¥¼ ìž…ë ¥í•˜ì‹ì‹œì˜¤." #: actions/smssettings.php:138 -msgid "SMS Phone number" +#, fuzzy +msgid "SMS phone number" msgstr "SMS íœ´ëŒ€í° ë²ˆí˜¸" #: actions/smssettings.php:140 @@ -3603,8 +3541,8 @@ msgid "%s subscribers" msgstr "%s 구ë…ìž" #: actions/subscribers.php:52 -#, php-format -msgid "%s subscribers, page %d" +#, fuzzy, php-format +msgid "%1$s subscribers, page %2$d" msgstr "%s 구ë…ìž, %d 페ì´ì§€" #: actions/subscribers.php:63 @@ -3640,8 +3578,8 @@ msgid "%s subscriptions" msgstr "%s 구ë…" #: actions/subscriptions.php:54 -#, php-format -msgid "%s subscriptions, page %d" +#, fuzzy, php-format +msgid "%1$s subscriptions, page %2$d" msgstr "%s subscriptions, %d 페ì´ì§€" #: actions/subscriptions.php:65 @@ -3676,11 +3614,6 @@ msgstr "Jabber" msgid "SMS" msgstr "SMS" -#: actions/tag.php:68 -#, php-format -msgid "Notices tagged with %s, page %d" -msgstr "%s 으로 íƒœê·¸ëœ ê²Œì‹œê¸€, %d 페ì´ì§€" - #: actions/tag.php:86 #, fuzzy, php-format msgid "Notice feed for tag %s (RSS 1.0)" @@ -3767,20 +3700,17 @@ msgstr "ì´ìš©ìžê°€ í”„ë¡œí•„ì„ ê°€ì§€ê³ ìžˆì§€ 않습니다." msgid "No profile id in request." msgstr "ìš”ì²í•œ 프로필idê°€ 없습니다." -#: actions/unsubscribe.php:84 -msgid "No profile with that id." -msgstr "해당 idì˜ í”„ë¡œí•„ì´ ì—†ìŠµë‹ˆë‹¤." - #: actions/unsubscribe.php:98 msgid "Unsubscribed" msgstr "구ë…취소 ë˜ì—ˆìŠµë‹ˆë‹¤." #: actions/updateprofile.php:62 actions/userauthorization.php:330 #, php-format -msgid "Listenee stream license ‘%s’ is not compatible with site license ‘%s’." +msgid "" +"Listenee stream license ‘%1$s’ is not compatible with site license ‘%2$s’." msgstr "" -#: actions/useradminpanel.php:58 lib/adminpanelaction.php:305 +#: actions/useradminpanel.php:58 lib/adminpanelaction.php:321 #: lib/personalgroupnav.php:115 msgid "User" msgstr "ì´ìš©ìž" @@ -3886,7 +3816,7 @@ msgstr "" "사용ìžì˜ 통지를 구ë…í•˜ë ¤ë©´ ìƒì„¸ë¥¼ 확ì¸í•´ 주세요. 구ë…하지 않는 경우는, \"취소" "\"를 í´ë¦í•´ 주세요." -#: actions/userauthorization.php:188 +#: actions/userauthorization.php:188 actions/version.php:165 #, fuzzy msgid "License" msgstr "ë¼ì´ì„ 스" @@ -3943,7 +3873,7 @@ msgstr "" #: actions/userauthorization.php:296 #, php-format -msgid "Listener URI ‘%s’ not found here" +msgid "Listener URI ‘%s’ not found here." msgstr "" #: actions/userauthorization.php:301 @@ -3976,11 +3906,6 @@ msgstr "아바타 URL '%s'ì„(를) ì½ì–´ë‚¼ 수 없습니다." msgid "Wrong image type for avatar URL ‘%s’." msgstr "%S ìž˜ëª»ëœ ê·¸ë¦¼ íŒŒì¼ íƒ€ìž…ìž…ë‹ˆë‹¤. " -#: actions/userbyid.php:70 -#, fuzzy -msgid "No ID." -msgstr "IDê°€ 없습니다." - #: actions/userdesignsettings.php:76 lib/designsettings.php:65 #, fuzzy msgid "Profile design" @@ -3996,11 +3921,6 @@ msgstr "" msgid "Enjoy your hotdog!" msgstr "" -#: actions/usergroups.php:64 -#, php-format -msgid "%s groups, page %d" -msgstr "%s 그룹, %d 페ì´ì§€" - #: actions/usergroups.php:130 #, fuzzy msgid "Search for more groups" @@ -4016,6 +3936,72 @@ msgstr "ë‹¹ì‹ ì€ í•´ë‹¹ ê·¸ë£¹ì˜ ë©¤ë²„ê°€ 아닙니다." msgid "Try [searching for groups](%%action.groupsearch%%) and joining them." msgstr "" +#: actions/version.php:73 +#, fuzzy, php-format +msgid "StatusNet %s" +msgstr "통계" + +#: actions/version.php:153 +#, php-format +msgid "" +"This site is powered by %1$s version %2$s, Copyright 2008-2010 StatusNet, " +"Inc. and contributors." +msgstr "" + +#: actions/version.php:157 +#, fuzzy +msgid "StatusNet" +msgstr "아바타가 ì—…ë°ì´íŠ¸ ë˜ì—ˆìŠµë‹ˆë‹¤." + +#: actions/version.php:161 +msgid "Contributors" +msgstr "" + +#: actions/version.php:168 +msgid "" +"StatusNet is free software: you can redistribute it and/or modify it under " +"the terms of the GNU Affero General Public License as published by the Free " +"Software Foundation, either version 3 of the License, or (at your option) " +"any later version. " +msgstr "" + +#: actions/version.php:174 +msgid "" +"This program is distributed in the hope that it will be useful, but WITHOUT " +"ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or " +"FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License " +"for more details. " +msgstr "" + +#: actions/version.php:180 +#, php-format +msgid "" +"You should have received a copy of the GNU Affero General Public License " +"along with this program. If not, see %s." +msgstr "" + +#: actions/version.php:189 +msgid "Plugins" +msgstr "" + +#: actions/version.php:195 +#, fuzzy +msgid "Name" +msgstr "별명" + +#: actions/version.php:196 lib/action.php:741 +#, fuzzy +msgid "Version" +msgstr "ê°œì¸ì ì¸" + +#: actions/version.php:197 +msgid "Author(s)" +msgstr "" + +#: actions/version.php:198 lib/groupeditform.php:172 +msgid "Description" +msgstr "설명" + #: classes/File.php:137 #, php-format msgid "" @@ -4089,7 +4075,7 @@ msgstr "통지를 ì €ìž¥í•˜ëŠ”ë° ë¬¸ì œê°€ ë°œìƒí–ˆìŠµë‹ˆë‹¤." msgid "DB error inserting reply: %s" msgstr "ë‹µì‹ ì„ ì¶”ê°€ í• ë•Œì— ë°ì´íƒ€ë² ì´ìŠ¤ ì—러 : %s" -#: classes/Notice.php:1361 +#: classes/Notice.php:1359 #, fuzzy, php-format msgid "RT @%1$s %2$s" msgstr "%1$s (%2$s)" @@ -4136,140 +4122,135 @@ msgstr "기타" msgid "Other options" msgstr "다른 옵션들" -#: lib/action.php:144 -#, php-format -msgid "%s - %s" -msgstr "%s - %s" - #: lib/action.php:159 msgid "Untitled page" msgstr "ì œëª©ì—†ëŠ” 페ì´ì§€" -#: lib/action.php:426 +#: lib/action.php:427 msgid "Primary site navigation" msgstr "주 사ì´íŠ¸ 네비게ì´ì…˜" -#: lib/action.php:432 +#: lib/action.php:433 msgid "Home" msgstr "홈" -#: lib/action.php:432 +#: lib/action.php:433 msgid "Personal profile and friends timeline" msgstr "ê°œì¸ í”„ë¡œí•„ê³¼ 친구 타임ë¼ì¸" -#: lib/action.php:434 +#: lib/action.php:435 msgid "Account" msgstr "ê³„ì •" -#: lib/action.php:434 +#: lib/action.php:435 msgid "Change your email, avatar, password, profile" msgstr "ë‹¹ì‹ ì˜ ì´ë©”ì¼, 아바타, 비밀 번호, í”„ë¡œí•„ì„ ë³€ê²½í•˜ì„¸ìš”." -#: lib/action.php:437 +#: lib/action.php:438 msgid "Connect" msgstr "ì—°ê²°" -#: lib/action.php:437 +#: lib/action.php:438 #, fuzzy msgid "Connect to services" msgstr "ì„œë²„ì— ìž¬ì ‘ì† í• ìˆ˜ 없습니다 : %s" -#: lib/action.php:441 +#: lib/action.php:442 #, fuzzy msgid "Change site configuration" msgstr "주 사ì´íŠ¸ 네비게ì´ì…˜" -#: lib/action.php:445 lib/subgroupnav.php:105 +#: lib/action.php:446 lib/subgroupnav.php:105 msgid "Invite" msgstr "초대" -#: lib/action.php:446 lib/subgroupnav.php:106 +#: lib/action.php:447 lib/subgroupnav.php:106 #, php-format msgid "Invite friends and colleagues to join you on %s" msgstr "%sì— ì¹œêµ¬ë¥¼ 가입시키기 위해 친구와 ë™ë£Œë¥¼ 초대합니다." -#: lib/action.php:451 +#: lib/action.php:452 msgid "Logout" msgstr "로그아웃" -#: lib/action.php:451 +#: lib/action.php:452 msgid "Logout from the site" msgstr "ì´ ì‚¬ì´íŠ¸ë¡œë¶€í„° 로그아웃" -#: lib/action.php:456 +#: lib/action.php:457 msgid "Create an account" msgstr "ê³„ì • 만들기" -#: lib/action.php:459 +#: lib/action.php:460 msgid "Login to the site" msgstr "ì´ ì‚¬ì´íŠ¸ 로그ì¸" -#: lib/action.php:462 lib/action.php:725 +#: lib/action.php:463 lib/action.php:726 msgid "Help" msgstr "ë„움ë§" -#: lib/action.php:462 +#: lib/action.php:463 msgid "Help me!" msgstr "ë„ì›€ì´ í•„ìš”í•´!" -#: lib/action.php:465 lib/searchaction.php:127 +#: lib/action.php:466 lib/searchaction.php:127 msgid "Search" msgstr "검색" -#: lib/action.php:465 +#: lib/action.php:466 msgid "Search for people or text" msgstr "프로필ì´ë‚˜ í…스트 검색" -#: lib/action.php:486 +#: lib/action.php:487 msgid "Site notice" msgstr "사ì´íŠ¸ 공지" -#: lib/action.php:552 +#: lib/action.php:553 msgid "Local views" msgstr "로컬 ë·°" -#: lib/action.php:618 +#: lib/action.php:619 msgid "Page notice" msgstr "페ì´ì§€ 공지" -#: lib/action.php:720 +#: lib/action.php:721 msgid "Secondary site navigation" msgstr "ë³´ì¡° 사ì´íŠ¸ 네비게ì´ì…˜" -#: lib/action.php:727 +#: lib/action.php:728 msgid "About" msgstr "ì •ë³´" -#: lib/action.php:729 +#: lib/action.php:730 msgid "FAQ" msgstr "ìžì£¼ 묻는 질문" -#: lib/action.php:733 +#: lib/action.php:734 msgid "TOS" msgstr "" -#: lib/action.php:736 +#: lib/action.php:737 msgid "Privacy" msgstr "ê°œì¸ì •ë³´ 취급방침" -#: lib/action.php:738 +#: lib/action.php:739 msgid "Source" msgstr "소스 코드" -#: lib/action.php:740 +#: lib/action.php:743 msgid "Contact" msgstr "ì—°ë½í•˜ê¸°" -#: lib/action.php:742 +#: lib/action.php:745 #, fuzzy msgid "Badge" msgstr "찔러 보기" -#: lib/action.php:770 +#: lib/action.php:773 msgid "StatusNet software license" msgstr "ë¼ì½”니카 소프트웨어 ë¼ì´ì„ 스" -#: lib/action.php:773 +#: lib/action.php:776 #, php-format msgid "" "**%%site.name%%** is a microblogging service brought to you by [%%site." @@ -4278,12 +4259,12 @@ msgstr "" "**%%site.name%%** 는 [%%site.broughtby%%](%%site.broughtbyurl%%)ê°€ ì œê³µí•˜ëŠ” " "마ì´í¬ë¡œë¸”로깅서비스입니다." -#: lib/action.php:775 +#: lib/action.php:778 #, php-format msgid "**%%site.name%%** is a microblogging service. " msgstr "**%%site.name%%** 는 마ì´í¬ë¡œë¸”로깅서비스입니다." -#: lib/action.php:777 +#: lib/action.php:780 #, php-format msgid "" "It runs the [StatusNet](http://status.net/) microblogging software, version %" @@ -4294,32 +4275,32 @@ msgstr "" "ì„ ì‚¬ìš©í•©ë‹ˆë‹¤. StatusNet는 [GNU Affero General Public License](http://www." "fsf.org/licensing/licenses/agpl-3.0.html) ë¼ì´ì„ ìŠ¤ì— ë”°ë¼ ì‚¬ìš©í• ìˆ˜ 있습니다." -#: lib/action.php:791 +#: lib/action.php:794 #, fuzzy msgid "Site content license" msgstr "ë¼ì½”니카 소프트웨어 ë¼ì´ì„ 스" -#: lib/action.php:800 +#: lib/action.php:803 msgid "All " msgstr "ëª¨ë“ ê²ƒ" -#: lib/action.php:805 +#: lib/action.php:808 msgid "license." msgstr "ë¼ì´ì„ 스" -#: lib/action.php:1099 +#: lib/action.php:1102 msgid "Pagination" msgstr "페ì´ì§€ìˆ˜" -#: lib/action.php:1108 +#: lib/action.php:1111 msgid "After" msgstr "ë’· 페ì´ì§€" -#: lib/action.php:1116 +#: lib/action.php:1119 msgid "Before" msgstr "ì•ž 페ì´ì§€" -#: lib/action.php:1164 +#: lib/action.php:1167 msgid "There was a problem with your session token." msgstr "ë‹¹ì‹ ì˜ ì„¸ì…˜í† í°ê´€ë ¨ ë¬¸ì œê°€ 있습니다." @@ -4328,32 +4309,37 @@ msgstr "ë‹¹ì‹ ì˜ ì„¸ì…˜í† í°ê´€ë ¨ ë¬¸ì œê°€ 있습니다." msgid "You cannot make changes to this site." msgstr "ë‹¹ì‹ ì€ ì´ ì‚¬ìš©ìžì—게 메시지를 보낼 수 없습니다." -#: lib/adminpanelaction.php:195 +#: lib/adminpanelaction.php:107 +#, fuzzy +msgid "Changes to that panel are not allowed." +msgstr "ê°€ìž…ì´ í—ˆìš©ë˜ì§€ 않습니다." + +#: lib/adminpanelaction.php:206 #, fuzzy msgid "showForm() not implemented." msgstr "ëª…ë ¹ì´ ì•„ì§ ì‹¤í–‰ë˜ì§€ 않았습니다." -#: lib/adminpanelaction.php:224 +#: lib/adminpanelaction.php:235 #, fuzzy msgid "saveSettings() not implemented." msgstr "ëª…ë ¹ì´ ì•„ì§ ì‹¤í–‰ë˜ì§€ 않았습니다." -#: lib/adminpanelaction.php:247 +#: lib/adminpanelaction.php:258 #, fuzzy msgid "Unable to delete design setting." msgstr "트위터 í™˜ê²½ì„¤ì •ì„ ì €ìž¥í• ìˆ˜ 없습니다." -#: lib/adminpanelaction.php:300 +#: lib/adminpanelaction.php:312 #, fuzzy msgid "Basic site configuration" msgstr "ì´ë©”ì¼ ì£¼ì†Œ 확ì¸ì„œ" -#: lib/adminpanelaction.php:303 +#: lib/adminpanelaction.php:317 #, fuzzy msgid "Design configuration" msgstr "SMS ì¸ì¦" -#: lib/adminpanelaction.php:306 lib/adminpanelaction.php:309 +#: lib/adminpanelaction.php:322 lib/adminpanelaction.php:327 #, fuzzy msgid "Paths configuration" msgstr "SMS ì¸ì¦" @@ -4379,11 +4365,21 @@ msgstr "" msgid "Tags for this attachment" msgstr "" +#: lib/authenticationplugin.php:182 lib/authenticationplugin.php:187 +#, fuzzy +msgid "Password changing failed" +msgstr "비밀번호 변경" + +#: lib/authenticationplugin.php:197 +#, fuzzy +msgid "Password changing is not allowed" +msgstr "비밀번호 변경" + #: lib/channel.php:138 lib/channel.php:158 msgid "Command results" msgstr "실행결과" -#: lib/channel.php:210 +#: lib/channel.php:210 lib/mailhandler.php:142 msgid "Command complete" msgstr "실행 완료" @@ -4397,7 +4393,7 @@ msgstr "죄송합니다. ì´ ëª…ë ¹ì€ ì•„ì§ ì‹¤í–‰ë˜ì§€ 않았습니다." #: lib/command.php:88 #, fuzzy, php-format -msgid "Could not find a user with nickname %s" +msgid "Could not find a user with nickname %s." msgstr "ì´ ì´ë©”ì¼ ì£¼ì†Œë¡œ 사용ìžë¥¼ ì—…ë°ì´íŠ¸ í• ìˆ˜ 없습니다." #: lib/command.php:92 @@ -4406,7 +4402,7 @@ msgstr "" #: lib/command.php:99 #, fuzzy, php-format -msgid "Nudge sent to %s" +msgid "Nudge sent to %s." msgstr "찔러 보기를 보냈습니다." #: lib/command.php:126 @@ -4418,34 +4414,36 @@ msgid "" msgstr "" #: lib/command.php:152 lib/command.php:399 lib/command.php:460 -msgid "Notice with that id does not exist" -msgstr "" +#, fuzzy +msgid "Notice with that id does not exist." +msgstr "해당 idì˜ í”„ë¡œí•„ì´ ì—†ìŠµë‹ˆë‹¤." #: lib/command.php:168 lib/command.php:415 lib/command.php:476 #: lib/command.php:532 -msgid "User has no last notice" +#, fuzzy +msgid "User has no last notice." msgstr "ì´ìš©ìžì˜ 지ì†ì ì¸ ê²Œì‹œê¸€ì´ ì—†ìŠµë‹ˆë‹¤." #: lib/command.php:190 msgid "Notice marked as fave." msgstr "ê²Œì‹œê¸€ì´ ì¢‹ì•„í•˜ëŠ” 글로 ì§€ì •ë˜ì—ˆìŠµë‹ˆë‹¤." -#: lib/command.php:315 -#, php-format -msgid "%1$s (%2$s)" -msgstr "%1$s (%2$s)" +#: lib/command.php:284 +#, fuzzy, php-format +msgid "Could not remove user %1$s to group %2$s." +msgstr "그룹 %sì—ì„œ %s 사용ìžë¥¼ ì œê±°í• ìˆ˜ 없습니다." #: lib/command.php:318 -#, php-format -msgid "Fullname: %s" +#, fuzzy, php-format +msgid "Full name: %s" msgstr "ì „ì²´ì´ë¦„: %s" -#: lib/command.php:321 +#: lib/command.php:321 lib/mail.php:254 #, php-format msgid "Location: %s" msgstr "위치: %s" -#: lib/command.php:324 +#: lib/command.php:324 lib/mail.php:256 #, php-format msgid "Homepage: %s" msgstr "홈페ì´ì§€: %s" @@ -4457,26 +4455,16 @@ msgstr "ìžê¸°ì†Œê°œ: %s" #: lib/command.php:358 scripts/xmppdaemon.php:301 #, fuzzy, php-format -msgid "Message too long - maximum is %d characters, you sent %d" +msgid "Message too long - maximum is %1$d characters, you sent %2$d." msgstr "ë‹¹ì‹ ì´ ë³´ë‚¸ 메시지가 너무 길어요. 최대 140글ìžê¹Œì§€ìž…니다." #: lib/command.php:378 msgid "Error sending direct message." msgstr "ì§ì ‘ 메시지 보내기 오류." -#: lib/command.php:422 -#, fuzzy -msgid "Cannot repeat your own notice" -msgstr "ì•Œë¦¼ì„ ì¼¤ 수 없습니다." - -#: lib/command.php:427 -#, fuzzy -msgid "Already repeated that notice" -msgstr "ì´ ê²Œì‹œê¸€ ì‚ì œí•˜ê¸°" - #: lib/command.php:435 #, fuzzy, php-format -msgid "Notice from %s repeated" +msgid "Notice from %s repeated." msgstr "ê²Œì‹œê¸€ì´ ë“±ë¡ë˜ì—ˆìŠµë‹ˆë‹¤." #: lib/command.php:437 @@ -4486,12 +4474,12 @@ msgstr "통지를 ì €ìž¥í•˜ëŠ”ë° ë¬¸ì œê°€ ë°œìƒí–ˆìŠµë‹ˆë‹¤." #: lib/command.php:491 #, fuzzy, php-format -msgid "Notice too long - maximum is %d characters, you sent %d" +msgid "Notice too long - maximum is %1$d characters, you sent %2$d." msgstr "ë‹¹ì‹ ì´ ë³´ë‚¸ 메시지가 너무 길어요. 최대 140글ìžê¹Œì§€ìž…니다." #: lib/command.php:500 #, fuzzy, php-format -msgid "Reply to %s sent" +msgid "Reply to %s sent." msgstr "ì´ ê²Œì‹œê¸€ì— ëŒ€í•´ 답장하기" #: lib/command.php:502 @@ -4500,7 +4488,8 @@ msgid "Error saving notice." msgstr "통지를 ì €ìž¥í•˜ëŠ”ë° ë¬¸ì œê°€ ë°œìƒí–ˆìŠµë‹ˆë‹¤." #: lib/command.php:556 -msgid "Specify the name of the user to subscribe to" +#, fuzzy +msgid "Specify the name of the user to subscribe to." msgstr "구ë…í•˜ë ¤ëŠ” 사용ìžì˜ ì´ë¦„ì„ ì§€ì •í•˜ì‹ì‹œì˜¤." #: lib/command.php:563 @@ -4509,7 +4498,8 @@ msgid "Subscribed to %s" msgstr "%sì—게 구ë…ë˜ì—ˆìŠµë‹ˆë‹¤." #: lib/command.php:584 -msgid "Specify the name of the user to unsubscribe from" +#, fuzzy +msgid "Specify the name of the user to unsubscribe from." msgstr "구ë…ì„ í•´ì œí•˜ë ¤ëŠ” 사용ìžì˜ ì´ë¦„ì„ ì§€ì •í•˜ì‹ì‹œì˜¤." #: lib/command.php:591 @@ -4538,17 +4528,17 @@ msgid "Can't turn on notification." msgstr "ì•Œë¦¼ì„ ì¼¤ 수 없습니다." #: lib/command.php:650 -msgid "Login command is disabled" +msgid "Login command is disabled." msgstr "" #: lib/command.php:664 #, fuzzy, php-format -msgid "Could not create login token for %s" +msgid "Could not create login token for %s." msgstr "OpenID를 작성 í• ìˆ˜ 없습니다 : %s" #: lib/command.php:669 #, php-format -msgid "This link is useable only once, and is good for only 2 minutes: %s" +msgid "This link is useable only once, and is good for only 2 minutes: %s." msgstr "" #: lib/command.php:685 @@ -4742,10 +4732,6 @@ msgstr "140글ìžë¡œ 그룹ì´ë‚˜ í† í”½ 설명하기" msgid "Describe the group or topic in %d characters" msgstr "140글ìžë¡œ 그룹ì´ë‚˜ í† í”½ 설명하기" -#: lib/groupeditform.php:172 -msgid "Description" -msgstr "설명" - #: lib/groupeditform.php:179 msgid "" "Location for the group, if any, like \"City, State (or Region), Country\"" @@ -4909,21 +4895,9 @@ msgstr "" "\n" "그럼 ì´ë§Œ,%4$s.\n" -#: lib/mail.php:254 -#, php-format -msgid "Location: %s\n" -msgstr "위치: %s\n" - -#: lib/mail.php:256 -#, php-format -msgid "Homepage: %s\n" -msgstr "홈페ì´ì§€: %s\n" - #: lib/mail.php:258 -#, php-format -msgid "" -"Bio: %s\n" -"\n" +#, fuzzy, php-format +msgid "Bio: %s" msgstr "" "소개: %s\n" "\n" @@ -5063,6 +5037,27 @@ msgstr "" msgid "from" msgstr "다ìŒì—ì„œ:" +#: lib/mailhandler.php:37 +msgid "Could not parse message." +msgstr "메시지를 ë¶„ë¦¬í• ìˆ˜ 없습니다." + +#: lib/mailhandler.php:42 +msgid "Not a registered user." +msgstr "ê°€ìž…ëœ ì‚¬ìš©ìžê°€ 아닙니다." + +#: lib/mailhandler.php:46 +msgid "Sorry, that is not your incoming email address." +msgstr "죄송합니다. ê·€í•˜ì˜ ì´ë©”ì¼ì´ 아닙니다." + +#: lib/mailhandler.php:50 +msgid "Sorry, no incoming email allowed." +msgstr "죄송합니다. ì´ë©”ì¼ì´ 허용ë˜ì§€ 않습니다." + +#: lib/mailhandler.php:228 +#, fuzzy, php-format +msgid "Unsupported message type: %s" +msgstr "지ì›í•˜ì§€ 않는 그림 íŒŒì¼ í˜•ì‹ìž…니다." + #: lib/mediafile.php:98 lib/mediafile.php:123 msgid "There was a database error while saving your file. Please try again." msgstr "" @@ -5094,7 +5089,7 @@ msgid "File upload stopped by extension." msgstr "" #: lib/mediafile.php:179 lib/mediafile.php:216 -msgid "File exceeds user's quota!" +msgid "File exceeds user's quota." msgstr "" #: lib/mediafile.php:196 lib/mediafile.php:233 @@ -5102,7 +5097,8 @@ msgid "File could not be moved to destination directory." msgstr "" #: lib/mediafile.php:201 lib/mediafile.php:237 -msgid "Could not determine file's mime-type!" +#, fuzzy +msgid "Could not determine file's MIME type." msgstr "공개 streamì„ ë¶ˆëŸ¬ì˜¬ 수 없습니다." #: lib/mediafile.php:270 @@ -5112,7 +5108,7 @@ msgstr "" #: lib/mediafile.php:275 #, php-format -msgid "%s is not a supported filetype on this server." +msgid "%s is not a supported file type on this server." msgstr "" #: lib/messageform.php:120 @@ -5145,7 +5141,17 @@ msgid "Attach a file" msgstr "" #: lib/noticeform.php:212 -msgid "Share your location" +#, fuzzy +msgid "Share my location." +msgstr "태그를 ì €ìž¥í• ìˆ˜ 없습니다." + +#: lib/noticeform.php:214 +#, fuzzy +msgid "Do not share my location." +msgstr "태그를 ì €ìž¥í• ìˆ˜ 없습니다." + +#: lib/noticeform.php:215 +msgid "Hide this info" msgstr "" #: lib/noticelist.php:428 @@ -5268,6 +5274,11 @@ msgstr "ë‹¹ì‹ ì˜ ë³´ë‚¸ 메시지들" msgid "Tags in %s's notices" msgstr "%sì˜ ê²Œì‹œê¸€ì˜ íƒœê·¸" +#: lib/plugin.php:114 +#, fuzzy +msgid "Unknown" +msgstr "ì•Œë ¤ì§€ì§€ ì•Šì€ í–‰ë™" + #: lib/profileaction.php:109 lib/profileaction.php:192 lib/subgroupnav.php:82 msgid "Subscriptions" msgstr "구ë…" @@ -5449,10 +5460,6 @@ msgstr "" msgid "People Tagcloud as tagged" msgstr "" -#: lib/subscriptionlist.php:126 -msgid "(none)" -msgstr "(없습니다)" - #: lib/tagcloudsection.php:56 msgid "None" msgstr "ì—†ìŒ" @@ -5570,19 +5577,3 @@ msgstr "홈페ì´ì§€ 주소형ì‹ì´ 올바르지 않습니다." #, php-format msgid "%s is not a valid color! Use 3 or 6 hex chars." msgstr "" - -#: scripts/maildaemon.php:48 -msgid "Could not parse message." -msgstr "메시지를 ë¶„ë¦¬í• ìˆ˜ 없습니다." - -#: scripts/maildaemon.php:53 -msgid "Not a registered user." -msgstr "ê°€ìž…ëœ ì‚¬ìš©ìžê°€ 아닙니다." - -#: scripts/maildaemon.php:57 -msgid "Sorry, that is not your incoming email address." -msgstr "죄송합니다. ê·€í•˜ì˜ ì´ë©”ì¼ì´ 아닙니다." - -#: scripts/maildaemon.php:61 -msgid "Sorry, no incoming email allowed." -msgstr "죄송합니다. ì´ë©”ì¼ì´ 허용ë˜ì§€ 않습니다." diff --git a/locale/mk/LC_MESSAGES/statusnet.po b/locale/mk/LC_MESSAGES/statusnet.po index 537618601..ec0b98c72 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-01-03 10:37+0000\n" -"PO-Revision-Date: 2010-01-03 10:38:21+0000\n" +"POT-Creation-Date: 2010-01-10 11:27+0000\n" +"PO-Revision-Date: 2010-01-11 00:20:58+0000\n" "Language-Team: Macedonian\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha (r60575); Translate extension (2009-12-06)\n" +"X-Generator: MediaWiki 1.16alpha (r60910); Translate extension (2010-01-04)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: mk\n" "X-Message-Group: out-statusnet\n" @@ -51,11 +51,6 @@ msgstr "Ðема таква Ñтраница" msgid "No such user." msgstr "Ðема таков кориÑник." -#: actions/all.php:84 -#, php-format -msgid "%s and friends, page %d" -msgstr "%s и пријателите, Ñтраница %d" - #: actions/all.php:86 actions/all.php:167 actions/allrss.php:115 #: actions/apitimelinefriends.php:115 actions/apitimelinehome.php:115 #: lib/personalgroupnav.php:100 @@ -83,6 +78,7 @@ msgstr "Канал за пријатели на %S (Atom)" msgid "" "This is the timeline for %s and friends but no one has posted anything yet." msgstr "" +"Ова е иÑторијата за %s и пријателите, но доÑега никој нема објавено ништо." #: actions/all.php:132 #, php-format @@ -90,13 +86,18 @@ msgid "" "Try subscribing to more people, [join a group](%%action.groups%%) or post " "something yourself." msgstr "" +"Пробајте да Ñе претплатите на повеќе луѓе, [зачленете Ñе во група](%%action." +"groups%%) или објавете нешто Ñамите." #: actions/all.php:134 #, php-format msgid "" -"You can try to [nudge %s](../%s) from his profile or [post something to his " -"or her attention](%%%%action.newnotice%%%%?status_textarea=%s)." +"You can try to [nudge %1$s](../%2$s) from his profile or [post something to " +"his or her attention](%%%%action.newnotice%%%%?status_textarea=%3$s)." msgstr "" +"Можете да Ñе обидете да го [подбуцнете кориÑникот %1$s](../%2$s) од профилот " +"на кориÑникот или да [објавите нешто што Ñакате тој да го прочита](%%%%" +"action.newnotice%%%%?status_textarea=%3$s)." #: actions/all.php:137 actions/replies.php:209 actions/showstream.php:202 #, php-format @@ -104,24 +105,44 @@ msgid "" "Why not [register an account](%%%%action.register%%%%) and then nudge %s or " "post a notice to his or her attention." msgstr "" +"Рзошто не [региÑтрирате Ñметка](%%%%action.register%%%%), за да можете да " +"го подбуцнете кориÑникот %s или да објавите забелешка што Ñакате тој да ја " +"прочита." #: actions/all.php:165 msgid "You and friends" -msgstr "Вие и пријатели" +msgstr "Вие и пријателите" #: actions/allrss.php:119 actions/apitimelinefriends.php:122 #: actions/apitimelinehome.php:122 #, php-format msgid "Updates from %1$s and friends on %2$s!" -msgstr "" +msgstr "Подновувања од %1$s и пријатели на %2$s!" #: actions/apiaccountratelimitstatus.php:70 #: actions/apiaccountupdatedeliverydevice.php:93 #: actions/apiaccountupdateprofile.php:97 #: actions/apiaccountupdateprofilebackgroundimage.php:94 #: actions/apiaccountupdateprofilecolors.php:118 +#: actions/apidirectmessage.php:156 actions/apifavoritecreate.php:99 +#: actions/apifavoritedestroy.php:100 actions/apifriendshipscreate.php:100 +#: actions/apifriendshipsdestroy.php:100 actions/apifriendshipsshow.php:129 +#: actions/apigroupcreate.php:136 actions/apigroupismember.php:114 +#: actions/apigroupjoin.php:155 actions/apigroupleave.php:141 +#: actions/apigrouplist.php:132 actions/apigrouplistall.php:120 +#: actions/apigroupmembership.php:106 actions/apigroupshow.php:105 +#: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102 +#: actions/apistatusesretweets.php:112 actions/apistatusesshow.php:108 +#: actions/apistatusnetconfig.php:133 actions/apistatusnetversion.php:93 +#: actions/apisubscriptions.php:111 actions/apitimelinefavorites.php:146 +#: actions/apitimelinefriends.php:156 actions/apitimelinegroup.php:150 +#: actions/apitimelinehome.php:156 actions/apitimelinementions.php:151 +#: actions/apitimelinepublic.php:131 actions/apitimelineretweetedbyme.php:122 +#: actions/apitimelineretweetedtome.php:121 +#: actions/apitimelineretweetsofme.php:122 actions/apitimelinetag.php:141 +#: actions/apitimelineuser.php:165 actions/apiusershow.php:101 msgid "API method not found." -msgstr "API методот не епронајден." +msgstr "API методот не е пронајден." #: actions/apiaccountupdatedeliverydevice.php:85 #: actions/apiaccountupdateprofile.php:89 @@ -135,17 +156,19 @@ msgstr "API методот не епронајден." #: actions/apigroupleave.php:91 actions/apistatusesretweet.php:65 #: actions/apistatusesupdate.php:114 msgid "This method requires a POST." -msgstr "" +msgstr "Овој метод бара POST." #: actions/apiaccountupdatedeliverydevice.php:105 msgid "" "You must specify a parameter named 'device' with a value of one of: sms, im, " "none" msgstr "" +"Мора да назначите параметар Ñо име 'device' Ñо една од Ñледниве вредноÑти: " +"sms, im, none" #: actions/apiaccountupdatedeliverydevice.php:132 msgid "Could not update user." -msgstr "Ðе може да Ñе ажурира кориÑник." +msgstr "Ðе можев да го подновам кориÑникот." #: actions/apiaccountupdateprofile.php:112 #: actions/apiaccountupdateprofilebackgroundimage.php:194 @@ -170,18 +193,23 @@ msgid "" "The server was unable to handle that much POST data (%s bytes) due to its " "current configuration." msgstr "" +"Серверот не можеше да обработи толку многу POST-податоци (%s бајти) заради " +"неговата тековна конфигурација." #: actions/apiaccountupdateprofilebackgroundimage.php:136 #: actions/apiaccountupdateprofilebackgroundimage.php:146 #: actions/apiaccountupdateprofilecolors.php:164 #: actions/apiaccountupdateprofilecolors.php:174 +#: actions/groupdesignsettings.php:287 actions/groupdesignsettings.php:297 +#: actions/userdesignsettings.php:210 actions/userdesignsettings.php:220 +#: actions/userdesignsettings.php:263 actions/userdesignsettings.php:273 msgid "Unable to save your design settings." -msgstr "" +msgstr "Ðе можам да ги зачувам Вашите нагодувања за изглед." #: actions/apiaccountupdateprofilebackgroundimage.php:187 #: actions/apiaccountupdateprofilecolors.php:142 msgid "Could not update your design." -msgstr "Ðе може да Ñе ажурира вашиот дизајн." +msgstr "Ðе може да Ñе поднови Вашиот изглед." #: actions/apiblockcreate.php:105 msgid "You cannot block yourself!" @@ -189,55 +217,35 @@ msgstr "Ðе можете да Ñе блокирате Ñамите ÑебеÑи #: actions/apiblockcreate.php:126 msgid "Block user failed." -msgstr "" +msgstr "Блокирањето на кориÑникот не уÑпеа." #: actions/apiblockdestroy.php:114 msgid "Unblock user failed." -msgstr "" +msgstr "Ðе уÑпеа одблокирањето на кориÑникот." #: actions/apidirectmessage.php:89 #, php-format msgid "Direct messages from %s" -msgstr "" +msgstr "Директни пораки од %s" #: actions/apidirectmessage.php:93 #, php-format msgid "All the direct messages sent from %s" -msgstr "" +msgstr "Сите директни пораки иÑпратени од %s" #: actions/apidirectmessage.php:101 #, php-format msgid "Direct messages to %s" -msgstr "" +msgstr "Директни пораки до %s" #: actions/apidirectmessage.php:105 #, php-format msgid "All the direct messages sent to %s" -msgstr "" - -#: actions/apidirectmessage.php:156 actions/apifavoritecreate.php:99 -#: actions/apifavoritedestroy.php:100 actions/apifriendshipscreate.php:100 -#: actions/apifriendshipsdestroy.php:100 actions/apifriendshipsshow.php:129 -#: actions/apigroupcreate.php:136 actions/apigroupismember.php:114 -#: actions/apigroupjoin.php:155 actions/apigroupleave.php:141 -#: actions/apigrouplist.php:132 actions/apigrouplistall.php:120 -#: actions/apigroupmembership.php:106 actions/apigroupshow.php:105 -#: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102 -#: actions/apistatusesretweets.php:112 actions/apistatusesshow.php:108 -#: actions/apistatusnetconfig.php:133 actions/apistatusnetversion.php:93 -#: actions/apisubscriptions.php:111 actions/apitimelinefavorites.php:146 -#: actions/apitimelinefriends.php:156 actions/apitimelinegroup.php:150 -#: actions/apitimelinehome.php:156 actions/apitimelinementions.php:151 -#: actions/apitimelinepublic.php:131 actions/apitimelineretweetedbyme.php:122 -#: actions/apitimelineretweetedtome.php:121 -#: actions/apitimelineretweetsofme.php:122 actions/apitimelinetag.php:141 -#: actions/apitimelineuser.php:165 actions/apiusershow.php:101 -msgid "API method not found!" -msgstr "" +msgstr "Сите директни пораки иÑпратени до %s" #: actions/apidirectmessagenew.php:126 msgid "No message text!" -msgstr "" +msgstr "Ðема текÑÑ‚ за пораката!" #: actions/apidirectmessagenew.php:135 actions/newmessage.php:150 #, php-format @@ -246,41 +254,42 @@ msgstr "Ова е предолго. МакÑималната должина из #: actions/apidirectmessagenew.php:146 msgid "Recipient user not found." -msgstr "" +msgstr "Примачот не е пронајден." #: actions/apidirectmessagenew.php:150 msgid "Can't send direct messages to users who aren't your friend." msgstr "" +"Ðеможете да иÑпраќате директни пораки на кориÑници што не ви Ñе пријатели." #: actions/apifavoritecreate.php:108 actions/apifavoritedestroy.php:109 #: actions/apistatusesdestroy.php:113 msgid "No status found with that ID." -msgstr "" +msgstr "Ðема пронајдено ÑÑ‚Ð°Ñ‚ÑƒÑ Ñо таков ID." #: actions/apifavoritecreate.php:119 -msgid "This status is already a favorite!" -msgstr "" +msgid "This status is already a favorite." +msgstr "Овој ÑÑ‚Ð°Ñ‚ÑƒÑ Ð²ÐµÑœÐµ Ви е омилен." #: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:176 msgid "Could not create favorite." -msgstr "" +msgstr "Ðе можам да Ñоздадам омилина забелешка." #: actions/apifavoritedestroy.php:122 -msgid "That status is not a favorite!" -msgstr "" +msgid "That status is not a favorite." +msgstr "Тој ÑÑ‚Ð°Ñ‚ÑƒÑ Ð½Ðµ Ви е омилен." #: actions/apifavoritedestroy.php:134 actions/disfavor.php:87 msgid "Could not delete favorite." -msgstr "" +msgstr "Ðе можам да ја избришам омилената забелешка." #: actions/apifriendshipscreate.php:109 msgid "Could not follow user: User not found." -msgstr "" +msgstr "Ðе можам да го Ñледам кориÑникот: КориÑникот не е пронајден." #: actions/apifriendshipscreate.php:118 #, php-format msgid "Could not follow user: %s is already on your list." -msgstr "" +msgstr "Ðе можам да го Ñледам кориÑникот: %s веќе е на Вашата лиÑта." #: actions/apifriendshipsdestroy.php:109 msgid "Could not unfollow user: User not found." @@ -288,12 +297,13 @@ msgstr "" "Ðе можам да преÑтанам да го Ñледам кориÑникот: КориÑникот не е пронајден." #: actions/apifriendshipsdestroy.php:120 -msgid "You cannot unfollow yourself!" -msgstr "" +msgid "You cannot unfollow yourself." +msgstr "Ðе можете да преÑтанете да Ñе Ñледите Ñамите ÑебеÑи." #: actions/apifriendshipsexists.php:94 msgid "Two user ids or screen_names must be supplied." msgstr "" +"Мора да бидат наведени два кориÑнички идентификатора (ID) или две имиња." #: actions/apifriendshipsshow.php:135 msgid "Could not determine source user." @@ -325,7 +335,7 @@ msgstr "Ðеправилен прекар." #: actions/newgroup.php:139 actions/profilesettings.php:222 #: actions/register.php:217 msgid "Homepage is not a valid URL." -msgstr "Главната Ñтраница не е валиден URL." +msgstr "Главната Ñтраница не е важечка URL-адреÑа." #: actions/apigroupcreate.php:205 actions/editgroup.php:198 #: actions/newgroup.php:142 actions/profilesettings.php:225 @@ -373,38 +383,33 @@ msgstr "ÐлијаÑот не може да биде иÑÑ‚ како Ð¿Ñ€ÐµÐºÐ°Ñ msgid "Group not found!" msgstr "Групата не е пронајдена!" -#: actions/apigroupjoin.php:110 +#: actions/apigroupjoin.php:110 actions/joingroup.php:90 lib/command.php:217 msgid "You are already a member of that group." msgstr "Веќе членувате во таа група." #: actions/apigroupjoin.php:119 actions/joingroup.php:95 lib/command.php:221 msgid "You have been blocked from that group by the admin." -msgstr "" +msgstr "Блокирани Ñте од таа група од админиÑтраторот." -#: actions/apigroupjoin.php:138 +#: actions/apigroupjoin.php:138 actions/joingroup.php:128 lib/command.php:234 #, php-format -msgid "Could not join user %s to group %s." -msgstr "Ðе може да Ñе придружи кориÑник %s на група %s." +msgid "Could not join user %1$s to group %2$s." +msgstr "Ðе можам да го зачленам кориÑникот %1$s во групата 2$s." #: actions/apigroupleave.php:114 msgid "You are not a member of this group." -msgstr "Ðе Ñте член на оваа група" +msgstr "Ðе членувате во оваа група." -#: actions/apigroupleave.php:124 +#: actions/apigroupleave.php:124 actions/leavegroup.php:127 #, php-format -msgid "Could not remove user %s to group %s." -msgstr "Ðе може да Ñе избрише кориÑник %s од група %s." +msgid "Could not remove user %1$s from group %2$s." +msgstr "Ðе можев да го отÑтранам кориÑникот %1$s од групата %2$s." #: actions/apigrouplist.php:95 #, php-format msgid "%s's groups" msgstr "%s групи" -#: actions/apigrouplist.php:103 -#, php-format -msgid "Groups %s is a member of on %s." -msgstr "Групите %s Ñе членови на %s." - #: actions/apigrouplistall.php:90 actions/usergroups.php:62 #, php-format msgid "%s groups" @@ -421,131 +426,130 @@ msgstr "Методот бара POST или DELETE." #: actions/apistatusesdestroy.php:130 msgid "You may not delete another user's status." -msgstr "" +msgstr "Ðе можете да избришете ÑÑ‚Ð°Ñ‚ÑƒÑ Ð½Ð° друг кориÑник." #: actions/apistatusesretweet.php:75 actions/apistatusesretweets.php:72 #: actions/deletenotice.php:52 actions/shownotice.php:92 msgid "No such notice." -msgstr "Ðема такво извеÑтување." +msgstr "Ðема таква забелешка." -#: actions/apistatusesretweet.php:83 -#, fuzzy +#: actions/apistatusesretweet.php:83 lib/command.php:422 msgid "Cannot repeat your own notice." -msgstr "Ðе може да Ñе региÑтрирате ако не ја прифаќате лиценцата." +msgstr "Ðе можете да ја повторувате ÑопÑтвената забелешка." -#: actions/apistatusesretweet.php:91 -#, fuzzy +#: actions/apistatusesretweet.php:91 lib/command.php:427 msgid "Already repeated that notice." -msgstr "Веќе Ñте пријавени!" +msgstr "Забелешката е веќе повторена." #: actions/apistatusesshow.php:138 -#, fuzzy msgid "Status deleted." -msgstr "Ðватарот е ажуриран." +msgstr "СтатуÑот е избришан." #: actions/apistatusesshow.php:144 msgid "No status with that ID found." -msgstr "" +msgstr "Ðема пронајдено ÑÑ‚Ð°Ñ‚ÑƒÑ Ñо тој ID." #: actions/apistatusesupdate.php:157 actions/newnotice.php:155 -#: scripts/maildaemon.php:71 -#, fuzzy, php-format +#: lib/mailhandler.php:60 +#, php-format msgid "That's too long. Max notice size is %d chars." -msgstr "Ова е предолго. МакÑималната должина е 140 знаци." +msgstr "Ова е предолго. МакÑималната дозволена должина изнеÑува %d знаци." #: actions/apistatusesupdate.php:198 msgid "Not found" -msgstr "" +msgstr "Ðе е пронајдено" #: actions/apistatusesupdate.php:221 actions/newnotice.php:178 #, php-format msgid "Max notice size is %d chars, including attachment URL." msgstr "" +"МакÑималната големина на забелешката е %d знаци, вклучувајќи ја URL-адреÑата " +"на прилогот." #: actions/apisubscriptions.php:231 actions/apisubscriptions.php:261 -#, fuzzy msgid "Unsupported format." -msgstr "Ðеподдржан фомрат на Ñлики." +msgstr "Ðеподдржан формат." #: actions/apitimelinefavorites.php:108 #, php-format -msgid "%s / Favorites from %s" -msgstr "" +msgid "%1$s / Favorites from %2$s" +msgstr "%1$s / Омилени од %2$s" #: actions/apitimelinefavorites.php:120 #, php-format -msgid "%s updates favorited by %s / %s." -msgstr "" +msgid "%1$s updates favorited by %2$s / %2$s." +msgstr "Подновувања на %1$s омилени на %2$s / %2$s." #: actions/apitimelinegroup.php:109 actions/apitimelineuser.php:118 #: actions/grouprss.php:131 actions/userrss.php:90 #, php-format msgid "%s timeline" -msgstr "" +msgstr "ИÑторија на %s" #: actions/apitimelinegroup.php:117 actions/apitimelineuser.php:126 #: actions/userrss.php:92 #, php-format msgid "Updates from %1$s on %2$s!" -msgstr "" +msgstr "Подновувања од %1$s на %2$s!" #: actions/apitimelinementions.php:117 -#, fuzzy, php-format +#, php-format msgid "%1$s / Updates mentioning %2$s" -msgstr "%1$s ÑÑ‚Ð°Ñ‚ÑƒÑ Ð½Ð° %2$s" +msgstr "%1$s / Подновувања кои Ñпоменуваат %2$s" #: actions/apitimelinementions.php:127 #, php-format msgid "%1$s updates that reply to updates from %2$s / %3$s." -msgstr "" +msgstr "%1$s подновувања коишто Ñе одговор на подновувањата од %2$s / %3$s." #: actions/apitimelinepublic.php:107 actions/publicrss.php:103 #, php-format msgid "%s public timeline" -msgstr "" +msgstr "Јавна иÑторија на %s" #: actions/apitimelinepublic.php:111 actions/publicrss.php:105 #, php-format msgid "%s updates from everyone!" -msgstr "" +msgstr "%s подновуввања од Ñите!" #: actions/apitimelineretweetedbyme.php:112 #, php-format msgid "Repeated by %s" -msgstr "" +msgstr "Повторено од %s" #: actions/apitimelineretweetedtome.php:111 -#, fuzzy, php-format +#, php-format msgid "Repeated to %s" -msgstr "Одговори иÑпратени до %s" +msgstr "Повторено за %s" #: actions/apitimelineretweetsofme.php:112 -#, fuzzy, php-format +#, php-format msgid "Repeats of %s" -msgstr "Одговори иÑпратени до %s" +msgstr "Повторувања на %s" #: actions/apitimelinetag.php:102 actions/tag.php:66 #, php-format msgid "Notices tagged with %s" -msgstr "" +msgstr "Забелешки означени Ñо %s" #: actions/apitimelinetag.php:108 actions/tagrss.php:64 -#, fuzzy, php-format +#, php-format msgid "Updates tagged with %1$s on %2$s!" -msgstr "Микроблог на %s" +msgstr "Подновувањата Ñе означени Ñо %1$s на %2$s!" #: actions/apiusershow.php:96 -#, fuzzy msgid "Not found." -msgstr "Ðе е пронаједено барање." +msgstr "Ðе е пронајдено." #: actions/attachment.php:73 -#, fuzzy msgid "No such attachment." -msgstr "Ðема таков документ." +msgstr "Ðема таков прилог." -#: actions/avatarbynickname.php:59 actions/grouprss.php:91 -#: actions/leavegroup.php:76 +#: actions/avatarbynickname.php:59 actions/blockedfromgroup.php:73 +#: actions/editgroup.php:84 actions/groupdesignsettings.php:84 +#: actions/grouplogo.php:86 actions/groupmembers.php:76 +#: actions/grouprss.php:91 actions/joingroup.php:76 actions/leavegroup.php:76 +#: actions/showgroup.php:121 msgid "No nickname." msgstr "Ðема прекар." @@ -566,23 +570,24 @@ msgstr "Ðватар" #, php-format msgid "You can upload your personal avatar. The maximum file size is %s." msgstr "" +"Можете да подигнете Ñвој личен аватар. МакÑималната дозволена големина на " +"податотеката изнеÑува %s." #: actions/avatarsettings.php:106 actions/avatarsettings.php:185 -#: actions/grouplogo.php:178 actions/remotesubscribe.php:191 -#: actions/userauthorization.php:72 actions/userrss.php:103 +#: actions/remotesubscribe.php:191 actions/userauthorization.php:72 +#: actions/userrss.php:103 msgid "User without matching profile" -msgstr "" +msgstr "КориÑник без Ñоодветен профил" #: actions/avatarsettings.php:119 actions/avatarsettings.php:197 #: actions/grouplogo.php:251 -#, fuzzy msgid "Avatar settings" -msgstr "ПоÑтавки" +msgstr "Ðагодувања на аватарот" #: actions/avatarsettings.php:127 actions/avatarsettings.php:205 #: actions/grouplogo.php:199 actions/grouplogo.php:259 msgid "Original" -msgstr "" +msgstr "Оригинал" #: actions/avatarsettings.php:142 actions/avatarsettings.php:217 #: actions/grouplogo.php:210 actions/grouplogo.php:271 @@ -596,15 +601,15 @@ msgstr "Бриши" #: actions/avatarsettings.php:166 actions/grouplogo.php:233 msgid "Upload" -msgstr "Товари" +msgstr "Подигни" #: actions/avatarsettings.php:231 actions/grouplogo.php:286 msgid "Crop" msgstr "ОтÑечи" -#: actions/avatarsettings.php:268 actions/disfavor.php:74 -#: actions/emailsettings.php:238 actions/favor.php:75 actions/geocode.php:50 -#: actions/groupblock.php:66 actions/grouplogo.php:309 +#: actions/avatarsettings.php:268 actions/deletenotice.php:157 +#: actions/disfavor.php:74 actions/emailsettings.php:238 actions/favor.php:75 +#: actions/geocode.php:50 actions/groupblock.php:66 actions/grouplogo.php:309 #: actions/groupunblock.php:66 actions/imsettings.php:206 #: actions/invite.php:56 actions/login.php:135 actions/makeadmin.php:66 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80 @@ -616,7 +621,7 @@ msgstr "ОтÑечи" #: actions/unsubscribe.php:69 actions/userauthorization.php:52 #: lib/designsettings.php:294 msgid "There was a problem with your session token. Try again, please." -msgstr "" +msgstr "Се поајви проблем Ñо Вашиот ÑеÑиÑки жетон. Обидете Ñе повторно." #: actions/avatarsettings.php:281 actions/designadminpanel.php:103 #: actions/emailsettings.php:256 actions/grouplogo.php:319 @@ -627,34 +632,31 @@ msgstr "Ðеочекувано поднеÑување на образец." #: actions/avatarsettings.php:328 msgid "Pick a square area of the image to be your avatar" -msgstr "" +msgstr "Одберете квадратна површина од Ñликата за аватар" #: actions/avatarsettings.php:343 actions/grouplogo.php:377 msgid "Lost our file data." -msgstr "" +msgstr "Податоците за податотеката Ñе изгубени." #: actions/avatarsettings.php:366 msgid "Avatar updated." -msgstr "Ðватарот е ажуриран." +msgstr "Ðватарот е подновен." #: actions/avatarsettings.php:369 msgid "Failed updating avatar." -msgstr "Товарањето на аватарот не уÑпеа." +msgstr "Подновата на аватарот не уÑпеа." #: actions/avatarsettings.php:393 -#, fuzzy msgid "Avatar deleted." -msgstr "Ðватарот е ажуриран." +msgstr "Ðватарот е избришан." #: actions/block.php:69 -#, fuzzy msgid "You already blocked that user." -msgstr "Веќе Ñте пријавени!" +msgstr "Веќе го имате блокирано тој кориÑник." #: actions/block.php:105 actions/block.php:128 actions/groupblock.php:160 -#, fuzzy msgid "Block user" -msgstr "Ðема таков кориÑник." +msgstr "Блокирај кориÑник" #: actions/block.php:130 msgid "" @@ -662,6 +664,10 @@ msgid "" "unsubscribed from you, unable to subscribe to you in the future, and you " "will not be notified of any @-replies from them." msgstr "" +"Дали Ñте Ñигурни дека Ñакате да го блокирате овој кориÑник? По ова, " +"кориÑникот повеќе нема да биде претплатен на ВаÑ, нема да може да Ñе " +"претплати на Ð’Ð°Ñ Ð²Ð¾ иднина, и нема да бидете извеÑтени ако имате @-одговори " +"од кориÑникот." #: actions/block.php:143 actions/deletenotice.php:145 #: actions/deleteuser.php:147 actions/groupblock.php:178 @@ -669,38 +675,32 @@ msgid "No" msgstr "Ðе" #: actions/block.php:143 actions/deleteuser.php:147 -#, fuzzy msgid "Do not block this user" -msgstr "Ðема таков кориÑник." +msgstr "Ðе го блокирај кориÑников" #: actions/block.php:144 actions/deletenotice.php:146 #: actions/deleteuser.php:148 actions/groupblock.php:179 #: lib/repeatform.php:132 msgid "Yes" -msgstr "" +msgstr "Да" #: actions/block.php:144 actions/groupmembers.php:346 lib/blockform.php:80 -#, fuzzy msgid "Block this user" -msgstr "Ðема таков кориÑник." +msgstr "Блокирај го кориÑников" #: actions/block.php:167 msgid "Failed to save block information." -msgstr "" - -#: actions/blockedfromgroup.php:73 actions/editgroup.php:84 -#: actions/groupdesignsettings.php:84 actions/grouplogo.php:86 -#: actions/groupmembers.php:76 actions/joingroup.php:76 -#: actions/showgroup.php:121 -msgid "No nickname" -msgstr "Ðема прекар" +msgstr "Ðе можев да ги Ñнимам инофрмациите за блокот." #: actions/blockedfromgroup.php:80 actions/editgroup.php:96 +#: actions/foafgroup.php:44 actions/foafgroup.php:62 actions/groupblock.php:86 #: actions/groupbyid.php:83 actions/groupdesignsettings.php:97 #: actions/grouplogo.php:99 actions/groupmembers.php:83 -#: actions/joingroup.php:83 actions/showgroup.php:137 -msgid "No such group" -msgstr "Ðема такваа група" +#: actions/grouprss.php:98 actions/groupunblock.php:86 +#: actions/joingroup.php:83 actions/leavegroup.php:83 actions/makeadmin.php:86 +#: actions/showgroup.php:137 lib/command.php:212 lib/command.php:263 +msgid "No such group." +msgstr "Ðема таква група." #: actions/blockedfromgroup.php:90 #, php-format @@ -709,12 +709,12 @@ msgstr "%s блокирани профили" #: actions/blockedfromgroup.php:93 #, php-format -msgid "%s blocked profiles, page %d" -msgstr "%s блокирани профили, Ñтраница %d" +msgid "%1$s blocked profiles, page %2$d" +msgstr "%1$s блокирани профили, ÑÑ‚Ñ€. %2$d" #: actions/blockedfromgroup.php:108 msgid "A list of the users blocked from joining this group." -msgstr "" +msgstr "ЛиÑтана кориÑниците блокирани од придружување во оваа група." #: actions/blockedfromgroup.php:281 msgid "Unblock user from group" @@ -730,7 +730,7 @@ msgstr "Одблокирај го овој корÑник" #: actions/bookmarklet.php:50 msgid "Post to " -msgstr "" +msgstr "Објави во " #: actions/confirmaddress.php:75 msgid "No confirmation code." @@ -759,7 +759,7 @@ msgstr "Оваа адреÑа веќе е потврдена." #: actions/profilesettings.php:283 actions/smssettings.php:278 #: actions/smssettings.php:420 msgid "Couldn't update user." -msgstr "КориÑникот не може да Ñе оÑвежи/" +msgstr "Ðе можев да го подновам кориÑникот." #: actions/confirmaddress.php:126 actions/emailsettings.php:391 #: actions/imsettings.php:363 actions/smssettings.php:382 @@ -777,12 +777,12 @@ msgstr "ÐдреÑата \"%s\" е потврдена за Вашата ÑÐ¼ÐµÑ #: actions/conversation.php:99 msgid "Conversation" -msgstr "Конверзација" +msgstr "Разговор" #: actions/conversation.php:154 lib/mailbox.php:116 lib/noticelist.php:87 #: lib/profileaction.php:216 lib/searchgroupnav.php:82 msgid "Notices" -msgstr "ИзвеÑтувања" +msgstr "Забелешки" #: actions/deletenotice.php:67 actions/disfavor.php:61 actions/favor.php:62 #: actions/groupblock.php:61 actions/groupunblock.php:61 actions/logout.php:69 @@ -792,7 +792,7 @@ msgstr "ИзвеÑтувања" #: lib/adminpanelaction.php:72 lib/profileformaction.php:63 #: lib/settingsaction.php:72 msgid "Not logged in." -msgstr "Ðе Ñте пријавени." +msgstr "Ðе Ñте најавени." #: actions/deletenotice.php:71 msgid "Can't delete this notice." @@ -803,6 +803,8 @@ msgid "" "You are about to permanently delete a notice. Once this is done, it cannot " "be undone." msgstr "" +"Ðа пат Ñте да избришете забелешка заÑекогаш. Откако ќе го направите тоа, " +"поÑтапката нема да може да Ñе врати." #: actions/deletenotice.php:109 actions/deletenotice.php:141 msgid "Delete notice" @@ -810,7 +812,7 @@ msgstr "Бриши забелешка" #: actions/deletenotice.php:144 msgid "Are you sure you want to delete this notice?" -msgstr "" +msgstr "Дали Ñте Ñигурни дека Ñакате да ја избришете оваа заблешка?" #: actions/deletenotice.php:145 msgid "Do not delete this notice" @@ -820,10 +822,6 @@ msgstr "Ðе ја бриши оваа забелешка" msgid "Delete this notice" msgstr "Бриши ја оваа забелешка" -#: actions/deletenotice.php:157 -msgid "There was a problem with your session token. Try again, please." -msgstr "" - #: actions/deleteuser.php:67 msgid "You cannot delete users." msgstr "Ðе можете да бришете кориÑници." @@ -841,19 +839,21 @@ msgid "" "Are you sure you want to delete this user? This will clear all data about " "the user from the database, without a backup." msgstr "" +"Дали Ñе Ñигурни дека Ñакате да го избришете овој кориÑник? Ова воедно ќе ги " +"избрише Ñите податоци за кориÑникот од базата, без да може да Ñе вратат." #: actions/deleteuser.php:148 lib/deleteuserform.php:77 msgid "Delete this user" msgstr "Избриши овој кориÑник" #: actions/designadminpanel.php:62 lib/accountsettingsaction.php:124 -#: lib/adminpanelaction.php:302 lib/groupnav.php:119 +#: lib/adminpanelaction.php:316 lib/groupnav.php:119 msgid "Design" -msgstr "Дизајн" +msgstr "Изглед" #: actions/designadminpanel.php:73 msgid "Design settings for this StatusNet site." -msgstr "Ðагодувања на дизајн на ова StatusNet меÑто." +msgstr "Ðагодувања на изгледот на оваа StatusNet веб-Ñтраница." #: actions/designadminpanel.php:275 msgid "Invalid logo URL." @@ -870,7 +870,7 @@ msgstr "Промени лого" #: actions/designadminpanel.php:380 msgid "Site logo" -msgstr "Лого знак на Ñајт" +msgstr "Лого на веб-Ñтраницата" #: actions/designadminpanel.php:387 msgid "Change theme" @@ -878,11 +878,11 @@ msgstr "Промени тема" #: actions/designadminpanel.php:404 msgid "Site theme" -msgstr "Тема на Ñајт" +msgstr "Тема на веб-Ñтраницата" #: actions/designadminpanel.php:405 msgid "Theme for the site." -msgstr "Тема на Ñајтот." +msgstr "Тема за веб-Ñтраницата." #: actions/designadminpanel.php:417 lib/designsettings.php:101 msgid "Change background image" @@ -899,24 +899,24 @@ msgid "" "You can upload a background image for the site. The maximum file size is %1" "$s." msgstr "" -"Може да подигнете Ñлика за позадина за ова меÑто. МакÑималната големина на " -"податотеката е %1$s." +"Може да подигнете позадинÑка Ñлика за оваа веб-Ñтраница. МакÑималната " +"големина на податотеката е %1$s." #: actions/designadminpanel.php:457 lib/designsettings.php:139 msgid "On" -msgstr "" +msgstr "Вкл." #: actions/designadminpanel.php:473 lib/designsettings.php:155 msgid "Off" -msgstr "" +msgstr "ИÑкл." #: actions/designadminpanel.php:474 lib/designsettings.php:156 msgid "Turn background image on or off." -msgstr "" +msgstr "Вклучи или иÑклучи позадинÑка Ñлика." #: actions/designadminpanel.php:479 lib/designsettings.php:161 msgid "Tile background image" -msgstr "" +msgstr "Позадината во квадрати" #: actions/designadminpanel.php:488 lib/designsettings.php:170 msgid "Change colours" @@ -940,15 +940,15 @@ msgstr "Ð’Ñ€Ñки" #: actions/designadminpanel.php:577 lib/designsettings.php:247 msgid "Use defaults" -msgstr "" +msgstr "КориÑти по оÑновно" #: actions/designadminpanel.php:578 lib/designsettings.php:248 msgid "Restore default designs" -msgstr "" +msgstr "Врати оÑновно-зададени нагодувања" #: actions/designadminpanel.php:584 lib/designsettings.php:254 msgid "Reset back to default" -msgstr "" +msgstr "Врати по оÑновно" #: actions/designadminpanel.php:586 actions/emailsettings.php:195 #: actions/imsettings.php:163 actions/othersettings.php:126 @@ -958,19 +958,19 @@ msgstr "" #: actions/useradminpanel.php:313 lib/designsettings.php:256 #: lib/groupeditform.php:202 msgid "Save" -msgstr "Сними" +msgstr "Зачувај" #: actions/designadminpanel.php:587 lib/designsettings.php:257 msgid "Save design" -msgstr "Зачувај дизајн" +msgstr "Зачувај изглед" #: actions/disfavor.php:81 msgid "This notice is not a favorite!" -msgstr "" +msgstr "Оваа забелешка не Ви е омилена!" #: actions/disfavor.php:94 msgid "Add to favorites" -msgstr "" +msgstr "Додај во омилени" #: actions/doc.php:69 msgid "No such document." @@ -979,49 +979,46 @@ msgstr "Ðема таков документ." #: actions/editgroup.php:56 #, php-format msgid "Edit %s group" -msgstr "" +msgstr "Уреди ја групата %s" #: actions/editgroup.php:68 actions/grouplogo.php:70 actions/newgroup.php:65 msgid "You must be logged in to create a group." -msgstr "" +msgstr "Мора да Ñте најавени за да можете да Ñоздавате групи." #: actions/editgroup.php:103 actions/editgroup.php:168 #: actions/groupdesignsettings.php:104 actions/grouplogo.php:106 -msgid "You must be an admin to edit the group" -msgstr "" +msgid "You must be an admin to edit the group." +msgstr "Мора да Ñте админиÑтратор за да можете да ја уредите групата." #: actions/editgroup.php:154 msgid "Use this form to edit the group." -msgstr "" +msgstr "ОБразецов Ñлужи за уредување на групата." #: actions/editgroup.php:201 actions/newgroup.php:145 -#, fuzzy, php-format +#, php-format msgid "description is too long (max %d chars)." -msgstr "Биографијата е предолга (макÑимумот е 140 знаци)." +msgstr "опиÑот е предолг (макÑимум %d знаци)" #: actions/editgroup.php:253 -#, fuzzy msgid "Could not update group." -msgstr "КориÑникот не може да Ñе оÑвежи/" +msgstr "Ðе можев да ја подновам групата." #: actions/editgroup.php:259 classes/User_group.php:390 -#, fuzzy msgid "Could not create aliases." -msgstr "Информациите за аватарот не може да Ñе Ñнимат" +msgstr "Ðе можеше да Ñе Ñоздадат алијаÑи." #: actions/editgroup.php:269 -#, fuzzy msgid "Options saved." -msgstr "ПоÑтавките Ñе Ñнимени." +msgstr "Ðагодувањата Ñе зачувани." #: actions/emailsettings.php:60 -msgid "Email Settings" -msgstr "" +msgid "Email settings" +msgstr "Ðагодувања за е-пошта" #: actions/emailsettings.php:71 #, php-format msgid "Manage how you get email from %%site.name%%." -msgstr "" +msgstr "Раководење Ñо начинот на кој добивате е-пошта од %%site.name%%." #: actions/emailsettings.php:100 actions/imsettings.php:100 #: actions/smssettings.php:104 @@ -1030,7 +1027,7 @@ msgstr "ÐдреÑа" #: actions/emailsettings.php:105 msgid "Current confirmed email address." -msgstr "" +msgstr "Тековна потврдена е-поштенÑка адреÑа." #: actions/emailsettings.php:107 actions/emailsettings.php:140 #: actions/imsettings.php:108 actions/smssettings.php:115 @@ -1043,6 +1040,8 @@ msgid "" "Awaiting confirmation on this address. Check your inbox (and spam box!) for " "a message with further instructions." msgstr "" +"Очекувам потврда за оваа адреÑа. Проверете Ñи го приемното Ñандаче (а и " +"Ñандачето за Ñпам!). Во пиÑмото ќе Ñледат понатамошни напатÑтвија." #: actions/emailsettings.php:117 actions/imsettings.php:120 #: actions/smssettings.php:126 @@ -1050,12 +1049,12 @@ msgid "Cancel" msgstr "Откажи" #: actions/emailsettings.php:121 -msgid "Email Address" -msgstr "" +msgid "Email address" +msgstr "Е-поштенÑка адреÑа" #: actions/emailsettings.php:123 msgid "Email address, like \"UserName@example.org\"" -msgstr "" +msgstr "Е-пошта, од обликот „UserName@example.org“" #: actions/emailsettings.php:126 actions/imsettings.php:133 #: actions/smssettings.php:145 @@ -1064,77 +1063,81 @@ msgstr "Додај" #: actions/emailsettings.php:133 actions/smssettings.php:152 msgid "Incoming email" -msgstr "" +msgstr "Приемна пошта" #: actions/emailsettings.php:138 actions/smssettings.php:157 msgid "Send email to this address to post new notices." -msgstr "" +msgstr "ИÑпраќајте е-пошта на оваа адреÑа за да објавувате нови забелешки." #: actions/emailsettings.php:145 actions/smssettings.php:162 msgid "Make a new email address for posting to; cancels the old one." msgstr "" +"Создај нова е-поштенÑка адреÑа за примање објави; ја заменува Ñтарата адреÑа." #: actions/emailsettings.php:148 actions/smssettings.php:164 msgid "New" -msgstr "" +msgstr "Ðово" #: actions/emailsettings.php:153 actions/imsettings.php:139 #: actions/smssettings.php:169 msgid "Preferences" -msgstr "Преференции" +msgstr "Ðагодувања" #: actions/emailsettings.php:158 msgid "Send me notices of new subscriptions through email." -msgstr "" +msgstr "ИÑпраќај ми извеÑтувања за нови претплати по е-пошта." #: actions/emailsettings.php:163 msgid "Send me email when someone adds my notice as a favorite." -msgstr "" +msgstr "ИÑпраќај ми е-пошта кога некој ќе додаде моја забелешка како омилена." #: actions/emailsettings.php:169 msgid "Send me email when someone sends me a private message." -msgstr "" +msgstr "ИÑпраќај ми е-пошта кога некој ќе ми иÑпрати приватна порака." #: actions/emailsettings.php:174 msgid "Send me email when someone sends me an \"@-reply\"." -msgstr "" +msgstr "ИÑпраќај ми е-пошта кога некој ќе ми иÑпрати „@-одговор“" #: actions/emailsettings.php:179 msgid "Allow friends to nudge me and send me an email." msgstr "" +"Дозволи им на пријателите да можат да ме подбуцнуваат и да ми иÑпраќаат е-" +"пошта." #: actions/emailsettings.php:185 msgid "I want to post notices by email." -msgstr "" +msgstr "Сакам да објавувам забелешки по е-пошта." #: actions/emailsettings.php:191 msgid "Publish a MicroID for my email address." -msgstr "" +msgstr "Објави MicroID за мојата е-поштенÑка адреÑа." #: actions/emailsettings.php:302 actions/imsettings.php:264 #: actions/othersettings.php:180 actions/smssettings.php:284 msgid "Preferences saved." -msgstr "Преференциите Ñе Ñнимени." +msgstr "Ðагодувањата Ñе зачувани." #: actions/emailsettings.php:320 msgid "No email address." -msgstr "" +msgstr "Ðема е-поштенÑка адреÑа." #: actions/emailsettings.php:327 msgid "Cannot normalize that email address" -msgstr "" +msgstr "Ðеможам да ја нормализирам таа е-поштенÑка адреÑа" -#: actions/emailsettings.php:331 actions/siteadminpanel.php:157 -msgid "Not a valid email address" -msgstr "" +#: actions/emailsettings.php:331 actions/register.php:201 +#: actions/siteadminpanel.php:157 +msgid "Not a valid email address." +msgstr "Ðеправилна адреÑа за е-пошта." #: actions/emailsettings.php:334 msgid "That is already your email address." -msgstr "" +msgstr "Оваа е-поштенÑка адреÑа е веќе Ваша." #: actions/emailsettings.php:337 msgid "That email address already belongs to another user." -msgstr "" +msgstr "Таа е-поштенÑка адреÑа е веќе зафатена од друг кориÑник." #: actions/emailsettings.php:353 actions/imsettings.php:317 #: actions/smssettings.php:337 @@ -1146,6 +1149,9 @@ msgid "" "A confirmation code was sent to the email address you added. Check your " "inbox (and spam box!) for the code and instructions on how to use it." msgstr "" +"ИÑпратен е потврден код на е-поштата која ја додадовте. Проверете Ñи го " +"Ñандачето за добиени пиÑма (а и Ñандачето за Ñпам!) за да го видите кодот и " +"напатÑтвијата за негово кориÑтење." #: actions/emailsettings.php:379 actions/imsettings.php:351 #: actions/smssettings.php:370 @@ -1163,7 +1169,7 @@ msgstr "Потврдата е откажана" #: actions/emailsettings.php:413 msgid "That is not your email address." -msgstr "" +msgstr "Ова не е Вашата е-поштенÑка адреÑа." #: actions/emailsettings.php:432 actions/imsettings.php:408 #: actions/smssettings.php:425 @@ -1172,28 +1178,28 @@ msgstr "ÐдреÑата е отÑтранета." #: actions/emailsettings.php:446 actions/smssettings.php:518 msgid "No incoming email address." -msgstr "" +msgstr "Ðема приемна е-поштенÑка адреÑа." #: actions/emailsettings.php:456 actions/emailsettings.php:478 #: actions/smssettings.php:528 actions/smssettings.php:552 msgid "Couldn't update user record." -msgstr "" +msgstr "Ðе можев да ја подновам кориÑничката евиденција." #: actions/emailsettings.php:459 actions/smssettings.php:531 msgid "Incoming email address removed." -msgstr "" +msgstr "Приемната е-поштенÑка адреÑа е отÑтранета." #: actions/emailsettings.php:481 actions/smssettings.php:555 msgid "New incoming email address added." -msgstr "" +msgstr "Додадена е нова влезна е-поштенÑка адреÑа." #: actions/favor.php:79 msgid "This notice is already a favorite!" -msgstr "" +msgstr "Оваа белешка е веќе омилена!" #: actions/favor.php:92 lib/disfavorform.php:140 msgid "Disfavor favorite" -msgstr "" +msgstr "Тргни од омилени" #: actions/favorited.php:65 lib/popularnoticesection.php:88 #: lib/publicgroupnav.php:93 @@ -1201,23 +1207,27 @@ msgid "Popular notices" msgstr "Популарни забелешки" #: actions/favorited.php:67 -#, fuzzy, php-format +#, php-format msgid "Popular notices, page %d" -msgstr "Ðема такво извеÑтување." +msgstr "Популарни забелешки, ÑÑ‚Ñ€. %d" #: actions/favorited.php:79 msgid "The most popular notices on the site right now." -msgstr "" +msgstr "Моментално најпопуларни забелешки на веб-Ñтраницата." #: actions/favorited.php:150 msgid "Favorite notices appear on this page but no one has favorited one yet." msgstr "" +"Омилените забелешки Ñе појавуваат на оваа Ñтраница, но никој доÑега нема " +"одбележано таква." #: actions/favorited.php:153 msgid "" "Be the first to add a notice to your favorites by clicking the fave button " "next to any notice you like." msgstr "" +"Бидете првиот што ќе додаде белешка во омилени Ñо тоа што ќе кликнете на " +"копчето за омилени забелешки веднаш до забелешката која Ви Ñе допаѓа." #: actions/favorited.php:156 #, php-format @@ -1225,37 +1235,38 @@ msgid "" "Why not [register an account](%%action.register%%) and be the first to add a " "notice to your favorites!" msgstr "" +"Рзошто не [региÑтрирате Ñметка](%%action.register%%) и да бидете први што " +"ќе додадете забелешка во Вашите омилени!" #: actions/favoritesrss.php:111 actions/showfavorites.php:77 #: lib/personalgroupnav.php:115 #, php-format msgid "%s's favorite notices" -msgstr "" +msgstr "Омилени забелешки на %s" #: actions/favoritesrss.php:115 -#, fuzzy, php-format +#, php-format msgid "Updates favored by %1$s on %2$s!" -msgstr "Микроблог на %s" +msgstr "Подновувања, омилени на %1$s на %2$s!" #: actions/featured.php:69 lib/featureduserssection.php:87 #: lib/publicgroupnav.php:89 msgid "Featured users" -msgstr "" +msgstr "Избрани кориÑници" #: actions/featured.php:71 #, php-format msgid "Featured users, page %d" -msgstr "" +msgstr "Избрани кориÑници, ÑÑ‚Ñ€. %d" #: actions/featured.php:99 #, php-format msgid "A selection of some great users on %s" -msgstr "" +msgstr "Ðекои од поÑлавните кориÑници на %s" #: actions/file.php:34 -#, fuzzy msgid "No notice ID." -msgstr "Ðово извеÑтување" +msgstr "Ðема ID за белешка." #: actions/file.php:38 msgid "No notice." @@ -1263,20 +1274,19 @@ msgstr "Ðема забелешка." #: actions/file.php:42 msgid "No attachments." -msgstr "Ðема прикачувања." +msgstr "Ðема прилози." #: actions/file.php:51 msgid "No uploaded attachments." -msgstr "Ðема подигнато прикачувања." +msgstr "Ðема подигнато прилози." #: actions/finishremotesubscribe.php:69 msgid "Not expecting this response!" msgstr "Овој одговор не беше очекуван!" #: actions/finishremotesubscribe.php:80 -#, fuzzy msgid "User being listened to does not exist." -msgstr "КориÑникот кој го Ñледите не поÑтои." +msgstr "Следениот кориÑник не поÑтои." #: actions/finishremotesubscribe.php:87 actions/remotesubscribe.php:59 msgid "You can use the local subscription!" @@ -1284,209 +1294,195 @@ msgstr "Може да ја кориÑтите локалната Ð¿Ñ€ÐµÑ‚Ð¿Ð»Ð°Ñ #: actions/finishremotesubscribe.php:99 msgid "That user has blocked you from subscribing." -msgstr "" +msgstr "Тој кориÑник Ве има блокирано од претплаќање." #: actions/finishremotesubscribe.php:110 msgid "You are not authorized." msgstr "Ðе Ñте авторизирани." #: actions/finishremotesubscribe.php:113 -#, fuzzy msgid "Could not convert request token to access token." -msgstr "Белезите за барање не може да Ñе конвертираат во белези за приÑтап." +msgstr "Ðе можев да ги претворам жетоните за барање во жетони за приÑтап." #: actions/finishremotesubscribe.php:118 -#, fuzzy msgid "Remote service uses unknown version of OMB protocol." -msgstr "Ðепозната верзија на протоколот OMB." +msgstr "Оддалечената Ñлужба кориÑти непозната верзија на OMB протокол." #: actions/finishremotesubscribe.php:138 lib/oauthstore.php:306 msgid "Error updating remote profile" -msgstr "Грешка во оÑвежувањето на оддалечениот профил" - -#: actions/foafgroup.php:44 actions/foafgroup.php:62 actions/groupblock.php:86 -#: actions/grouprss.php:98 actions/groupunblock.php:86 -#: actions/leavegroup.php:83 actions/makeadmin.php:86 lib/command.php:212 -#: lib/command.php:263 -#, fuzzy -msgid "No such group." -msgstr "Ðема такво извеÑтување." +msgstr "Грешка во подновувањето на оддалечениот профил" -#: actions/getfile.php:75 -#, fuzzy +#: actions/getfile.php:79 msgid "No such file." -msgstr "Ðема такво извеÑтување." +msgstr "Ðема таква податотека." -#: actions/getfile.php:79 -#, fuzzy +#: actions/getfile.php:83 msgid "Cannot read file." -msgstr "Ðема такво извеÑтување." +msgstr "Податотеката не може да Ñе прочита." #: actions/groupblock.php:71 actions/groupunblock.php:71 #: actions/makeadmin.php:71 actions/subedit.php:46 #: lib/profileformaction.php:70 msgid "No profile specified." -msgstr "" +msgstr "Ðема назначено профил." #: actions/groupblock.php:76 actions/groupunblock.php:76 #: actions/makeadmin.php:76 actions/subedit.php:53 actions/tagother.php:46 -#: lib/profileformaction.php:77 +#: actions/unsubscribe.php:84 lib/profileformaction.php:77 msgid "No profile with that ID." -msgstr "" +msgstr "Ðема профил Ñо тоа ID." #: actions/groupblock.php:81 actions/groupunblock.php:81 #: actions/makeadmin.php:81 msgid "No group specified." -msgstr "" +msgstr "Ðема назначено група." #: actions/groupblock.php:91 msgid "Only an admin can block group members." -msgstr "" +msgstr "Само админиÑтратор може да блокира членови на група." #: actions/groupblock.php:95 -#, fuzzy msgid "User is already blocked from group." -msgstr "КориÑникот нема профил." +msgstr "КориÑникот е веќе блокиран од оваа група." #: actions/groupblock.php:100 -#, fuzzy msgid "User is not a member of group." -msgstr "Ðе ни го иÑпративте тој профил." +msgstr "КориÑникот не членува во групата." #: actions/groupblock.php:136 actions/groupmembers.php:314 -#, fuzzy msgid "Block user from group" -msgstr "Ðема таков кориÑник." +msgstr "Блокирај кориÑник од група" #: actions/groupblock.php:162 #, php-format msgid "" -"Are you sure you want to block user \"%s\" from the group \"%s\"? They will " -"be removed from the group, unable to post, and unable to subscribe to the " -"group in the future." +"Are you sure you want to block user \"%1$s\" from the group \"%2$s\"? They " +"will be removed from the group, unable to post, and unable to subscribe to " +"the group in the future." msgstr "" +"Дали Ñте Ñигурни дека Ñакате да го блокирате кориÑникот „%1$s“ од групата „%2" +"$s“? КориÑникот ќе биде отÑтранет од групата, и во иднина нема да може да " +"објавува во таа група и да Ñе претплаќа на неа." #: actions/groupblock.php:178 -#, fuzzy msgid "Do not block this user from this group" -msgstr "Ðе може да Ñе пренаÑочи кон Ñерверот: %s" +msgstr "Ðе го блокирај овој кориÑник од оваа група" #: actions/groupblock.php:179 -#, fuzzy msgid "Block this user from this group" -msgstr "Ðема таков кориÑник." +msgstr "Блокирај го овој кориÑник од оваа група" #: actions/groupblock.php:196 msgid "Database error blocking user from group." msgstr "" +"Се појави грешка во базата наподатоци при блокирањето на кориÑникот од " +"групата." -#: actions/groupbyid.php:74 -msgid "No ID" -msgstr "" +#: actions/groupbyid.php:74 actions/userbyid.php:70 +msgid "No ID." +msgstr "Ðема ID." #: actions/groupdesignsettings.php:68 msgid "You must be logged in to edit a group." -msgstr "" +msgstr "Мора да Ñте најавени за да можете да уредувате група." #: actions/groupdesignsettings.php:141 msgid "Group design" -msgstr "" +msgstr "Изглед на групата" #: actions/groupdesignsettings.php:152 msgid "" "Customize the way your group looks with a background image and a colour " "palette of your choice." msgstr "" +"Прилагодете го изгледот на Вашата група Ñо позадинÑка Ñлика и палета од бои " +"по Ваш избор." #: actions/groupdesignsettings.php:263 actions/userdesignsettings.php:186 #: lib/designsettings.php:391 lib/designsettings.php:413 -#, fuzzy msgid "Couldn't update your design." -msgstr "КориÑникот не може да Ñе оÑвежи/" - -#: actions/groupdesignsettings.php:287 actions/groupdesignsettings.php:297 -#: actions/userdesignsettings.php:210 actions/userdesignsettings.php:220 -#: actions/userdesignsettings.php:263 actions/userdesignsettings.php:273 -msgid "Unable to save your design settings!" -msgstr "" +msgstr "Ðе можев да го подновам Вашиот изглед." #: actions/groupdesignsettings.php:308 actions/userdesignsettings.php:231 -#, fuzzy msgid "Design preferences saved." -msgstr "Преференциите Ñе Ñнимени." +msgstr "Ðагодувањата Ñе зачувани." #: actions/grouplogo.php:139 actions/grouplogo.php:192 msgid "Group logo" -msgstr "" +msgstr "Лого на групата" #: actions/grouplogo.php:150 #, php-format msgid "" "You can upload a logo image for your group. The maximum file size is %s." msgstr "" +"Можете да подигнете Ñлика за логото на Вашата група. МакÑималната дозволена " +"големина на податотеката е %s." + +#: actions/grouplogo.php:178 +msgid "User without matching profile." +msgstr "КориÑник без Ñоодветен профил." #: actions/grouplogo.php:362 msgid "Pick a square area of the image to be the logo." -msgstr "" +msgstr "Одберете квадратен проÑтор на Ñликата за лого." #: actions/grouplogo.php:396 -#, fuzzy msgid "Logo updated." -msgstr "Ðватарот е ажуриран." +msgstr "Логото е подновено." #: actions/grouplogo.php:398 -#, fuzzy msgid "Failed updating logo." -msgstr "Товарањето на аватарот не уÑпеа." +msgstr "Подновата на логото не уÑпеа." #: actions/groupmembers.php:93 lib/groupnav.php:92 #, php-format msgid "%s group members" -msgstr "" +msgstr "Членови на групата %s" #: actions/groupmembers.php:96 #, php-format -msgid "%s group members, page %d" -msgstr "" +msgid "%1$s group members, page %2$d" +msgstr "Членови на групата %1$s, ÑÑ‚Ñ€. %2$d" #: actions/groupmembers.php:111 msgid "A list of the users in this group." -msgstr "" +msgstr "ЛиÑта на кориÑниците на овааг група." -#: actions/groupmembers.php:175 lib/action.php:441 lib/groupnav.php:107 +#: actions/groupmembers.php:175 lib/action.php:442 lib/groupnav.php:107 msgid "Admin" -msgstr "" +msgstr "ÐдминиÑтратор" #: actions/groupmembers.php:346 lib/blockform.php:69 msgid "Block" -msgstr "" +msgstr "Блокирај" #: actions/groupmembers.php:441 msgid "Make user an admin of the group" -msgstr "" +msgstr "Ðаправи го кориÑникот админиÑтратор на групата" #: actions/groupmembers.php:473 msgid "Make Admin" -msgstr "" +msgstr "Ðаправи го/ја админиÑтратор" #: actions/groupmembers.php:473 msgid "Make this user an admin" -msgstr "" +msgstr "Ðаправи го кориÑникот админиÑтратор" #: actions/grouprss.php:133 -#, fuzzy, php-format +#, php-format msgid "Updates from members of %1$s on %2$s!" -msgstr "Микроблог на %s" +msgstr "Подновувања од членови на %1$s на %2$s!" #: actions/groups.php:62 lib/profileaction.php:210 lib/profileaction.php:230 #: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98 msgid "Groups" -msgstr "" +msgstr "Групи" #: actions/groups.php:64 #, php-format msgid "Groups, page %d" -msgstr "" +msgstr "Групи, ÑÑ‚Ñ€. %d" #: actions/groups.php:90 #, php-format @@ -1497,30 +1493,34 @@ msgid "" "for one](%%%%action.groupsearch%%%%) or [start your own!](%%%%action.newgroup" "%%%%)" msgstr "" +"Групите на %%%%site.name%%%% Ви овоможуваат да пронајдете луѓе Ñо Ñлични " +"интереÑи на Вашите и да зборувате Ñо нив. Откако ќе Ñе придружите во група " +"ќе можете да иÑпраќате пораки до Ñите други членови, кориÑтејќи ја " +"ÑинтакÑата „!groupname“. Ðе гледате група што Ве интереÑира? Обидете Ñе да " +"[ја пронајдете](%%%%action.groupsearch%%%%) или [започнете Ñвоја!](%%%%" +"action.newgroup%%%%)" #: actions/groups.php:107 actions/usergroups.php:124 lib/groupeditform.php:122 msgid "Create a new group" msgstr "Создај нова група" #: actions/groupsearch.php:52 -#, fuzzy, php-format +#, php-format msgid "" "Search for groups on %%site.name%% by their name, location, or description. " "Separate the terms by spaces; they must be 3 characters or more." msgstr "" -"Барајте луѓе на %%site.name%% Ñпоред нивното име, локација или интереÑи. " -"Термините одделете ги Ñо празни меÑта. Ðајмала должина е 3 знаци." +"Пребарајте групи на %%site.name%% по име, локација или опиÑ. Одделете ги " +"поимите Ñо празни меÑта; зборовите мора да имаат барем по 3 букви." #: actions/groupsearch.php:58 -#, fuzzy msgid "Group search" -msgstr "Пребарување на луѓе" +msgstr "Пребарување на групи" #: actions/groupsearch.php:79 actions/noticesearch.php:117 #: actions/peoplesearch.php:83 -#, fuzzy msgid "No results." -msgstr "Ðема резултати" +msgstr "Ðема резултати." #: actions/groupsearch.php:82 #, php-format @@ -1528,6 +1528,8 @@ msgid "" "If you can't find the group you're looking for, you can [create it](%%action." "newgroup%%) yourself." msgstr "" +"Ðко не можете да ја пронајдете групата што ја барате, тогаш [Ñоздајте ја](%%" +"action.newgroup%%) Ñамите." #: actions/groupsearch.php:85 #, php-format @@ -1535,24 +1537,24 @@ msgid "" "Why not [register an account](%%action.register%%) and [create the group](%%" "action.newgroup%%) yourself!" msgstr "" +"Рзошто Ñамите не [региÑтрирате Ñметка](%%action.register%%) и [Ñоздадете " +"група](%%action.newgroup%%)!" #: actions/groupunblock.php:91 msgid "Only an admin can unblock group members." -msgstr "" +msgstr "Само админиÑтратор може да одблокира членови на група." #: actions/groupunblock.php:95 -#, fuzzy msgid "User is not blocked from group." -msgstr "КориÑникот нема профил." +msgstr "КориÑникот не е блокиран од групата." #: actions/groupunblock.php:128 actions/unblock.php:86 -#, fuzzy msgid "Error removing the block." -msgstr "Грешка во Ñнимањето на кориÑникот." +msgstr "Грешка при отÑтранување на блокот." #: actions/imsettings.php:59 -msgid "IM Settings" -msgstr "ПоÑтавки за IM" +msgid "IM settings" +msgstr "Ðагодувања за IM" #: actions/imsettings.php:70 #, php-format @@ -1560,12 +1562,12 @@ msgid "" "You can send and receive notices through Jabber/GTalk [instant messages](%%" "doc.im%%). Configure your address and settings below." msgstr "" -"Можете да примате и праќате извеÑтувања преку Jabber/GTalk [брзи пораки](%%" -"doc.im%%). Подолу " +"Можете да примате и праќате забелешки преку Jabber/GTalk [брзи пораки](%%doc." +"im%%). Подолу " #: actions/imsettings.php:89 msgid "IM is not available." -msgstr "ИП не Ñе возможни." +msgstr "IM е недоÑтапно." #: actions/imsettings.php:106 msgid "Current confirmed Jabber/GTalk address." @@ -1577,12 +1579,12 @@ msgid "" "Awaiting confirmation on this address. Check your Jabber/GTalk account for a " "message with further instructions. (Did you add %s to your buddy list?)" msgstr "" -"Чекам потвдар за оваа адреÑа. Проверете ја вашата Jabber/GTalk Ñметка за " -"порака Ñо понатамошни инÑтрукции. (Дали го додадовте %s на вашата лиÑта Ñо " +"Чекам потврда за оваа адреÑа. Проверете ја Вашата Jabber/GTalk Ñметка за " +"порака Ñо понатамошни инÑтрукции. (Дали го додадовте %s на Вашата лиÑта Ñо " "пријатели?)" #: actions/imsettings.php:124 -msgid "IM Address" +msgid "IM address" msgstr "IM адреÑа" #: actions/imsettings.php:126 @@ -1596,19 +1598,20 @@ msgstr "" #: actions/imsettings.php:143 msgid "Send me notices through Jabber/GTalk." -msgstr "ИÑпраќај ми извеÑтувања преку Jabber/GTalk." +msgstr "ИÑпраќај ми забелешки преку Jabber/GTalk." #: actions/imsettings.php:148 msgid "Post a notice when my Jabber/GTalk status changes." -msgstr "ИÑпрати извеÑтување кога мојот ÑÑ‚Ð°Ñ‚ÑƒÑ Ð½Ð° Jabber/GTalk ќе Ñе Ñмени." +msgstr "Објавувај забелешка кога мојот ÑÑ‚Ð°Ñ‚ÑƒÑ Ð½Ð° Jabber/GTalk ќе Ñе промени." #: actions/imsettings.php:153 msgid "Send me replies through Jabber/GTalk from people I'm not subscribed to." msgstr "" +"ИÑпраќај ми одговори преку Jabber/GTalk од луѓе на кои не Ñум претплатен." #: actions/imsettings.php:159 msgid "Publish a MicroID for my Jabber/GTalk address." -msgstr "" +msgstr "Објави MicroID за мојата адреÑа на Jabber/GTalk." #: actions/imsettings.php:285 msgid "No Jabber ID." @@ -1628,7 +1631,7 @@ msgstr "Ова веќе е Вашиот Jabber ID." #: actions/imsettings.php:302 msgid "Jabber ID already belongs to another user." -msgstr "Ова Jabber ID му припаќа на друг кориÑник." +msgstr "Ова Jabber ID му припаѓа на друг кориÑник." #: actions/imsettings.php:327 #, php-format @@ -1643,11 +1646,6 @@ msgstr "" msgid "That is not your Jabber ID." msgstr "Ова не е Вашиот Jabber ID." -#: actions/inbox.php:59 -#, php-format -msgid "Inbox for %s - page %d" -msgstr "" - #: actions/inbox.php:62 #, php-format msgid "Inbox for %s" @@ -1656,82 +1654,90 @@ msgstr "Приемно Ñандаче за %s" #: actions/inbox.php:115 msgid "This is your inbox, which lists your incoming private messages." msgstr "" +"Ова е Вашето приемно Ñандаче, кадешто Ñе наведени Вашите добиени приватни " +"пораки." #: actions/invite.php:39 msgid "Invites have been disabled." -msgstr "" +msgstr "Поканите Ñе оневозможени." #: actions/invite.php:41 #, php-format msgid "You must be logged in to invite other users to use %s" msgstr "" +"Мора да Ñте најавени за да можете да каните други кориÑници да кориÑтат %s" #: actions/invite.php:72 #, php-format msgid "Invalid email address: %s" -msgstr "" +msgstr "Ðеважечка е-поштенÑка адреÑа: %s" #: actions/invite.php:110 msgid "Invitation(s) sent" -msgstr "" +msgstr "Пораките Ñе иÑпратени" #: actions/invite.php:112 msgid "Invite new users" -msgstr "" +msgstr "Покани нови кориÑници" #: actions/invite.php:128 msgid "You are already subscribed to these users:" -msgstr "" +msgstr "Веќе Ñте претплатени на овие кориÑници:" -#: actions/invite.php:131 actions/invite.php:139 +#: actions/invite.php:131 actions/invite.php:139 lib/command.php:315 #, php-format -msgid "%s (%s)" -msgstr "" +msgid "%1$s (%2$s)" +msgstr "%1$s (%2$s)" #: actions/invite.php:136 msgid "" "These people are already users and you were automatically subscribed to them:" -msgstr "" +msgstr "Овие луѓе веќе Ñе кориÑници и Вие бевте автоматÑки претплатени на нив:" #: actions/invite.php:144 msgid "Invitation(s) sent to the following people:" -msgstr "" +msgstr "ИÑпратени Ñе покани до Ñледниве луѓе:" #: actions/invite.php:150 msgid "" "You will be notified when your invitees accept the invitation and register " "on the site. Thanks for growing the community!" msgstr "" +"Ќе добиете извеÑтување кога луѓето кои Ñте ги поканиле ќе ја прифатат " +"поканата и ќе Ñе региÑтрираат на веб-Ñтраницата. Ви благодариме за Вашата " +"помош Ñо проширувањето на заедницата!" #: actions/invite.php:162 msgid "" "Use this form to invite your friends and colleagues to use this service." msgstr "" +"Со овој обраец можете да поканите пријатели и колеги да ја кориÑтат веб-" +"Ñтраницата." #: actions/invite.php:187 msgid "Email addresses" -msgstr "" +msgstr "Е-поштенÑки адреÑи" #: actions/invite.php:189 msgid "Addresses of friends to invite (one per line)" -msgstr "" +msgstr "ÐдреÑи на пријателите што ги каните (по една во Ñекој ред)" #: actions/invite.php:192 msgid "Personal message" -msgstr "" +msgstr "Лична порака" #: actions/invite.php:194 msgid "Optionally add a personal message to the invitation." -msgstr "" +msgstr "Можете да додадете и лична порака во поканата." -#: actions/invite.php:197 lib/messageform.php:178 lib/noticeform.php:232 +#: actions/invite.php:197 lib/messageform.php:178 lib/noticeform.php:234 msgid "Send" msgstr "ИÑпрати" #: actions/invite.php:226 #, php-format msgid "%1$s has invited you to join them on %2$s" -msgstr "" +msgstr "%1$s ве покани да Ñе придружите на %2$s" #: actions/invite.php:228 #, php-format @@ -1763,75 +1769,83 @@ msgid "" "\n" "Sincerely, %2$s\n" msgstr "" +"%1$s Ве кани да Ñе придружите на %2$s (%3$s).\n" +"\n" +"%2$s е веб-Ñтраница за микроблогирање што ви овозможува да бидете во тек " +"луѓето што ги познавате и луѓето кои ве интереÑираат.\n" +"\n" +"Можете да објавувате и новоÑти за ВаÑ, Ваши размиÑли, и наÑтани од Вашиот " +"живот за да ги информирате луѓето што Ве знаат. Ова е воедно и одлично меÑто " +"за запознавање на нови луѓе Ñо иÑти интереÑи како Вашите.\n" +"\n" +"%1$s рече:\n" +"\n" +"%4$s\n" +"\n" +"Можете да го погледате профилот на %1$s на %2$s тука:\n" +"\n" +"%5$s\n" +"\n" +"Ðко Ñакате да ја иÑпробате оваа друштвена веб-Ñтраница, кликнете на врÑката " +"подолу за да ја прифатите поканата.\n" +"\n" +"%6$s\n" +"\n" +"Ðко не Ñте заинтереÑирани, занемарете го пиÑмово. Ви благодариме на времето " +"и трпението.\n" +"\n" +"Со почит, %2$s\n" #: actions/joingroup.php:60 msgid "You must be logged in to join a group." -msgstr "" - -#: actions/joingroup.php:90 lib/command.php:217 -#, fuzzy -msgid "You are already a member of that group" -msgstr "Веќе Ñте пријавени!" - -#: actions/joingroup.php:128 lib/command.php:234 -#, fuzzy, php-format -msgid "Could not join user %s to group %s" -msgstr "Ðе може да Ñе пренаÑочи кон Ñерверот: %s" +msgstr "Мора да Ñте најавени за да можете да Ñе зачлените во група." #: actions/joingroup.php:135 lib/command.php:239 #, php-format -msgid "%s joined group %s" -msgstr "" +msgid "%1$s joined group %2$s" +msgstr "%1$s Ñе зачлени во групата %2$s" #: actions/leavegroup.php:60 msgid "You must be logged in to leave a group." -msgstr "" +msgstr "Мора да Ñте најавени за да можете да ја напуштите групата." #: actions/leavegroup.php:90 lib/command.php:268 -#, fuzzy msgid "You are not a member of that group." -msgstr "Ðе ни го иÑпративте тој профил." +msgstr "Ðе членувате во таа група." #: actions/leavegroup.php:119 lib/command.php:278 msgid "Could not find membership record." -msgstr "" - -#: actions/leavegroup.php:127 lib/command.php:284 -#, php-format -msgid "Could not remove user %s to group %s" -msgstr "Ðе можев да го отÑтранам кориÑникот %s од групата %s" +msgstr "Ðе можам да ја пронајдам членÑката евиденција." #: actions/leavegroup.php:134 lib/command.php:289 #, php-format -msgid "%s left group %s" -msgstr "" +msgid "%1$s left group %2$s" +msgstr "%1$s ја напушти групата %2$s" #: actions/login.php:83 actions/register.php:137 msgid "Already logged in." msgstr "Веќе Ñте најавени." #: actions/login.php:114 actions/login.php:124 -#, fuzzy msgid "Invalid or expired token." -msgstr "Ðеправилна Ñодржина за извеÑтување" +msgstr "Ðеважечки или иÑтечен жетон." #: actions/login.php:147 msgid "Incorrect username or password." msgstr "Ðеточно кориÑничко име или лозинка" #: actions/login.php:153 -#, fuzzy msgid "Error setting user. You are probably not authorized." -msgstr "Ðе е одобрено." +msgstr "Грешка при поÑтавувањето на кориÑникот. Веројатно не Ñе заверени." -#: actions/login.php:208 actions/login.php:261 lib/action.php:459 +#: actions/login.php:208 actions/login.php:261 lib/action.php:460 #: lib/logingroupnav.php:79 msgid "Login" -msgstr "Пријави Ñе" +msgstr "Ðајава" #: actions/login.php:247 msgid "Login to site" -msgstr "" +msgstr "Ðајавете Ñе" #: actions/login.php:250 actions/profilesettings.php:106 #: actions/register.php:423 actions/showgroup.php:236 actions/tagother.php:94 @@ -1855,7 +1869,7 @@ msgstr "" #: actions/login.php:267 msgid "Lost or forgotten password?" -msgstr "Загубена или заборавена лозинка?" +msgstr "Ја загубивте или заборавивте лозинката?" #: actions/login.php:286 msgid "" @@ -1863,55 +1877,55 @@ msgid "" "changing your settings." msgstr "" "Поради безбедноÑни причини треба повторно да го внеÑете Вашето кориÑничко " -"име и лозинка пред да ги Ñмените Вашите поÑтавки." +"име и лозинка пред да ги Ñмените Вашите нагодувања." #: actions/login.php:290 -#, fuzzy, php-format +#, php-format msgid "" "Login with your username and password. Don't have a username yet? [Register]" "(%%action.register%%) a new account." msgstr "" -"Пријавете Ñе Ñо кориÑничко име и лозинка. Ðемате? [РегиÑтрирајте](%%action." -"register%%) нова Ñметка или пробајте [OpenID](%%action.openidlogin%%). " +"Ðајавете Ñе Ñо Вашето кориÑничко име и лозинка. Сè уште немате кориÑничко " +"име? [РегиÑтрирајте](%%action.register%%) нова Ñметка." #: actions/makeadmin.php:91 msgid "Only an admin can make another user an admin." -msgstr "" +msgstr "Само админиÑтратор може да направи друг кориÑник админиÑтратор." #: actions/makeadmin.php:95 #, php-format -msgid "%s is already an admin for group \"%s\"." -msgstr "" +msgid "%1$s is already an admin for group \"%2$s\"." +msgstr "%1$s веќе е админиÑтратор на групата „%2$s“." #: actions/makeadmin.php:132 #, php-format -msgid "Can't get membership record for %s in group %s" -msgstr "" +msgid "Can't get membership record for %1$s in group %2$s." +msgstr "Ðе можам да добијам евиденција за членÑтво на %1$s во групата %2$s." #: actions/makeadmin.php:145 #, php-format -msgid "Can't make %s an admin for group %s" -msgstr "" +msgid "Can't make %1$s an admin for group %2$s." +msgstr "Ðе можам да го направам кориÑникот %1$s админиÑтратор на групата %2$s." #: actions/microsummary.php:69 msgid "No current status" -msgstr "" +msgstr "Ðема тековен ÑтатуÑ" #: actions/newgroup.php:53 msgid "New group" -msgstr "" +msgstr "Ðова група" #: actions/newgroup.php:110 msgid "Use this form to create a new group." -msgstr "" +msgstr "Овој образец Ñлужи за Ñоздавање нова група." #: actions/newmessage.php:71 actions/newmessage.php:231 msgid "New message" -msgstr "" +msgstr "Ðова порака" #: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:367 msgid "You can't send a message to this user." -msgstr "" +msgstr "Ðе можете да иÑпратите порака до овојо кориÑник." #: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:351 #: lib/command.php:484 @@ -1920,34 +1934,35 @@ msgstr "Ðема Ñодржина!" #: actions/newmessage.php:158 msgid "No recipient specified." -msgstr "" +msgstr "Ðема назначено примач." #: actions/newmessage.php:164 lib/command.php:370 msgid "" "Don't send a message to yourself; just say it to yourself quietly instead." msgstr "" +"Ðе иÑпраќајте Ñи порака Ñамите на Ñебе; подобро тивко кажете Ñи го тоа на " +"ÑебеÑи." #: actions/newmessage.php:181 msgid "Message sent" -msgstr "" +msgstr "Пораката е иÑпратена" #: actions/newmessage.php:185 lib/command.php:376 #, php-format -msgid "Direct message to %s sent" -msgstr "" +msgid "Direct message to %s sent." +msgstr "Директната порака до %s е иÑпратена." #: actions/newmessage.php:210 actions/newnotice.php:245 lib/channel.php:170 msgid "Ajax Error" -msgstr "" +msgstr "Ajax-грешка" #: actions/newnotice.php:69 msgid "New notice" -msgstr "Ðово извеÑтување" +msgstr "Ðово забелешка" #: actions/newnotice.php:211 -#, fuzzy msgid "Notice posted" -msgstr "ИзвеÑтувања" +msgstr "Забелешката е објавена" #: actions/noticesearch.php:68 #, php-format @@ -1955,17 +1970,17 @@ msgid "" "Search for notices on %%site.name%% by their contents. Separate search terms " "by spaces; they must be 3 characters or more." msgstr "" -"Барајте извеÑтувања на %%site.name%% Ñпоред нивната Ñодржина. Термините " -"одделете ги Ñо празни меÑта. Ðајмала должина е 3 знаци." +"Пребарајте забелешки на %%site.name%% Ñпоред нивната Ñодржина. Поимите " +"одделете ги Ñо празни меÑта; мора да имаат барем по 3 знаци." #: actions/noticesearch.php:78 msgid "Text search" msgstr "ТекÑтуално пребарување" #: actions/noticesearch.php:91 -#, fuzzy, php-format -msgid "Search results for \"%s\" on %s" -msgstr "Пребарувај го потокот за „%s“" +#, php-format +msgid "Search results for \"%1$s\" on %2$s" +msgstr "Резултати од пребарувањето за „%1$s“ на %2$s" #: actions/noticesearch.php:121 #, php-format @@ -1973,6 +1988,8 @@ msgid "" "Be the first to [post on this topic](%%%%action.newnotice%%%%?" "status_textarea=%s)!" msgstr "" +"Бидете први што ќе [објавите нешто на оваа тема](%%%%action.newnotice%%%%?" +"status_textarea=%s)!" #: actions/noticesearch.php:124 #, php-format @@ -1980,33 +1997,38 @@ msgid "" "Why not [register an account](%%%%action.register%%%%) and be the first to " "[post on this topic](%%%%action.newnotice%%%%?status_textarea=%s)!" msgstr "" +"Рзошто не [региÑтрирате Ñметка](%%%%action.register%%%%) и Ñтанете првиот " +"што ќе [објави нешто на оваа тема](%%%%action.newnotice%%%%?status_textarea=" +"%s)!" #: actions/noticesearchrss.php:96 -#, fuzzy, php-format +#, php-format msgid "Updates with \"%s\"" -msgstr "Микроблог на %s" +msgstr "Подновувања Ñо „%s“" #: actions/noticesearchrss.php:98 -#, fuzzy, php-format +#, php-format msgid "Updates matching search term \"%1$s\" on %2$s!" -msgstr "Сите новини кои Ñе еднакви Ñо бараниот термин „%s“" +msgstr "Подновувања кои Ñе Ñовпаѓаат Ñо пребараниот израз „%1$s“ на %2$s!" #: actions/nudge.php:85 msgid "" "This user doesn't allow nudges or hasn't confirmed or set his email yet." msgstr "" +"Овој кориÑник не дозволува подбуцнувања или Ñè уште нема потврдено или " +"поÑтавено Ñвоја е-пошта." #: actions/nudge.php:94 msgid "Nudge sent" -msgstr "" +msgstr "Подбуцнувањето е иÑпратено" #: actions/nudge.php:97 msgid "Nudge sent!" -msgstr "" +msgstr "Подбуцнувањето е иÑпратено!" #: actions/oembed.php:79 actions/shownotice.php:100 msgid "Notice has no profile" -msgstr "ИзвеÑтувањето нема профил" +msgstr "Забелешката нема профил" #: actions/oembed.php:86 actions/shownotice.php:180 #, php-format @@ -2014,89 +2036,80 @@ msgid "%1$s's status on %2$s" msgstr "%1$s ÑÑ‚Ð°Ñ‚ÑƒÑ Ð½Ð° %2$s" #: actions/oembed.php:157 -#, fuzzy msgid "content type " -msgstr "Поврзи Ñе" +msgstr "тип на Ñодржини " #: actions/oembed.php:160 msgid "Only " -msgstr "" +msgstr "Само " #: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1031 #: lib/api.php:1059 lib/api.php:1169 msgid "Not a supported data format." -msgstr "" +msgstr "Ова не е поддржан формат на податотека." #: actions/opensearch.php:64 msgid "People Search" -msgstr "" +msgstr "Пребарување на луѓе" #: actions/opensearch.php:67 msgid "Notice Search" -msgstr "" +msgstr "Пребарување на забелешки" #: actions/othersettings.php:60 -#, fuzzy msgid "Other Settings" -msgstr "ПоÑтавки" +msgstr "Други нагодувања" #: actions/othersettings.php:71 msgid "Manage various other options." -msgstr "" +msgstr "Раководење Ñо разни други можноÑти." #: actions/othersettings.php:108 msgid " (free service)" -msgstr "" +msgstr "(беÑплатна уÑлуга)" #: actions/othersettings.php:116 msgid "Shorten URLs with" -msgstr "" +msgstr "Скратувај URL-адреÑи Ñо" #: actions/othersettings.php:117 msgid "Automatic shortening service to use." -msgstr "" +msgstr "Која автоматÑка Ñлужба за Ñкратување да Ñе кориÑти." #: actions/othersettings.php:122 -#, fuzzy msgid "View profile designs" -msgstr "ПоÑтавки на профилот" +msgstr "Види изгледи на профилот" #: actions/othersettings.php:123 msgid "Show or hide profile designs." -msgstr "" +msgstr "Прикажи или Ñокриј профилни изгледи." #: actions/othersettings.php:153 -#, fuzzy msgid "URL shortening service is too long (max 50 chars)." -msgstr "Локацијата е предолга (макÑимумот е 255 знаци)." - -#: actions/outbox.php:58 -#, php-format -msgid "Outbox for %s - page %d" -msgstr "" +msgstr "УÑлугата за Ñкратување на URL-адреÑи е предолга (највеќе до 50 знаци)." #: actions/outbox.php:61 #, php-format msgid "Outbox for %s" -msgstr "" +msgstr "Излезно Ñандаче за %s" #: actions/outbox.php:116 msgid "This is your outbox, which lists private messages you have sent." msgstr "" +"Ова е вашето излезно Ñандче, во кое Ñе наведени приватните пораки кои ги " +"имате иÑпратено." #: actions/passwordsettings.php:58 msgid "Change password" msgstr "Промени ја лозинката" #: actions/passwordsettings.php:69 -#, fuzzy msgid "Change your password." -msgstr "Промени ја лозинката" +msgstr "Променете Ñи ја лозинката." #: actions/passwordsettings.php:96 actions/recoverpassword.php:231 -#, fuzzy msgid "Password change" -msgstr "Лозинката е Ñнимена." +msgstr "Промена на лозинка" #: actions/passwordsettings.php:104 msgid "Old password" @@ -2125,7 +2138,7 @@ msgstr "Промени" #: actions/passwordsettings.php:154 actions/register.php:230 msgid "Password must be 6 or more characters." -msgstr "" +msgstr "Лозинката мора да Ñодржи барем 6 знаци." #: actions/passwordsettings.php:157 actions/register.php:233 msgid "Passwords don't match." @@ -2137,160 +2150,152 @@ msgstr "Ðеточна Ñтара лозинка" #: actions/passwordsettings.php:181 msgid "Error saving user; invalid." -msgstr "Грешка во Ñнимањето на кориÑникот; неправилен." +msgstr "Грешка во зачувувањето на кориÑникот; неправилен." #: actions/passwordsettings.php:186 actions/recoverpassword.php:368 msgid "Can't save new password." -msgstr "Ðовата лозинка не може да Ñе Ñними" +msgstr "Ðе можам да ја зачувам новата лозинка." #: actions/passwordsettings.php:192 actions/recoverpassword.php:211 msgid "Password saved." -msgstr "Лозинката е Ñнимена." +msgstr "Лозинката е зачувана." -#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:308 +#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:326 msgid "Paths" -msgstr "" +msgstr "Патеки" #: actions/pathsadminpanel.php:70 msgid "Path and server settings for this StatusNet site." -msgstr "" +msgstr "Ðагодувања за патеки и Ñервери за оваа StatusNet веб-Ñтраница." #: actions/pathsadminpanel.php:140 -#, fuzzy, php-format +#, php-format msgid "Theme directory not readable: %s" -msgstr "Оваа Ñтраница не е доÑтапна во форматот кој Вие го прифаќате." +msgstr "Директориумот на темата е нечитлив: %s" #: actions/pathsadminpanel.php:146 #, php-format msgid "Avatar directory not writable: %s" -msgstr "" +msgstr "Директориумот на аватарот е недоÑтапен за пишување: %s" #: actions/pathsadminpanel.php:152 #, php-format msgid "Background directory not writable: %s" -msgstr "" +msgstr "Директориумот на позадината е нечитлив: %s" #: actions/pathsadminpanel.php:160 #, php-format msgid "Locales directory not readable: %s" -msgstr "" +msgstr "Директориумот на локалите е нечитлив: %s" #: actions/pathsadminpanel.php:166 msgid "Invalid SSL server. The maximum length is 255 characters." -msgstr "" +msgstr "Ðеважечки SSL-Ñервер. Дозволени Ñе најмногу 255 знаци" #: actions/pathsadminpanel.php:217 actions/siteadminpanel.php:58 -#: lib/adminpanelaction.php:299 +#: lib/adminpanelaction.php:311 msgid "Site" -msgstr "" +msgstr "Веб-Ñтраница" #: actions/pathsadminpanel.php:221 msgid "Path" -msgstr "" +msgstr "Патека" #: actions/pathsadminpanel.php:221 -#, fuzzy msgid "Site path" -msgstr "Ðово извеÑтување" +msgstr "Патека на веб-Ñтраницата" #: actions/pathsadminpanel.php:225 msgid "Path to locales" -msgstr "" +msgstr "Патека до локалите" #: actions/pathsadminpanel.php:225 msgid "Directory path to locales" -msgstr "" +msgstr "Патека до директориумот на локалите" #: actions/pathsadminpanel.php:232 msgid "Theme" -msgstr "" +msgstr "Тема" #: actions/pathsadminpanel.php:237 msgid "Theme server" -msgstr "" +msgstr "Сервер на темата" #: actions/pathsadminpanel.php:241 msgid "Theme path" -msgstr "" +msgstr "Патека до темата" #: actions/pathsadminpanel.php:245 msgid "Theme directory" -msgstr "" +msgstr "Директориум на темата" #: actions/pathsadminpanel.php:252 -#, fuzzy msgid "Avatars" -msgstr "Ðватар" +msgstr "Ðватари" #: actions/pathsadminpanel.php:257 -#, fuzzy msgid "Avatar server" -msgstr "ПоÑтавки" +msgstr "Сервер на аватарот" #: actions/pathsadminpanel.php:261 -#, fuzzy msgid "Avatar path" -msgstr "Ðватарот е ажуриран." +msgstr "Патека на аватарот" #: actions/pathsadminpanel.php:265 -#, fuzzy msgid "Avatar directory" -msgstr "Ðватарот е ажуриран." +msgstr "Директориум на аватарот" #: actions/pathsadminpanel.php:274 msgid "Backgrounds" -msgstr "" +msgstr "Позадини" #: actions/pathsadminpanel.php:278 msgid "Background server" -msgstr "" +msgstr "Сервер на позаднината" #: actions/pathsadminpanel.php:282 msgid "Background path" -msgstr "" +msgstr "Патека до позадината" #: actions/pathsadminpanel.php:286 msgid "Background directory" -msgstr "" +msgstr "Директориум на позадината" #: actions/pathsadminpanel.php:293 msgid "SSL" -msgstr "" +msgstr "SSL" #: actions/pathsadminpanel.php:296 actions/siteadminpanel.php:346 -#, fuzzy msgid "Never" -msgstr "Пронајди" +msgstr "Ðикогаш" #: actions/pathsadminpanel.php:297 -#, fuzzy msgid "Sometimes" -msgstr "ИзвеÑтувања" +msgstr "Понекогаш" #: actions/pathsadminpanel.php:298 msgid "Always" -msgstr "" +msgstr "Секогаш" #: actions/pathsadminpanel.php:302 msgid "Use SSL" -msgstr "" +msgstr "КориÑти SSL" #: actions/pathsadminpanel.php:303 msgid "When to use SSL" -msgstr "" +msgstr "Кога Ñе кориÑти SSL" #: actions/pathsadminpanel.php:308 -msgid "SSL Server" -msgstr "" +msgid "SSL server" +msgstr "SSL-Ñервер" #: actions/pathsadminpanel.php:309 msgid "Server to direct SSL requests to" -msgstr "" +msgstr "Сервер, кому ќе му Ñе иÑпраќаат SSL-барања" #: actions/pathsadminpanel.php:325 -#, fuzzy msgid "Save paths" -msgstr "Ðово извеÑтување" +msgstr "Зачувај патеки" #: actions/peoplesearch.php:52 #, php-format @@ -2298,35 +2303,38 @@ msgid "" "Search for people on %%site.name%% by their name, location, or interests. " "Separate the terms by spaces; they must be 3 characters or more." msgstr "" -"Барајте луѓе на %%site.name%% Ñпоред нивното име, локација или интереÑи. " -"Термините одделете ги Ñо празни меÑта. Ðајмала должина е 3 знаци." +"Барајте луѓе на %%site.name%% Ñпоред име, локација или интереÑи. Поимите " +"одделете ги Ñо празни меÑта. Минималната должина на зборовите изнеÑува 3 " +"знаци." #: actions/peoplesearch.php:58 msgid "People search" msgstr "Пребарување на луѓе" #: actions/peopletag.php:70 -#, fuzzy, php-format +#, php-format msgid "Not a valid people tag: %s" -msgstr "Ðеправилна адреÑа за е-пошта." +msgstr "Ðе е важечка ознака за луѓе: %s" #: actions/peopletag.php:144 #, php-format -msgid "Users self-tagged with %s - page %d" -msgstr "" +msgid "Users self-tagged with %1$s - page %2$d" +msgstr "КориÑтници Ñамоозначени Ñо %1$s - ÑÑ‚Ñ€. %2$d" #: actions/postnotice.php:84 msgid "Invalid notice content" -msgstr "Ðеправилна Ñодржина за извеÑтување" +msgstr "Ðеважечка Ñодржина на забелешката" #: actions/postnotice.php:90 #, php-format -msgid "Notice license ‘%s’ is not compatible with site license ‘%s’." +msgid "Notice license ‘%1$s’ is not compatible with site license ‘%2$s’." msgstr "" +"Лиценцата на забелешката „%1$s“ не е компатибилна Ñо лиценцата на веб-" +"Ñтраницата „%2$s“." #: actions/profilesettings.php:60 msgid "Profile settings" -msgstr "ПоÑтавки на профилот" +msgstr "Ðагодувања на профилот" #: actions/profilesettings.php:71 msgid "" @@ -2356,21 +2364,20 @@ msgstr "Домашна Ñтраница" #: actions/profilesettings.php:117 actions/register.php:454 msgid "URL of your homepage, blog, or profile on another site" -msgstr "URL на Вашата домашна Ñтраница, блог или профил на друго меÑто." +msgstr "URL на Вашата домашна Ñтраница, блог или профил на друга веб-Ñтраница." #: actions/profilesettings.php:122 actions/register.php:460 -#, fuzzy, php-format +#, php-format msgid "Describe yourself and your interests in %d chars" -msgstr "Опишете Ñе Ñебе Ñи и ÑопÑтвените интереÑи во 140 знаци." +msgstr "Опишете Ñе ÑебеÑи и Ñвоите интереÑи во %d знаци." #: actions/profilesettings.php:125 actions/register.php:463 -#, fuzzy msgid "Describe yourself and your interests" -msgstr "Опишете Ñе Ñебе Ñи и ÑопÑтвените интереÑи во 140 знаци." +msgstr "Опишете Ñе ÑебеÑи и Вашите интереÑи" #: actions/profilesettings.php:127 actions/register.php:465 msgid "Bio" -msgstr "Био" +msgstr "Биографија" #: actions/profilesettings.php:132 actions/register.php:470 #: actions/showgroup.php:256 actions/tagother.php:112 @@ -2381,11 +2388,11 @@ msgstr "Локација" #: actions/profilesettings.php:134 actions/register.php:472 msgid "Where you are, like \"City, State (or Region), Country\"" -msgstr "Каде Ñе наоѓате, на пр. „Град, Држава“." +msgstr "Каде Ñе наоѓате, на пр. „Град, ОблаÑÑ‚, Земја“." #: actions/profilesettings.php:138 msgid "Share my current location when posting notices" -msgstr "" +msgstr "Сподели ја мојата тековна локација при објавување на забелешки" #: actions/profilesettings.php:145 actions/tagother.php:149 #: actions/tagother.php:209 lib/subscriptionlist.php:106 @@ -2397,6 +2404,8 @@ msgstr "Ознаки" msgid "" "Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated" msgstr "" +"Ознаки за Ð’Ð°Ñ Ñамите (букви, бројки, -, . и _), одделени Ñо запирка или " +"празно меÑто" #: actions/profilesettings.php:151 actions/siteadminpanel.php:294 msgid "Language" @@ -2404,93 +2413,90 @@ msgstr "Јазик" #: actions/profilesettings.php:152 msgid "Preferred language" -msgstr "" +msgstr "Претпочитан јазик" #: actions/profilesettings.php:161 msgid "Timezone" -msgstr "" +msgstr "ЧаÑовна зона" #: actions/profilesettings.php:162 msgid "What timezone are you normally in?" -msgstr "" +msgstr "Во која чаÑовна зона обично Ñе наоѓате?" #: actions/profilesettings.php:167 msgid "" "Automatically subscribe to whoever subscribes to me (best for non-humans)" msgstr "" +"ÐвтоматÑки претплаќај ме на Ñекој што Ñе претплаќа на мене (најдобро за " +"ботови и Ñл.)" #: actions/profilesettings.php:228 actions/register.php:223 -#, fuzzy, php-format +#, php-format msgid "Bio is too long (max %d chars)." -msgstr "Биографијата е предолга (макÑимумот е 140 знаци)." +msgstr "Биографијата е преголема (највеќе до %d знаци)." #: actions/profilesettings.php:235 actions/siteadminpanel.php:164 msgid "Timezone not selected." -msgstr "Ðе е избрана временÑка зона." +msgstr "Ðе е избрана чаÑовна зона." #: actions/profilesettings.php:241 msgid "Language is too long (max 50 chars)." -msgstr "" +msgstr "Јазикот е предлог (највеќе до 50 знаци)." #: actions/profilesettings.php:253 actions/tagother.php:178 #, php-format msgid "Invalid tag: \"%s\"" -msgstr "Ðевалидна ознака: \"%s\"" +msgstr "Ðеважечка ознака: „%s“" #: actions/profilesettings.php:302 msgid "Couldn't update user for autosubscribe." -msgstr "" +msgstr "Ðе можев да го подновам кориÑникот за автопретплата." -#: actions/profilesettings.php:354 -#, fuzzy +#: actions/profilesettings.php:359 msgid "Couldn't save location prefs." -msgstr "Профилот не може да Ñе Ñними." +msgstr "Ðе можев да ги зачувам нагодувањата за локација" -#: actions/profilesettings.php:366 +#: actions/profilesettings.php:371 msgid "Couldn't save profile." -msgstr "Профилот не може да Ñе Ñними." +msgstr "Ðе можам да го зачувам профилот." -#: actions/profilesettings.php:374 -#, fuzzy +#: actions/profilesettings.php:379 msgid "Couldn't save tags." -msgstr "Профилот не може да Ñе Ñними." +msgstr "Ðе можев да ги зачувам ознаките." -#: actions/profilesettings.php:382 lib/adminpanelaction.php:126 +#: actions/profilesettings.php:387 lib/adminpanelaction.php:137 msgid "Settings saved." -msgstr "ПоÑтавките Ñе Ñнимени." +msgstr "Ðагодувањата Ñе зачувани" #: actions/public.php:83 #, php-format msgid "Beyond the page limit (%s)" -msgstr "" +msgstr "Ðадминато е ограничувањето на Ñтраницата (%s)" #: actions/public.php:92 msgid "Could not retrieve public stream." -msgstr "" +msgstr "Ðе можам да го вратам јавниот поток." #: actions/public.php:129 -#, fuzzy, php-format +#, php-format msgid "Public timeline, page %d" -msgstr "Јавна иÑторија" +msgstr "Јавна иÑторија, ÑÑ‚Ñ€. %d" #: actions/public.php:131 lib/publicgroupnav.php:79 msgid "Public timeline" msgstr "Јавна иÑторија" #: actions/public.php:151 -#, fuzzy msgid "Public Stream Feed (RSS 1.0)" -msgstr "Јавен канал" +msgstr "Канал на јавниот поток (RSS 1.0)" #: actions/public.php:155 -#, fuzzy msgid "Public Stream Feed (RSS 2.0)" -msgstr "Јавен канал" +msgstr "Канал на јавниот поток (RSS 2.0)" #: actions/public.php:159 -#, fuzzy msgid "Public Stream Feed (Atom)" -msgstr "Јавен канал" +msgstr "Канал на јавниот поток (Atom)" #: actions/public.php:179 #, php-format @@ -2498,16 +2504,19 @@ msgid "" "This is the public timeline for %%site.name%% but no one has posted anything " "yet." msgstr "" +"Ова е јавната иÑторија за %%site.name%%, но доÑега никој ништо нема објавено." #: actions/public.php:182 msgid "Be the first to post!" -msgstr "" +msgstr "Создајте ја првата забелешка!" #: actions/public.php:186 #, php-format msgid "" "Why not [register an account](%%action.register%%) and be the first to post!" msgstr "" +"Зошто не [региÑтрирате Ñметка](%%action.register%%) и Ñтанете првиот " +"објавувач!" #: actions/public.php:233 #, php-format @@ -2517,6 +2526,11 @@ msgid "" "tool. [Join now](%%action.register%%) to share notices about yourself with " "friends, family, and colleagues! ([Read more](%%doc.help%%))" msgstr "" +"Ова е %%site.name%%, веб-Ñтраница за [микроблогирање](http://mk.wikipedia." +"org/wiki/Микроблогирање) базирана на Ñлободната програмÑка алатка [StatusNet]" +"(http://status.net/). [Зачленете Ñе](%%action.register%%) за да Ñи " +"Ñподелувате забелешки за Ñебе Ñо приајтелите, ÑемејÑтвото и колегите! " +"([Прочитајте повеќе](%%doc.help%%))" #: actions/public.php:238 #, php-format @@ -2525,25 +2539,27 @@ msgid "" "blogging) service based on the Free Software [StatusNet](http://status.net/) " "tool." msgstr "" +"Ова е %%site.name%%, веб-Ñтраница за [микроблогирање](http://mk.wikipedia." +"org/wiki/Микроблогирање) базирана на Ñлободната програмÑка алатка [StatusNet]" +"(http://status.net/)." #: actions/publictagcloud.php:57 -#, fuzzy msgid "Public tag cloud" -msgstr "Јавен канал" +msgstr "Јавен облак од ознаки" #: actions/publictagcloud.php:63 #, php-format msgid "These are most popular recent tags on %s " -msgstr "" +msgstr "Овие Ñе најпопуларните Ñкорешни ознаки на %s " #: actions/publictagcloud.php:69 #, php-format msgid "No one has posted a notice with a [hashtag](%%doc.tags%%) yet." -msgstr "" +msgstr "Сè уште некој нема објавено забелешка Ñо [хеш-ознака](%%doc.tags%%)." #: actions/publictagcloud.php:72 msgid "Be the first to post one!" -msgstr "" +msgstr "Бидете првиот објавувач!" #: actions/publictagcloud.php:75 #, php-format @@ -2551,14 +2567,16 @@ msgid "" "Why not [register an account](%%action.register%%) and be the first to post " "one!" msgstr "" +"Зошто не [региÑтрирате Ñметка](%%action.register%%) и Ñтанете прв што ќе " +"објави!" -#: actions/publictagcloud.php:135 +#: actions/publictagcloud.php:131 msgid "Tag cloud" -msgstr "" +msgstr "Облак од ознаки" #: actions/recoverpassword.php:36 msgid "You are already logged in!" -msgstr "Веќе Ñте пријавени!" +msgstr "Веќе Ñте најавени!" #: actions/recoverpassword.php:62 msgid "No such recovery code." @@ -2582,25 +2600,27 @@ msgstr "Овој код за потврда е премногу Ñтар. Поч #: actions/recoverpassword.php:111 msgid "Could not update user with confirmed email address." -msgstr "" +msgstr "Ðе можев да го подновам кориÑникот Ñо потврдена е-поштенÑка адреÑа." #: actions/recoverpassword.php:152 msgid "" "If you have forgotten or lost your password, you can get a new one sent to " "the email address you have stored in your account." msgstr "" +"Ðко ја имате заборавено или загубено лозинката, можете да побарате да Ви Ñе " +"иÑпрати нова по е-поштата која Ñте ја назначиле за Ñметката." #: actions/recoverpassword.php:158 msgid "You have been identified. Enter a new password below. " -msgstr "" +msgstr "Препознаени Ñте. ВнеÑете нова лозинка подполу. " #: actions/recoverpassword.php:188 msgid "Password recovery" -msgstr "" +msgstr "Враќање на лозинката" #: actions/recoverpassword.php:191 msgid "Nickname or email address" -msgstr "" +msgstr "Прекар или е-поштенÑка адреÑа" #: actions/recoverpassword.php:193 msgid "Your nickname on this server, or your registered email address." @@ -2626,15 +2646,15 @@ msgstr "Побарано е пронаоѓање на лозинката" #: actions/recoverpassword.php:213 msgid "Unknown action" -msgstr "" +msgstr "Ðепознато дејÑтво" #: actions/recoverpassword.php:236 msgid "6 or more characters, and don't forget it!" -msgstr "6 или повеќе знаци и не ја заборавајте!" +msgstr "6 или повеќе знаци и не заборавајте!" #: actions/recoverpassword.php:243 msgid "Reset" -msgstr "РеÑетирај" +msgstr "Врати одново" #: actions/recoverpassword.php:252 msgid "Enter a nickname or email address." @@ -2642,7 +2662,7 @@ msgstr "ВнеÑете прекар или е-пошта" #: actions/recoverpassword.php:272 msgid "No user with that email address or username." -msgstr "" +msgstr "Ðема кориÑник Ñо таа е-поштенÑка адреÑа или кориÑничко име." #: actions/recoverpassword.php:287 msgid "No registered email address for that user." @@ -2650,7 +2670,7 @@ msgstr "Ðема региÑтрирана адреÑа за е-пошта за Ñ #: actions/recoverpassword.php:301 msgid "Error saving address confirmation." -msgstr "Грешка во Ñнимањето на потвдата за адреÑата." +msgstr "Грешка при зачувувањето на потврдата за адреÑа." #: actions/recoverpassword.php:325 msgid "" @@ -2662,7 +2682,7 @@ msgstr "" #: actions/recoverpassword.php:344 msgid "Unexpected password reset." -msgstr "Ðеочекувано реÑетирање на лозинка." +msgstr "Ðеочекувано подновување на лозинката." #: actions/recoverpassword.php:352 msgid "Password must be 6 chars or more." @@ -2678,38 +2698,33 @@ msgstr "Грешка во поÑтавувањето на кориÑникот." #: actions/recoverpassword.php:382 msgid "New password successfully saved. You are now logged in." -msgstr "Ðовата лозинка уÑпешно е Ñнимена. Сега Ñте пријавени." +msgstr "Ðовата лозинка е уÑпешно зачувана. Сега Ñте најавени." #: actions/register.php:85 actions/register.php:189 actions/register.php:404 msgid "Sorry, only invited people can register." -msgstr "" +msgstr "Жалиме, региÑтрацијата е Ñамо Ñо покана." #: actions/register.php:92 -#, fuzzy msgid "Sorry, invalid invitation code." -msgstr "Грешка Ñо кодот за потврдување." +msgstr "Жалиме, неважечки код за поканата." #: actions/register.php:112 msgid "Registration successful" -msgstr "" +msgstr "РегиÑтрацијата е уÑпешна" -#: actions/register.php:114 actions/register.php:502 lib/action.php:456 +#: actions/register.php:114 actions/register.php:502 lib/action.php:457 #: lib/logingroupnav.php:85 msgid "Register" msgstr "РегиÑтрирај Ñе" #: actions/register.php:135 msgid "Registration not allowed." -msgstr "" +msgstr "РегиÑтрирањето не е дозволено." #: actions/register.php:198 msgid "You can't register if you don't agree to the license." msgstr "Ðе може да Ñе региÑтрирате ако не ја прифаќате лиценцата." -#: actions/register.php:201 -msgid "Not a valid email address." -msgstr "Ðеправилна адреÑа за е-пошта." - #: actions/register.php:212 msgid "Email address already exists." msgstr "ÐдреÑата веќе поÑтои." @@ -2723,18 +2738,22 @@ msgid "" "With this form you can create a new account. You can then post notices and " "link up to friends and colleagues. " msgstr "" +"Со овој образец можете да Ñоздадете нова Ñметка. Потоа ќе можете да " +"објавувате забелешки и да Ñе поврзувате Ñо пријатели и колеги. " #: actions/register.php:424 msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required." msgstr "" +"1-64 мали букви или бројки, без интерпункциÑки знаци и празни меÑта. " +"Задолжително поле." #: actions/register.php:429 msgid "6 or more characters. Required." -msgstr "" +msgstr "Барем 6 знаци. Задолжително поле." #: actions/register.php:433 msgid "Same as password above. Required." -msgstr "" +msgstr "ИÑто што и лозинката погоре. Задолжително поле." #: actions/register.php:437 actions/register.php:441 #: actions/siteadminpanel.php:270 lib/accountsettingsaction.php:120 @@ -2743,11 +2762,11 @@ msgstr "Е-пошта" #: actions/register.php:438 actions/register.php:442 msgid "Used only for updates, announcements, and password recovery" -msgstr "Се кориÑти Ñамо за надградби, објави и пронаоѓање на лозинка." +msgstr "Се кориÑти Ñамо за подновувања, објави и повраќање на лозинка." #: actions/register.php:449 msgid "Longer name, preferably your \"real\" name" -msgstr "" +msgstr "Подолго име, по можноÑÑ‚ Вашето виÑтинÑко име и презиме" #: actions/register.php:493 msgid "My text and files are available under " @@ -2755,24 +2774,23 @@ msgstr "Мојот текÑÑ‚ и податотеки Ñе доÑтапни по #: actions/register.php:495 msgid "Creative Commons Attribution 3.0" -msgstr "" +msgstr "Creative Commons Ðаведи извор 3.0" #: actions/register.php:496 -#, fuzzy msgid "" " except this private data: password, email address, IM address, and phone " "number." msgstr "" -"оÑвен Ñледниве лични податоци: лозинка, адреÑа за е-пошта, адреÑа за ИМ, " -"телефонÑки број." +" оÑвен овие приватни податоци: лозинка, е-пошта, IM-адреÑа и телефонÑки " +"број." #: actions/register.php:537 #, php-format msgid "" -"Congratulations, %s! And welcome to %%%%site.name%%%%. From here, you may " +"Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may " "want to...\n" "\n" -"* Go to [your profile](%s) and post your first message.\n" +"* Go to [your profile](%2$s) and post your first message.\n" "* Add a [Jabber/GTalk address](%%%%action.imsettings%%%%) so you can send " "notices through instant messages.\n" "* [Search for people](%%%%action.peoplesearch%%%%) that you may know or that " @@ -2784,12 +2802,29 @@ msgid "" "\n" "Thanks for signing up and we hope you enjoy using this service." msgstr "" +"Ви чеÑтитаме %1$s! И ви пожелуваме добредојде на %%%%site.name%%%%. Оттука " +"можете да...\n" +"\n" +"* Отидете на [Вашиот профил](%2$s) и објавете ја Вашата прва порака.\n" +"* Додајте [Jabber/GTalk адреÑа](%%%%action.imsettings%%%%) за да можете да " +"иÑпраќате забелешки преку инÑтант-пораки.\n" +"* [Пребарајте луѓе](%%%%action.peoplesearch%%%%) кои можеби ги знаете или " +"кои имаат иÑти интереÑи како ВаÑ. \n" +"* Подновете Ñи ги [нагодувањата на профилот](%%%%action.profilesettings%%%%) " +"за да можат другите да дознаат нешто повеќе за ВаÑ. \n" +"* Прочитајте ги [документите](%%%%doc.help%%%%) за да Ñе запознаете Ñо " +"можноÑтите за кои можеби не знаете. \n" +"\n" +"Ви благодариме што Ñе зачленивте и Ви пожелуваме пријатни мигови Ñо оваа " +"Ñлужба." #: actions/register.php:561 msgid "" "(You should receive a message by email momentarily, with instructions on how " "to confirm your email address.)" msgstr "" +"(Би требало веднаш да добиете порака по е-пошта, во која Ñтојат напатÑтвија " +"за потврдување на е-поштенÑката адреÑа.)" #: actions/remotesubscribe.php:98 #, php-format @@ -2798,19 +2833,18 @@ msgid "" "register%%) a new account. If you already have an account on a [compatible " "microblogging site](%%doc.openmublog%%), enter your profile URL below." msgstr "" -"За да Ñе претплатите, може да Ñе [пријавите](%%action.login%%) или да Ñе " -"[региÑтрирате](%%action.register%%). Ðко имате Ñметка на [компатибилно меÑто " -"за микро блогирање](%%doc.openmublog%%), внеÑете го URL-то на Вашиот профил " -"подолу." +"За да Ñе претплатите, може да Ñе [најавите](%%action.login%%) или да " +"[региÑтрирате](%%action.register%%) нова Ñметка. Ðко веќе имате Ñметка на " +"[компатибилна веб-Ñтраница за микроблогирање](%%doc.openmublog%%), внеÑете " +"го URL-то на Вашиот профил подолу." #: actions/remotesubscribe.php:112 msgid "Remote subscribe" msgstr "Оддалечена претплата" #: actions/remotesubscribe.php:124 -#, fuzzy msgid "Subscribe to a remote user" -msgstr "Претплатата е одобрена" +msgstr "Претплати Ñе на оддалечен кориÑник" #: actions/remotesubscribe.php:129 msgid "User nickname" @@ -2826,7 +2860,7 @@ msgstr "URL на профилот" #: actions/remotesubscribe.php:134 msgid "URL of your profile on another compatible microblogging service" -msgstr "URL на Вашиот профил на друго компатибилно меÑто за микроблогирање." +msgstr "URL на Вашиот профил на друга компатибилна Ñлужба за микроблогирање." #: actions/remotesubscribe.php:137 lib/subscribeform.php:139 #: lib/userprofile.php:365 @@ -2838,37 +2872,34 @@ msgid "Invalid profile URL (bad format)" msgstr "Ðеправилно URL на профил (лош формат)" #: actions/remotesubscribe.php:168 -#, fuzzy msgid "Not a valid profile URL (no YADIS document or invalid XRDS defined)." -msgstr "Ðеправилно URL на профил (нема YADIS документ)." +msgstr "" +"Ðеважечка URL-адреÑа на профил (нема YADIS документ или определен е " +"неважечки XRDS)." #: actions/remotesubscribe.php:176 msgid "That’s a local profile! Login to subscribe." -msgstr "" +msgstr "Тоа е локален профил! најавете Ñе за да Ñе претплатите." #: actions/remotesubscribe.php:183 -#, fuzzy msgid "Couldn’t get a request token." -msgstr "Ðе може да Ñе земе белег за барање." +msgstr "Ðе можев да добијам жетон за барање." #: actions/repeat.php:57 msgid "Only logged-in users can repeat notices." -msgstr "" +msgstr "Само најавени кориÑници можат да повторуваат забелешки." #: actions/repeat.php:64 actions/repeat.php:71 -#, fuzzy msgid "No notice specified." -msgstr "Ðово извеÑтување" +msgstr "Ðема назначено забелешка." #: actions/repeat.php:76 -#, fuzzy msgid "You can't repeat your own notice." -msgstr "Ðе може да Ñе региÑтрирате ако не ја прифаќате лиценцата." +msgstr "Ðе можете да повторувате ÑопÑтвена забелешка." #: actions/repeat.php:90 -#, fuzzy msgid "You already repeated that notice." -msgstr "Веќе Ñте пријавени!" +msgstr "Веќе ја имате повторено таа забелешка." #: actions/repeat.php:114 lib/noticelist.php:629 msgid "Repeated" @@ -2884,32 +2915,29 @@ msgstr "Повторено!" msgid "Replies to %s" msgstr "Одговори иÑпратени до %s" -#: actions/replies.php:127 -#, fuzzy, php-format -msgid "Replies to %s, page %d" -msgstr "Одговори иÑпратени до %s" - #: actions/replies.php:144 -#, fuzzy, php-format +#, php-format msgid "Replies feed for %s (RSS 1.0)" -msgstr "Канал Ñо извеÑтувања на %s" +msgstr "Канал Ñо одговори за %s (RSS 1.0)" #: actions/replies.php:151 -#, fuzzy, php-format +#, php-format msgid "Replies feed for %s (RSS 2.0)" -msgstr "Канал Ñо извеÑтувања на %s" +msgstr "Канал Ñо одговори за %s (RSS 2.0)" #: actions/replies.php:158 -#, fuzzy, php-format +#, php-format msgid "Replies feed for %s (Atom)" -msgstr "Канал Ñо извеÑтувања на %s" +msgstr "Канал Ñо одговори за %s (Atom)" #: actions/replies.php:198 #, php-format msgid "" -"This is the timeline showing replies to %s but %s hasn't received a notice " -"to his attention yet." +"This is the timeline showing replies to %1$s but %2$s hasn't received a " +"notice to his attention yet." msgstr "" +"Ова е иÑторијата на која Ñе прикажани одговорите на %1$s, но %2$s Ñè уште " +"нема добиено порака од некој што Ñака да ја прочита." #: actions/replies.php:203 #, php-format @@ -2917,58 +2945,58 @@ msgid "" "You can engage other users in a conversation, subscribe to more people or " "[join groups](%%action.groups%%)." msgstr "" +"Можете да започнувате разговори Ñо други кориÑници, да Ñе претплаќате на " +"други луѓе или да [Ñе зачленувате во групи](%%action.groups%%)." #: actions/replies.php:205 #, php-format msgid "" -"You can try to [nudge %s](../%s) or [post something to his or her attention]" -"(%%%%action.newnotice%%%%?status_textarea=%s)." +"You can try to [nudge %1$s](../%2$s) or [post something to his or her " +"attention](%%%%action.newnotice%%%%?status_textarea=%3$s)." msgstr "" +"Можете да го [подбуцнете кориÑникот 1$s](../%2$s) или да [објавите нешто што " +"Ñакате тој да го прочита](%%%%action.newnotice%%%%?status_textarea=%3$s)." #: actions/repliesrss.php:72 -#, fuzzy, php-format +#, php-format msgid "Replies to %1$s on %2$s!" -msgstr "Одговори иÑпратени до %s" +msgstr "Одговори на %1$s на %2$s!" #: actions/sandbox.php:65 actions/unsandbox.php:65 -#, fuzzy msgid "You cannot sandbox users on this site." -msgstr "Ðе ни го иÑпративте тој профил." +msgstr "Ðе можете да Ñтавате кориÑници во пеÑочен режим на оваа веб-Ñтраница." #: actions/sandbox.php:72 -#, fuzzy msgid "User is already sandboxed." -msgstr "КориÑникот нема профил." - -#: actions/showfavorites.php:79 -#, fuzzy, php-format -msgid "%s's favorite notices, page %d" -msgstr "Ðема такво извеÑтување." +msgstr "КориÑникот е веќе во пеÑочен режим." #: actions/showfavorites.php:132 msgid "Could not retrieve favorite notices." -msgstr "" +msgstr "Ðе можев да ги вратам омилените забелешки." #: actions/showfavorites.php:170 -#, fuzzy, php-format +#, php-format msgid "Feed for favorites of %s (RSS 1.0)" -msgstr "Канал Ñо пријатели на %S" +msgstr "Канал за омилени забелешки на %s (RSS 1.0)" #: actions/showfavorites.php:177 -#, fuzzy, php-format +#, php-format msgid "Feed for favorites of %s (RSS 2.0)" -msgstr "Канал Ñо пријатели на %S" +msgstr "Канал за омилени забелешки на %s (RSS 2.0)" #: actions/showfavorites.php:184 -#, fuzzy, php-format +#, php-format msgid "Feed for favorites of %s (Atom)" -msgstr "Канал Ñо пријатели на %S" +msgstr "Канал за омилени забелешки на %s (Atom)" #: actions/showfavorites.php:205 msgid "" "You haven't chosen any favorite notices yet. Click the fave button on " "notices you like to bookmark them for later or shed a spotlight on them." msgstr "" +"Сè уште немате избрано ниедна омилена забелешка. Кликнете на копчето за " +"омилена забелешка веднаш до Ñамата забелешката што Ви Ñе допаѓа за да ја " +"обележите за подоцна, или за да Ñ Ð´Ð°Ð´ÐµÑ‚Ðµ на важноÑÑ‚." #: actions/showfavorites.php:207 #, php-format @@ -2976,6 +3004,8 @@ msgid "" "%s hasn't added any notices to his favorites yet. Post something interesting " "they would add to their favorites :)" msgstr "" +"%s Ñè уште нема додадено забелешки како омилени. Објавете нешто интереÑно, " +"што кориÑникот би го обележал како омилено :)" #: actions/showfavorites.php:211 #, php-format @@ -2984,20 +3014,18 @@ msgid "" "account](%%%%action.register%%%%) and then post something interesting they " "would add to their favorites :)" msgstr "" +"%s Ñè уште нема додадено омилени забелешки. Зошто не [региÑтрирате Ñметка](%%" +"%%action.register%%%%) и потоа објавите нешто интереÑно што кориÑникот би го " +"додал како омилено :)" #: actions/showfavorites.php:242 msgid "This is a way to share what you like." -msgstr "" +msgstr "Ова е начин да го Ñподелите она што Ви Ñе допаѓа." #: actions/showgroup.php:82 lib/groupnav.php:86 #, php-format msgid "%s group" -msgstr "" - -#: actions/showgroup.php:84 -#, php-format -msgid "%s group, page %d" -msgstr "" +msgstr "Група %s" #: actions/showgroup.php:218 msgid "Group profile" @@ -3006,7 +3034,7 @@ msgstr "Профил на група" #: actions/showgroup.php:263 actions/tagother.php:118 #: actions/userauthorization.php:167 lib/userprofile.php:177 msgid "URL" -msgstr "" +msgstr "URL" #: actions/showgroup.php:274 actions/tagother.php:128 #: actions/userauthorization.php:179 lib/userprofile.php:194 @@ -3015,50 +3043,49 @@ msgstr "Забелешка" #: actions/showgroup.php:284 lib/groupeditform.php:184 msgid "Aliases" -msgstr "" +msgstr "ÐлијаÑи" #: actions/showgroup.php:293 msgid "Group actions" -msgstr "" +msgstr "Групни дејÑтва" #: actions/showgroup.php:328 -#, fuzzy, php-format +#, php-format msgid "Notice feed for %s group (RSS 1.0)" -msgstr "Канал Ñо извеÑтувања на %s" +msgstr "Канал Ñо забелешки за групата %s (RSS 1.0)" #: actions/showgroup.php:334 -#, fuzzy, php-format +#, php-format msgid "Notice feed for %s group (RSS 2.0)" -msgstr "Канал Ñо извеÑтувања на %s" +msgstr "Канал Ñо забелешки за групата %s (RSS 2.0)" #: actions/showgroup.php:340 -#, fuzzy, php-format +#, php-format msgid "Notice feed for %s group (Atom)" -msgstr "Канал Ñо извеÑтувања на %s" +msgstr "Канал Ñо забелешки за групата%s (Atom)" #: actions/showgroup.php:345 -#, fuzzy, php-format +#, php-format msgid "FOAF for %s group" -msgstr "Канал Ñо извеÑтувања на %s" +msgstr "FOAF за групата %s" #: actions/showgroup.php:381 actions/showgroup.php:438 lib/groupnav.php:91 -#, fuzzy msgid "Members" -msgstr "Член од" +msgstr "Членови" #: actions/showgroup.php:386 lib/profileaction.php:117 #: lib/profileaction.php:148 lib/profileaction.php:236 lib/section.php:95 -#: lib/tagcloudsection.php:71 +#: lib/subscriptionlist.php:126 lib/tagcloudsection.php:71 msgid "(None)" -msgstr "" +msgstr "(Ðема)" #: actions/showgroup.php:392 msgid "All members" -msgstr "" +msgstr "Сите членови" #: actions/showgroup.php:429 lib/profileaction.php:174 msgid "Statistics" -msgstr "СтатиÑтика" +msgstr "СтатиÑтики" #: actions/showgroup.php:432 msgid "Created" @@ -3073,6 +3100,12 @@ msgid "" "their life and interests. [Join now](%%%%action.register%%%%) to become part " "of this group and many more! ([Read more](%%%%doc.help%%%%))" msgstr "" +"**%s** е кориÑничка група на %%%%site.name%%%%, веб-Ñтраница за " +"[микроблогирање](http://mk.wikipedia.org/wiki/Микроблогирање) базирана на " +"Ñлободната програмÑка алатка [StatusNet](http://status.net/). Ðејзините " +"членови Ñи разменуваат кратки пораки за нивниот живот и интереÑи. [Зачленете " +"Ñе](%%%%action.register%%%%) за да Ñтанете дел од оваа група и многу повеќе! " +"([Прочитајте повеќе](%%%%doc.help%%%%))" #: actions/showgroup.php:454 #, php-format @@ -3082,23 +3115,27 @@ msgid "" "[StatusNet](http://status.net/) tool. Its members share short messages about " "their life and interests. " msgstr "" +"**%s** е кориÑничка група на %%%%site.name%%%%, веб-Ñтраница за " +"[микроблогирање](http://mk.wikipedia.org/wiki/Микроблогирање) базирана на " +"Ñлободната програмÑка алатка [StatusNet](http://status.net/). Ðејзините " +"членови Ñи разменуваат кратки пораки за нивниот живот и интереÑи. " #: actions/showgroup.php:482 msgid "Admins" -msgstr "" +msgstr "ÐдминиÑтратори" #: actions/showmessage.php:81 msgid "No such message." -msgstr "" +msgstr "Ðема таква порака." #: actions/showmessage.php:98 msgid "Only the sender and recipient may read this message." -msgstr "" +msgstr "Само иÑпраќачот и примачот можат да ја читаат оваа порака." #: actions/showmessage.php:108 #, php-format msgid "Message to %1$s on %2$s" -msgstr "" +msgstr "Порака за %1$s на %2$s" #: actions/showmessage.php:113 #, php-format @@ -3112,55 +3149,54 @@ msgstr "Избришана забелешка" #: actions/showstream.php:73 #, php-format msgid " tagged %s" -msgstr "" - -#: actions/showstream.php:79 -#, php-format -msgid "%s, page %d" -msgstr "" +msgstr " означено Ñо %s" #: actions/showstream.php:122 -#, fuzzy, php-format -msgid "Notice feed for %s tagged %s (RSS 1.0)" -msgstr "Канал Ñо извеÑтувања на %s" +#, php-format +msgid "Notice feed for %1$s tagged %2$s (RSS 1.0)" +msgstr "Канал Ñо забелешки за %1$s означен Ñо %2$s (RSS 1.0)" #: actions/showstream.php:129 -#, fuzzy, php-format +#, php-format msgid "Notice feed for %s (RSS 1.0)" -msgstr "Канал Ñо извеÑтувања на %s" +msgstr "Канал Ñо забелешки за %s (RSS 1.0)" #: actions/showstream.php:136 -#, fuzzy, php-format +#, php-format msgid "Notice feed for %s (RSS 2.0)" -msgstr "Канал Ñо извеÑтувања на %s" +msgstr "Канал Ñо забелешки за %s (RSS 2.0)" #: actions/showstream.php:143 -#, fuzzy, php-format +#, php-format msgid "Notice feed for %s (Atom)" -msgstr "Канал Ñо извеÑтувања на %s" +msgstr "Канал Ñо забелешки за %s (Atom)" #: actions/showstream.php:148 #, php-format msgid "FOAF for %s" -msgstr "" +msgstr "FOAF за %s" #: actions/showstream.php:191 #, php-format -msgid "This is the timeline for %s but %s hasn't posted anything yet." -msgstr "" +msgid "This is the timeline for %1$s but %2$s hasn't posted anything yet." +msgstr "Ова е иÑторијата за %1$s, но %2$s Ñè уште нема објавено ништо." #: actions/showstream.php:196 msgid "" "Seen anything interesting recently? You haven't posted any notices yet, now " "would be a good time to start :)" msgstr "" +"Имате видено нешто интереÑно во поÑледно време? Сè уште немате објавено " +"ниедна забелешка, но Ñега е добро време за да почнете :)" #: actions/showstream.php:198 #, php-format msgid "" -"You can try to nudge %s or [post something to his or her attention](%%%%" -"action.newnotice%%%%?status_textarea=%s)." +"You can try to nudge %1$s or [post something to his or her attention](%%%%" +"action.newnotice%%%%?status_textarea=%2$s)." msgstr "" +"Можете да го подбуцнете кориÑникот %1$s или [да објавите нешто што Ñакате да " +"го прочита](%%%%action.newnotice%%%%?status_textarea=%2$s)." #: actions/showstream.php:234 #, php-format @@ -3170,6 +3206,11 @@ msgid "" "[StatusNet](http://status.net/) tool. [Join now](%%%%action.register%%%%) to " "follow **%s**'s notices and many more! ([Read more](%%%%doc.help%%%%))" msgstr "" +"**%s** има Ñметка на %%%%site.name%%%%, веб-Ñтраница за [микроблогирање]" +"(http://mk.wikipedia.org/wiki/Микроблогирање) базирана на Ñлободната " +"програмÑка алатка [StatusNet](http://status.net/). [Зачленете Ñе](%%%%action." +"register%%%%) за да можете да ги Ñледите забелешките на **%s** и многу " +"повеќе! ([Прочитајте повеќе](%%%%doc.help%%%%))" #: actions/showstream.php:239 #, php-format @@ -3178,6 +3219,9 @@ msgid "" "wikipedia.org/wiki/Micro-blogging) service based on the Free Software " "[StatusNet](http://status.net/) tool. " msgstr "" +"**%s** има Ñметка на %%%%site.name%%%%, веб-Ñтраница за [микроблогирање]" +"(http://mk.wikipedia.org/wiki/Микроблогирање) базирана на Ñлободната " +"програмÑка алатка [StatusNet](http://status.net/). " #: actions/showstream.php:313 #, php-format @@ -3186,83 +3230,84 @@ msgstr "Повторувања на %s" #: actions/silence.php:65 actions/unsilence.php:65 msgid "You cannot silence users on this site." -msgstr "" +msgstr "Ðе можете да замолчувате кориÑници на оваа веб-Ñтраница." #: actions/silence.php:72 -#, fuzzy msgid "User is already silenced." -msgstr "КориÑникот нема профил." +msgstr "КориÑникот е веќе замолчен." #: actions/siteadminpanel.php:69 msgid "Basic settings for this StatusNet site." -msgstr "" +msgstr "ОÑновни нагодувања за оваа StatusNet веб-Ñтраница." #: actions/siteadminpanel.php:146 msgid "Site name must have non-zero length." -msgstr "" +msgstr "Должината на името на веб-Ñтраницата не може да изнеÑува нула." #: actions/siteadminpanel.php:154 -#, fuzzy -msgid "You must have a valid contact email address" -msgstr "Ðеправилна адреÑа за е-пошта." +msgid "You must have a valid contact email address." +msgstr "Мора да имате важечка контактна е-поштенÑка адреÑа." #: actions/siteadminpanel.php:172 #, php-format -msgid "Unknown language \"%s\"" -msgstr "" +msgid "Unknown language \"%s\"." +msgstr "Ðепознат јазик „%s“" #: actions/siteadminpanel.php:179 msgid "Invalid snapshot report URL." -msgstr "" +msgstr "Ðеважечки URL за извештај од Ñнимката." #: actions/siteadminpanel.php:185 msgid "Invalid snapshot run value." -msgstr "" +msgstr "Ðеважечка вредноÑÑ‚ на пуштањето на Ñнимката." #: actions/siteadminpanel.php:191 msgid "Snapshot frequency must be a number." -msgstr "" +msgstr "ЧеÑтотата на Ñнимките мора да биде бројка." #: actions/siteadminpanel.php:197 msgid "Minimum text limit is 140 characters." -msgstr "" +msgstr "Минималното ограничување на текÑтот изнеÑува 140 знаци." #: actions/siteadminpanel.php:203 msgid "Dupe limit must 1 or more seconds." -msgstr "" +msgstr "Ограничувањето на дуплирањето мора да изнеÑува барем 1 Ñекунда." #: actions/siteadminpanel.php:253 msgid "General" -msgstr "" +msgstr "Општи" #: actions/siteadminpanel.php:256 msgid "Site name" -msgstr "Име на Ñајт" +msgstr "Име на веб-Ñтраницата" #: actions/siteadminpanel.php:257 msgid "The name of your site, like \"Yourcompany Microblog\"" -msgstr "" +msgstr "Името на Вашата веб-Ñтраница, како на пр. „Микроблог на Вашафирма“" #: actions/siteadminpanel.php:261 msgid "Brought by" -msgstr "" +msgstr "Овозможено од" #: actions/siteadminpanel.php:262 msgid "Text used for credits link in footer of each page" msgstr "" +"ТекÑÑ‚ за врÑката за наведување на авторите во долната колонцифра на Ñекоја " +"Ñтраница" #: actions/siteadminpanel.php:266 msgid "Brought by URL" -msgstr "" +msgstr "URL-адреÑа на овозможувачот на уÑлугите" #: actions/siteadminpanel.php:267 msgid "URL used for credits link in footer of each page" msgstr "" +"URL-адреÑата која е кориÑти за врÑки за автори во долната колоцифра на " +"Ñекоја Ñтраница" #: actions/siteadminpanel.php:271 -#, fuzzy msgid "Contact email address for your site" -msgstr "Ðема региÑтрирана адреÑа за е-пошта за тој кориÑник." +msgstr "Контактна е-пошта за Вашата веб-Ñтраница" #: actions/siteadminpanel.php:277 msgid "Local" @@ -3270,11 +3315,11 @@ msgstr "Локално" #: actions/siteadminpanel.php:288 msgid "Default timezone" -msgstr "ОÑновна временÑка зона" +msgstr "ОÑновна чаÑовна зона" #: actions/siteadminpanel.php:289 msgid "Default timezone for the site; usually UTC." -msgstr "" +msgstr "Матична чаÑовна зона за веб-Ñтраницата; обично UTC." #: actions/siteadminpanel.php:295 msgid "Default site language" @@ -3282,7 +3327,7 @@ msgstr "ОÑновен јазик" #: actions/siteadminpanel.php:303 msgid "URLs" -msgstr "" +msgstr "URL-адреÑи" #: actions/siteadminpanel.php:306 msgid "Server" @@ -3290,190 +3335,193 @@ msgstr "ОпÑлужувач" #: actions/siteadminpanel.php:306 msgid "Site's server hostname." -msgstr "" +msgstr "Име на домаќинот на Ñерверот на веб-Ñтраницата" #: actions/siteadminpanel.php:310 msgid "Fancy URLs" -msgstr "" +msgstr "ИнтереÑни URL-адреÑи" #: actions/siteadminpanel.php:312 msgid "Use fancy (more readable and memorable) URLs?" -msgstr "" +msgstr "Да кориÑтам интереÑни (почитливи и повпечатливи) URL-адреÑи?" #: actions/siteadminpanel.php:318 -#, fuzzy msgid "Access" -msgstr "Прифати" +msgstr "ПриÑтап" #: actions/siteadminpanel.php:321 -#, fuzzy msgid "Private" -msgstr "ПриватноÑÑ‚" +msgstr "Приватен" #: actions/siteadminpanel.php:323 msgid "Prohibit anonymous users (not logged in) from viewing site?" msgstr "" +"Да им забранам на анонимните (ненајавени) кориÑници да ја гледаат веб-" +"Ñтраницата?" #: actions/siteadminpanel.php:327 msgid "Invite only" -msgstr "" +msgstr "Само Ñо покана" #: actions/siteadminpanel.php:329 msgid "Make registration invitation only." -msgstr "" +msgstr "РегиÑтрирање Ñамо Ñо покана." #: actions/siteadminpanel.php:333 -#, fuzzy msgid "Closed" -msgstr "Ðема таков кориÑник." +msgstr "Затворен" #: actions/siteadminpanel.php:335 msgid "Disable new registrations." -msgstr "" +msgstr "Оневозможи нови региÑтрации." #: actions/siteadminpanel.php:341 msgid "Snapshots" -msgstr "" +msgstr "Снимки" #: actions/siteadminpanel.php:344 msgid "Randomly during Web hit" -msgstr "" +msgstr "По ÑлучајноÑÑ‚ во текот на поÑета" #: actions/siteadminpanel.php:345 msgid "In a scheduled job" -msgstr "" +msgstr "Во зададена задача" #: actions/siteadminpanel.php:347 msgid "Data snapshots" -msgstr "" +msgstr "Снимки од податоци" #: actions/siteadminpanel.php:348 msgid "When to send statistical data to status.net servers" -msgstr "" +msgstr "Кога да им Ñе иÑпраќаат ÑтатиÑтички податоци на status.net Ñерверите" #: actions/siteadminpanel.php:353 msgid "Frequency" -msgstr "" +msgstr "ЧеÑтота" #: actions/siteadminpanel.php:354 msgid "Snapshots will be sent once every N web hits" -msgstr "" +msgstr "Ќе Ñе иÑпраќаат Ñнимки на Ñекои N поÑети" #: actions/siteadminpanel.php:359 msgid "Report URL" -msgstr "" +msgstr "URL на извештајот" #: actions/siteadminpanel.php:360 msgid "Snapshots will be sent to this URL" -msgstr "" +msgstr "Снимките ќе Ñе иÑпраќаат на оваа URL-адреÑа" #: actions/siteadminpanel.php:367 msgid "Limits" -msgstr "" +msgstr "Ограничувања" #: actions/siteadminpanel.php:370 msgid "Text limit" -msgstr "" +msgstr "Ограничување на текÑтот" #: actions/siteadminpanel.php:370 msgid "Maximum number of characters for notices." -msgstr "" +msgstr "МакÑимален број на знаци за забелешки." #: actions/siteadminpanel.php:374 msgid "Dupe limit" -msgstr "" +msgstr "Ограничување на дуплирањето" #: actions/siteadminpanel.php:374 msgid "How long users must wait (in seconds) to post the same thing again." msgstr "" +"Колку долго треба да почекаат кориÑниците (во Ñекунди) за да можат повторно " +"да го објават иÑтото." #: actions/siteadminpanel.php:388 actions/useradminpanel.php:313 -#, fuzzy msgid "Save site settings" -msgstr "ПоÑтавки" +msgstr "Зачувај нагодувања на веб-Ñтраницата" #: actions/smssettings.php:58 -msgid "SMS Settings" -msgstr "" +msgid "SMS settings" +msgstr "Ðагодувања за СМС" #: actions/smssettings.php:69 #, php-format msgid "You can receive SMS messages through email from %%site.name%%." -msgstr "" +msgstr "Можете да примате СМС пораки по е-пошта од %%site.name%%." #: actions/smssettings.php:91 -#, fuzzy msgid "SMS is not available." -msgstr "Оваа Ñтраница не е доÑтапна во форматот кој Вие го прифаќате." +msgstr "СМС-пораките Ñе недоÑтапни." #: actions/smssettings.php:112 msgid "Current confirmed SMS-enabled phone number." -msgstr "" +msgstr "Тековен потврден телефонÑки број Ñо можноÑÑ‚ за СМС." #: actions/smssettings.php:123 msgid "Awaiting confirmation on this phone number." -msgstr "" +msgstr "Очекувам потврда за овој телефонÑки број." #: actions/smssettings.php:130 msgid "Confirmation code" -msgstr "" +msgstr "Потврден код" #: actions/smssettings.php:131 msgid "Enter the code you received on your phone." -msgstr "" +msgstr "ВнеÑете го кодот што го добивте по телефон." #: actions/smssettings.php:138 -msgid "SMS Phone number" -msgstr "" +msgid "SMS phone number" +msgstr "ТелефонÑки број за СМС" #: actions/smssettings.php:140 msgid "Phone number, no punctuation or spaces, with area code" msgstr "" +"ТелефонÑки број, без интерпункциÑки знаци и празни меÑта, Ñо повикувачки код" #: actions/smssettings.php:174 msgid "" "Send me notices through SMS; I understand I may incur exorbitant charges " "from my carrier." msgstr "" +"ИÑпраќај ми забелешки по СМС; разбрам дека ова може да доведе до прекумерни " +"трошоци." #: actions/smssettings.php:306 msgid "No phone number." -msgstr "" +msgstr "Ðема телефонÑки број." #: actions/smssettings.php:311 msgid "No carrier selected." -msgstr "" +msgstr "Ðема избрано оператор." #: actions/smssettings.php:318 msgid "That is already your phone number." -msgstr "" +msgstr "Ова и Ñега е вашиот телефонÑки број." #: actions/smssettings.php:321 msgid "That phone number already belongs to another user." -msgstr "" +msgstr "Тој телефонÑки број е веќе во употреба од друг кориÑник." #: actions/smssettings.php:347 -#, fuzzy msgid "" "A confirmation code was sent to the phone number you added. Check your phone " "for the code and instructions on how to use it." -msgstr "Овој код за потврда не е за ВаÑ!" +msgstr "" +"Ðа телефонÑкиот број што го додадовте е иÑпратен потврден код. Проверете Ñи " +"го телефонот за да го видите кодот, заедно Ñо напатÑтвија за негова употреба." #: actions/smssettings.php:374 msgid "That is the wrong confirmation number." -msgstr "" +msgstr "Ова е погрешен потврден број." #: actions/smssettings.php:405 msgid "That is not your phone number." -msgstr "" +msgstr "Тоа не е вашиот телефонÑки број." #: actions/smssettings.php:465 msgid "Mobile carrier" -msgstr "" +msgstr "Мобилен оператор" #: actions/smssettings.php:469 msgid "Select a carrier" -msgstr "" +msgstr "Изберете оператор" #: actions/smssettings.php:476 #, php-format @@ -3481,59 +3529,60 @@ msgid "" "Mobile carrier for your phone. If you know a carrier that accepts SMS over " "email but isn't listed here, send email to let us know at %s." msgstr "" +"Мобилен оператор за телефонот. Ðко знаете оператор што прифаќа СМС преку е-" +"пошта, но не фигурира овде, извеÑтете нè на %s." #: actions/smssettings.php:498 msgid "No code entered" -msgstr "" +msgstr "Ðема внеÑено код" #: actions/subedit.php:70 -#, fuzzy msgid "You are not subscribed to that profile." -msgstr "Ðе ни го иÑпративте тој профил." +msgstr "Ðе Ñте претплатени на тој профил." #: actions/subedit.php:83 msgid "Could not save subscription." msgstr "Ðе можев да ја зачувам претплатата." #: actions/subscribe.php:55 -#, fuzzy msgid "Not a local user." -msgstr "Ðема таков кориÑник." +msgstr "Ðе е локален кориÑник." #: actions/subscribe.php:69 -#, fuzzy msgid "Subscribed" -msgstr "Претплати Ñе" +msgstr "Претплатено" #: actions/subscribers.php:50 -#, fuzzy, php-format +#, php-format msgid "%s subscribers" -msgstr "Претплатници" +msgstr "Претплатници на %s" #: actions/subscribers.php:52 #, php-format -msgid "%s subscribers, page %d" -msgstr "" +msgid "%1$s subscribers, page %2$d" +msgstr "Претплатници на %1$s, ÑÑ‚Ñ€. %2$d" #: actions/subscribers.php:63 msgid "These are the people who listen to your notices." -msgstr "Ова Ñе луѓето што ги Ñледат Вашите извеÑтувања." +msgstr "Ова Ñе луѓето што ги Ñледат Вашите забелешки." #: actions/subscribers.php:67 #, php-format msgid "These are the people who listen to %s's notices." -msgstr "Ова Ñе луѓето што ги Ñледат извеÑтувањата на %s." +msgstr "Ова Ñе луѓето што ги Ñледат забелешките на %s." #: actions/subscribers.php:108 msgid "" "You have no subscribers. Try subscribing to people you know and they might " "return the favor" msgstr "" +"Ðемате претплатници. Претплатете Ñе на луѓе што ги знаете, и тие можеби ќе " +"го Ñторат иÑтото за ВаÑ" #: actions/subscribers.php:110 #, php-format msgid "%s has no subscribers. Want to be the first?" -msgstr "" +msgstr "%s нема претплатници. Сакате да бидете првиот?" #: actions/subscribers.php:114 #, php-format @@ -3541,25 +3590,27 @@ msgid "" "%s has no subscribers. Why not [register an account](%%%%action.register%%%" "%) and be the first?" msgstr "" +"%s нема претплатници. Зошто не [региÑтрирате Ñметка](%%%%action.register%%%" +"%) и Ñтанете првиот претплатник?" #: actions/subscriptions.php:52 -#, fuzzy, php-format +#, php-format msgid "%s subscriptions" -msgstr "Сите претплати" +msgstr "Претплати на %s" #: actions/subscriptions.php:54 -#, fuzzy, php-format -msgid "%s subscriptions, page %d" -msgstr "Сите претплати" +#, php-format +msgid "%1$s subscriptions, page %2$d" +msgstr "Претплати на %1$s, ÑÑ‚Ñ€. %2$d" #: actions/subscriptions.php:65 msgid "These are the people whose notices you listen to." -msgstr "Ова Ñе луѓето чии извеÑтувања ги Ñледите." +msgstr "Ова Ñе луѓето чии забелешки ги Ñледите." #: actions/subscriptions.php:69 #, php-format msgid "These are the people whose notices %s listens to." -msgstr "Ова Ñе луѓето чии извеÑтувања ги Ñледи %s." +msgstr "Ова Ñе луѓето чии забелешки ги Ñледи %s." #: actions/subscriptions.php:121 #, php-format @@ -3570,149 +3621,141 @@ msgid "" "featured%%). If you're a [Twitter user](%%action.twittersettings%%), you can " "automatically subscribe to people you already follow there." msgstr "" +"Моментално не Ñледите ничии забелешки. Претплатете Ñе на луѓе кои ги " +"познавате. Пробајте Ñо [пребарување на луѓе](%%action.peoplesearch%%), " +"побарајте луѓе во група која ве интереÑира и меѓу нашите [избрани кориÑници]" +"(%%action.featured%%). Ðко Ñте [кориÑник на Twitter](%%action.twittersettings" +"%%), тука можете автоматÑки да Ñе претплатите на луѓе кои таму ги Ñледите." #: actions/subscriptions.php:123 actions/subscriptions.php:127 -#, fuzzy, php-format +#, php-format msgid "%s is not listening to anyone." -msgstr "%1$s Ñега ги Ñледи вашите забелешки за %2$s." +msgstr "%s не Ñледи никого." #: actions/subscriptions.php:194 -#, fuzzy msgid "Jabber" -msgstr "Ðема JabberID." +msgstr "Jabber" #: actions/subscriptions.php:199 lib/connectsettingsaction.php:115 msgid "SMS" -msgstr "" - -#: actions/tag.php:68 -#, fuzzy, php-format -msgid "Notices tagged with %s, page %d" -msgstr "Микроблог на %s" +msgstr "СМС" #: actions/tag.php:86 -#, fuzzy, php-format +#, php-format msgid "Notice feed for tag %s (RSS 1.0)" -msgstr "Канал Ñо извеÑтувања на %s" +msgstr "Канал Ñо забелешки за ознаката %s (RSS 1.0)" #: actions/tag.php:92 -#, fuzzy, php-format +#, php-format msgid "Notice feed for tag %s (RSS 2.0)" -msgstr "Канал Ñо извеÑтувања на %s" +msgstr "Канал Ñо забелешки за ознаката %s (RSS 2.0)" #: actions/tag.php:98 -#, fuzzy, php-format +#, php-format msgid "Notice feed for tag %s (Atom)" -msgstr "Канал Ñо извеÑтувања на %s" +msgstr "Канал Ñо забелешки за ознаката %s (Atom)" #: actions/tagother.php:39 -#, fuzzy msgid "No ID argument." -msgstr "Ðема таков документ." +msgstr "Ðема ID-аргумент." #: actions/tagother.php:65 #, php-format msgid "Tag %s" -msgstr "" +msgstr "Означи %s" #: actions/tagother.php:77 lib/userprofile.php:75 -#, fuzzy msgid "User profile" -msgstr "КориÑникот нема профил." +msgstr "КориÑнички профил" #: actions/tagother.php:81 lib/userprofile.php:102 msgid "Photo" -msgstr "" +msgstr "Фото" #: actions/tagother.php:141 msgid "Tag user" -msgstr "" +msgstr "Означи кориÑник" #: actions/tagother.php:151 msgid "" "Tags for this user (letters, numbers, -, ., and _), comma- or space- " "separated" msgstr "" +"Ознаки за овој кориÑник (букви, бројки, -, . и _), одделени Ñо запирка или " +"празно меÑто" #: actions/tagother.php:193 msgid "" "You can only tag people you are subscribed to or who are subscribed to you." msgstr "" +"Можете да означувате Ñамо луѓе на коишто Ñте претплатени или луѓе " +"претплатени на ВаÑ." #: actions/tagother.php:200 -#, fuzzy msgid "Could not save tags." -msgstr "Информациите за аватарот не може да Ñе Ñнимат" +msgstr "Ðе можев да ги зачувам ознаките." #: actions/tagother.php:236 msgid "Use this form to add tags to your subscribers or subscriptions." -msgstr "" +msgstr "Со овој образец додавајте ознаки во Вашите претплатници или претплати." #: actions/tagrss.php:35 -#, fuzzy msgid "No such tag." -msgstr "Ðема такво извеÑтување." +msgstr "Ðема таква ознака." #: actions/twitapitrends.php:87 msgid "API method under construction." -msgstr "" +msgstr "API-методот е во изработка." #: actions/unblock.php:59 -#, fuzzy msgid "You haven't blocked that user." -msgstr "Веќе Ñте пријавени!" +msgstr "Го немате блокирано тој кориÑник." #: actions/unsandbox.php:72 -#, fuzzy msgid "User is not sandboxed." -msgstr "КориÑникот нема профил." +msgstr "КориÑникот не е Ñтавен во пеÑочен режим." #: actions/unsilence.php:72 -#, fuzzy msgid "User is not silenced." -msgstr "КориÑникот нема профил." +msgstr "КориÑникот не е замолчен." #: actions/unsubscribe.php:77 -#, fuzzy msgid "No profile id in request." -msgstr "Серверот не доÑтави URL за профилот." - -#: actions/unsubscribe.php:84 -#, fuzzy -msgid "No profile with that id." -msgstr "Оддалечениот профил нема одговарачки профил" +msgstr "Во барањето нема id на профилот." #: actions/unsubscribe.php:98 -#, fuzzy msgid "Unsubscribed" -msgstr "Откажи ја претплатата" +msgstr "Претплатата е откажана" #: actions/updateprofile.php:62 actions/userauthorization.php:330 #, php-format -msgid "Listenee stream license ‘%s’ is not compatible with site license ‘%s’." +msgid "" +"Listenee stream license ‘%1$s’ is not compatible with site license ‘%2$s’." msgstr "" +"Лиценцата на потокот на Ñледачот „%1$s“ не е компатибилна Ñо лиценцата на " +"веб-Ñтраницата „%2$s“." -#: actions/useradminpanel.php:58 lib/adminpanelaction.php:305 +#: actions/useradminpanel.php:58 lib/adminpanelaction.php:321 #: lib/personalgroupnav.php:115 msgid "User" -msgstr "" +msgstr "КориÑник" #: actions/useradminpanel.php:69 msgid "User settings for this StatusNet site." -msgstr "" +msgstr "КориÑнички нагодувања за оваа StatusNet веб-Ñтраница." #: actions/useradminpanel.php:149 msgid "Invalid bio limit. Must be numeric." -msgstr "" +msgstr "Ðеважечко ограничување за биографијата. Мора да е бројчено." #: actions/useradminpanel.php:155 msgid "Invalid welcome text. Max length is 255 characters." -msgstr "" +msgstr "ÐЕважечки текÑÑ‚ за добредојде. Дозволени Ñе највеќе 255 знаци." #: actions/useradminpanel.php:165 #, php-format msgid "Invalid default subscripton: '%1$s' is not user." -msgstr "" +msgstr "Ðеважечки Ð¾Ð¿Ð¸Ñ Ð¿Ð¾ оÑновно: „%1$s“ не е кориÑник." #: actions/useradminpanel.php:218 lib/accountsettingsaction.php:108 #: lib/personalgroupnav.php:109 @@ -3721,84 +3764,81 @@ msgstr "Профил" #: actions/useradminpanel.php:222 msgid "Bio Limit" -msgstr "" +msgstr "Ограничување за биографијата" #: actions/useradminpanel.php:223 msgid "Maximum length of a profile bio in characters." -msgstr "" +msgstr "МакÑимална големина на профилната биографија во знаци." #: actions/useradminpanel.php:231 msgid "New users" -msgstr "" +msgstr "Ðови кориÑници" #: actions/useradminpanel.php:235 msgid "New user welcome" -msgstr "" +msgstr "Добредојде за нов кориÑник" #: actions/useradminpanel.php:236 msgid "Welcome text for new users (Max 255 chars)." -msgstr "" +msgstr "ТекÑÑ‚ за добредојде на нови кориÑници (највеќе до 255 знаци)." #: actions/useradminpanel.php:241 -#, fuzzy msgid "Default subscription" -msgstr "Сите претплати" +msgstr "ОÑновно-зададена претплата" #: actions/useradminpanel.php:242 -#, fuzzy msgid "Automatically subscribe new users to this user." -msgstr "Претплатата е одобрена" +msgstr "ÐвтоматÑки претплатувај нови кориÑници на овој кориÑник." #: actions/useradminpanel.php:251 -#, fuzzy msgid "Invitations" -msgstr "Локација" +msgstr "Покани" #: actions/useradminpanel.php:256 msgid "Invitations enabled" -msgstr "" +msgstr "Поканите Ñе овозможени" #: actions/useradminpanel.php:258 msgid "Whether to allow users to invite new users." -msgstr "" +msgstr "Дали да им е дозволено на кориÑниците да канат други кориÑници." #: actions/useradminpanel.php:265 msgid "Sessions" -msgstr "" +msgstr "СеÑии" #: actions/useradminpanel.php:270 msgid "Handle sessions" -msgstr "" +msgstr "Раководење Ñо ÑеÑии" #: actions/useradminpanel.php:272 msgid "Whether to handle sessions ourselves." -msgstr "" +msgstr "Дали Ñамите да Ñи раководиме Ñо ÑеÑиите." #: actions/useradminpanel.php:276 msgid "Session debugging" -msgstr "" +msgstr "Поправка на грешки во ÑеÑија" #: actions/useradminpanel.php:278 msgid "Turn on debugging output for sessions." -msgstr "" +msgstr "Вклучи извод од поправка на грешки за ÑеÑии." #: actions/userauthorization.php:105 msgid "Authorize subscription" msgstr "Одобрете ја претплатата" #: actions/userauthorization.php:110 -#, fuzzy msgid "" "Please check these details to make sure that you want to subscribe to this " "user’s notices. If you didn’t just ask to subscribe to someone’s notices, " "click “Rejectâ€." msgstr "" -"Проверете ги овие детали ако Ñакате да Ñе претплатите на извеÑтувањата на " -"овој кориÑник. Ðко не Ñакате да Ñе претплатите, кликнете на „Откажи“." +"Проверете ги овие податоци за да Ñе оÑигурате дека Ñакате да Ñе претплатите " +"за забелешките на овој кориÑник. Ðко не Ñакате да Ñе претплатите, едноÑтавно " +"кликнете на „Одбиј“" -#: actions/userauthorization.php:188 +#: actions/userauthorization.php:188 actions/version.php:165 msgid "License" -msgstr "" +msgstr "Лиценца" #: actions/userauthorization.php:209 msgid "Accept" @@ -3806,18 +3846,16 @@ msgstr "Прифати" #: actions/userauthorization.php:210 lib/subscribeform.php:115 #: lib/subscribeform.php:139 -#, fuzzy msgid "Subscribe to this user" -msgstr "Претплатата е одобрена" +msgstr "Претплати Ñе на кориÑников" #: actions/userauthorization.php:211 msgid "Reject" msgstr "Одбиј" #: actions/userauthorization.php:212 -#, fuzzy msgid "Reject this subscription" -msgstr "Сите претплати" +msgstr "Одбиј ја оваа претплата" #: actions/userauthorization.php:225 msgid "No authorization request!" @@ -3828,103 +3866,170 @@ msgid "Subscription authorized" msgstr "Претплатата е одобрена" #: actions/userauthorization.php:249 -#, fuzzy msgid "" "The subscription has been authorized, but no callback URL was passed. Check " "with the site’s instructions for details on how to authorize the " "subscription. Your subscription token is:" msgstr "" -"Претплатата е одобрена, но нема вратено URL. Проверете ги инÑтрукциите за " -"меÑтото за да видите како да ја одобрите претплатата. Вашиот белег за " -"претплата е:" +"Претплатата е одобрена, но не е зададена обратна URL-адреÑа. Проверете ги " +"инÑтрукциите на веб-Ñтраницата за да дознаете како Ñе одобрува претплата. " +"Жетонот на Вашата претплата е:" #: actions/userauthorization.php:259 msgid "Subscription rejected" msgstr "Претплатата е одбиена" #: actions/userauthorization.php:261 -#, fuzzy msgid "" "The subscription has been rejected, but no callback URL was passed. Check " "with the site’s instructions for details on how to fully reject the " "subscription." msgstr "" -"Претплатата е одбиена, но нема вратено URL. Проверете ги инÑтрукциите за " -"меÑтото за да видите како целоÑно да ја одбиете претплатата." +"Претплатата е одбиена, но не е зададена обратна URL-адреÑа. Проверете ги " +"инÑтрукциите на веб-Ñтраницата за да дознаете како Ñе одбива претплата во " +"потполноÑÑ‚." #: actions/userauthorization.php:296 #, php-format -msgid "Listener URI ‘%s’ not found here" -msgstr "" +msgid "Listener URI ‘%s’ not found here." +msgstr "URI-то на Ñледачот „%s“ не е пронајдено тука." #: actions/userauthorization.php:301 #, php-format msgid "Listenee URI ‘%s’ is too long." -msgstr "" +msgstr "Следениот URI „%s“ е предолг." #: actions/userauthorization.php:307 #, php-format msgid "Listenee URI ‘%s’ is a local user." -msgstr "" +msgstr "Следеното URI „%s“ е за локален кориÑник." #: actions/userauthorization.php:322 #, php-format msgid "Profile URL ‘%s’ is for a local user." -msgstr "" +msgstr "Профилната URL-адреÑа „%s“ е за локален кориÑник." #: actions/userauthorization.php:338 #, php-format msgid "Avatar URL ‘%s’ is not valid." -msgstr "" +msgstr "URL-адреÑата „%s“ за аватар е неважечка." #: actions/userauthorization.php:343 -#, fuzzy, php-format +#, php-format msgid "Can’t read avatar URL ‘%s’." -msgstr "Ðе може да Ñе прочита URL-то на аватарот: '%s'" +msgstr "Ðе можам да ја прочитам URL на аватарот „%s“." #: actions/userauthorization.php:348 -#, fuzzy, php-format +#, php-format msgid "Wrong image type for avatar URL ‘%s’." -msgstr "Погрешен тип на Ñлика за '%s'" - -#: actions/userbyid.php:70 -#, fuzzy -msgid "No ID." -msgstr "Ðема id." +msgstr "Погрешен тип на Ñлика за URL на аватарот „%s“." #: actions/userdesignsettings.php:76 lib/designsettings.php:65 -#, fuzzy msgid "Profile design" -msgstr "ПоÑтавки на профилот" +msgstr "Изглед на профилот" #: actions/userdesignsettings.php:87 lib/designsettings.php:76 msgid "" "Customize the way your profile looks with a background image and a colour " "palette of your choice." msgstr "" +"Прилагодете го изгледот на Вашиот профил, Ñо позадинÑка Ñлика и палета од " +"бои по Ваш избор." #: actions/userdesignsettings.php:282 msgid "Enjoy your hotdog!" -msgstr "" - -#: actions/usergroups.php:64 -#, php-format -msgid "%s groups, page %d" -msgstr "" +msgstr "Добар апетит!" #: actions/usergroups.php:130 msgid "Search for more groups" -msgstr "" +msgstr "Пребарај уште групи" #: actions/usergroups.php:153 -#, fuzzy, php-format +#, php-format msgid "%s is not a member of any group." -msgstr "Ðе ни го иÑпративте тој профил." +msgstr "%s не членува во ниедна група." #: actions/usergroups.php:158 #, php-format msgid "Try [searching for groups](%%action.groupsearch%%) and joining them." msgstr "" +"Обидете Ñе Ñо [пребарување на групи](%%action.groupsearch%%) и придружете им " +"Ñе." + +#: actions/version.php:73 +#, php-format +msgid "StatusNet %s" +msgstr "StatusNet %s" + +#: actions/version.php:153 +#, php-format +msgid "" +"This site is powered by %1$s version %2$s, Copyright 2008-2010 StatusNet, " +"Inc. and contributors." +msgstr "" +"Оваа веб-Ñтраница работи на %1$s верзија %2$s, ÐвторÑки права 2008-2010 " +"StatusNet, Inc. и учеÑници." + +#: actions/version.php:157 +msgid "StatusNet" +msgstr "StatusNet" + +#: actions/version.php:161 +msgid "Contributors" +msgstr "УчеÑници" + +#: actions/version.php:168 +msgid "" +"StatusNet is free software: you can redistribute it and/or modify it under " +"the terms of the GNU Affero General Public License as published by the Free " +"Software Foundation, either version 3 of the License, or (at your option) " +"any later version. " +msgstr "" +"StatusNet е Ñлободен ÑофтверÑки програм: можете да го редиÑтрибуирате и/или " +"менувате под уÑловите на Општата јавна лиценца ГÐУ Ðферо Ñпоред одредбите на " +"Фондацијата за Ñлободен Ñофтвер, верзија 3 на лиценцата, или (по Ваш избор) " +"било која подоцнежна верзија. " + +#: actions/version.php:174 +msgid "" +"This program is distributed in the hope that it will be useful, but WITHOUT " +"ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or " +"FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License " +"for more details. " +msgstr "" +"Овој програм е диÑтрибуиран Ñо надеж дека ќе биде од кориÑÑ‚, но БЕЗ БИЛО " +"КÐКВРГÐÐ ÐÐЦИЈÐ; дури и без подразбирливата гаранција за ПÐЗÐÐ ÐРПРОДÐЖÐОСТ " +"или ПОГОДÐОСТ ЗРОПРЕДЕЛЕÐРЦЕЛ. Погледајте ја Општата јавна лиценца ГÐУ " +"Ðферо за повеќе подробноÑти. " + +#: actions/version.php:180 +#, php-format +msgid "" +"You should have received a copy of the GNU Affero General Public License " +"along with this program. If not, see %s." +msgstr "" +"Треба да имате добиено примерок од Општата јавна лиценца ГÐУ Ðферо заедно Ñо " +"овој програм. Ðко ја немате, погледајте %s." + +#: actions/version.php:189 +msgid "Plugins" +msgstr "Приклучоци" + +#: actions/version.php:195 +msgid "Name" +msgstr "Име" + +#: actions/version.php:196 lib/action.php:741 +msgid "Version" +msgstr "Верзија" + +#: actions/version.php:197 +msgid "Author(s)" +msgstr "Ðвтор(и)" + +#: actions/version.php:198 lib/groupeditform.php:172 +msgid "Description" +msgstr "ОпиÑ" #: classes/File.php:137 #, php-format @@ -3932,82 +4037,86 @@ msgid "" "No file may be larger than %d bytes and the file you sent was %d bytes. Try " "to upload a smaller version." msgstr "" +"Ðиедна податотека не Ñмее да биде поголема од %d бајти, а подаотеката што ја " +"иÑпративте Ñодржи %d бајти. Подигнете помала верзија." #: classes/File.php:147 #, php-format msgid "A file this large would exceed your user quota of %d bytes." msgstr "" +"Волку голема податотека ќе ја надмине Вашата кориÑничка квота од %d бајти." #: classes/File.php:154 #, php-format msgid "A file this large would exceed your monthly quota of %d bytes." -msgstr "" +msgstr "ВОлку голема податотека ќе ја надмине Вашата меÑечна квота од %d бајти" #: classes/Message.php:45 msgid "You are banned from sending direct messages." -msgstr "" +msgstr "Забрането Ви е иÑпраќање на директни пораки." #: classes/Message.php:61 msgid "Could not insert message." -msgstr "" +msgstr "Ðе можев да ја иÑпратам пораката." #: classes/Message.php:71 msgid "Could not update message with new URI." -msgstr "" +msgstr "Ðе можев да ја подновам пораката Ñо нов URI." #: classes/Notice.php:172 #, php-format msgid "DB error inserting hashtag: %s" -msgstr "" +msgstr "Грешка во базата на податоци при вметнувањето на хеш-ознака: %s" #: classes/Notice.php:226 -#, fuzzy msgid "Problem saving notice. Too long." -msgstr "Проблем во Ñнимањето на извеÑтувањето." +msgstr "Проблем Ñо зачувувањето на белешката. Премногу долго." #: classes/Notice.php:230 -#, fuzzy msgid "Problem saving notice. Unknown user." -msgstr "Проблем во Ñнимањето на извеÑтувањето." +msgstr "Проблем Ñо зачувувањето на белешката. Ðепознат кориÑник." #: classes/Notice.php:235 msgid "" "Too many notices too fast; take a breather and post again in a few minutes." msgstr "" +"Премногу забелњшки за прекратко време; здивнете малку и продолжете за " +"неколку минути." #: classes/Notice.php:241 msgid "" "Too many duplicate messages too quickly; take a breather and post again in a " "few minutes." msgstr "" +"Премногу дуплирани пораки во прекратко време; здивнете малку и продолжете за " +"неколку минути." #: classes/Notice.php:247 msgid "You are banned from posting notices on this site." -msgstr "" +msgstr "Забрането Ви е да објавувате забелешки на оваа веб-Ñтраница." #: classes/Notice.php:309 classes/Notice.php:334 msgid "Problem saving notice." -msgstr "Проблем во Ñнимањето на извеÑтувањето." +msgstr "Проблем во зачувувањето на белешката." #: classes/Notice.php:1034 #, php-format msgid "DB error inserting reply: %s" msgstr "Одговор од внеÑот во базата: %s" -#: classes/Notice.php:1361 +#: classes/Notice.php:1359 #, php-format msgid "RT @%1$s %2$s" -msgstr "" +msgstr "RT @%1$s %2$s" #: classes/User.php:368 #, php-format msgid "Welcome to %1$s, @%2$s!" -msgstr "" +msgstr "Добредојдовте на %1$s, @%2$s!" #: classes/User_group.php:380 -#, fuzzy msgid "Could not create group." -msgstr "Информациите за аватарот не може да Ñе Ñнимат" +msgstr "Ðе можев да ја Ñоздадам групата." #: classes/User_group.php:409 msgid "Could not set group membership." @@ -4015,172 +4124,158 @@ msgstr "Ðе можев да назначам членÑтво во групат #: lib/accountsettingsaction.php:108 msgid "Change your profile settings" -msgstr "" +msgstr "Смени профилни нагодувања" #: lib/accountsettingsaction.php:112 -#, fuzzy msgid "Upload an avatar" -msgstr "Товарањето на аватарот не уÑпеа." +msgstr "Подигни аватар" #: lib/accountsettingsaction.php:116 msgid "Change your password" -msgstr "" +msgstr "Смени лозинка" #: lib/accountsettingsaction.php:120 msgid "Change email handling" -msgstr "" +msgstr "Смени ракување Ñо е-пошта" #: lib/accountsettingsaction.php:124 -#, fuzzy msgid "Design your profile" -msgstr "КориÑникот нема профил." +msgstr "ÐамеÑтете изглед на Вашиот профил" #: lib/accountsettingsaction.php:128 msgid "Other" -msgstr "" +msgstr "Друго" #: lib/accountsettingsaction.php:128 msgid "Other options" -msgstr "" - -#: lib/action.php:144 -#, php-format -msgid "%s - %s" -msgstr "" +msgstr "Други нагодувања" #: lib/action.php:159 msgid "Untitled page" -msgstr "" +msgstr "Страница без наÑлов" -#: lib/action.php:426 +#: lib/action.php:427 msgid "Primary site navigation" -msgstr "" +msgstr "Главна навигација" -#: lib/action.php:432 +#: lib/action.php:433 msgid "Home" msgstr "Дома" -#: lib/action.php:432 +#: lib/action.php:433 msgid "Personal profile and friends timeline" -msgstr "" +msgstr "Личен профил и иÑторија на пријатели" -#: lib/action.php:434 -#, fuzzy +#: lib/action.php:435 msgid "Account" -msgstr "За" +msgstr "Сметка" -#: lib/action.php:434 +#: lib/action.php:435 msgid "Change your email, avatar, password, profile" -msgstr "" +msgstr "Промена на е-пошта, аватар, лозинка, профил" -#: lib/action.php:437 +#: lib/action.php:438 msgid "Connect" msgstr "Поврзи Ñе" -#: lib/action.php:437 -#, fuzzy +#: lib/action.php:438 msgid "Connect to services" -msgstr "Ðе може да Ñе пренаÑочи кон Ñерверот: %s" +msgstr "Поврзи Ñе Ñо уÑлуги" -#: lib/action.php:441 -#, fuzzy +#: lib/action.php:442 msgid "Change site configuration" -msgstr "Претплати" +msgstr "Промена на конфигурацијата на веб-Ñтраницата" -#: lib/action.php:445 lib/subgroupnav.php:105 +#: lib/action.php:446 lib/subgroupnav.php:105 msgid "Invite" -msgstr "" +msgstr "Покани" -#: lib/action.php:446 lib/subgroupnav.php:106 +#: lib/action.php:447 lib/subgroupnav.php:106 #, php-format msgid "Invite friends and colleagues to join you on %s" -msgstr "" +msgstr "Поканете пријатели и колеги да Ви Ñе придружат на %s" -#: lib/action.php:451 +#: lib/action.php:452 msgid "Logout" msgstr "Одјави Ñе" -#: lib/action.php:451 +#: lib/action.php:452 msgid "Logout from the site" -msgstr "" +msgstr "Одјава" -#: lib/action.php:456 +#: lib/action.php:457 msgid "Create an account" msgstr "Создај Ñметка" -#: lib/action.php:459 +#: lib/action.php:460 msgid "Login to the site" -msgstr "" +msgstr "Ðајава" -#: lib/action.php:462 lib/action.php:725 +#: lib/action.php:463 lib/action.php:726 msgid "Help" msgstr "Помош" -#: lib/action.php:462 -#, fuzzy +#: lib/action.php:463 msgid "Help me!" -msgstr "Помош" +msgstr "Ðапомош!" -#: lib/action.php:465 lib/searchaction.php:127 +#: lib/action.php:466 lib/searchaction.php:127 msgid "Search" msgstr "Барај" -#: lib/action.php:465 +#: lib/action.php:466 msgid "Search for people or text" -msgstr "" +msgstr "Пребарајте луѓе или текÑÑ‚" -#: lib/action.php:486 -#, fuzzy +#: lib/action.php:487 msgid "Site notice" -msgstr "Ðово извеÑтување" +msgstr "Ðапомена за веб-Ñтраницата" -#: lib/action.php:552 +#: lib/action.php:553 msgid "Local views" -msgstr "" +msgstr "Локални прегледи" -#: lib/action.php:618 -#, fuzzy +#: lib/action.php:619 msgid "Page notice" -msgstr "Ðово извеÑтување" +msgstr "Ðапомена за Ñтраницата" -#: lib/action.php:720 -#, fuzzy +#: lib/action.php:721 msgid "Secondary site navigation" -msgstr "Претплати" +msgstr "Споредна навигација" -#: lib/action.php:727 +#: lib/action.php:728 msgid "About" msgstr "За" -#: lib/action.php:729 +#: lib/action.php:730 msgid "FAQ" msgstr "ЧПП" -#: lib/action.php:733 +#: lib/action.php:734 msgid "TOS" -msgstr "" +msgstr "УÑлови" -#: lib/action.php:736 +#: lib/action.php:737 msgid "Privacy" msgstr "ПриватноÑÑ‚" -#: lib/action.php:738 +#: lib/action.php:739 msgid "Source" msgstr "Изворен код" -#: lib/action.php:740 +#: lib/action.php:743 msgid "Contact" msgstr "Контакт" -#: lib/action.php:742 +#: lib/action.php:745 msgid "Badge" -msgstr "" +msgstr "Значка" -#: lib/action.php:770 +#: lib/action.php:773 msgid "StatusNet software license" -msgstr "" +msgstr "Лиценца на програмот StatusNet" -#: lib/action.php:773 +#: lib/action.php:776 #, php-format msgid "" "**%%site.name%%** is a microblogging service brought to you by [%%site." @@ -4189,12 +4284,12 @@ msgstr "" "**%%site.name%%** е ÑÐµÑ€Ð²Ð¸Ñ Ð·Ð° микроблогирање што ви го овозможува [%%site." "broughtby%%](%%site.broughtbyurl%%). " -#: lib/action.php:775 +#: lib/action.php:778 #, php-format msgid "**%%site.name%%** is a microblogging service. " msgstr "**%%site.name%%** е ÑÐµÑ€Ð²Ð¸Ñ Ð·Ð° микроблогирање." -#: lib/action.php:777 +#: lib/action.php:780 #, php-format msgid "" "It runs the [StatusNet](http://status.net/) microblogging software, version %" @@ -4205,68 +4300,69 @@ msgstr "" "верзија %s, доÑтапен пд [GNU Affero General Public License](http://www.fsf." "org/licensing/licenses/agpl-3.0.html)." -#: lib/action.php:791 -#, fuzzy +#: lib/action.php:794 msgid "Site content license" -msgstr "Ðово извеÑтување" +msgstr "Лиценца на Ñодржините на веб-Ñтраницата" -#: lib/action.php:800 +#: lib/action.php:803 msgid "All " -msgstr "" +msgstr "Сите " -#: lib/action.php:805 +#: lib/action.php:808 msgid "license." -msgstr "" +msgstr "лиценца." -#: lib/action.php:1099 +#: lib/action.php:1102 msgid "Pagination" -msgstr "" +msgstr "Прелом на Ñтраници" -#: lib/action.php:1108 +#: lib/action.php:1111 msgid "After" -msgstr "ПоÑле" +msgstr "По" -#: lib/action.php:1116 +#: lib/action.php:1119 msgid "Before" msgstr "Пред" -#: lib/action.php:1164 +#: lib/action.php:1167 msgid "There was a problem with your session token." -msgstr "" +msgstr "Се појави проблем Ñо Вашиот ÑеÑиÑки жетон." #: lib/adminpanelaction.php:96 msgid "You cannot make changes to this site." -msgstr "" +msgstr "Ðе можете да ја менувате оваа веб-Ñтраница." -#: lib/adminpanelaction.php:195 +#: lib/adminpanelaction.php:107 +msgid "Changes to that panel are not allowed." +msgstr "Менувањето на тој алатник не е дозволено." + +#: lib/adminpanelaction.php:206 msgid "showForm() not implemented." -msgstr "" +msgstr "showForm() не е имплементирано." -#: lib/adminpanelaction.php:224 +#: lib/adminpanelaction.php:235 msgid "saveSettings() not implemented." -msgstr "" +msgstr "saveSettings() не е имплементирано." -#: lib/adminpanelaction.php:247 +#: lib/adminpanelaction.php:258 msgid "Unable to delete design setting." -msgstr "" +msgstr "Ðе можам да ги избришам нагодувањата за изглед." -#: lib/adminpanelaction.php:300 +#: lib/adminpanelaction.php:312 msgid "Basic site configuration" -msgstr "ОÑновни нагодувања на Ñајтот" +msgstr "ОÑновни нагодувања на веб-Ñтраницата" -#: lib/adminpanelaction.php:303 -#, fuzzy +#: lib/adminpanelaction.php:317 msgid "Design configuration" -msgstr "Потврдување на адреÑата" +msgstr "Конфигурација на изгледот" -#: lib/adminpanelaction.php:306 lib/adminpanelaction.php:309 -#, fuzzy +#: lib/adminpanelaction.php:322 lib/adminpanelaction.php:327 msgid "Paths configuration" -msgstr "Потврдување на адреÑата" +msgstr "Конфигурација на патеки" #: lib/attachmentlist.php:87 msgid "Attachments" -msgstr "" +msgstr "Прилози" #: lib/attachmentlist.php:265 msgid "Author" @@ -4278,41 +4374,49 @@ msgstr "Обезбедувач" #: lib/attachmentnoticesection.php:67 msgid "Notices where this attachment appears" -msgstr "" +msgstr "Забелешки кадешто Ñе јавува овој прилог" #: lib/attachmenttagcloudsection.php:48 msgid "Tags for this attachment" -msgstr "" +msgstr "Ознаки за овој прилог" + +#: lib/authenticationplugin.php:182 lib/authenticationplugin.php:187 +msgid "Password changing failed" +msgstr "Менувањето на лозинката не уÑпеа" + +#: lib/authenticationplugin.php:197 +msgid "Password changing is not allowed" +msgstr "Менувањето на лозинка не е дозволено" #: lib/channel.php:138 lib/channel.php:158 msgid "Command results" -msgstr "" +msgstr "Резултати од наредбата" -#: lib/channel.php:210 +#: lib/channel.php:210 lib/mailhandler.php:142 msgid "Command complete" -msgstr "" +msgstr "Ðаредбата е завршена" #: lib/channel.php:221 msgid "Command failed" -msgstr "" +msgstr "Ðаредбата не уÑпеа" #: lib/command.php:44 msgid "Sorry, this command is not yet implemented." -msgstr "" +msgstr "Жалиме, оваа наредба Ñè уште не е имплементирана." #: lib/command.php:88 #, php-format -msgid "Could not find a user with nickname %s" -msgstr "КориÑникот не може да Ñе оÑвежи/" +msgid "Could not find a user with nickname %s." +msgstr "Ðе можев да пронајдам кориÑник Ñо прекар %s." #: lib/command.php:92 msgid "It does not make a lot of sense to nudge yourself!" -msgstr "" +msgstr "Ðема баш логика да Ñе подбуцнувате Ñами ÑебеÑи." #: lib/command.php:99 #, php-format -msgid "Nudge sent to %s" -msgstr "" +msgid "Nudge sent to %s." +msgstr "ИÑпратено подбуцнување на %s." #: lib/command.php:126 #, php-format @@ -4321,143 +4425,138 @@ msgid "" "Subscribers: %2$s\n" "Notices: %3$s" msgstr "" +"Претплати: %1$s\n" +"Претплатници: %2$s\n" +"Забелешки: %3$s" #: lib/command.php:152 lib/command.php:399 lib/command.php:460 -msgid "Notice with that id does not exist" -msgstr "" +msgid "Notice with that id does not exist." +msgstr "Ðе поÑтои забелешка Ñо таков id." #: lib/command.php:168 lib/command.php:415 lib/command.php:476 #: lib/command.php:532 -msgid "User has no last notice" -msgstr "" +msgid "User has no last notice." +msgstr "КориÑникот нема поÑледна забелешка" #: lib/command.php:190 msgid "Notice marked as fave." -msgstr "" +msgstr "Забелешката е обележана како омилена." -#: lib/command.php:315 +#: lib/command.php:284 #, php-format -msgid "%1$s (%2$s)" -msgstr "" +msgid "Could not remove user %1$s to group %2$s." +msgstr "Ðе можев да го отÑтранам кориÑникот %1$s од групата %2$s." #: lib/command.php:318 #, php-format -msgid "Fullname: %s" -msgstr "" +msgid "Full name: %s" +msgstr "Име и презиме: %s" -#: lib/command.php:321 +#: lib/command.php:321 lib/mail.php:254 #, php-format msgid "Location: %s" -msgstr "" +msgstr "Локација: %s" -#: lib/command.php:324 +#: lib/command.php:324 lib/mail.php:256 #, php-format msgid "Homepage: %s" -msgstr "" +msgstr "Домашна Ñтраница: %s" #: lib/command.php:327 #, php-format msgid "About: %s" -msgstr "" +msgstr "За: %s" #: lib/command.php:358 scripts/xmppdaemon.php:301 #, php-format -msgid "Message too long - maximum is %d characters, you sent %d" +msgid "Message too long - maximum is %1$d characters, you sent %2$d." msgstr "" +"Пораката е предолга - дозволени Ñе највеќе %1$d знаци, а вие иÑпративте %2$d." #: lib/command.php:378 msgid "Error sending direct message." -msgstr "" - -#: lib/command.php:422 -msgid "Cannot repeat your own notice" -msgstr "" - -#: lib/command.php:427 -msgid "Already repeated that notice" -msgstr "" +msgstr "Грашка при иÑпаќањето на директната порака." #: lib/command.php:435 -#, fuzzy, php-format -msgid "Notice from %s repeated" -msgstr "ИзвеÑтувања" +#, php-format +msgid "Notice from %s repeated." +msgstr "Забелешката од %s е повторена." #: lib/command.php:437 -#, fuzzy msgid "Error repeating notice." -msgstr "Проблем во Ñнимањето на извеÑтувањето." +msgstr "Грешка при повторувањето на белешката." #: lib/command.php:491 #, php-format -msgid "Notice too long - maximum is %d characters, you sent %d" +msgid "Notice too long - maximum is %1$d characters, you sent %2$d." msgstr "" +"Забелешката е предолга - треба да нема повеќе од %1$d знаци, а Вие " +"иÑпративте %2$d." #: lib/command.php:500 -#, fuzzy, php-format -msgid "Reply to %s sent" -msgstr "Одговори иÑпратени до %s" +#, php-format +msgid "Reply to %s sent." +msgstr "Одговорот на %s е иÑпратен." #: lib/command.php:502 -#, fuzzy msgid "Error saving notice." -msgstr "Проблем во Ñнимањето на извеÑтувањето." +msgstr "Грешка при зачувувањето на белешката." #: lib/command.php:556 -msgid "Specify the name of the user to subscribe to" -msgstr "" +msgid "Specify the name of the user to subscribe to." +msgstr "Ðазначете го името на кориÑникот на којшто Ñакате да Ñе претплатите." #: lib/command.php:563 #, php-format msgid "Subscribed to %s" -msgstr "" +msgstr "Претплатено на %s" #: lib/command.php:584 -msgid "Specify the name of the user to unsubscribe from" -msgstr "" +msgid "Specify the name of the user to unsubscribe from." +msgstr "Ðазначете го името на кориÑникот од кого откажувате претплата." #: lib/command.php:591 #, php-format msgid "Unsubscribed from %s" -msgstr "" +msgstr "Претплатата на %s е откажана" #: lib/command.php:609 lib/command.php:632 msgid "Command not yet implemented." -msgstr "" +msgstr "Ðаредбата Ñè уште не е имплементирана." #: lib/command.php:612 msgid "Notification off." -msgstr "" +msgstr "ИзвеÑтувањето е иÑклучено." #: lib/command.php:614 msgid "Can't turn off notification." -msgstr "" +msgstr "Ðе можам да иÑклучам извеÑтување." #: lib/command.php:635 msgid "Notification on." -msgstr "" +msgstr "ИзвеÑтувањето е вклучено." #: lib/command.php:637 msgid "Can't turn on notification." -msgstr "" +msgstr "Ðе можам да вклучам извеÑтување." #: lib/command.php:650 -msgid "Login command is disabled" -msgstr "" +msgid "Login command is disabled." +msgstr "Ðаредбата за најава е оневозможена." #: lib/command.php:664 #, php-format -msgid "Could not create login token for %s" -msgstr "Ðе можам да Ñоздадам најавен жетон за" +msgid "Could not create login token for %s." +msgstr "Ðе можам да Ñоздадам најавен жетон за %s." #: lib/command.php:669 #, php-format -msgid "This link is useable only once, and is good for only 2 minutes: %s" -msgstr "" +msgid "This link is useable only once, and is good for only 2 minutes: %s." +msgstr "Оваа врÑка може да Ñе употреби Ñамо еднаш, и трае Ñамо 2 минути: %s." #: lib/command.php:685 -#, fuzzy msgid "You are not subscribed to anyone." -msgstr "Ðе ни го иÑпративте тој профил." +msgstr "Ðе Ñте претплатени никому." #: lib/command.php:687 msgid "You are subscribed to this person:" @@ -4466,9 +4565,8 @@ msgstr[0] "Ðе ни го иÑпративте тој профил." msgstr[1] "Ðе ни го иÑпративте тој профил." #: lib/command.php:707 -#, fuzzy msgid "No one is subscribed to you." -msgstr "Оддалечена претплата" +msgstr "Ðикој не е претплатен на ВаÑ." #: lib/command.php:709 msgid "This person is subscribed to you:" @@ -4477,9 +4575,8 @@ msgstr[0] "Оддалечена претплата" msgstr[1] "Оддалечена претплата" #: lib/command.php:729 -#, fuzzy msgid "You are not a member of any groups." -msgstr "Ðе ни го иÑпративте тој профил." +msgstr "Ðе членувате во ниедна група." #: lib/command.php:731 msgid "You are a member of this group:" @@ -4527,189 +4624,216 @@ msgid "" "tracks - not yet implemented.\n" "tracking - not yet implemented.\n" msgstr "" +"Ðаредби:\n" +"on - вклучи извеÑтувања\n" +"off - иÑклучи извеÑтувања\n" +"help - прикажи ја оваа помош\n" +"follow <nickname> - претплати Ñе на кориÑник\n" +"groups - лиÑта на групи кадешто членувате\n" +"subscriptions - лиÑта на луѓе кои ги Ñледите\n" +"subscribers - лиÑта на луѓе кои ве Ñледат\n" +"leave <nickname> - откажи претплата на кориÑник\n" +"d <nickname> <text> - директна порака за кориÑник\n" +"get <nickname> - прикажи поÑледна забелешка на кориÑник\n" +"whois <nickname> - прикажи профилни информации за кориÑник\n" +"fav <nickname> - додај поÑледна забелешка на кориÑник во омилени\n" +"fav #<notice_id> - додај забелешка Ñо даден id како омилена\n" +"repeat #<notice_id> - повтори забелешка Ñо даден id\n" +"repeat <nickname> - повтори поÑледна забелешка на кориÑник\n" +"reply #<notice_id> - одговори на забелешка Ñо даден id\n" +"reply <nickname> - одговори на поÑледна забелешка на кориÑник\n" +"join <group> - зачлени Ñе во група\n" +"login - Дај врÑка за најавување на веб-интерфејÑот\n" +"drop <group> - напушти група\n" +"stats - прикажи мои ÑтатиÑтики\n" +"stop - иÑто што и 'off'\n" +"quit - иÑто што и 'off'\n" +"sub <nickname> - иÑто што и 'follow'\n" +"unsub <nickname> - иÑто што и 'leave'\n" +"last <nickname> - иÑто што и 'get'\n" +"on <nickname> - Ñè уште не е имплементирано.\n" +"off <nickname> - Ñè уште не е имплементирано.\n" +"nudge <nickname> - потÑети кориÑник да поднови.\n" +"invite <phone number> - Ñè уште не е имплементирано.\n" +"track <word> - Ñè уште не е имплементирано.\n" +"untrack <word> - Ñè уште не е имплементирано.\n" +"track off - Ñè уште не е имплементирано.\n" +"untrack all - Ñè уште не е имплементирано.\n" +"tracks - Ñè уште не е имплементирано.\n" +"tracking - Ñè уште не е имплементирано.\n" #: lib/common.php:199 -#, fuzzy msgid "No configuration file found. " -msgstr "Ðема код за потврда." +msgstr "Ðема пронајдено конфигурациÑка податотека. " #: lib/common.php:200 msgid "I looked for configuration files in the following places: " -msgstr "" +msgstr "Побарав конфигурациони податотеки на Ñледниве меÑта: " #: lib/common.php:201 msgid "You may wish to run the installer to fix this." -msgstr "" +msgstr "Препорачуваме да го пуштите инÑталатерот за да го поправите ова." #: lib/common.php:202 msgid "Go to the installer." -msgstr "" +msgstr "Оди на инÑталаторот." #: lib/connectsettingsaction.php:110 msgid "IM" -msgstr "" +msgstr "IM" #: lib/connectsettingsaction.php:111 msgid "Updates by instant messenger (IM)" -msgstr "" +msgstr "Подновувања преку инÑтант-пораки (IM)" #: lib/connectsettingsaction.php:116 msgid "Updates by SMS" -msgstr "" +msgstr "Подновувања по СМС" #: lib/dberroraction.php:60 msgid "Database error" -msgstr "" +msgstr "Грешка во базата на податоци" #: lib/designsettings.php:105 -#, fuzzy msgid "Upload file" -msgstr "Товари" +msgstr "Подигни податотека" #: lib/designsettings.php:109 -#, fuzzy msgid "" "You can upload your personal background image. The maximum file size is 2MB." -msgstr "Ова е предолго. МакÑималната должина е 140 знаци." +msgstr "" +"Ðе можете да подигнете личната позадинÑка Ñлика. МакÑималната дозволена " +"големина изнеÑува 2МБ." #: lib/designsettings.php:418 msgid "Design defaults restored." -msgstr "" +msgstr "ОÑновно-зададениот изглед е вратен." #: lib/disfavorform.php:114 lib/disfavorform.php:140 msgid "Disfavor this notice" -msgstr "" +msgstr "ОтÑтрани ја белешкава од омилени" #: lib/favorform.php:114 lib/favorform.php:140 -#, fuzzy msgid "Favor this notice" -msgstr "Ðема такво извеÑтување." +msgstr "Означи ја забелешкава како омилена" #: lib/favorform.php:140 msgid "Favor" -msgstr "" +msgstr "Омилено" #: lib/feed.php:85 msgid "RSS 1.0" -msgstr "" +msgstr "RSS 1.0" #: lib/feed.php:87 msgid "RSS 2.0" -msgstr "" +msgstr "RSS 2.0" #: lib/feed.php:89 msgid "Atom" -msgstr "" +msgstr "Atom" #: lib/feed.php:91 msgid "FOAF" -msgstr "" +msgstr "FOAF" #: lib/feedlist.php:64 msgid "Export data" -msgstr "" +msgstr "Извези податоци" #: lib/galleryaction.php:121 msgid "Filter tags" -msgstr "" +msgstr "Филтрирај ознаки" #: lib/galleryaction.php:131 msgid "All" -msgstr "" +msgstr "Сè" #: lib/galleryaction.php:139 msgid "Select tag to filter" -msgstr "" +msgstr "Одберете ознака за филтрирање" #: lib/galleryaction.php:140 msgid "Tag" -msgstr "" +msgstr "Ознака" #: lib/galleryaction.php:141 msgid "Choose a tag to narrow list" -msgstr "" +msgstr "Одберете ознака за да ја уточните лиÑтата" #: lib/galleryaction.php:143 msgid "Go" -msgstr "" +msgstr "Оди" #: lib/groupeditform.php:163 -#, fuzzy msgid "URL of the homepage or blog of the group or topic" -msgstr "URL на Вашата домашна Ñтраница, блог или профил на друго меÑто." +msgstr "URL на Ñтраницата или блогот на групата или темата" #: lib/groupeditform.php:168 -#, fuzzy msgid "Describe the group or topic" -msgstr "Опишете Ñе Ñебе Ñи и ÑопÑтвените интереÑи во 140 знаци." +msgstr "Опишете ја групата или темата" #: lib/groupeditform.php:170 -#, fuzzy, php-format +#, php-format msgid "Describe the group or topic in %d characters" -msgstr "Опишете Ñе Ñебе Ñи и ÑопÑтвените интереÑи во 140 знаци." - -#: lib/groupeditform.php:172 -#, fuzzy -msgid "Description" -msgstr "Претплати" +msgstr "Опишете ја групата или темата Ñо %d знаци" #: lib/groupeditform.php:179 -#, fuzzy msgid "" "Location for the group, if any, like \"City, State (or Region), Country\"" -msgstr "Каде Ñе наоѓате, на пр. „Град, Држава“." +msgstr "Локација на групата (ако има). Ðа пр. „Град, ОблаÑÑ‚, Земја“" #: lib/groupeditform.php:187 #, php-format msgid "Extra nicknames for the group, comma- or space- separated, max %d" msgstr "" +"Дополнителни прекари за групата, одделени Ñо запирка или празно меÑто, " +"највеќе до %d" #: lib/groupnav.php:85 msgid "Group" -msgstr "" +msgstr "Група" #: lib/groupnav.php:101 -#, fuzzy msgid "Blocked" -msgstr "Ðема таков кориÑник." +msgstr "Блокирани" #: lib/groupnav.php:102 -#, fuzzy, php-format +#, php-format msgid "%s blocked users" -msgstr "Ðема таков кориÑник." +msgstr "%s блокирани кориÑници" #: lib/groupnav.php:108 #, php-format msgid "Edit %s group properties" -msgstr "" +msgstr "Уреди ÑвојÑтва на групата %s" #: lib/groupnav.php:113 -#, fuzzy msgid "Logo" -msgstr "Одјави Ñе" +msgstr "Лого" #: lib/groupnav.php:114 #, php-format msgid "Add or edit %s logo" -msgstr "" +msgstr "Додај или уреди лого на %s" #: lib/groupnav.php:120 #, php-format msgid "Add or edit %s design" -msgstr "" +msgstr "Додај или уреди изглед на %s" #: lib/groupsbymemberssection.php:71 msgid "Groups with most members" -msgstr "" +msgstr "Групи Ñо највеќе членови" #: lib/groupsbypostssection.php:71 msgid "Groups with most posts" -msgstr "" +msgstr "Групи Ñо највеќе објави" #: lib/grouptagcloudsection.php:56 #, php-format msgid "Tags in %s group's notices" -msgstr "" +msgstr "Ознаки во забелешките на групата %s" #: lib/htmloutputter.php:103 msgid "This page is not available in a media type you accept" @@ -4722,56 +4846,52 @@ msgstr "Ова е предолго. МакÑималната должина е 1 #: lib/imagefile.php:80 msgid "Partial upload." -msgstr "Парцијално товарање" +msgstr "Делумно подигање." #: lib/imagefile.php:88 lib/mediafile.php:170 msgid "System error uploading file." -msgstr "СиÑтемÑка грешка при товарањето на датотеката." +msgstr "СиÑтемÑка грешка при подигањето на податотеката." #: lib/imagefile.php:96 msgid "Not an image or corrupt file." -msgstr "Ðе е Ñлика или датотеката е корумпирана." +msgstr "Ðе е Ñлика или податотеката е пореметена." #: lib/imagefile.php:105 msgid "Unsupported image file format." msgstr "Ðеподдржан фомрат на Ñлики." #: lib/imagefile.php:118 -#, fuzzy msgid "Lost our file." -msgstr "Ðема такво извеÑтување." +msgstr "Податотеката е изгубена." #: lib/imagefile.php:150 lib/imagefile.php:197 msgid "Unknown file type" -msgstr "" +msgstr "Ðепознат тип на податотека" #: lib/imagefile.php:217 msgid "MB" -msgstr "" +msgstr "МБ" #: lib/imagefile.php:219 msgid "kB" -msgstr "" +msgstr "кб" #: lib/jabber.php:191 #, php-format msgid "[%s]" -msgstr "" +msgstr "[%s]" #: lib/joinform.php:114 -#, fuzzy msgid "Join" -msgstr "Пријави Ñе" +msgstr "Придружи Ñе" #: lib/leaveform.php:114 -#, fuzzy msgid "Leave" -msgstr "Сними" +msgstr "Ðапушти" #: lib/logingroupnav.php:80 -#, fuzzy msgid "Login with a username and password" -msgstr "Погрешно име или лозинка." +msgstr "Ðајава Ñо кориÑничко име и лозинка" #: lib/logingroupnav.php:86 msgid "Sign up for a new account" @@ -4797,14 +4917,27 @@ msgid "" "Thanks for your time, \n" "%s\n" msgstr "" +"Здраво %s.\n" +"\n" +"Ðекој штотуку ја внеÑе оваа адреÑа на %s.\n" +"\n" +"Ðко тоа бевте Вие, и Ñакате да го потврдите влезот, употребете ја URL-" +"адреÑата подолу:\n" +"\n" +"%s\n" +"\n" +"Ðко не Ñте Вие, едноÑтавно занемарете ја поракава.\n" +"\n" +"Ви благодариме за потрошеното време, \n" +"%s\n" #: lib/mail.php:236 #, php-format msgid "%1$s is now listening to your notices on %2$s." -msgstr "%1$s Ñега ги Ñледи вашите забелешки за %2$s." +msgstr "%1$s Ñега ги Ñледи Вашите забелешки на %2$s." #: lib/mail.php:241 -#, fuzzy, php-format +#, php-format msgid "" "%1$s is now listening to your notices on %2$s.\n" "\n" @@ -4817,34 +4950,27 @@ msgid "" "----\n" "Change your email address or notification options at %8$s\n" msgstr "" -"%1$s Ñега ги Ñледи вашите забелешки на %2$s.\n" +"%1$s Ñега ги Ñледи Вашите забелешки на %2$s.\n" "\n" -"\t%3$s\n" +"%3$s\n" "\n" -"ИÑкрено ваш,\n" -"%4$s.\n" - -#: lib/mail.php:254 -#, php-format -msgid "Location: %s\n" -msgstr "" - -#: lib/mail.php:256 -#, php-format -msgid "Homepage: %s\n" -msgstr "" +"%4$s%5$s%6$s\n" +"Со иÑкрена почит,\n" +"%7$s.\n" +"\n" +"----\n" +"Изменете Ñи ја е-поштенÑката адреÑа или ги нагодувањата за извеÑтувања на %8" +"$s\n" #: lib/mail.php:258 #, php-format -msgid "" -"Bio: %s\n" -"\n" -msgstr "" +msgid "Bio: %s" +msgstr "Биографија: %s" #: lib/mail.php:286 #, php-format msgid "New email address for posting to %s" -msgstr "" +msgstr "Ðова е-поштенÑка адреÑа за објавување на %s" #: lib/mail.php:289 #, php-format @@ -4858,20 +4984,28 @@ msgid "" "Faithfully yours,\n" "%4$s" msgstr "" +"Имате нова адреÑа за објавување пораки на %1$s.\n" +"\n" +"ИÑпраќајте е-пошта до %2$s за да објавувате нови пораки.\n" +"\n" +"Повеќе напатÑтвија за е-пошта на %3$s.\n" +"\n" +"Со иÑкрена почит,\n" +"%4$s" #: lib/mail.php:413 #, php-format msgid "%s status" -msgstr "" +msgstr "Ð¡Ñ‚Ð°Ñ‚ÑƒÑ Ð½Ð° %s" #: lib/mail.php:439 msgid "SMS confirmation" -msgstr "" +msgstr "Потврда за СМС" #: lib/mail.php:463 #, php-format msgid "You've been nudged by %s" -msgstr "" +msgstr "%s Ве подбуцна" #: lib/mail.php:467 #, php-format @@ -4888,11 +5022,22 @@ msgid "" "With kind regards,\n" "%4$s\n" msgstr "" +"%1$s (%2$s) Ñе прашува што Ñе Ñлучува Ñо Ð’Ð°Ñ Ð²Ð¾ поÑледно време и Ве поканува " +"да објавите што има ново.\n" +"\n" +"Па, чекаме да Ñе произнеÑете :)\n" +"\n" +"%3$s\n" +"\n" +"Ðе одговарајте на ова пиÑмо; никој нема да го добие одговорот.\n" +"\n" +"Со почит,\n" +"%4$s\n" #: lib/mail.php:510 #, php-format msgid "New private message from %s" -msgstr "" +msgstr "Ðова приватна порака од %s" #: lib/mail.php:514 #, php-format @@ -4912,11 +5057,25 @@ msgid "" "With kind regards,\n" "%5$s\n" msgstr "" +"%1$s (%2$s) Ви иÑпрати приватна порака:\n" +"\n" +"------------------------------------------------------\n" +"%3$s\n" +"------------------------------------------------------\n" +"\n" +"Ðа пораката можете да одговорите тука:\n" +"\n" +"%4$s\n" +"\n" +"Ðе одговарајте на ова пиÑмо; никој нема да го добие одговорот.\n" +"\n" +"Со почит,\n" +"%5$s\n" #: lib/mail.php:559 -#, fuzzy, php-format +#, php-format msgid "%s (@%s) added your notice as a favorite" -msgstr "%1$s Ñега ги Ñледи вашите забелешки за %2$s." +msgstr "%s (@%s) додаде Ваша забелешка како омилена" #: lib/mail.php:561 #, php-format @@ -4938,11 +5097,28 @@ msgid "" "Faithfully yours,\n" "%6$s\n" msgstr "" +"%1$s (@%7$s) штотуку ја додаде Вашата забелешка од %2$s како една од " +"омилените.\n" +"\n" +"URL-адреÑата на Вашата забелешка е:\n" +"\n" +"%3$s\n" +"\n" +"ТекÑтот на Вашата забелешка е:\n" +"\n" +"%4$s\n" +"\n" +"Погледнете лиÑта на омилените забелешки на %1$s тука:\n" +"\n" +"%5$s\n" +"\n" +"Со иÑкрена почит,\n" +"%6$s\n" #: lib/mail.php:624 #, php-format msgid "%s (@%s) sent a notice to your attention" -msgstr "" +msgstr "%s (@%s) Ви иÑпрати забелешка што Ñака да ја прочитате" #: lib/mail.php:626 #, php-format @@ -4958,86 +5134,125 @@ msgid "" "\t%4$s\n" "\n" msgstr "" +"%1$s (@%9$s) штотуку Ви иÑпрати забелешка што Ñака да ја видите („@-" +"одговор“) на %2$s.\n" +"\n" +"Забелешката ќе ја најдете тука:\n" +"\n" +"%3$s\n" +"\n" +"ГлаÑи:\n" +"\n" +"%4$s\n" +"\n" #: lib/mailbox.php:89 msgid "Only the user can read their own mailboxes." -msgstr "" +msgstr "Само кориÑникот може да го чита Ñвоето Ñандаче." #: lib/mailbox.php:139 msgid "" "You have no private messages. You can send private message to engage other " "users in conversation. People can send you messages for your eyes only." msgstr "" +"Ðемате приватни пораки. Можете да иÑпратите приватна порака за да Ñе " +"впуштите во разговор Ñо други кориÑници. Луѓето можат да ви иÑпраќаат пораки " +"што ќе можете да ги видите Ñамо Вие." #: lib/mailbox.php:227 lib/noticelist.php:477 msgid "from" -msgstr "" +msgstr "од" + +#: lib/mailhandler.php:37 +msgid "Could not parse message." +msgstr "Ðе можев да ја парÑирам пораката." + +#: lib/mailhandler.php:42 +msgid "Not a registered user." +msgstr "Тоа не е региÑтриран кориÑник." + +#: lib/mailhandler.php:46 +msgid "Sorry, that is not your incoming email address." +msgstr "Жалиме, но тоа не е Вашата приемна е-поштенÑка адреÑа." + +#: lib/mailhandler.php:50 +msgid "Sorry, no incoming email allowed." +msgstr "Жалиме, приемната пошта не е дозволена." + +#: lib/mailhandler.php:228 +#, php-format +msgid "Unsupported message type: %s" +msgstr "Ðеподдржан формат на порака: %s" #: lib/mediafile.php:98 lib/mediafile.php:123 msgid "There was a database error while saving your file. Please try again." msgstr "" +"Се појави грешка во базата на податоци при зачувувањето на Вашата " +"податотека. Обидете Ñе повторно." #: lib/mediafile.php:142 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini." msgstr "" +"Подигнатата податотека ја надминува директивата upload_max_filesize во php." +"ini." #: lib/mediafile.php:147 msgid "" "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in " "the HTML form." msgstr "" +"Подигнатата податотека ја надминува директивата the MAX_FILE_SIZE назначена " +"во HTML-образецот." #: lib/mediafile.php:152 msgid "The uploaded file was only partially uploaded." -msgstr "" +msgstr "Подигнатата податотека е Ñамо делумно подигната." #: lib/mediafile.php:159 msgid "Missing a temporary folder." -msgstr "" +msgstr "ÐедоÑтаÑува привремена папка." #: lib/mediafile.php:162 msgid "Failed to write file to disk." -msgstr "" +msgstr "Податотеката не може да Ñе запише на диÑкот." #: lib/mediafile.php:165 msgid "File upload stopped by extension." -msgstr "" +msgstr "Подигањето на податотеката е запрено од проширувањето." #: lib/mediafile.php:179 lib/mediafile.php:216 -msgid "File exceeds user's quota!" -msgstr "" +msgid "File exceeds user's quota." +msgstr "Податотеката ја надминува квотата на кориÑникот." #: lib/mediafile.php:196 lib/mediafile.php:233 msgid "File could not be moved to destination directory." -msgstr "" +msgstr "Податотеката не може да Ñе премеÑти во целниот директориум." #: lib/mediafile.php:201 lib/mediafile.php:237 -#, fuzzy -msgid "Could not determine file's mime-type!" -msgstr "КориÑникот не може да Ñе оÑвежи/" +msgid "Could not determine file's MIME type." +msgstr "Ðе можев да го утврдам mime-типот на податотеката." #: lib/mediafile.php:270 #, php-format msgid " Try using another %s format." -msgstr "" +msgstr " Обидете Ñе Ñо друг формат на %s." #: lib/mediafile.php:275 #, php-format -msgid "%s is not a supported filetype on this server." -msgstr "" +msgid "%s is not a supported file type on this server." +msgstr "%s не е поддржан тип на податотека на овој Ñервер." #: lib/messageform.php:120 msgid "Send a direct notice" -msgstr "" +msgstr "ИÑпрати директна забелешка" #: lib/messageform.php:146 msgid "To" -msgstr "" +msgstr "За" #: lib/messageform.php:159 lib/noticeform.php:185 -#, fuzzy msgid "Available characters" -msgstr "6 или повеќе знаци" +msgstr "РаÑположиви знаци" #: lib/noticeform.php:160 msgid "Send a notice" @@ -5046,49 +5261,56 @@ msgstr "ИÑпрати забелешка" #: lib/noticeform.php:173 #, php-format msgid "What's up, %s?" -msgstr "Што има %s?" +msgstr "Што има ново, %s?" #: lib/noticeform.php:192 msgid "Attach" -msgstr "Прикачи" +msgstr "Приложи" #: lib/noticeform.php:196 msgid "Attach a file" -msgstr "Прикаќи податотека" +msgstr "Прикажи податотека" #: lib/noticeform.php:212 -msgid "Share your location" -msgstr "" +msgid "Share my location." +msgstr "Споделете ја мојата локација." + +#: lib/noticeform.php:214 +msgid "Do not share my location." +msgstr "Ðе ја Ñподелувај мојата локација." + +#: lib/noticeform.php:215 +msgid "Hide this info" +msgstr "Сокриј го ова инфо" #: lib/noticelist.php:428 #, php-format msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s" -msgstr "" +msgstr "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s" #: lib/noticelist.php:429 msgid "N" -msgstr "" +msgstr "С" #: lib/noticelist.php:429 msgid "S" -msgstr "" +msgstr "Ј" #: lib/noticelist.php:430 msgid "E" -msgstr "" +msgstr "И" #: lib/noticelist.php:430 msgid "W" -msgstr "" +msgstr "З" #: lib/noticelist.php:436 msgid "at" -msgstr "" +msgstr "во" #: lib/noticelist.php:531 -#, fuzzy msgid "in context" -msgstr "Ðема Ñодржина!" +msgstr "во контекÑÑ‚" #: lib/noticelist.php:556 msgid "Repeated by" @@ -5096,28 +5318,27 @@ msgstr "Повторено од" #: lib/noticelist.php:585 msgid "Reply to this notice" -msgstr "" +msgstr "Одговори на забелешкава" #: lib/noticelist.php:586 msgid "Reply" msgstr "Одговор" #: lib/noticelist.php:628 -#, fuzzy msgid "Notice repeated" -msgstr "ИзвеÑтувања" +msgstr "Забелешката е повторена" #: lib/nudgeform.php:116 msgid "Nudge this user" -msgstr "" +msgstr "Подбуцни го кориÑников" #: lib/nudgeform.php:128 msgid "Nudge" -msgstr "" +msgstr "Подбуцни" #: lib/nudgeform.php:128 msgid "Send a nudge to this user" -msgstr "" +msgstr "ИÑпрати подбуцнување на кориÑников" #: lib/oauthstore.php:283 msgid "Error inserting new profile" @@ -5133,11 +5354,11 @@ msgstr "Грешка во внеÑувањето на оддалечениот Ð #: lib/oauthstore.php:345 msgid "Duplicate notice" -msgstr "Дуплирано извеÑтување" +msgstr "Дуплирај забелешка" #: lib/oauthstore.php:466 lib/subs.php:48 msgid "You have been banned from subscribing." -msgstr "" +msgstr "Блокирани Ñте од претплаќање." #: lib/oauthstore.php:491 msgid "Couldn't insert new subscription." @@ -5153,28 +5374,32 @@ msgstr "Одговори" #: lib/personalgroupnav.php:114 msgid "Favorites" -msgstr "" +msgstr "Омилени" #: lib/personalgroupnav.php:124 msgid "Inbox" -msgstr "" +msgstr "Примени" #: lib/personalgroupnav.php:125 msgid "Your incoming messages" -msgstr "" +msgstr "Ваши приемни пораки" #: lib/personalgroupnav.php:129 msgid "Outbox" -msgstr "" +msgstr "За праќање" #: lib/personalgroupnav.php:130 msgid "Your sent messages" -msgstr "" +msgstr "Ваши иÑпратени пораки" #: lib/personaltagcloudsection.php:56 #, php-format msgid "Tags in %s's notices" -msgstr "" +msgstr "Ознаки во забелешките на %s" + +#: lib/plugin.php:114 +msgid "Unknown" +msgstr "Ðепознато" #: lib/profileaction.php:109 lib/profileaction.php:192 lib/subgroupnav.php:82 msgid "Subscriptions" @@ -5194,7 +5419,7 @@ msgstr "Сите претплатници" #: lib/profileaction.php:178 msgid "User ID" -msgstr "" +msgstr "КориÑнички ID" #: lib/profileaction.php:183 msgid "Member since" @@ -5205,13 +5430,12 @@ msgid "All groups" msgstr "Сите групи" #: lib/profileformaction.php:123 -#, fuzzy msgid "No return-to arguments." -msgstr "Ðема таков документ." +msgstr "Ðема return-to аргументи." #: lib/profileformaction.php:137 msgid "Unimplemented method." -msgstr "" +msgstr "Ðеимплементиран метод." #: lib/publicgroupnav.php:78 msgid "Public" @@ -5219,73 +5443,67 @@ msgstr "Јавен" #: lib/publicgroupnav.php:82 msgid "User groups" -msgstr "" +msgstr "КориÑнички групи" #: lib/publicgroupnav.php:84 lib/publicgroupnav.php:85 msgid "Recent tags" -msgstr "" +msgstr "Скорешни ознаки" #: lib/publicgroupnav.php:88 msgid "Featured" -msgstr "" +msgstr "Избрани" #: lib/publicgroupnav.php:92 -#, fuzzy msgid "Popular" -msgstr "Пребарување на луѓе" +msgstr "Популарно" #: lib/repeatform.php:107 -#, fuzzy msgid "Repeat this notice?" -msgstr "Ðема такво извеÑтување." +msgstr "Да ја повторам белешкава?" #: lib/repeatform.php:132 -#, fuzzy msgid "Repeat this notice" -msgstr "Ðема такво извеÑтување." +msgstr "Повтори ја забелешкава" #: lib/sandboxform.php:67 msgid "Sandbox" -msgstr "" +msgstr "ПеÑок" #: lib/sandboxform.php:78 -#, fuzzy msgid "Sandbox this user" -msgstr "Ðема таков кориÑник." +msgstr "Стави го кориÑников во пеÑочен режим" #: lib/searchaction.php:120 -#, fuzzy msgid "Search site" -msgstr "Барај" +msgstr "Пребарај по веб-Ñтраницата" #: lib/searchaction.php:126 msgid "Keyword(s)" msgstr "Клучен збор" #: lib/searchaction.php:162 -#, fuzzy msgid "Search help" -msgstr "Барај" +msgstr "Помош Ñо пребарување" #: lib/searchgroupnav.php:80 msgid "People" -msgstr "" +msgstr "Луѓе" #: lib/searchgroupnav.php:81 msgid "Find people on this site" -msgstr "" +msgstr "Пронајдете луѓе на оваа веб-Ñтраница" #: lib/searchgroupnav.php:83 msgid "Find content of notices" -msgstr "" +msgstr "Пронајдете Ñодржини на забелешките" #: lib/searchgroupnav.php:85 msgid "Find groups on this site" -msgstr "" +msgstr "Пронајдете групи на оваа веб-Ñтраница" #: lib/section.php:89 msgid "Untitled section" -msgstr "" +msgstr "Заглавие без наÑлов" #: lib/section.php:106 msgid "More..." @@ -5293,43 +5511,42 @@ msgstr "Повеќе..." #: lib/silenceform.php:67 msgid "Silence" -msgstr "Молк" +msgstr "Замолчи" #: lib/silenceform.php:78 msgid "Silence this user" msgstr "Замолчи го овој кориÑник" #: lib/subgroupnav.php:83 -#, fuzzy, php-format +#, php-format msgid "People %s subscribes to" -msgstr "Оддалечена претплата" +msgstr "Луѓе на кои е претплатен кориÑникот %s" #: lib/subgroupnav.php:91 -#, fuzzy, php-format +#, php-format msgid "People subscribed to %s" -msgstr "Оддалечена претплата" +msgstr "Луѓе претплатени на %s" #: lib/subgroupnav.php:99 #, php-format msgid "Groups %s is a member of" -msgstr "" +msgstr "Групи кадешто членува %s" #: lib/subs.php:52 msgid "Already subscribed!" -msgstr "" +msgstr "Веќе претплатено!" #: lib/subs.php:56 -#, fuzzy msgid "User has blocked you." -msgstr "КориÑникот нема профил." +msgstr "КориÑникот Ве има блокирано." #: lib/subs.php:60 msgid "Could not subscribe." -msgstr "" +msgstr "Претплатата е неуÑпешна." #: lib/subs.php:79 msgid "Could not subscribe other to you." -msgstr "" +msgstr "Ðе можев да прептлатам друг кориÑник на ВаÑ." #: lib/subs.php:128 #, fuzzy @@ -5337,9 +5554,8 @@ msgid "Not subscribed!" msgstr "Ðе Ñте претплатени!" #: lib/subs.php:133 -#, fuzzy msgid "Couldn't delete self-subscription." -msgstr "Претплата не може да Ñе избрише." +msgstr "Ðе можам да ја избришам Ñамопретплатата." #: lib/subs.php:146 msgid "Couldn't delete subscription." @@ -5348,64 +5564,56 @@ msgstr "Претплата не може да Ñе избрише." #: lib/subscriberspeopleselftagcloudsection.php:48 #: lib/subscriptionspeopleselftagcloudsection.php:48 msgid "People Tagcloud as self-tagged" -msgstr "" +msgstr "Облак од Ñамоозначени ознаки за луѓе" #: lib/subscriberspeopletagcloudsection.php:48 #: lib/subscriptionspeopletagcloudsection.php:48 msgid "People Tagcloud as tagged" -msgstr "" - -#: lib/subscriptionlist.php:126 -msgid "(none)" -msgstr "" +msgstr "Облак од ознаки за луѓе" #: lib/tagcloudsection.php:56 msgid "None" -msgstr "" +msgstr "Без ознаки" #: lib/topposterssection.php:74 msgid "Top posters" -msgstr "" +msgstr "Ðајактивни објавувачи" #: lib/unsandboxform.php:69 msgid "Unsandbox" -msgstr "" +msgstr "Извади од пеÑочен режим" #: lib/unsandboxform.php:80 -#, fuzzy msgid "Unsandbox this user" -msgstr "Ðема таков кориÑник." +msgstr "Тргни го кориÑников од пеÑочен режим" #: lib/unsilenceform.php:67 msgid "Unsilence" -msgstr "" +msgstr "Тргни замолчување" #: lib/unsilenceform.php:78 -#, fuzzy msgid "Unsilence this user" -msgstr "Ðема таков кориÑник." +msgstr "Тргни замолчување за овој кориÑник" #: lib/unsubscribeform.php:113 lib/unsubscribeform.php:137 msgid "Unsubscribe from this user" -msgstr "" +msgstr "Откажи претплата од овој корÑиник" #: lib/unsubscribeform.php:137 msgid "Unsubscribe" msgstr "Откажи ја претплатата" #: lib/userprofile.php:116 -#, fuzzy msgid "Edit Avatar" -msgstr "Ðватар" +msgstr "Уреди аватар" #: lib/userprofile.php:236 msgid "User actions" -msgstr "" +msgstr "КориÑнички дејÑтва" #: lib/userprofile.php:248 -#, fuzzy msgid "Edit profile settings" -msgstr "ПоÑтавки на профилот" +msgstr "Уреди нагодувања на профилот" #: lib/userprofile.php:249 msgid "Edit" @@ -5413,7 +5621,7 @@ msgstr "Уреди" #: lib/userprofile.php:272 msgid "Send a direct message to this user" -msgstr "" +msgstr "ИÑпрати му директна порака на кориÑников" #: lib/userprofile.php:273 msgid "Message" @@ -5421,7 +5629,7 @@ msgstr "Порака" #: lib/userprofile.php:311 msgid "Moderate" -msgstr "" +msgstr "Модерирај" #: lib/util.php:837 msgid "a few seconds ago" @@ -5461,34 +5669,18 @@ msgstr "пред еден меÑец" #: lib/util.php:853 #, php-format msgid "about %d months ago" -msgstr "пред %d меÑеци" +msgstr "пред %d меÑеца" #: lib/util.php:855 msgid "about a year ago" msgstr "пред една година" #: lib/webcolor.php:82 -#, fuzzy, php-format +#, php-format msgid "%s is not a valid color!" -msgstr "Домашната Ñтраница не е правилно URL." +msgstr "%s не е важечка боја!" #: lib/webcolor.php:123 #, php-format msgid "%s is not a valid color! Use 3 or 6 hex chars." -msgstr "" - -#: scripts/maildaemon.php:48 -msgid "Could not parse message." -msgstr "" - -#: scripts/maildaemon.php:53 -msgid "Not a registered user." -msgstr "" - -#: scripts/maildaemon.php:57 -msgid "Sorry, that is not your incoming email address." -msgstr "" - -#: scripts/maildaemon.php:61 -msgid "Sorry, no incoming email allowed." -msgstr "" +msgstr "%s не е важечка боја! КориÑтете 3 или 6 шеÑнаеÑетни (hex) знаци." diff --git a/locale/nb/LC_MESSAGES/statusnet.po b/locale/nb/LC_MESSAGES/statusnet.po index 6dfb5813f..2646a8142 100644 --- a/locale/nb/LC_MESSAGES/statusnet.po +++ b/locale/nb/LC_MESSAGES/statusnet.po @@ -8,12 +8,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-01-03 10:37+0000\n" -"PO-Revision-Date: 2010-01-03 10:38:24+0000\n" +"POT-Creation-Date: 2010-01-10 11:27+0000\n" +"PO-Revision-Date: 2010-01-10 11:28:42+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.16alpha (r60575); Translate extension (2009-12-06)\n" +"X-Generator: MediaWiki 1.16alpha (r60888); Translate extension (2010-01-04)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: no\n" "X-Message-Group: out-statusnet\n" @@ -50,11 +50,6 @@ msgstr "Ingen slik side" msgid "No such user." msgstr "Ingen slik bruker" -#: actions/all.php:84 -#, php-format -msgid "%s and friends, page %d" -msgstr "%s og venner, side %d" - #: actions/all.php:86 actions/all.php:167 actions/allrss.php:115 #: actions/apitimelinefriends.php:115 actions/apitimelinehome.php:115 #: lib/personalgroupnav.php:100 @@ -93,10 +88,10 @@ msgstr "" "eller post noe selv." #: actions/all.php:134 -#, php-format +#, fuzzy, php-format msgid "" -"You can try to [nudge %s](../%s) from his profile or [post something to his " -"or her attention](%%%%action.newnotice%%%%?status_textarea=%s)." +"You can try to [nudge %1$s](../%2$s) from his profile or [post something to " +"his or her attention](%%%%action.newnotice%%%%?status_textarea=%3$s)." msgstr "" "Du kan prøve Ã¥ [knuffe %s](../%s) fra dennes profil eller [post noe for Ã¥ fÃ¥ " "hans eller hennes oppmerksomhet](%%%%action.newnotice%%%%?status_textarea=%" @@ -126,6 +121,23 @@ msgstr "Oppdateringer fra %1$s og venner pÃ¥ %2$s!" #: actions/apiaccountupdateprofile.php:97 #: actions/apiaccountupdateprofilebackgroundimage.php:94 #: actions/apiaccountupdateprofilecolors.php:118 +#: actions/apidirectmessage.php:156 actions/apifavoritecreate.php:99 +#: actions/apifavoritedestroy.php:100 actions/apifriendshipscreate.php:100 +#: actions/apifriendshipsdestroy.php:100 actions/apifriendshipsshow.php:129 +#: actions/apigroupcreate.php:136 actions/apigroupismember.php:114 +#: actions/apigroupjoin.php:155 actions/apigroupleave.php:141 +#: actions/apigrouplist.php:132 actions/apigrouplistall.php:120 +#: actions/apigroupmembership.php:106 actions/apigroupshow.php:105 +#: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102 +#: actions/apistatusesretweets.php:112 actions/apistatusesshow.php:108 +#: actions/apistatusnetconfig.php:133 actions/apistatusnetversion.php:93 +#: actions/apisubscriptions.php:111 actions/apitimelinefavorites.php:146 +#: actions/apitimelinefriends.php:156 actions/apitimelinegroup.php:150 +#: actions/apitimelinehome.php:156 actions/apitimelinementions.php:151 +#: actions/apitimelinepublic.php:131 actions/apitimelineretweetedbyme.php:122 +#: actions/apitimelineretweetedtome.php:121 +#: actions/apitimelineretweetsofme.php:122 actions/apitimelinetag.php:141 +#: actions/apitimelineuser.php:165 actions/apiusershow.php:101 #, fuzzy msgid "API method not found." msgstr "API-metode ikke funnet!" @@ -186,6 +198,9 @@ msgstr "" #: actions/apiaccountupdateprofilebackgroundimage.php:146 #: actions/apiaccountupdateprofilecolors.php:164 #: actions/apiaccountupdateprofilecolors.php:174 +#: actions/groupdesignsettings.php:287 actions/groupdesignsettings.php:297 +#: actions/userdesignsettings.php:210 actions/userdesignsettings.php:220 +#: actions/userdesignsettings.php:263 actions/userdesignsettings.php:273 msgid "Unable to save your design settings." msgstr "Kunne ikke lagre dine innstillinger for utseende." @@ -227,26 +242,6 @@ msgstr "Direktemeldinger til %s" msgid "All the direct messages sent to %s" msgstr "Alle direktemeldinger sendt til %s" -#: actions/apidirectmessage.php:156 actions/apifavoritecreate.php:99 -#: actions/apifavoritedestroy.php:100 actions/apifriendshipscreate.php:100 -#: actions/apifriendshipsdestroy.php:100 actions/apifriendshipsshow.php:129 -#: actions/apigroupcreate.php:136 actions/apigroupismember.php:114 -#: actions/apigroupjoin.php:155 actions/apigroupleave.php:141 -#: actions/apigrouplist.php:132 actions/apigrouplistall.php:120 -#: actions/apigroupmembership.php:106 actions/apigroupshow.php:105 -#: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102 -#: actions/apistatusesretweets.php:112 actions/apistatusesshow.php:108 -#: actions/apistatusnetconfig.php:133 actions/apistatusnetversion.php:93 -#: actions/apisubscriptions.php:111 actions/apitimelinefavorites.php:146 -#: actions/apitimelinefriends.php:156 actions/apitimelinegroup.php:150 -#: actions/apitimelinehome.php:156 actions/apitimelinementions.php:151 -#: actions/apitimelinepublic.php:131 actions/apitimelineretweetedbyme.php:122 -#: actions/apitimelineretweetedtome.php:121 -#: actions/apitimelineretweetsofme.php:122 actions/apitimelinetag.php:141 -#: actions/apitimelineuser.php:165 actions/apiusershow.php:101 -msgid "API method not found!" -msgstr "API-metode ikke funnet!" - #: actions/apidirectmessagenew.php:126 msgid "No message text!" msgstr "Ingen meldingstekst!" @@ -270,7 +265,8 @@ msgid "No status found with that ID." msgstr "Fant ingen status med den ID-en." #: actions/apifavoritecreate.php:119 -msgid "This status is already a favorite!" +#, fuzzy +msgid "This status is already a favorite." msgstr "Denne statusen er allerede en favoritt!" #: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:176 @@ -278,7 +274,8 @@ msgid "Could not create favorite." msgstr "Kunne ikke opprette favoritt." #: actions/apifavoritedestroy.php:122 -msgid "That status is not a favorite!" +#, fuzzy +msgid "That status is not a favorite." msgstr "Den statusen er ikke en favoritt!" #: actions/apifavoritedestroy.php:134 actions/disfavor.php:87 @@ -299,7 +296,8 @@ msgid "Could not unfollow user: User not found." msgstr "Kunne ikke slutte Ã¥ følge brukeren: Fant ikke brukeren." #: actions/apifriendshipsdestroy.php:120 -msgid "You cannot unfollow yourself!" +#, fuzzy +msgid "You cannot unfollow yourself." msgstr "Du kan ikke slutte Ã¥ følge deg selv!" #: actions/apifriendshipsexists.php:94 @@ -387,7 +385,7 @@ msgstr "" msgid "Group not found!" msgstr "API-metode ikke funnet!" -#: actions/apigroupjoin.php:110 +#: actions/apigroupjoin.php:110 actions/joingroup.php:90 lib/command.php:217 msgid "You are already a member of that group." msgstr "Du er allerede medlem av den gruppen." @@ -395,9 +393,9 @@ msgstr "Du er allerede medlem av den gruppen." msgid "You have been blocked from that group by the admin." msgstr "" -#: actions/apigroupjoin.php:138 +#: actions/apigroupjoin.php:138 actions/joingroup.php:128 lib/command.php:234 #, fuzzy, php-format -msgid "Could not join user %s to group %s." +msgid "Could not join user %1$s to group %2$s." msgstr "Klarte ikke Ã¥ oppdatere bruker." #: actions/apigroupleave.php:114 @@ -405,9 +403,9 @@ msgstr "Klarte ikke Ã¥ oppdatere bruker." msgid "You are not a member of this group." msgstr "Du er allerede logget inn!" -#: actions/apigroupleave.php:124 +#: actions/apigroupleave.php:124 actions/leavegroup.php:127 #, fuzzy, php-format -msgid "Could not remove user %s to group %s." +msgid "Could not remove user %1$s from group %2$s." msgstr "Klarte ikke Ã¥ oppdatere bruker." #: actions/apigrouplist.php:95 @@ -415,11 +413,6 @@ msgstr "Klarte ikke Ã¥ oppdatere bruker." msgid "%s's groups" msgstr "%s sine grupper" -#: actions/apigrouplist.php:103 -#, php-format -msgid "Groups %s is a member of on %s." -msgstr "" - #: actions/apigrouplistall.php:90 actions/usergroups.php:62 #, php-format msgid "%s groups" @@ -443,12 +436,12 @@ msgstr "" msgid "No such notice." msgstr "" -#: actions/apistatusesretweet.php:83 +#: actions/apistatusesretweet.php:83 lib/command.php:422 #, fuzzy msgid "Cannot repeat your own notice." msgstr "Kan ikke slette notisen." -#: actions/apistatusesretweet.php:91 +#: actions/apistatusesretweet.php:91 lib/command.php:427 #, fuzzy msgid "Already repeated that notice." msgstr "Kan ikke slette notisen." @@ -462,7 +455,7 @@ msgid "No status with that ID found." msgstr "" #: actions/apistatusesupdate.php:157 actions/newnotice.php:155 -#: scripts/maildaemon.php:71 +#: lib/mailhandler.php:60 #, php-format msgid "That's too long. Max notice size is %d chars." msgstr "" @@ -481,14 +474,14 @@ msgid "Unsupported format." msgstr "" #: actions/apitimelinefavorites.php:108 -#, php-format -msgid "%s / Favorites from %s" -msgstr "" +#, fuzzy, php-format +msgid "%1$s / Favorites from %2$s" +msgstr "%1$s / Oppdateringer som svarer til %2$s" #: actions/apitimelinefavorites.php:120 -#, php-format -msgid "%s updates favorited by %s / %s." -msgstr "" +#, fuzzy, php-format +msgid "%1$s updates favorited by %2$s / %2$s." +msgstr "%1$s oppdateringer som svarer pÃ¥ oppdateringer fra %2$s / %3$s." #: actions/apitimelinegroup.php:109 actions/apitimelineuser.php:118 #: actions/grouprss.php:131 actions/userrss.php:90 @@ -556,8 +549,11 @@ msgstr "Ingen id." msgid "No such attachment." msgstr "" -#: actions/avatarbynickname.php:59 actions/grouprss.php:91 -#: actions/leavegroup.php:76 +#: actions/avatarbynickname.php:59 actions/blockedfromgroup.php:73 +#: actions/editgroup.php:84 actions/groupdesignsettings.php:84 +#: actions/grouplogo.php:86 actions/groupmembers.php:76 +#: actions/grouprss.php:91 actions/joingroup.php:76 actions/leavegroup.php:76 +#: actions/showgroup.php:121 msgid "No nickname." msgstr "" @@ -580,8 +576,8 @@ msgid "You can upload your personal avatar. The maximum file size is %s." msgstr "" #: actions/avatarsettings.php:106 actions/avatarsettings.php:185 -#: actions/grouplogo.php:178 actions/remotesubscribe.php:191 -#: actions/userauthorization.php:72 actions/userrss.php:103 +#: actions/remotesubscribe.php:191 actions/userauthorization.php:72 +#: actions/userrss.php:103 msgid "User without matching profile" msgstr "" @@ -615,9 +611,9 @@ msgstr "Last opp" msgid "Crop" msgstr "" -#: actions/avatarsettings.php:268 actions/disfavor.php:74 -#: actions/emailsettings.php:238 actions/favor.php:75 actions/geocode.php:50 -#: actions/groupblock.php:66 actions/grouplogo.php:309 +#: actions/avatarsettings.php:268 actions/deletenotice.php:157 +#: actions/disfavor.php:74 actions/emailsettings.php:238 actions/favor.php:75 +#: actions/geocode.php:50 actions/groupblock.php:66 actions/grouplogo.php:309 #: actions/groupunblock.php:66 actions/imsettings.php:206 #: actions/invite.php:56 actions/login.php:135 actions/makeadmin.php:66 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80 @@ -699,20 +695,15 @@ msgstr "" msgid "Failed to save block information." msgstr "" -#: actions/blockedfromgroup.php:73 actions/editgroup.php:84 -#: actions/groupdesignsettings.php:84 actions/grouplogo.php:86 -#: actions/groupmembers.php:76 actions/joingroup.php:76 -#: actions/showgroup.php:121 -#, fuzzy -msgid "No nickname" -msgstr "Nytt nick" - #: actions/blockedfromgroup.php:80 actions/editgroup.php:96 +#: actions/foafgroup.php:44 actions/foafgroup.php:62 actions/groupblock.php:86 #: actions/groupbyid.php:83 actions/groupdesignsettings.php:97 #: actions/grouplogo.php:99 actions/groupmembers.php:83 -#: actions/joingroup.php:83 actions/showgroup.php:137 +#: actions/grouprss.php:98 actions/groupunblock.php:86 +#: actions/joingroup.php:83 actions/leavegroup.php:83 actions/makeadmin.php:86 +#: actions/showgroup.php:137 lib/command.php:212 lib/command.php:263 #, fuzzy -msgid "No such group" +msgid "No such group." msgstr "Klarte ikke Ã¥ lagre profil." #: actions/blockedfromgroup.php:90 @@ -722,7 +713,7 @@ msgstr "Klarte ikke Ã¥ lagre profil." #: actions/blockedfromgroup.php:93 #, fuzzy, php-format -msgid "%s blocked profiles, page %d" +msgid "%1$s blocked profiles, page %2$d" msgstr "%s og venner" #: actions/blockedfromgroup.php:108 @@ -835,10 +826,6 @@ msgstr "Kan ikke slette notisen." msgid "Delete this notice" msgstr "" -#: actions/deletenotice.php:157 -msgid "There was a problem with your session token. Try again, please." -msgstr "" - #: actions/deleteuser.php:67 #, fuzzy msgid "You cannot delete users." @@ -866,7 +853,7 @@ msgid "Delete this user" msgstr "Kan ikke slette notisen." #: actions/designadminpanel.php:62 lib/accountsettingsaction.php:124 -#: lib/adminpanelaction.php:302 lib/groupnav.php:119 +#: lib/adminpanelaction.php:316 lib/groupnav.php:119 msgid "Design" msgstr "" @@ -1010,8 +997,9 @@ msgstr "" #: actions/editgroup.php:103 actions/editgroup.php:168 #: actions/groupdesignsettings.php:104 actions/grouplogo.php:106 -msgid "You must be an admin to edit the group" -msgstr "" +#, fuzzy +msgid "You must be an admin to edit the group." +msgstr "Gjør brukeren til en administrator for gruppen" #: actions/editgroup.php:154 msgid "Use this form to edit the group." @@ -1037,7 +1025,8 @@ msgid "Options saved." msgstr "" #: actions/emailsettings.php:60 -msgid "Email Settings" +#, fuzzy +msgid "Email settings" msgstr "Innstillinger for e-post" #: actions/emailsettings.php:71 @@ -1074,7 +1063,8 @@ msgid "Cancel" msgstr "Avbryt" #: actions/emailsettings.php:121 -msgid "Email Address" +#, fuzzy +msgid "Email address" msgstr "E-postadresse" #: actions/emailsettings.php:123 @@ -1148,9 +1138,10 @@ msgstr "Ingen e-postadresse." msgid "Cannot normalize that email address" msgstr "Klarer ikke normalisere epostadressen" -#: actions/emailsettings.php:331 actions/siteadminpanel.php:157 -msgid "Not a valid email address" -msgstr "Ugyldig e-postadresse" +#: actions/emailsettings.php:331 actions/register.php:201 +#: actions/siteadminpanel.php:157 +msgid "Not a valid email address." +msgstr "Ugyldig e-postadresse." #: actions/emailsettings.php:334 msgid "That is already your email address." @@ -1329,20 +1320,12 @@ msgstr "" msgid "Error updating remote profile" msgstr "" -#: actions/foafgroup.php:44 actions/foafgroup.php:62 actions/groupblock.php:86 -#: actions/grouprss.php:98 actions/groupunblock.php:86 -#: actions/leavegroup.php:83 actions/makeadmin.php:86 lib/command.php:212 -#: lib/command.php:263 -#, fuzzy -msgid "No such group." -msgstr "Klarte ikke Ã¥ lagre profil." - -#: actions/getfile.php:75 +#: actions/getfile.php:79 #, fuzzy msgid "No such file." msgstr "Klarte ikke Ã¥ lagre profil." -#: actions/getfile.php:79 +#: actions/getfile.php:83 #, fuzzy msgid "Cannot read file." msgstr "Klarte ikke Ã¥ lagre profil." @@ -1355,7 +1338,7 @@ msgstr "" #: actions/groupblock.php:76 actions/groupunblock.php:76 #: actions/makeadmin.php:76 actions/subedit.php:53 actions/tagother.php:46 -#: lib/profileformaction.php:77 +#: actions/unsubscribe.php:84 lib/profileformaction.php:77 msgid "No profile with that ID." msgstr "" @@ -1384,9 +1367,9 @@ msgstr "" #: actions/groupblock.php:162 #, php-format msgid "" -"Are you sure you want to block user \"%s\" from the group \"%s\"? They will " -"be removed from the group, unable to post, and unable to subscribe to the " -"group in the future." +"Are you sure you want to block user \"%1$s\" from the group \"%2$s\"? They " +"will be removed from the group, unable to post, and unable to subscribe to " +"the group in the future." msgstr "" #: actions/groupblock.php:178 @@ -1401,9 +1384,10 @@ msgstr "" msgid "Database error blocking user from group." msgstr "" -#: actions/groupbyid.php:74 -msgid "No ID" -msgstr "Ingen ID" +#: actions/groupbyid.php:74 actions/userbyid.php:70 +#, fuzzy +msgid "No ID." +msgstr "Ingen id." #: actions/groupdesignsettings.php:68 msgid "You must be logged in to edit a group." @@ -1425,12 +1409,6 @@ msgstr "" msgid "Couldn't update your design." msgstr "Klarte ikke Ã¥ oppdatere bruker." -#: actions/groupdesignsettings.php:287 actions/groupdesignsettings.php:297 -#: actions/userdesignsettings.php:210 actions/userdesignsettings.php:220 -#: actions/userdesignsettings.php:263 actions/userdesignsettings.php:273 -msgid "Unable to save your design settings!" -msgstr "" - #: actions/groupdesignsettings.php:308 actions/userdesignsettings.php:231 msgid "Design preferences saved." msgstr "" @@ -1445,6 +1423,11 @@ msgid "" "You can upload a logo image for your group. The maximum file size is %s." msgstr "" +#: actions/grouplogo.php:178 +#, fuzzy +msgid "User without matching profile." +msgstr "Brukeren har ingen profil." + #: actions/grouplogo.php:362 msgid "Pick a square area of the image to be the logo." msgstr "" @@ -1465,14 +1448,14 @@ msgstr "" #: actions/groupmembers.php:96 #, php-format -msgid "%s group members, page %d" +msgid "%1$s group members, page %2$d" msgstr "" #: actions/groupmembers.php:111 msgid "A list of the users in this group." msgstr "En liste over brukerne i denne gruppen." -#: actions/groupmembers.php:175 lib/action.php:441 lib/groupnav.php:107 +#: actions/groupmembers.php:175 lib/action.php:442 lib/groupnav.php:107 msgid "Admin" msgstr "Administrator" @@ -1566,7 +1549,8 @@ msgid "Error removing the block." msgstr "" #: actions/imsettings.php:59 -msgid "IM Settings" +#, fuzzy +msgid "IM settings" msgstr "Innstillinger for IM" #: actions/imsettings.php:70 @@ -1594,7 +1578,8 @@ msgstr "" "instruksjoner (la du %s til vennelisten din?)" #: actions/imsettings.php:124 -msgid "IM Address" +#, fuzzy +msgid "IM address" msgstr "IM-adresse" #: actions/imsettings.php:126 @@ -1653,11 +1638,6 @@ msgstr "" msgid "That is not your Jabber ID." msgstr "Det er ikke din Jabber ID." -#: actions/inbox.php:59 -#, php-format -msgid "Inbox for %s - page %d" -msgstr "" - #: actions/inbox.php:62 #, php-format msgid "Inbox for %s" @@ -1693,10 +1673,10 @@ msgstr "" msgid "You are already subscribed to these users:" msgstr "" -#: actions/invite.php:131 actions/invite.php:139 +#: actions/invite.php:131 actions/invite.php:139 lib/command.php:315 #, php-format -msgid "%s (%s)" -msgstr "%s (%s)" +msgid "%1$s (%2$s)" +msgstr "" #: actions/invite.php:136 msgid "" @@ -1734,7 +1714,7 @@ msgstr "" msgid "Optionally add a personal message to the invitation." msgstr "" -#: actions/invite.php:197 lib/messageform.php:178 lib/noticeform.php:232 +#: actions/invite.php:197 lib/messageform.php:178 lib/noticeform.php:234 msgid "Send" msgstr "Send" @@ -1799,19 +1779,9 @@ msgstr "" msgid "You must be logged in to join a group." msgstr "" -#: actions/joingroup.php:90 lib/command.php:217 -#, fuzzy -msgid "You are already a member of that group" -msgstr "Du er allerede logget inn!" - -#: actions/joingroup.php:128 lib/command.php:234 -#, php-format -msgid "Could not join user %s to group %s" -msgstr "" - #: actions/joingroup.php:135 lib/command.php:239 #, php-format -msgid "%s joined group %s" +msgid "%1$s joined group %2$s" msgstr "" #: actions/leavegroup.php:60 @@ -1826,15 +1796,10 @@ msgstr "" msgid "Could not find membership record." msgstr "" -#: actions/leavegroup.php:127 lib/command.php:284 -#, fuzzy, php-format -msgid "Could not remove user %s to group %s" -msgstr "Klarte ikke Ã¥ oppdatere bruker." - #: actions/leavegroup.php:134 lib/command.php:289 -#, php-format -msgid "%s left group %s" -msgstr "" +#, fuzzy, php-format +msgid "%1$s left group %2$s" +msgstr "%1$s sin status pÃ¥ %2$s" #: actions/login.php:83 actions/register.php:137 msgid "Already logged in." @@ -1853,7 +1818,7 @@ msgstr "Feil brukernavn eller passord" msgid "Error setting user. You are probably not authorized." msgstr "Ikke autorisert." -#: actions/login.php:208 actions/login.php:261 lib/action.php:459 +#: actions/login.php:208 actions/login.php:261 lib/action.php:460 #: lib/logingroupnav.php:79 msgid "Login" msgstr "Logg inn" @@ -1904,19 +1869,19 @@ msgid "Only an admin can make another user an admin." msgstr "" #: actions/makeadmin.php:95 -#, php-format -msgid "%s is already an admin for group \"%s\"." -msgstr "" +#, fuzzy, php-format +msgid "%1$s is already an admin for group \"%2$s\"." +msgstr "Du er allerede logget inn!" #: actions/makeadmin.php:132 -#, php-format -msgid "Can't get membership record for %s in group %s" -msgstr "" +#, fuzzy, php-format +msgid "Can't get membership record for %1$s in group %2$s." +msgstr "Klarte ikke Ã¥ oppdatere bruker." #: actions/makeadmin.php:145 -#, php-format -msgid "Can't make %s an admin for group %s" -msgstr "" +#, fuzzy, php-format +msgid "Can't make %1$s an admin for group %2$s." +msgstr "Gjør brukeren til en administrator for gruppen" #: actions/microsummary.php:69 msgid "No current status" @@ -1957,9 +1922,9 @@ msgid "Message sent" msgstr "" #: actions/newmessage.php:185 lib/command.php:376 -#, php-format -msgid "Direct message to %s sent" -msgstr "" +#, fuzzy, php-format +msgid "Direct message to %s sent." +msgstr "Direktemeldinger til %s" #: actions/newmessage.php:210 actions/newnotice.php:245 lib/channel.php:170 msgid "Ajax Error" @@ -1986,7 +1951,7 @@ msgstr "Tekst-søk" #: actions/noticesearch.php:91 #, fuzzy, php-format -msgid "Search results for \"%s\" on %s" +msgid "Search results for \"%1$s\" on %2$s" msgstr "Søkestrøm for «%s»" #: actions/noticesearch.php:121 @@ -2090,11 +2055,6 @@ msgstr "" msgid "URL shortening service is too long (max 50 chars)." msgstr "Bioen er for lang (max 140 tegn)" -#: actions/outbox.php:58 -#, php-format -msgid "Outbox for %s - page %d" -msgstr "" - #: actions/outbox.php:61 #, php-format msgid "Outbox for %s" @@ -2167,7 +2127,7 @@ msgstr "Klarer ikke Ã¥ lagre nytt passord." msgid "Password saved." msgstr "Passordet ble lagret" -#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:308 +#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:326 msgid "Paths" msgstr "" @@ -2200,7 +2160,7 @@ msgid "Invalid SSL server. The maximum length is 255 characters." msgstr "" #: actions/pathsadminpanel.php:217 actions/siteadminpanel.php:58 -#: lib/adminpanelaction.php:299 +#: lib/adminpanelaction.php:311 msgid "Site" msgstr "" @@ -2298,8 +2258,9 @@ msgid "When to use SSL" msgstr "" #: actions/pathsadminpanel.php:308 -msgid "SSL Server" -msgstr "" +#, fuzzy +msgid "SSL server" +msgstr "Gjenopprett" #: actions/pathsadminpanel.php:309 msgid "Server to direct SSL requests to" @@ -2326,9 +2287,9 @@ msgid "Not a valid people tag: %s" msgstr "Ugyldig e-postadresse" #: actions/peopletag.php:144 -#, php-format -msgid "Users self-tagged with %s - page %d" -msgstr "" +#, fuzzy, php-format +msgid "Users self-tagged with %1$s - page %2$d" +msgstr "Mikroblogg av %s" #: actions/postnotice.php:84 msgid "Invalid notice content" @@ -2336,7 +2297,7 @@ msgstr "" #: actions/postnotice.php:90 #, php-format -msgid "Notice license ‘%s’ is not compatible with site license ‘%s’." +msgid "Notice license ‘%1$s’ is not compatible with site license ‘%2$s’." msgstr "" #: actions/profilesettings.php:60 @@ -2455,21 +2416,21 @@ msgstr "Ugyldig hjemmeside '%s'" msgid "Couldn't update user for autosubscribe." msgstr "" -#: actions/profilesettings.php:354 +#: actions/profilesettings.php:359 #, fuzzy msgid "Couldn't save location prefs." msgstr "Klarte ikke Ã¥ lagre profil." -#: actions/profilesettings.php:366 +#: actions/profilesettings.php:371 msgid "Couldn't save profile." msgstr "Klarte ikke Ã¥ lagre profil." -#: actions/profilesettings.php:374 +#: actions/profilesettings.php:379 #, fuzzy msgid "Couldn't save tags." msgstr "Klarte ikke Ã¥ lagre profil." -#: actions/profilesettings.php:382 lib/adminpanelaction.php:126 +#: actions/profilesettings.php:387 lib/adminpanelaction.php:137 msgid "Settings saved." msgstr "" @@ -2563,7 +2524,7 @@ msgid "" "one!" msgstr "" -#: actions/publictagcloud.php:135 +#: actions/publictagcloud.php:131 msgid "Tag cloud" msgstr "" @@ -2701,7 +2662,7 @@ msgstr "" msgid "Registration successful" msgstr "" -#: actions/register.php:114 actions/register.php:502 lib/action.php:456 +#: actions/register.php:114 actions/register.php:502 lib/action.php:457 #: lib/logingroupnav.php:85 msgid "Register" msgstr "" @@ -2714,10 +2675,6 @@ msgstr "" msgid "You can't register if you don't agree to the license." msgstr "" -#: actions/register.php:201 -msgid "Not a valid email address." -msgstr "Ugyldig e-postadresse." - #: actions/register.php:212 msgid "Email address already exists." msgstr "" @@ -2776,12 +2733,12 @@ msgstr "" "telefonnummer." #: actions/register.php:537 -#, php-format +#, fuzzy, php-format msgid "" -"Congratulations, %s! And welcome to %%%%site.name%%%%. From here, you may " +"Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may " "want to...\n" "\n" -"* Go to [your profile](%s) and post your first message.\n" +"* Go to [your profile](%2$s) and post your first message.\n" "* Add a [Jabber/GTalk address](%%%%action.imsettings%%%%) so you can send " "notices through instant messages.\n" "* [Search for people](%%%%action.peoplesearch%%%%) that you may know or that " @@ -2903,11 +2860,6 @@ msgstr "Opprett" msgid "Replies to %s" msgstr "Svar til %s" -#: actions/replies.php:127 -#, fuzzy, php-format -msgid "Replies to %s, page %d" -msgstr "Svar til %s" - #: actions/replies.php:144 #, php-format msgid "Replies feed for %s (RSS 1.0)" @@ -2924,11 +2876,11 @@ msgid "Replies feed for %s (Atom)" msgstr "Svar til %s" #: actions/replies.php:198 -#, php-format +#, fuzzy, php-format msgid "" -"This is the timeline showing replies to %s but %s hasn't received a notice " -"to his attention yet." -msgstr "" +"This is the timeline showing replies to %1$s but %2$s hasn't received a " +"notice to his attention yet." +msgstr "Dette er tidslinjen for %s og venner, men ingen har postet noe enda." #: actions/replies.php:203 #, php-format @@ -2938,11 +2890,14 @@ msgid "" msgstr "" #: actions/replies.php:205 -#, php-format +#, fuzzy, php-format msgid "" -"You can try to [nudge %s](../%s) or [post something to his or her attention]" -"(%%%%action.newnotice%%%%?status_textarea=%s)." +"You can try to [nudge %1$s](../%2$s) or [post something to his or her " +"attention](%%%%action.newnotice%%%%?status_textarea=%3$s)." msgstr "" +"Du kan prøve Ã¥ [knuffe %s](../%s) fra dennes profil eller [post noe for Ã¥ fÃ¥ " +"hans eller hennes oppmerksomhet](%%%%action.newnotice%%%%?status_textarea=%" +"s)." #: actions/repliesrss.php:72 #, fuzzy, php-format @@ -2959,11 +2914,6 @@ msgstr "Du er allerede logget inn!" msgid "User is already sandboxed." msgstr "Du er allerede logget inn!" -#: actions/showfavorites.php:79 -#, fuzzy, php-format -msgid "%s's favorite notices, page %d" -msgstr "%s og venner" - #: actions/showfavorites.php:132 msgid "Could not retrieve favorite notices." msgstr "" @@ -3013,11 +2963,6 @@ msgstr "" msgid "%s group" msgstr "" -#: actions/showgroup.php:84 -#, php-format -msgid "%s group, page %d" -msgstr "" - #: actions/showgroup.php:218 #, fuzzy msgid "Group profile" @@ -3068,7 +3013,7 @@ msgstr "Medlem siden" #: actions/showgroup.php:386 lib/profileaction.php:117 #: lib/profileaction.php:148 lib/profileaction.php:236 lib/section.php:95 -#: lib/tagcloudsection.php:71 +#: lib/subscriptionlist.php:126 lib/tagcloudsection.php:71 msgid "(None)" msgstr "" @@ -3135,15 +3080,10 @@ msgstr "" msgid " tagged %s" msgstr "Tagger" -#: actions/showstream.php:79 -#, php-format -msgid "%s, page %d" -msgstr "" - #: actions/showstream.php:122 -#, php-format -msgid "Notice feed for %s tagged %s (RSS 1.0)" -msgstr "" +#, fuzzy, php-format +msgid "Notice feed for %1$s tagged %2$s (RSS 1.0)" +msgstr "Feed for taggen %s" #: actions/showstream.php:129 #, php-format @@ -3166,9 +3106,9 @@ msgid "FOAF for %s" msgstr "Feed for taggen %s" #: actions/showstream.php:191 -#, php-format -msgid "This is the timeline for %s but %s hasn't posted anything yet." -msgstr "" +#, fuzzy, php-format +msgid "This is the timeline for %1$s but %2$s hasn't posted anything yet." +msgstr "Dette er tidslinjen for %s og venner, men ingen har postet noe enda." #: actions/showstream.php:196 msgid "" @@ -3177,11 +3117,14 @@ msgid "" msgstr "" #: actions/showstream.php:198 -#, php-format +#, fuzzy, php-format msgid "" -"You can try to nudge %s or [post something to his or her attention](%%%%" -"action.newnotice%%%%?status_textarea=%s)." +"You can try to nudge %1$s or [post something to his or her attention](%%%%" +"action.newnotice%%%%?status_textarea=%2$s)." msgstr "" +"Du kan prøve Ã¥ [knuffe %s](../%s) fra dennes profil eller [post noe for Ã¥ fÃ¥ " +"hans eller hennes oppmerksomhet](%%%%action.newnotice%%%%?status_textarea=%" +"s)." #: actions/showstream.php:234 #, php-format @@ -3224,12 +3167,12 @@ msgstr "" #: actions/siteadminpanel.php:154 #, fuzzy -msgid "You must have a valid contact email address" +msgid "You must have a valid contact email address." msgstr "Ugyldig e-postadresse" #: actions/siteadminpanel.php:172 #, php-format -msgid "Unknown language \"%s\"" +msgid "Unknown language \"%s\"." msgstr "" #: actions/siteadminpanel.php:179 @@ -3412,7 +3355,8 @@ msgid "Save site settings" msgstr "Innstillinger for IM" #: actions/smssettings.php:58 -msgid "SMS Settings" +#, fuzzy +msgid "SMS settings" msgstr "Innstillinger for SMS" #: actions/smssettings.php:69 @@ -3441,7 +3385,8 @@ msgid "Enter the code you received on your phone." msgstr "" #: actions/smssettings.php:138 -msgid "SMS Phone number" +#, fuzzy +msgid "SMS phone number" msgstr "Telefonnummer for SMS" #: actions/smssettings.php:140 @@ -3530,9 +3475,9 @@ msgid "%s subscribers" msgstr "" #: actions/subscribers.php:52 -#, php-format -msgid "%s subscribers, page %d" -msgstr "" +#, fuzzy, php-format +msgid "%1$s subscribers, page %2$d" +msgstr "Alle abonnementer" #: actions/subscribers.php:63 msgid "These are the people who listen to your notices." @@ -3568,7 +3513,7 @@ msgstr "Alle abonnementer" #: actions/subscriptions.php:54 #, fuzzy, php-format -msgid "%s subscriptions, page %d" +msgid "%1$s subscriptions, page %2$d" msgstr "Alle abonnementer" #: actions/subscriptions.php:65 @@ -3604,11 +3549,6 @@ msgstr "Ingen Jabber ID." msgid "SMS" msgstr "" -#: actions/tag.php:68 -#, fuzzy, php-format -msgid "Notices tagged with %s, page %d" -msgstr "Mikroblogg av %s" - #: actions/tag.php:86 #, php-format msgid "Notice feed for tag %s (RSS 1.0)" @@ -3692,20 +3632,17 @@ msgstr "" msgid "No profile id in request." msgstr "" -#: actions/unsubscribe.php:84 -msgid "No profile with that id." -msgstr "" - #: actions/unsubscribe.php:98 msgid "Unsubscribed" msgstr "" #: actions/updateprofile.php:62 actions/userauthorization.php:330 #, php-format -msgid "Listenee stream license ‘%s’ is not compatible with site license ‘%s’." +msgid "" +"Listenee stream license ‘%1$s’ is not compatible with site license ‘%2$s’." msgstr "" -#: actions/useradminpanel.php:58 lib/adminpanelaction.php:305 +#: actions/useradminpanel.php:58 lib/adminpanelaction.php:321 #: lib/personalgroupnav.php:115 msgid "User" msgstr "" @@ -3808,7 +3745,7 @@ msgid "" "click “Rejectâ€." msgstr "" -#: actions/userauthorization.php:188 +#: actions/userauthorization.php:188 actions/version.php:165 msgid "License" msgstr "" @@ -3858,7 +3795,7 @@ msgstr "" #: actions/userauthorization.php:296 #, php-format -msgid "Listener URI ‘%s’ not found here" +msgid "Listener URI ‘%s’ not found here." msgstr "" #: actions/userauthorization.php:301 @@ -3891,11 +3828,6 @@ msgstr "Kan ikke lese brukerbilde-URL «%s»" msgid "Wrong image type for avatar URL ‘%s’." msgstr "" -#: actions/userbyid.php:70 -#, fuzzy -msgid "No ID." -msgstr "Ingen id." - #: actions/userdesignsettings.php:76 lib/designsettings.php:65 #, fuzzy msgid "Profile design" @@ -3911,11 +3843,6 @@ msgstr "" msgid "Enjoy your hotdog!" msgstr "" -#: actions/usergroups.php:64 -#, php-format -msgid "%s groups, page %d" -msgstr "" - #: actions/usergroups.php:130 msgid "Search for more groups" msgstr "" @@ -3930,6 +3857,73 @@ msgstr "Du er allerede logget inn!" msgid "Try [searching for groups](%%action.groupsearch%%) and joining them." msgstr "" +#: actions/version.php:73 +#, fuzzy, php-format +msgid "StatusNet %s" +msgstr "Statistikk" + +#: actions/version.php:153 +#, php-format +msgid "" +"This site is powered by %1$s version %2$s, Copyright 2008-2010 StatusNet, " +"Inc. and contributors." +msgstr "" + +#: actions/version.php:157 +#, fuzzy +msgid "StatusNet" +msgstr "Statistikk" + +#: actions/version.php:161 +msgid "Contributors" +msgstr "" + +#: actions/version.php:168 +msgid "" +"StatusNet is free software: you can redistribute it and/or modify it under " +"the terms of the GNU Affero General Public License as published by the Free " +"Software Foundation, either version 3 of the License, or (at your option) " +"any later version. " +msgstr "" + +#: actions/version.php:174 +msgid "" +"This program is distributed in the hope that it will be useful, but WITHOUT " +"ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or " +"FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License " +"for more details. " +msgstr "" + +#: actions/version.php:180 +#, php-format +msgid "" +"You should have received a copy of the GNU Affero General Public License " +"along with this program. If not, see %s." +msgstr "" + +#: actions/version.php:189 +msgid "Plugins" +msgstr "" + +#: actions/version.php:195 +#, fuzzy +msgid "Name" +msgstr "Nick" + +#: actions/version.php:196 lib/action.php:741 +#, fuzzy +msgid "Version" +msgstr "Personlig" + +#: actions/version.php:197 +msgid "Author(s)" +msgstr "" + +#: actions/version.php:198 lib/groupeditform.php:172 +#, fuzzy +msgid "Description" +msgstr "Alle abonnementer" + #: classes/File.php:137 #, php-format msgid "" @@ -3996,7 +3990,7 @@ msgstr "" msgid "DB error inserting reply: %s" msgstr "" -#: classes/Notice.php:1361 +#: classes/Notice.php:1359 #, php-format msgid "RT @%1$s %2$s" msgstr "" @@ -4045,140 +4039,135 @@ msgstr "" msgid "Other options" msgstr "" -#: lib/action.php:144 -#, php-format -msgid "%s - %s" -msgstr "" - #: lib/action.php:159 msgid "Untitled page" msgstr "" -#: lib/action.php:426 +#: lib/action.php:427 msgid "Primary site navigation" msgstr "" -#: lib/action.php:432 +#: lib/action.php:433 msgid "Home" msgstr "Hjem" -#: lib/action.php:432 +#: lib/action.php:433 msgid "Personal profile and friends timeline" msgstr "" -#: lib/action.php:434 +#: lib/action.php:435 #, fuzzy msgid "Account" msgstr "Om" -#: lib/action.php:434 +#: lib/action.php:435 msgid "Change your email, avatar, password, profile" msgstr "" -#: lib/action.php:437 +#: lib/action.php:438 msgid "Connect" msgstr "Koble til" -#: lib/action.php:437 +#: lib/action.php:438 msgid "Connect to services" msgstr "" -#: lib/action.php:441 +#: lib/action.php:442 msgid "Change site configuration" msgstr "" -#: lib/action.php:445 lib/subgroupnav.php:105 +#: lib/action.php:446 lib/subgroupnav.php:105 msgid "Invite" msgstr "" -#: lib/action.php:446 lib/subgroupnav.php:106 +#: lib/action.php:447 lib/subgroupnav.php:106 #, php-format msgid "Invite friends and colleagues to join you on %s" msgstr "" -#: lib/action.php:451 +#: lib/action.php:452 msgid "Logout" msgstr "Logg ut" -#: lib/action.php:451 +#: lib/action.php:452 msgid "Logout from the site" msgstr "" -#: lib/action.php:456 +#: lib/action.php:457 #, fuzzy msgid "Create an account" msgstr "Opprett en ny konto" -#: lib/action.php:459 +#: lib/action.php:460 msgid "Login to the site" msgstr "" -#: lib/action.php:462 lib/action.php:725 +#: lib/action.php:463 lib/action.php:726 msgid "Help" msgstr "Hjelp" -#: lib/action.php:462 +#: lib/action.php:463 #, fuzzy msgid "Help me!" msgstr "Hjelp" -#: lib/action.php:465 lib/searchaction.php:127 +#: lib/action.php:466 lib/searchaction.php:127 msgid "Search" msgstr "Søk" -#: lib/action.php:465 +#: lib/action.php:466 msgid "Search for people or text" msgstr "" -#: lib/action.php:486 +#: lib/action.php:487 msgid "Site notice" msgstr "" -#: lib/action.php:552 +#: lib/action.php:553 msgid "Local views" msgstr "" -#: lib/action.php:618 +#: lib/action.php:619 msgid "Page notice" msgstr "" -#: lib/action.php:720 +#: lib/action.php:721 msgid "Secondary site navigation" msgstr "" -#: lib/action.php:727 +#: lib/action.php:728 msgid "About" msgstr "Om" -#: lib/action.php:729 +#: lib/action.php:730 msgid "FAQ" msgstr "OSS/FAQ" -#: lib/action.php:733 +#: lib/action.php:734 msgid "TOS" msgstr "" -#: lib/action.php:736 +#: lib/action.php:737 msgid "Privacy" msgstr "" -#: lib/action.php:738 +#: lib/action.php:739 msgid "Source" msgstr "Kilde" -#: lib/action.php:740 +#: lib/action.php:743 msgid "Contact" msgstr "Kontakt" -#: lib/action.php:742 +#: lib/action.php:745 msgid "Badge" msgstr "" -#: lib/action.php:770 +#: lib/action.php:773 msgid "StatusNet software license" msgstr "" -#: lib/action.php:773 +#: lib/action.php:776 #, php-format msgid "" "**%%site.name%%** is a microblogging service brought to you by [%%site." @@ -4187,12 +4176,12 @@ msgstr "" "**%%site.name%%** er en mikrobloggingtjeneste av [%%site.broughtby%%](%%site." "broughtbyurl%%). " -#: lib/action.php:775 +#: lib/action.php:778 #, php-format msgid "**%%site.name%%** is a microblogging service. " msgstr "**%%site.name%%** er en mikrobloggingtjeneste. " -#: lib/action.php:777 +#: lib/action.php:780 #, php-format msgid "" "It runs the [StatusNet](http://status.net/) microblogging software, version %" @@ -4200,32 +4189,32 @@ msgid "" "org/licensing/licenses/agpl-3.0.html)." msgstr "" -#: lib/action.php:791 +#: lib/action.php:794 msgid "Site content license" msgstr "" -#: lib/action.php:800 +#: lib/action.php:803 msgid "All " msgstr "" -#: lib/action.php:805 +#: lib/action.php:808 msgid "license." msgstr "" -#: lib/action.php:1099 +#: lib/action.php:1102 msgid "Pagination" msgstr "" -#: lib/action.php:1108 +#: lib/action.php:1111 msgid "After" msgstr "" -#: lib/action.php:1116 +#: lib/action.php:1119 #, fuzzy msgid "Before" msgstr "Tidligere »" -#: lib/action.php:1164 +#: lib/action.php:1167 msgid "There was a problem with your session token." msgstr "" @@ -4233,27 +4222,31 @@ msgstr "" msgid "You cannot make changes to this site." msgstr "" -#: lib/adminpanelaction.php:195 +#: lib/adminpanelaction.php:107 +msgid "Changes to that panel are not allowed." +msgstr "" + +#: lib/adminpanelaction.php:206 msgid "showForm() not implemented." msgstr "" -#: lib/adminpanelaction.php:224 +#: lib/adminpanelaction.php:235 msgid "saveSettings() not implemented." msgstr "" -#: lib/adminpanelaction.php:247 +#: lib/adminpanelaction.php:258 msgid "Unable to delete design setting." msgstr "" -#: lib/adminpanelaction.php:300 +#: lib/adminpanelaction.php:312 msgid "Basic site configuration" msgstr "" -#: lib/adminpanelaction.php:303 +#: lib/adminpanelaction.php:317 msgid "Design configuration" msgstr "" -#: lib/adminpanelaction.php:306 lib/adminpanelaction.php:309 +#: lib/adminpanelaction.php:322 lib/adminpanelaction.php:327 msgid "Paths configuration" msgstr "" @@ -4278,11 +4271,21 @@ msgstr "" msgid "Tags for this attachment" msgstr "" +#: lib/authenticationplugin.php:182 lib/authenticationplugin.php:187 +#, fuzzy +msgid "Password changing failed" +msgstr "Passordet ble lagret" + +#: lib/authenticationplugin.php:197 +#, fuzzy +msgid "Password changing is not allowed" +msgstr "Passordet ble lagret" + #: lib/channel.php:138 lib/channel.php:158 msgid "Command results" msgstr "" -#: lib/channel.php:210 +#: lib/channel.php:210 lib/mailhandler.php:142 msgid "Command complete" msgstr "" @@ -4296,7 +4299,7 @@ msgstr "" #: lib/command.php:88 #, fuzzy, php-format -msgid "Could not find a user with nickname %s" +msgid "Could not find a user with nickname %s." msgstr "Klarte ikke Ã¥ oppdatere bruker med bekreftet e-post." #: lib/command.php:92 @@ -4305,7 +4308,7 @@ msgstr "" #: lib/command.php:99 #, php-format -msgid "Nudge sent to %s" +msgid "Nudge sent to %s." msgstr "" #: lib/command.php:126 @@ -4317,34 +4320,35 @@ msgid "" msgstr "" #: lib/command.php:152 lib/command.php:399 lib/command.php:460 -msgid "Notice with that id does not exist" +msgid "Notice with that id does not exist." msgstr "" #: lib/command.php:168 lib/command.php:415 lib/command.php:476 #: lib/command.php:532 -msgid "User has no last notice" -msgstr "" +#, fuzzy +msgid "User has no last notice." +msgstr "Brukeren har ingen profil." #: lib/command.php:190 msgid "Notice marked as fave." msgstr "" -#: lib/command.php:315 -#, php-format -msgid "%1$s (%2$s)" -msgstr "" +#: lib/command.php:284 +#, fuzzy, php-format +msgid "Could not remove user %1$s to group %2$s." +msgstr "Klarte ikke Ã¥ oppdatere bruker." #: lib/command.php:318 -#, php-format -msgid "Fullname: %s" -msgstr "" +#, fuzzy, php-format +msgid "Full name: %s" +msgstr "Fullt navn" -#: lib/command.php:321 +#: lib/command.php:321 lib/mail.php:254 #, php-format msgid "Location: %s" msgstr "" -#: lib/command.php:324 +#: lib/command.php:324 lib/mail.php:256 #, php-format msgid "Homepage: %s" msgstr "" @@ -4356,26 +4360,17 @@ msgstr "" #: lib/command.php:358 scripts/xmppdaemon.php:301 #, php-format -msgid "Message too long - maximum is %d characters, you sent %d" +msgid "Message too long - maximum is %1$d characters, you sent %2$d." msgstr "" #: lib/command.php:378 msgid "Error sending direct message." msgstr "" -#: lib/command.php:422 -msgid "Cannot repeat your own notice" -msgstr "" - -#: lib/command.php:427 -#, fuzzy -msgid "Already repeated that notice" -msgstr "Kan ikke slette notisen." - #: lib/command.php:435 -#, php-format -msgid "Notice from %s repeated" -msgstr "" +#, fuzzy, php-format +msgid "Notice from %s repeated." +msgstr "Nytt nick" #: lib/command.php:437 msgid "Error repeating notice." @@ -4383,12 +4378,12 @@ msgstr "" #: lib/command.php:491 #, php-format -msgid "Notice too long - maximum is %d characters, you sent %d" +msgid "Notice too long - maximum is %1$d characters, you sent %2$d." msgstr "" #: lib/command.php:500 #, fuzzy, php-format -msgid "Reply to %s sent" +msgid "Reply to %s sent." msgstr "Svar til %s" #: lib/command.php:502 @@ -4396,7 +4391,7 @@ msgid "Error saving notice." msgstr "" #: lib/command.php:556 -msgid "Specify the name of the user to subscribe to" +msgid "Specify the name of the user to subscribe to." msgstr "" #: lib/command.php:563 @@ -4405,7 +4400,7 @@ msgid "Subscribed to %s" msgstr "" #: lib/command.php:584 -msgid "Specify the name of the user to unsubscribe from" +msgid "Specify the name of the user to unsubscribe from." msgstr "" #: lib/command.php:591 @@ -4434,17 +4429,17 @@ msgid "Can't turn on notification." msgstr "" #: lib/command.php:650 -msgid "Login command is disabled" +msgid "Login command is disabled." msgstr "" #: lib/command.php:664 #, fuzzy, php-format -msgid "Could not create login token for %s" +msgid "Could not create login token for %s." msgstr "Klarte ikke Ã¥ lagre avatar-informasjonen" #: lib/command.php:669 #, php-format -msgid "This link is useable only once, and is good for only 2 minutes: %s" +msgid "This link is useable only once, and is good for only 2 minutes: %s." msgstr "" #: lib/command.php:685 @@ -4641,11 +4636,6 @@ msgstr "Beskriv degselv og dine interesser med 140 tegn" msgid "Describe the group or topic in %d characters" msgstr "Beskriv degselv og dine interesser med 140 tegn" -#: lib/groupeditform.php:172 -#, fuzzy -msgid "Description" -msgstr "Alle abonnementer" - #: lib/groupeditform.php:179 msgid "" "Location for the group, if any, like \"City, State (or Region), Country\"" @@ -4816,22 +4806,10 @@ msgstr "" "Vennlig hilsen,\n" "%4$s.\n" -#: lib/mail.php:254 -#, php-format -msgid "Location: %s\n" -msgstr "" - -#: lib/mail.php:256 -#, fuzzy, php-format -msgid "Homepage: %s\n" -msgstr "Hjemmesiden: %s\n" - #: lib/mail.php:258 -#, php-format -msgid "" -"Bio: %s\n" -"\n" -msgstr "" +#, fuzzy, php-format +msgid "Bio: %s" +msgstr "Om meg" #: lib/mail.php:286 #, php-format @@ -4966,6 +4944,27 @@ msgstr "" msgid "from" msgstr "fra" +#: lib/mailhandler.php:37 +msgid "Could not parse message." +msgstr "" + +#: lib/mailhandler.php:42 +msgid "Not a registered user." +msgstr "" + +#: lib/mailhandler.php:46 +msgid "Sorry, that is not your incoming email address." +msgstr "" + +#: lib/mailhandler.php:50 +msgid "Sorry, no incoming email allowed." +msgstr "" + +#: lib/mailhandler.php:228 +#, fuzzy, php-format +msgid "Unsupported message type: %s" +msgstr "Direktemeldinger til %s" + #: lib/mediafile.php:98 lib/mediafile.php:123 msgid "There was a database error while saving your file. Please try again." msgstr "" @@ -4997,7 +4996,7 @@ msgid "File upload stopped by extension." msgstr "" #: lib/mediafile.php:179 lib/mediafile.php:216 -msgid "File exceeds user's quota!" +msgid "File exceeds user's quota." msgstr "" #: lib/mediafile.php:196 lib/mediafile.php:233 @@ -5005,8 +5004,9 @@ msgid "File could not be moved to destination directory." msgstr "" #: lib/mediafile.php:201 lib/mediafile.php:237 -msgid "Could not determine file's mime-type!" -msgstr "" +#, fuzzy +msgid "Could not determine file's MIME type." +msgstr "Klarte ikke Ã¥ oppdatere bruker." #: lib/mediafile.php:270 #, php-format @@ -5015,7 +5015,7 @@ msgstr "" #: lib/mediafile.php:275 #, php-format -msgid "%s is not a supported filetype on this server." +msgid "%s is not a supported file type on this server." msgstr "" #: lib/messageform.php:120 @@ -5049,7 +5049,17 @@ msgid "Attach a file" msgstr "" #: lib/noticeform.php:212 -msgid "Share your location" +#, fuzzy +msgid "Share my location." +msgstr "Klarte ikke Ã¥ lagre profil." + +#: lib/noticeform.php:214 +#, fuzzy +msgid "Do not share my location." +msgstr "Klarte ikke Ã¥ lagre profil." + +#: lib/noticeform.php:215 +msgid "Hide this info" msgstr "" #: lib/noticelist.php:428 @@ -5169,6 +5179,10 @@ msgstr "" msgid "Tags in %s's notices" msgstr "" +#: lib/plugin.php:114 +msgid "Unknown" +msgstr "" + #: lib/profileaction.php:109 lib/profileaction.php:192 lib/subgroupnav.php:82 msgid "Subscriptions" msgstr "" @@ -5349,10 +5363,6 @@ msgstr "" msgid "People Tagcloud as tagged" msgstr "" -#: lib/subscriptionlist.php:126 -msgid "(none)" -msgstr "" - #: lib/tagcloudsection.php:56 msgid "None" msgstr "" @@ -5470,19 +5480,3 @@ msgstr "" #, php-format msgid "%s is not a valid color! Use 3 or 6 hex chars." msgstr "" - -#: scripts/maildaemon.php:48 -msgid "Could not parse message." -msgstr "" - -#: scripts/maildaemon.php:53 -msgid "Not a registered user." -msgstr "" - -#: scripts/maildaemon.php:57 -msgid "Sorry, that is not your incoming email address." -msgstr "" - -#: scripts/maildaemon.php:61 -msgid "Sorry, no incoming email allowed." -msgstr "" diff --git a/locale/nl/LC_MESSAGES/statusnet.po b/locale/nl/LC_MESSAGES/statusnet.po index e9095b9c8..2b66fe049 100644 --- a/locale/nl/LC_MESSAGES/statusnet.po +++ b/locale/nl/LC_MESSAGES/statusnet.po @@ -1,5 +1,6 @@ # Translation of StatusNet to Dutch # +# Author@translatewiki.net: Itavero # Author@translatewiki.net: McDutchie # Author@translatewiki.net: Siebrand # -- @@ -9,12 +10,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-01-03 10:37+0000\n" -"PO-Revision-Date: 2010-01-03 10:38:30+0000\n" +"POT-Creation-Date: 2010-01-10 11:27+0000\n" +"PO-Revision-Date: 2010-01-11 00:21:09+0000\n" "Language-Team: Dutch\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha (r60575); Translate extension (2009-12-06)\n" +"X-Generator: MediaWiki 1.16alpha (r60910); Translate extension (2010-01-04)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: nl\n" "X-Message-Group: out-statusnet\n" @@ -51,11 +52,6 @@ msgstr "Deze pagina bestaat niet" msgid "No such user." msgstr "Onbekende gebruiker." -#: actions/all.php:84 -#, php-format -msgid "%s and friends, page %d" -msgstr "%s en vrienden, pagina %d" - #: actions/all.php:86 actions/all.php:167 actions/allrss.php:115 #: actions/apitimelinefriends.php:115 actions/apitimelinehome.php:115 #: lib/personalgroupnav.php:100 @@ -84,7 +80,7 @@ msgid "" "This is the timeline for %s and friends but no one has posted anything yet." msgstr "" "Dit is de tijdlijn voor %s en vrienden, maar niemand heeft nog mededelingen " -"doen uitgaan." +"geplaatst." #: actions/all.php:132 #, php-format @@ -98,12 +94,12 @@ msgstr "" #: actions/all.php:134 #, php-format msgid "" -"You can try to [nudge %s](../%s) from his profile or [post something to his " -"or her attention](%%%%action.newnotice%%%%?status_textarea=%s)." +"You can try to [nudge %1$s](../%2$s) from his profile or [post something to " +"his or her attention](%%%%action.newnotice%%%%?status_textarea=%3$s)." msgstr "" -"U kunt proberen [%s te porren](../%s) op de eigen profielpagina of [een " +"U kunt proberen [%1$s te porren](../%2$s) op de eigen profielpagina of [een " "bericht voor die gebruiker plaatsen](%%%%action.newnotice%%%%?" -"status_textarea=%s)." +"status_textarea=%3$s)." #: actions/all.php:137 actions/replies.php:209 actions/showstream.php:202 #, php-format @@ -111,8 +107,8 @@ msgid "" "Why not [register an account](%%%%action.register%%%%) and then nudge %s or " "post a notice to his or her attention." msgstr "" -"U kunt een [gebruiker registeren](%%%%action.register%%%%) en %s dan porren " -"of een een bericht voor die gebruiker plaatsen." +"U kunt een [gebruiker aanmaken](%%%%action.register%%%%) en %s dan porren of " +"een bericht sturen." #: actions/all.php:165 msgid "You and friends" @@ -129,6 +125,23 @@ msgstr "Updates van %1$s en vrienden op %2$s." #: actions/apiaccountupdateprofile.php:97 #: actions/apiaccountupdateprofilebackgroundimage.php:94 #: actions/apiaccountupdateprofilecolors.php:118 +#: actions/apidirectmessage.php:156 actions/apifavoritecreate.php:99 +#: actions/apifavoritedestroy.php:100 actions/apifriendshipscreate.php:100 +#: actions/apifriendshipsdestroy.php:100 actions/apifriendshipsshow.php:129 +#: actions/apigroupcreate.php:136 actions/apigroupismember.php:114 +#: actions/apigroupjoin.php:155 actions/apigroupleave.php:141 +#: actions/apigrouplist.php:132 actions/apigrouplistall.php:120 +#: actions/apigroupmembership.php:106 actions/apigroupshow.php:105 +#: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102 +#: actions/apistatusesretweets.php:112 actions/apistatusesshow.php:108 +#: actions/apistatusnetconfig.php:133 actions/apistatusnetversion.php:93 +#: actions/apisubscriptions.php:111 actions/apitimelinefavorites.php:146 +#: actions/apitimelinefriends.php:156 actions/apitimelinegroup.php:150 +#: actions/apitimelinehome.php:156 actions/apitimelinementions.php:151 +#: actions/apitimelinepublic.php:131 actions/apitimelineretweetedbyme.php:122 +#: actions/apitimelineretweetedtome.php:121 +#: actions/apitimelineretweetsofme.php:122 actions/apitimelinetag.php:141 +#: actions/apitimelineuser.php:165 actions/apiusershow.php:101 msgid "API method not found." msgstr "De API-functie is niet aangetroffen." @@ -144,19 +157,19 @@ msgstr "De API-functie is niet aangetroffen." #: actions/apigroupleave.php:91 actions/apistatusesretweet.php:65 #: actions/apistatusesupdate.php:114 msgid "This method requires a POST." -msgstr "Deze methode heeft een POST nodig." +msgstr "Deze methode vereist een POST." #: actions/apiaccountupdatedeliverydevice.php:105 msgid "" "You must specify a parameter named 'device' with a value of one of: sms, im, " "none" msgstr "" -"U moet een parameter met de naam \"device\" opgeven met een waarde uit de " -"volgende lijst: sms, im, none" +"U moet een parameter met de naam \"device\" opgeven met een van de volgende " +"waardes: sms, im, none" #: actions/apiaccountupdatedeliverydevice.php:132 msgid "Could not update user." -msgstr "Het was niet mogelijk de gebruiker te actualiseren." +msgstr "Het was niet mogelijk de gebruiker bij te werken." #: actions/apiaccountupdateprofile.php:112 #: actions/apiaccountupdateprofilebackgroundimage.php:194 @@ -181,13 +194,16 @@ msgid "" "The server was unable to handle that much POST data (%s bytes) due to its " "current configuration." msgstr "" -"De server was niet in staat zoveel POST-gegevens af te handelen (%s bytes) " +"De server was niet in staat zoveel POST-gegevens te verwerken (%s bytes) " "vanwege de huidige instellingen." #: actions/apiaccountupdateprofilebackgroundimage.php:136 #: actions/apiaccountupdateprofilebackgroundimage.php:146 #: actions/apiaccountupdateprofilecolors.php:164 #: actions/apiaccountupdateprofilecolors.php:174 +#: actions/groupdesignsettings.php:287 actions/groupdesignsettings.php:297 +#: actions/userdesignsettings.php:210 actions/userdesignsettings.php:220 +#: actions/userdesignsettings.php:263 actions/userdesignsettings.php:273 msgid "Unable to save your design settings." msgstr "Het was niet mogelijk om uw ontwerpinstellingen op te slaan." @@ -211,46 +227,26 @@ msgstr "Het deblokkeren van de gebruiker is mislukt." #: actions/apidirectmessage.php:89 #, php-format msgid "Direct messages from %s" -msgstr "Directe berichten van %s" +msgstr "Privéberichten van %s" #: actions/apidirectmessage.php:93 #, php-format msgid "All the direct messages sent from %s" -msgstr "Alle directe berichten door %s verzonden" +msgstr "Alle privéberichten van %s" #: actions/apidirectmessage.php:101 #, php-format msgid "Direct messages to %s" -msgstr "Directe beichten aan %s" +msgstr "Privéberichten aan %s" #: actions/apidirectmessage.php:105 #, php-format msgid "All the direct messages sent to %s" -msgstr "Alle directe berichten verzonden aan %s" - -#: actions/apidirectmessage.php:156 actions/apifavoritecreate.php:99 -#: actions/apifavoritedestroy.php:100 actions/apifriendshipscreate.php:100 -#: actions/apifriendshipsdestroy.php:100 actions/apifriendshipsshow.php:129 -#: actions/apigroupcreate.php:136 actions/apigroupismember.php:114 -#: actions/apigroupjoin.php:155 actions/apigroupleave.php:141 -#: actions/apigrouplist.php:132 actions/apigrouplistall.php:120 -#: actions/apigroupmembership.php:106 actions/apigroupshow.php:105 -#: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102 -#: actions/apistatusesretweets.php:112 actions/apistatusesshow.php:108 -#: actions/apistatusnetconfig.php:133 actions/apistatusnetversion.php:93 -#: actions/apisubscriptions.php:111 actions/apitimelinefavorites.php:146 -#: actions/apitimelinefriends.php:156 actions/apitimelinegroup.php:150 -#: actions/apitimelinehome.php:156 actions/apitimelinementions.php:151 -#: actions/apitimelinepublic.php:131 actions/apitimelineretweetedbyme.php:122 -#: actions/apitimelineretweetedtome.php:121 -#: actions/apitimelineretweetsofme.php:122 actions/apitimelinetag.php:141 -#: actions/apitimelineuser.php:165 actions/apiusershow.php:101 -msgid "API method not found!" -msgstr "De API-functie is niet aangetroffen!" +msgstr "Alle privéberichten aan %s" #: actions/apidirectmessagenew.php:126 msgid "No message text!" -msgstr "Het bericht bevat geen inhoud!" +msgstr "Het bericht is leeg!" #: actions/apidirectmessagenew.php:135 actions/newmessage.php:150 #, php-format @@ -264,7 +260,7 @@ msgstr "De ontvanger is niet aangetroffen." #: actions/apidirectmessagenew.php:150 msgid "Can't send direct messages to users who aren't your friend." msgstr "" -"U kunt geen directe berichten sturen aan gebruikers die niet op uw " +"U kunt geen privéberichten sturen aan gebruikers die niet op uw " "vriendenlijst staan." #: actions/apifavoritecreate.php:108 actions/apifavoritedestroy.php:109 @@ -273,25 +269,25 @@ msgid "No status found with that ID." msgstr "Er is geen status gevonden met dit ID." #: actions/apifavoritecreate.php:119 -msgid "This status is already a favorite!" -msgstr "Deze status is al toegevoegd aan de favorieten." +msgid "This status is already a favorite." +msgstr "Deze mededeling staat al in uw favorietenlijst." #: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:176 msgid "Could not create favorite." msgstr "Het was niet mogelijk een favoriet aan te maken." #: actions/apifavoritedestroy.php:122 -msgid "That status is not a favorite!" -msgstr "Deze status staat niet in de favorieten." +msgid "That status is not a favorite." +msgstr "Deze mededeling staat niet in uw favorietenlijst." #: actions/apifavoritedestroy.php:134 actions/disfavor.php:87 msgid "Could not delete favorite." msgstr "" -"Het was niet mogelijk dit bericht van uw favorietenlijst te verwijderen." +"Het was niet mogelijk deze mededeling van uw favorietenlijst te verwijderen." #: actions/apifriendshipscreate.php:109 msgid "Could not follow user: User not found." -msgstr "U kunt de gebruiker %s niet volgen, omdat deze gebruiker niet bestaat." +msgstr "U kunt deze gebruiker niet volgen, omdat deze niet bestaat." #: actions/apifriendshipscreate.php:118 #, php-format @@ -305,12 +301,12 @@ msgstr "" "niet aangetroffen." #: actions/apifriendshipsdestroy.php:120 -msgid "You cannot unfollow yourself!" +msgid "You cannot unfollow yourself." msgstr "U kunt het abonnement op uzelf niet opzeggen." #: actions/apifriendshipsexists.php:94 msgid "Two user ids or screen_names must be supplied." -msgstr "Er moeten twee gebruikersnamen opgegeven worden." +msgstr "Er moeten twee gebruikersnamen of ID's opgegeven worden." #: actions/apifriendshipsshow.php:135 msgid "Could not determine source user." @@ -325,8 +321,8 @@ msgstr "Het was niet mogelijk de doelgebruiker te vinden." #: actions/register.php:205 msgid "Nickname must have only lowercase letters and numbers and no spaces." msgstr "" -"De gebruikersnaam moet alleen bestaan uit kleine letters en cijfers, en mag " -"geen spaties bevatten." +"De gebruikersnaam mag alleen kleine letters en cijfers bevatten. Spaties " +"zijn niet toegestaan." #: actions/apigroupcreate.php:173 actions/editgroup.php:186 #: actions/newgroup.php:130 actions/profilesettings.php:238 @@ -339,7 +335,7 @@ msgstr "" #: actions/newgroup.php:133 actions/profilesettings.php:218 #: actions/register.php:210 msgid "Not a valid nickname." -msgstr "Geen geldige gebruikersnaam." +msgstr "Ongeldige gebruikersnaam!" #: actions/apigroupcreate.php:196 actions/editgroup.php:195 #: actions/newgroup.php:139 actions/profilesettings.php:222 @@ -356,7 +352,7 @@ msgstr "De volledige naam is te lang (maximaal 255 tekens)." #: actions/apigroupcreate.php:213 #, php-format msgid "Description is too long (max %d chars)." -msgstr "De beschrijving is te lang. Gebruik maximaal %d tekens." +msgstr "De beschrijving is te lang (maximaal %d tekens)." #: actions/apigroupcreate.php:224 actions/editgroup.php:204 #: actions/newgroup.php:148 actions/profilesettings.php:232 @@ -374,7 +370,7 @@ msgstr "Te veel aliassen! Het maximale aantal is %d." #: actions/newgroup.php:168 #, php-format msgid "Invalid alias: \"%s\"" -msgstr "Ongeldig alias: \"%s\"" +msgstr "Ongeldige alias: \"%s\"" #: actions/apigroupcreate.php:273 actions/editgroup.php:228 #: actions/newgroup.php:172 @@ -393,7 +389,7 @@ msgstr "Een alias kan niet hetzelfde zijn als de gebruikersnaam." msgid "Group not found!" msgstr "De groep is niet aangetroffen!" -#: actions/apigroupjoin.php:110 +#: actions/apigroupjoin.php:110 actions/joingroup.php:90 lib/command.php:217 msgid "You are already a member of that group." msgstr "U bent al lid van die groep." @@ -401,30 +397,25 @@ msgstr "U bent al lid van die groep." msgid "You have been blocked from that group by the admin." msgstr "Een beheerder heeft ingesteld dat u geen lid mag worden van die groep." -#: actions/apigroupjoin.php:138 +#: actions/apigroupjoin.php:138 actions/joingroup.php:128 lib/command.php:234 #, php-format -msgid "Could not join user %s to group %s." -msgstr "Het was niet mogelijk gebruiker %s toe te voegen aan de groep %s." +msgid "Could not join user %1$s to group %2$s." +msgstr "Het was niet mogelijk gebruiker %1$s toe te voegen aan de groep %2$s." #: actions/apigroupleave.php:114 msgid "You are not a member of this group." msgstr "U bent geen lid van deze groep." -#: actions/apigroupleave.php:124 +#: actions/apigroupleave.php:124 actions/leavegroup.php:127 #, php-format -msgid "Could not remove user %s to group %s." -msgstr "Het was niet mogelijk gebruiker %s uit de group %s te verwijderen." +msgid "Could not remove user %1$s from group %2$s." +msgstr "Het was niet mogelijk gebruiker %1$s uit de group %2$s te verwijderen." #: actions/apigrouplist.php:95 #, php-format msgid "%s's groups" msgstr "Groepen van %s" -#: actions/apigrouplist.php:103 -#, php-format -msgid "Groups %s is a member of on %s." -msgstr "Groepen waarvan %s lid is op %s." - #: actions/apigrouplistall.php:90 actions/usergroups.php:62 #, php-format msgid "%s groups" @@ -437,7 +428,7 @@ msgstr "groepen op %s" #: actions/apistatusesdestroy.php:107 msgid "This method requires a POST or DELETE." -msgstr "Deze methode heeft een POST of DELETE nodig." +msgstr "Deze methode vereist een POST of DELETE." #: actions/apistatusesdestroy.php:130 msgid "You may not delete another user's status." @@ -448,11 +439,11 @@ msgstr "U kunt de status van een andere gebruiker niet verwijderen." msgid "No such notice." msgstr "De mededeling bestaat niet." -#: actions/apistatusesretweet.php:83 +#: actions/apistatusesretweet.php:83 lib/command.php:422 msgid "Cannot repeat your own notice." -msgstr "U kunt uw eigen mededelingen niet herhalen." +msgstr "U kunt uw eigen mededeling niet herhalen." -#: actions/apistatusesretweet.php:91 +#: actions/apistatusesretweet.php:91 lib/command.php:427 msgid "Already repeated that notice." msgstr "U hebt die mededeling al herhaald." @@ -465,10 +456,10 @@ msgid "No status with that ID found." msgstr "Er is geen status gevonden met dit ID." #: actions/apistatusesupdate.php:157 actions/newnotice.php:155 -#: scripts/maildaemon.php:71 +#: lib/mailhandler.php:60 #, php-format msgid "That's too long. Max notice size is %d chars." -msgstr "Dat is te lang. De maximale mededelingslengte is 140 tekens." +msgstr "De mededeling is te lang. Gebruik maximaal %d tekens." #: actions/apistatusesupdate.php:198 msgid "Not found" @@ -487,13 +478,13 @@ msgstr "Niet-ondersteund bestandsformaat." #: actions/apitimelinefavorites.php:108 #, php-format -msgid "%s / Favorites from %s" -msgstr "%s / Favorieten van %s" +msgid "%1$s / Favorites from %2$s" +msgstr "%1$s / Favorieten van %2$s" #: actions/apitimelinefavorites.php:120 #, php-format -msgid "%s updates favorited by %s / %s." -msgstr "%s updates op de favorietenlijst geplaatst door %s / %s" +msgid "%1$s updates favorited by %2$s / %2$s." +msgstr "%1$s updates op de favorietenlijst geplaatst door %2$s / %3$s" #: actions/apitimelinegroup.php:109 actions/apitimelineuser.php:118 #: actions/grouprss.php:131 actions/userrss.php:90 @@ -558,10 +549,13 @@ msgstr "Niet aangetroffen." #: actions/attachment.php:73 msgid "No such attachment." -msgstr "Dat document bestaat niet." +msgstr "Deze bijlage bestaat niet." -#: actions/avatarbynickname.php:59 actions/grouprss.php:91 -#: actions/leavegroup.php:76 +#: actions/avatarbynickname.php:59 actions/blockedfromgroup.php:73 +#: actions/editgroup.php:84 actions/groupdesignsettings.php:84 +#: actions/grouplogo.php:86 actions/groupmembers.php:76 +#: actions/grouprss.php:91 actions/joingroup.php:76 actions/leavegroup.php:76 +#: actions/showgroup.php:121 msgid "No nickname." msgstr "Geen gebruikersnaam." @@ -585,8 +579,8 @@ msgstr "" "U kunt een persoonlijke avatar uploaden. De maximale bestandsgrootte is %s." #: actions/avatarsettings.php:106 actions/avatarsettings.php:185 -#: actions/grouplogo.php:178 actions/remotesubscribe.php:191 -#: actions/userauthorization.php:72 actions/userrss.php:103 +#: actions/remotesubscribe.php:191 actions/userauthorization.php:72 +#: actions/userrss.php:103 msgid "User without matching profile" msgstr "Gebruiker zonder bijbehorend profiel" @@ -618,9 +612,9 @@ msgstr "Uploaden" msgid "Crop" msgstr "Uitsnijden" -#: actions/avatarsettings.php:268 actions/disfavor.php:74 -#: actions/emailsettings.php:238 actions/favor.php:75 actions/geocode.php:50 -#: actions/groupblock.php:66 actions/grouplogo.php:309 +#: actions/avatarsettings.php:268 actions/deletenotice.php:157 +#: actions/disfavor.php:74 actions/emailsettings.php:238 actions/favor.php:75 +#: actions/geocode.php:50 actions/groupblock.php:66 actions/grouplogo.php:309 #: actions/groupunblock.php:66 actions/imsettings.php:206 #: actions/invite.php:56 actions/login.php:135 actions/makeadmin.php:66 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80 @@ -645,11 +639,12 @@ msgstr "Het formulier is onverwacht ingezonden." #: actions/avatarsettings.php:328 msgid "Pick a square area of the image to be your avatar" -msgstr "Selecteer een vierkant de afbeelding om als uw avatar in te stellen" +msgstr "" +"Selecteer een vierkant in de afbeelding om deze als uw avatar in te stellen" #: actions/avatarsettings.php:343 actions/grouplogo.php:377 msgid "Lost our file data." -msgstr "Ons databestand is verloren gegaan." +msgstr "Ons bestand is verloren gegaan." #: actions/avatarsettings.php:366 msgid "Avatar updated." @@ -677,10 +672,9 @@ msgid "" "unsubscribed from you, unable to subscribe to you in the future, and you " "will not be notified of any @-replies from them." msgstr "" -"Weet u zeker dat u deze gebruiker wilt blokkeren? Na deze handeling wordt " -"het abonnement van de gebruiker op u opgezegd en kan deze gebruiker in de " -"toekomst niet op u abonneren. U wordt niet op de hoogte gesteld van \"@\"-" -"antwoorden van de gebruiker." +"Weet u zeker dat u deze gebruiker wilt blokkeren? Deze gebruiker kan u dan " +"niet meer volgen en u wordt niet op de hoogte gebracht van \"@\"-antwoorden " +"van deze gebruiker." #: actions/block.php:143 actions/deletenotice.php:145 #: actions/deleteuser.php:147 actions/groupblock.php:178 @@ -705,19 +699,15 @@ msgstr "Deze gebruiker blokkeren" msgid "Failed to save block information." msgstr "Het was niet mogelijk om de blokkadeinformatie op te slaan." -#: actions/blockedfromgroup.php:73 actions/editgroup.php:84 -#: actions/groupdesignsettings.php:84 actions/grouplogo.php:86 -#: actions/groupmembers.php:76 actions/joingroup.php:76 -#: actions/showgroup.php:121 -msgid "No nickname" -msgstr "Geen gebruikersnaam" - #: actions/blockedfromgroup.php:80 actions/editgroup.php:96 +#: actions/foafgroup.php:44 actions/foafgroup.php:62 actions/groupblock.php:86 #: actions/groupbyid.php:83 actions/groupdesignsettings.php:97 #: actions/grouplogo.php:99 actions/groupmembers.php:83 -#: actions/joingroup.php:83 actions/showgroup.php:137 -msgid "No such group" -msgstr "Deze groep bestaat niet" +#: actions/grouprss.php:98 actions/groupunblock.php:86 +#: actions/joingroup.php:83 actions/leavegroup.php:83 actions/makeadmin.php:86 +#: actions/showgroup.php:137 lib/command.php:212 lib/command.php:263 +msgid "No such group." +msgstr "De opgegeven groep bestaat niet." #: actions/blockedfromgroup.php:90 #, php-format @@ -726,8 +716,8 @@ msgstr "%s geblokkeerde profielen" #: actions/blockedfromgroup.php:93 #, php-format -msgid "%s blocked profiles, page %d" -msgstr "%s geblokkeerde profielen, pagina %d" +msgid "%1$s blocked profiles, page %2$d" +msgstr "%1$s geblokkeerde profielen, pagina %2$d" #: actions/blockedfromgroup.php:108 msgid "A list of the users blocked from joining this group." @@ -776,7 +766,7 @@ msgstr "Dit adres is al bevestigd." #: actions/profilesettings.php:283 actions/smssettings.php:278 #: actions/smssettings.php:420 msgid "Couldn't update user." -msgstr "Kon gebruiker niet actualiseren." +msgstr "De gebruiker kon gebruiker niet bijwerkt worden." #: actions/confirmaddress.php:126 actions/emailsettings.php:391 #: actions/imsettings.php:363 actions/smssettings.php:382 @@ -839,11 +829,6 @@ msgstr "Deze mededeling niet verwijderen" msgid "Delete this notice" msgstr "Deze mededeling verwijderen" -#: actions/deletenotice.php:157 -msgid "There was a problem with your session token. Try again, please." -msgstr "" -"Er is een probleem ontstaan met uw sessietoken. Probeer het nog een keer." - #: actions/deleteuser.php:67 msgid "You cannot delete users." msgstr "U kunt gebruikers niet verwijderen." @@ -870,7 +855,7 @@ msgid "Delete this user" msgstr "Gebruiker verwijderen" #: actions/designadminpanel.php:62 lib/accountsettingsaction.php:124 -#: lib/adminpanelaction.php:302 lib/groupnav.php:119 +#: lib/adminpanelaction.php:316 lib/groupnav.php:119 msgid "Design" msgstr "Ontwerp" @@ -1010,8 +995,8 @@ msgstr "U moet aangemeld zijn om een groep aan te kunnen maken." #: actions/editgroup.php:103 actions/editgroup.php:168 #: actions/groupdesignsettings.php:104 actions/grouplogo.php:106 -msgid "You must be an admin to edit the group" -msgstr "U moet beheerder zijn om de groep te kunnen bewerken" +msgid "You must be an admin to edit the group." +msgstr "U moet beheerder zijn om de groep te kunnen bewerken." #: actions/editgroup.php:154 msgid "Use this form to edit the group." @@ -1035,8 +1020,8 @@ msgid "Options saved." msgstr "De instellingen zijn opgeslagen." #: actions/emailsettings.php:60 -msgid "Email Settings" -msgstr "E-mailinstellingen" +msgid "Email settings" +msgstr "E-mailvoorkeuren" #: actions/emailsettings.php:71 #, php-format @@ -1063,8 +1048,8 @@ msgid "" "Awaiting confirmation on this address. Check your inbox (and spam box!) for " "a message with further instructions." msgstr "" -"Er wordt gewacht op bevestiging van dit adres. Controleer uw inbox en uw " -"spambox voor een bericht met nadere instructies." +"Er wordt gewacht op bevestiging van dit adres. Controleer uw inbox (en uw " +"ongewenste berichten/spam) voor een bericht met nadere instructies." #: actions/emailsettings.php:117 actions/imsettings.php:120 #: actions/smssettings.php:126 @@ -1072,8 +1057,8 @@ msgid "Cancel" msgstr "Annuleren" #: actions/emailsettings.php:121 -msgid "Email Address" -msgstr "E-mailadres" +msgid "Email address" +msgstr "E-mailadressen" #: actions/emailsettings.php:123 msgid "Email address, like \"UserName@example.org\"" @@ -1138,7 +1123,7 @@ msgstr "Een MicroID voor mijn e-mailadres publiceren." #: actions/emailsettings.php:302 actions/imsettings.php:264 #: actions/othersettings.php:180 actions/smssettings.php:284 msgid "Preferences saved." -msgstr "De voorkeuren zijn opgeslagen." +msgstr "Uw voorkeuren zijn opgeslagen." #: actions/emailsettings.php:320 msgid "No email address." @@ -1148,13 +1133,14 @@ msgstr "Geen e-mailadres" msgid "Cannot normalize that email address" msgstr "Kan het emailadres niet normaliseren" -#: actions/emailsettings.php:331 actions/siteadminpanel.php:157 -msgid "Not a valid email address" +#: actions/emailsettings.php:331 actions/register.php:201 +#: actions/siteadminpanel.php:157 +msgid "Not a valid email address." msgstr "Geen geldig e-mailadres." #: actions/emailsettings.php:334 msgid "That is already your email address." -msgstr "U hebt dit al ingesteld als uw e-mailadres." +msgstr "U hebt dit e-mailadres als ingesteld als uw e-mailadres." #: actions/emailsettings.php:337 msgid "That email address already belongs to another user." @@ -1257,8 +1243,8 @@ msgid "" "Why not [register an account](%%action.register%%) and be the first to add a " "notice to your favorites!" msgstr "" -"U kunt een [gebruiker registreren](%%action.register%%) en de eerste " -"mededeling voor de favorietenlijst plaatsen!" +"U kunt een [gebruiker aanmaken](%%action.register%%) en de eerste mededeling " +"voor de favorietenlijst plaatsen!" #: actions/favoritesrss.php:111 actions/showfavorites.php:77 #: lib/personalgroupnav.php:115 @@ -1338,18 +1324,11 @@ msgid "Error updating remote profile" msgstr "" "Er is een fout opgetreden tijdens het bijwerken van het profiel op afstand." -#: actions/foafgroup.php:44 actions/foafgroup.php:62 actions/groupblock.php:86 -#: actions/grouprss.php:98 actions/groupunblock.php:86 -#: actions/leavegroup.php:83 actions/makeadmin.php:86 lib/command.php:212 -#: lib/command.php:263 -msgid "No such group." -msgstr "De opgegeven groep bestaat niet." - -#: actions/getfile.php:75 +#: actions/getfile.php:79 msgid "No such file." msgstr "Het bestand bestaat niet." -#: actions/getfile.php:79 +#: actions/getfile.php:83 msgid "Cannot read file." msgstr "Het bestand kon niet gelezen worden." @@ -1361,7 +1340,7 @@ msgstr "Er is geen profiel opgegeven." #: actions/groupblock.php:76 actions/groupunblock.php:76 #: actions/makeadmin.php:76 actions/subedit.php:53 actions/tagother.php:46 -#: lib/profileformaction.php:77 +#: actions/unsubscribe.php:84 lib/profileformaction.php:77 msgid "No profile with that ID." msgstr "Er is geen profiel met dat ID." @@ -1389,11 +1368,11 @@ msgstr "Gebruiker toegang tot de groep blokkeren" #: actions/groupblock.php:162 #, php-format msgid "" -"Are you sure you want to block user \"%s\" from the group \"%s\"? They will " -"be removed from the group, unable to post, and unable to subscribe to the " -"group in the future." +"Are you sure you want to block user \"%1$s\" from the group \"%2$s\"? They " +"will be removed from the group, unable to post, and unable to subscribe to " +"the group in the future." msgstr "" -"Weet u zeker dat u gebruiker \"%s\" uit de groep \"%s\" wilt weren? De " +"Weet u zeker dat u gebruiker \"%1$s\" uit de groep \"%2$s\" wilt weren? De " "gebruiker wordt dan uit de groep verwijderd, kan er geen berichten meer " "plaatsen en kan zich in de toekomst ook niet meer op de groep abonneren." @@ -1411,9 +1390,9 @@ msgstr "" "Er is een databasefout opgetreden bij het uitsluiten van de gebruiker van de " "groep." -#: actions/groupbyid.php:74 -msgid "No ID" -msgstr "Geen ID" +#: actions/groupbyid.php:74 actions/userbyid.php:70 +msgid "No ID." +msgstr "Geen ID." #: actions/groupdesignsettings.php:68 msgid "You must be logged in to edit a group." @@ -1421,7 +1400,7 @@ msgstr "U moet aangemeld zijn om een groep te kunnen bewerken." #: actions/groupdesignsettings.php:141 msgid "Group design" -msgstr "Groepsontwerpen" +msgstr "Groepsontwerp" #: actions/groupdesignsettings.php:152 msgid "" @@ -1436,12 +1415,6 @@ msgstr "" msgid "Couldn't update your design." msgstr "Het was niet mogelijk uw ontwerp bij te werken." -#: actions/groupdesignsettings.php:287 actions/groupdesignsettings.php:297 -#: actions/userdesignsettings.php:210 actions/userdesignsettings.php:220 -#: actions/userdesignsettings.php:263 actions/userdesignsettings.php:273 -msgid "Unable to save your design settings!" -msgstr "Het was niet mogelijk om uw ontwerpinstellingen op te slaan!" - #: actions/groupdesignsettings.php:308 actions/userdesignsettings.php:231 msgid "Design preferences saved." msgstr "De ontwerpvoorkeuren zijn opgeslagen." @@ -1458,6 +1431,10 @@ msgstr "" "Hier kunt u een logo voor uw groep uploaden. De maximale bestandsgrootte is %" "s." +#: actions/grouplogo.php:178 +msgid "User without matching profile." +msgstr "Gebruiker zonder bijbehorend profiel." + #: actions/grouplogo.php:362 msgid "Pick a square area of the image to be the logo." msgstr "Selecteer een vierkant uit de afbeelding die het logo wordt." @@ -1477,14 +1454,14 @@ msgstr "leden van de groep %s" #: actions/groupmembers.php:96 #, php-format -msgid "%s group members, page %d" -msgstr "% groeps leden, pagina %d" +msgid "%1$s group members, page %2$d" +msgstr "%1$s groeps leden, pagina %2$d" #: actions/groupmembers.php:111 msgid "A list of the users in this group." msgstr "Ledenlijst van deze groep" -#: actions/groupmembers.php:175 lib/action.php:441 lib/groupnav.php:107 +#: actions/groupmembers.php:175 lib/action.php:442 lib/groupnav.php:107 msgid "Admin" msgstr "Beheerder" @@ -1589,7 +1566,7 @@ msgid "Error removing the block." msgstr "Er is een fout opgetreden bij het verwijderen van de blokkade." #: actions/imsettings.php:59 -msgid "IM Settings" +msgid "IM settings" msgstr "IM-instellingen" #: actions/imsettings.php:70 @@ -1620,7 +1597,7 @@ msgstr "" "contactenlijst toegevoegd?" #: actions/imsettings.php:124 -msgid "IM Address" +msgid "IM address" msgstr "IM-adres" #: actions/imsettings.php:126 @@ -1683,11 +1660,6 @@ msgstr "" msgid "That is not your Jabber ID." msgstr "Dit is niet uw Jabber-ID." -#: actions/inbox.php:59 -#, php-format -msgid "Inbox for %s - page %d" -msgstr "Postvak IN van %s - pagina %d" - #: actions/inbox.php:62 #, php-format msgid "Inbox for %s" @@ -1724,10 +1696,10 @@ msgstr "Nieuwe gebruikers uitnodigen" msgid "You are already subscribed to these users:" msgstr "U bent als geabonneerd op deze gebruikers:" -#: actions/invite.php:131 actions/invite.php:139 +#: actions/invite.php:131 actions/invite.php:139 lib/command.php:315 #, php-format -msgid "%s (%s)" -msgstr "%s (%s)" +msgid "%1$s (%2$s)" +msgstr "%1$s (%2$s)" #: actions/invite.php:136 msgid "" @@ -1772,7 +1744,7 @@ msgstr "Persoonlijk bericht" msgid "Optionally add a personal message to the invitation." msgstr "Persoonlijk bericht bij de uitnodiging (optioneel)." -#: actions/invite.php:197 lib/messageform.php:178 lib/noticeform.php:232 +#: actions/invite.php:197 lib/messageform.php:178 lib/noticeform.php:234 msgid "Send" msgstr "Verzenden" @@ -1842,19 +1814,10 @@ msgstr "" msgid "You must be logged in to join a group." msgstr "U moet aangemeld zijn om lid te worden van een groep." -#: actions/joingroup.php:90 lib/command.php:217 -msgid "You are already a member of that group" -msgstr "U bent al lid van deze groep" - -#: actions/joingroup.php:128 lib/command.php:234 -#, php-format -msgid "Could not join user %s to group %s" -msgstr "Het was niet mogelijk om de gebruiker %s toe te voegen aan de groep %s" - #: actions/joingroup.php:135 lib/command.php:239 #, php-format -msgid "%s joined group %s" -msgstr "%s is lid geworden van de groep %s" +msgid "%1$s joined group %2$s" +msgstr "%1$s is lid geworden van de groep %2$s" #: actions/leavegroup.php:60 msgid "You must be logged in to leave a group." @@ -1868,15 +1831,10 @@ msgstr "U bent geen lid van deze groep" msgid "Could not find membership record." msgstr "Er is geen groepslidmaatschap aangetroffen." -#: actions/leavegroup.php:127 lib/command.php:284 -#, php-format -msgid "Could not remove user %s to group %s" -msgstr "De gebruiker %s kon niet uit de groep %s verwijderd worden" - #: actions/leavegroup.php:134 lib/command.php:289 #, php-format -msgid "%s left group %s" -msgstr "%s heeft de groep %s verlaten" +msgid "%1$s left group %2$s" +msgstr "%1$s heeft de groep %2$s verlaten" #: actions/login.php:83 actions/register.php:137 msgid "Already logged in." @@ -1896,7 +1854,7 @@ msgstr "" "Er is een fout opgetreden bij het maken van de instellingen. U hebt " "waarschijnlijk niet de juiste rechten." -#: actions/login.php:208 actions/login.php:261 lib/action.php:459 +#: actions/login.php:208 actions/login.php:261 lib/action.php:460 #: lib/logingroupnav.php:79 msgid "Login" msgstr "Aanmelden" @@ -1951,18 +1909,18 @@ msgstr "Alleen beheerders kunnen andere gebruikers beheerder maken." #: actions/makeadmin.php:95 #, php-format -msgid "%s is already an admin for group \"%s\"." -msgstr "%s is al beheerder van de groep \"%s\"" +msgid "%1$s is already an admin for group \"%2$s\"." +msgstr "%1$s is al beheerder van de groep \"%2$s\"" #: actions/makeadmin.php:132 #, php-format -msgid "Can't get membership record for %s in group %s" -msgstr "Het was niet mogelijk te bevestigen dat %s lid is van de groep %s" +msgid "Can't get membership record for %1$s in group %2$s." +msgstr "Het was niet mogelijk te bevestigen dat %1$s lid is van de groep %2$s." #: actions/makeadmin.php:145 #, php-format -msgid "Can't make %s an admin for group %s" -msgstr "Het is niet mogelijk %s beheerder te maken van de groep %s" +msgid "Can't make %1$s an admin for group %2$s." +msgstr "Het is niet mogelijk %1$s beheerder te maken van de groep %2$s." #: actions/microsummary.php:69 msgid "No current status" @@ -2004,8 +1962,8 @@ msgstr "Bericht verzonden." #: actions/newmessage.php:185 lib/command.php:376 #, php-format -msgid "Direct message to %s sent" -msgstr "Het directe bericht aan %s is verzonden" +msgid "Direct message to %s sent." +msgstr "Het directe bericht aan %s is verzonden." #: actions/newmessage.php:210 actions/newnotice.php:245 lib/channel.php:170 msgid "Ajax Error" @@ -2034,8 +1992,8 @@ msgstr "Tekst doorzoeken" #: actions/noticesearch.php:91 #, php-format -msgid "Search results for \"%s\" on %s" -msgstr "Zoekresultaten voor \"%s\" op %s" +msgid "Search results for \"%1$s\" on %2$s" +msgstr "Zoekresultaten voor \"%1$s\" op %2$s" #: actions/noticesearch.php:121 #, php-format @@ -2143,11 +2101,6 @@ msgstr "Profielontwerpen weergeven of verbergen" msgid "URL shortening service is too long (max 50 chars)." msgstr "De URL voor de verkortingdienst is te lang (maximaal 50 tekens)." -#: actions/outbox.php:58 -#, php-format -msgid "Outbox for %s - page %d" -msgstr "Postvak UIT voor %s - pagina %d" - #: actions/outbox.php:61 #, php-format msgid "Outbox for %s" @@ -2218,7 +2171,7 @@ msgstr "Het was niet mogelijk het nieuwe wachtwoord op te slaan." msgid "Password saved." msgstr "Het wachtwoord is opgeslagen." -#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:308 +#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:326 msgid "Paths" msgstr "Paden" @@ -2251,7 +2204,7 @@ msgid "Invalid SSL server. The maximum length is 255 characters." msgstr "De SSL-server is ongeldig. De maximale lengte is 255 tekens." #: actions/pathsadminpanel.php:217 actions/siteadminpanel.php:58 -#: lib/adminpanelaction.php:299 +#: lib/adminpanelaction.php:311 msgid "Site" msgstr "Website" @@ -2344,7 +2297,7 @@ msgid "When to use SSL" msgstr "Wanneer SSL gebruikt moet worden" #: actions/pathsadminpanel.php:308 -msgid "SSL Server" +msgid "SSL server" msgstr "SSL-server" #: actions/pathsadminpanel.php:309 @@ -2376,8 +2329,8 @@ msgstr "Geen geldig gebruikerslabel: %s" #: actions/peopletag.php:144 #, php-format -msgid "Users self-tagged with %s - page %d" -msgstr "Gebruikers die zichzelf met %s hebben gelabeld - pagina %d" +msgid "Users self-tagged with %1$s - page %2$d" +msgstr "Gebruikers die zichzelf met %1$s hebben gelabeld - pagina %2$d" #: actions/postnotice.php:84 msgid "Invalid notice content" @@ -2385,10 +2338,10 @@ msgstr "Ongeldige mededelinginhoud" #: actions/postnotice.php:90 #, php-format -msgid "Notice license ‘%s’ is not compatible with site license ‘%s’." +msgid "Notice license ‘%1$s’ is not compatible with site license ‘%2$s’." msgstr "" -"De mededelingenlicentie \"%s\" is niet compatibel met de licentie \"%s\" van " -"deze site." +"De mededelingenlicentie \"%1$s\" is niet compatibel met de licentie \"%2$s\" " +"van deze site." #: actions/profilesettings.php:60 msgid "Profile settings" @@ -2512,19 +2465,19 @@ msgstr "" "Het was niet mogelijk de instelling voor automatisch abonneren voor de " "gebruiker bij te werken." -#: actions/profilesettings.php:354 +#: actions/profilesettings.php:359 msgid "Couldn't save location prefs." msgstr "Het was niet mogelijk de locatievoorkeuren op te slaan." -#: actions/profilesettings.php:366 +#: actions/profilesettings.php:371 msgid "Couldn't save profile." msgstr "Het profiel kon niet opgeslagen worden." -#: actions/profilesettings.php:374 +#: actions/profilesettings.php:379 msgid "Couldn't save tags." msgstr "Het was niet mogelijk de labels op te slaan." -#: actions/profilesettings.php:382 lib/adminpanelaction.php:126 +#: actions/profilesettings.php:387 lib/adminpanelaction.php:137 msgid "Settings saved." msgstr "De instellingen zijn opgeslagen." @@ -2631,7 +2584,7 @@ msgstr "" "U kunt een [gebruiker registeren](%%action.register%%) en dan de eerste zijn " "die er een plaatst!" -#: actions/publictagcloud.php:135 +#: actions/publictagcloud.php:131 msgid "Tag cloud" msgstr "Woordwolk" @@ -2776,7 +2729,7 @@ msgstr "Sorry. De uitnodigingscode is ongeldig." msgid "Registration successful" msgstr "De registratie is voltooid" -#: actions/register.php:114 actions/register.php:502 lib/action.php:456 +#: actions/register.php:114 actions/register.php:502 lib/action.php:457 #: lib/logingroupnav.php:85 msgid "Register" msgstr "Registreren" @@ -2789,10 +2742,6 @@ msgstr "Registratie is niet toegestaan." msgid "You can't register if you don't agree to the license." msgstr "U kunt zich niet registreren als u niet met de licentie akkoord gaat." -#: actions/register.php:201 -msgid "Not a valid email address." -msgstr "Geen geldig e-mailadres." - #: actions/register.php:212 msgid "Email address already exists." msgstr "Het e-mailadres bestaat al." @@ -2853,10 +2802,10 @@ msgstr "" #: actions/register.php:537 #, php-format msgid "" -"Congratulations, %s! And welcome to %%%%site.name%%%%. From here, you may " +"Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may " "want to...\n" "\n" -"* Go to [your profile](%s) and post your first message.\n" +"* Go to [your profile](%2$s) and post your first message.\n" "* Add a [Jabber/GTalk address](%%%%action.imsettings%%%%) so you can send " "notices through instant messages.\n" "* [Search for people](%%%%action.peoplesearch%%%%) that you may know or that " @@ -2868,10 +2817,10 @@ msgid "" "\n" "Thanks for signing up and we hope you enjoy using this service." msgstr "" -"Gefeliciteerd, %s! Welkom bij %%%%site.name%%%%. Hier staan aan aantal " +"Gefeliciteerd, %1$s! Welkom bij %%%%site.name%%%%. Hier staan aan aantal " "handelingen die u wellicht uit wilt voeren:\n" "\n" -"* Naar uw [profiel](%s) gaan en uw eerste bericht verzenden;\n" +"* Naar uw [profiel](%2$s) gaan en uw eerste bericht verzenden;\n" "* Een [Jabber/GTalk-adres](%%%%action.imsettings%%%%) toevoegen zodat u " "vandaaruit mededelingen kunt verzenden;\n" "* [Gebruikers zoeken](%%%%action.peoplesearch%%%%) die u al kent of waarmee " @@ -2981,11 +2930,6 @@ msgstr "Herhaald!" msgid "Replies to %s" msgstr "Antwoorden aan %s" -#: actions/replies.php:127 -#, php-format -msgid "Replies to %s, page %d" -msgstr "Antwoorden aan %s, pagina %d" - #: actions/replies.php:144 #, php-format msgid "Replies feed for %s (RSS 1.0)" @@ -3004,10 +2948,10 @@ msgstr "Antwoordenfeed voor %s (Atom)" #: actions/replies.php:198 #, php-format msgid "" -"This is the timeline showing replies to %s but %s hasn't received a notice " -"to his attention yet." +"This is the timeline showing replies to %1$s but %2$s hasn't received a " +"notice to his attention yet." msgstr "" -"Dit is de tijdlijn met de antwoorden aan %s, maar %s heeft nog geen " +"Dit is de tijdlijn met de antwoorden aan %1$s, maar %2$s heeft nog geen " "antwoorden ontvangen." #: actions/replies.php:203 @@ -3022,11 +2966,11 @@ msgstr "" #: actions/replies.php:205 #, php-format msgid "" -"You can try to [nudge %s](../%s) or [post something to his or her attention]" -"(%%%%action.newnotice%%%%?status_textarea=%s)." +"You can try to [nudge %1$s](../%2$s) or [post something to his or her " +"attention](%%%%action.newnotice%%%%?status_textarea=%3$s)." msgstr "" -"U kunt proberen [%s te porren](../%s) of [een bericht voor die gebruiker " -"plaatsen](%%%%action.newnotice%%%%?status_textarea=%s)." +"U kunt proberen [%1$s te porren](../%2$s) of [een bericht voor die gebruiker " +"plaatsen](%%%%action.newnotice%%%%?status_textarea=%3$s)." #: actions/repliesrss.php:72 #, php-format @@ -3041,11 +2985,6 @@ msgstr "Op deze website kunt u gebruikers niet in de zandbak plaatsen." msgid "User is already sandboxed." msgstr "Deze gebruiker is al in de zandbak geplaatst." -#: actions/showfavorites.php:79 -#, php-format -msgid "%s's favorite notices, page %d" -msgstr "Favoriete mededelingen van %s, pagina %d" - #: actions/showfavorites.php:132 msgid "Could not retrieve favorite notices." msgstr "Het was niet mogelijk de favoriete mededelingen op te halen." @@ -3104,11 +3043,6 @@ msgstr "Dit is de manier om dat te delen wat u wilt." msgid "%s group" msgstr "%s groep" -#: actions/showgroup.php:84 -#, php-format -msgid "%s group, page %d" -msgstr "groep %s, pagina %d" - #: actions/showgroup.php:218 msgid "Group profile" msgstr "Groepsprofiel" @@ -3157,7 +3091,7 @@ msgstr "Leden" #: actions/showgroup.php:386 lib/profileaction.php:117 #: lib/profileaction.php:148 lib/profileaction.php:236 lib/section.php:95 -#: lib/tagcloudsection.php:71 +#: lib/subscriptionlist.php:126 lib/tagcloudsection.php:71 msgid "(None)" msgstr "(geen)" @@ -3233,15 +3167,10 @@ msgstr "Deze mededeling is verwijderd." msgid " tagged %s" msgstr " met het label %s" -#: actions/showstream.php:79 -#, php-format -msgid "%s, page %d" -msgstr "%s, pagina %d" - #: actions/showstream.php:122 #, php-format -msgid "Notice feed for %s tagged %s (RSS 1.0)" -msgstr "Mededelingenfeed voor %s met het label %s (RSS 1.0)" +msgid "Notice feed for %1$s tagged %2$s (RSS 1.0)" +msgstr "Mededelingenfeed voor %1$s met het label %2$s (RSS 1.0)" #: actions/showstream.php:129 #, php-format @@ -3265,9 +3194,9 @@ msgstr "Vriend van een vriend (FOAF) voor %s" #: actions/showstream.php:191 #, php-format -msgid "This is the timeline for %s but %s hasn't posted anything yet." +msgid "This is the timeline for %1$s but %2$s hasn't posted anything yet." msgstr "" -"Dit is de tijdlijn voor %s, maar %s heeft nog geen berichten verzonden." +"Dit is de tijdlijn voor %1$s, maar %2$s heeft nog geen berichten verzonden." #: actions/showstream.php:196 msgid "" @@ -3280,11 +3209,11 @@ msgstr "" #: actions/showstream.php:198 #, php-format msgid "" -"You can try to nudge %s or [post something to his or her attention](%%%%" -"action.newnotice%%%%?status_textarea=%s)." +"You can try to nudge %1$s or [post something to his or her attention](%%%%" +"action.newnotice%%%%?status_textarea=%2$s)." msgstr "" -"U kunt proberen %s te porren of [een bericht voor die gebruiker plaatsen](%%%" -"%action.newnotice%%%%?status_textarea=%s)." +"U kunt proberen %1$s te porren of [een bericht voor die gebruiker plaatsen](%" +"%%%action.newnotice%%%%?status_textarea=%2$s)." #: actions/showstream.php:234 #, php-format @@ -3333,14 +3262,14 @@ msgid "Site name must have non-zero length." msgstr "De sitenaam moet ingevoerd worden en mag niet leeg zijn." #: actions/siteadminpanel.php:154 -msgid "You must have a valid contact email address" +msgid "You must have a valid contact email address." msgstr "" -"U moet een geldig e-mailadres opgeven waarop contact opgenomen kan worden" +"U moet een geldig e-mailadres opgeven waarop contact opgenomen kan worden." #: actions/siteadminpanel.php:172 #, php-format -msgid "Unknown language \"%s\"" -msgstr "De taal \"%s\" is niet bekend" +msgid "Unknown language \"%s\"." +msgstr "De taal \"%s\" is niet bekend." #: actions/siteadminpanel.php:179 msgid "Invalid snapshot report URL." @@ -3526,7 +3455,7 @@ msgid "Save site settings" msgstr "Websiteinstellingen opslaan" #: actions/smssettings.php:58 -msgid "SMS Settings" +msgid "SMS settings" msgstr "SMS-instellingen" #: actions/smssettings.php:69 @@ -3555,7 +3484,7 @@ msgid "Enter the code you received on your phone." msgstr "Voer de code in die u via uw telefoon hebt ontvangen." #: actions/smssettings.php:138 -msgid "SMS Phone number" +msgid "SMS phone number" msgstr "SMS-nummer" #: actions/smssettings.php:140 @@ -3647,8 +3576,8 @@ msgstr "%s abonnees" #: actions/subscribers.php:52 #, php-format -msgid "%s subscribers, page %d" -msgstr "%s abonnees, pagina %d" +msgid "%1$s subscribers, page %2$d" +msgstr "%1$s abonnees, pagina %2$d" #: actions/subscribers.php:63 msgid "These are the people who listen to your notices." @@ -3688,8 +3617,8 @@ msgstr "%s abonnementen" #: actions/subscriptions.php:54 #, php-format -msgid "%s subscriptions, page %d" -msgstr "%s abonnementen, pagina %d" +msgid "%1$s subscriptions, page %2$d" +msgstr "%1$s abonnementen, pagina %2$d" #: actions/subscriptions.php:65 msgid "These are the people whose notices you listen to." @@ -3729,11 +3658,6 @@ msgstr "Jabber" msgid "SMS" msgstr "SMS" -#: actions/tag.php:68 -#, php-format -msgid "Notices tagged with %s, page %d" -msgstr "Mededelingen met het label %s, pagina %d" - #: actions/tag.php:86 #, php-format msgid "Notice feed for tag %s (RSS 1.0)" @@ -3819,22 +3743,19 @@ msgstr "Deze gebruiker is niet gemuilkorfd." msgid "No profile id in request." msgstr "Het profiel-ID was niet aanwezig in het verzoek." -#: actions/unsubscribe.php:84 -msgid "No profile with that id." -msgstr "Er is geen profiel met dat ID." - #: actions/unsubscribe.php:98 msgid "Unsubscribed" msgstr "Het abonnement is opgezegd" #: actions/updateprofile.php:62 actions/userauthorization.php:330 #, php-format -msgid "Listenee stream license ‘%s’ is not compatible with site license ‘%s’." +msgid "" +"Listenee stream license ‘%1$s’ is not compatible with site license ‘%2$s’." msgstr "" -"De licentie \"%s\" voor de stream die u wilt volgen is niet compatibel met " -"de sitelicentie \"%s\"." +"De licentie \"%1$s\" voor de stream die u wilt volgen is niet compatibel met " +"de sitelicentie \"%2$s\"." -#: actions/useradminpanel.php:58 lib/adminpanelaction.php:305 +#: actions/useradminpanel.php:58 lib/adminpanelaction.php:321 #: lib/personalgroupnav.php:115 msgid "User" msgstr "Gebruiker" @@ -3936,7 +3857,7 @@ msgstr "" "aangegeven dat u zich op de mededelingen van een gebruiker wilt abonneren, " "klik dan op \"Afwijzen\"." -#: actions/userauthorization.php:188 +#: actions/userauthorization.php:188 actions/version.php:165 msgid "License" msgstr "Licentie" @@ -3991,8 +3912,8 @@ msgstr "" #: actions/userauthorization.php:296 #, php-format -msgid "Listener URI ‘%s’ not found here" -msgstr "De abonnee-URI \"%s\" is hier niet te vinden" +msgid "Listener URI ‘%s’ not found here." +msgstr "De abonnee-URI \"%s\" is hier niet te vinden." #: actions/userauthorization.php:301 #, php-format @@ -4024,10 +3945,6 @@ msgstr "Het was niet mogelijk de avatar-URL \"%s\" te lezen." msgid "Wrong image type for avatar URL ‘%s’." msgstr "Er staat een verkeerd afbeeldingsttype op de avatar-URL \"%s\"." -#: actions/userbyid.php:70 -msgid "No ID." -msgstr "Geen ID." - #: actions/userdesignsettings.php:76 lib/designsettings.php:65 msgid "Profile design" msgstr "Profielontwerp" @@ -4044,11 +3961,6 @@ msgstr "" msgid "Enjoy your hotdog!" msgstr "Geniet van uw hotdog!" -#: actions/usergroups.php:64 -#, php-format -msgid "%s groups, page %d" -msgstr "%s groepen, pagina %d" - #: actions/usergroups.php:130 msgid "Search for more groups" msgstr "Meer groepen zoeken" @@ -4064,6 +3976,81 @@ msgid "Try [searching for groups](%%action.groupsearch%%) and joining them." msgstr "" "U kunt [naar groepen zoeken](%%action.groupsearch%%) en daar lid van worden." +#: actions/version.php:73 +#, php-format +msgid "StatusNet %s" +msgstr "StatusNet %s" + +#: actions/version.php:153 +#, php-format +msgid "" +"This site is powered by %1$s version %2$s, Copyright 2008-2010 StatusNet, " +"Inc. and contributors." +msgstr "" +"Deze website wordt aangedreven door %1$2 versie %2$s. Auteursrechten " +"voorbehouden 2008-2010 Statusnet, Inc. en medewerkers." + +#: actions/version.php:157 +msgid "StatusNet" +msgstr "StatusNet" + +#: actions/version.php:161 +msgid "Contributors" +msgstr "Medewerkers" + +#: actions/version.php:168 +msgid "" +"StatusNet is free software: you can redistribute it and/or modify it under " +"the terms of the GNU Affero General Public License as published by the Free " +"Software Foundation, either version 3 of the License, or (at your option) " +"any later version. " +msgstr "" +"StatusNet is vrije software. U kunt het herdistribueren en/of wijzigen in " +"overeenstemming met de voorwaarden van de GNU Affero General Public License " +"zoals gepubliceerd door de Free Software Foundation, versie 3 van de " +"Licentie, of (naar uw keuze) elke latere versie. " + +#: actions/version.php:174 +msgid "" +"This program is distributed in the hope that it will be useful, but WITHOUT " +"ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or " +"FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License " +"for more details. " +msgstr "" +"Dit programma wordt verspreid in de hoop dat het bruikbaar is, maar ZONDER " +"ENIGE GARANTIE; zonder zelfde impliciete garantie van VERMARKTBAARHEID of " +"GESCHIKTHEID VOOR EEN SPECIFIEK DOEL. Zie de GNU Affero General Public " +"License voor meer details. " + +#: actions/version.php:180 +#, php-format +msgid "" +"You should have received a copy of the GNU Affero General Public License " +"along with this program. If not, see %s." +msgstr "" +"Samen met dit programma hoort u een kopie van de GNU Affero General Public " +"License te hebben ontvangen. Zo niet, zie dan %s." + +#: actions/version.php:189 +msgid "Plugins" +msgstr "Plug-ins" + +#: actions/version.php:195 +msgid "Name" +msgstr "Naam" + +#: actions/version.php:196 lib/action.php:741 +msgid "Version" +msgstr "Versie" + +#: actions/version.php:197 +msgid "Author(s)" +msgstr "Auteur(s)" + +#: actions/version.php:198 lib/groupeditform.php:172 +msgid "Description" +msgstr "Beschrijving" + #: classes/File.php:137 #, php-format msgid "" @@ -4144,7 +4131,7 @@ msgid "DB error inserting reply: %s" msgstr "" "Er is een databasefout opgetreden bij het invoegen van het antwoord: %s" -#: classes/Notice.php:1361 +#: classes/Notice.php:1359 #, php-format msgid "RT @%1$s %2$s" msgstr "RT @%1$s %2$s" @@ -4190,137 +4177,132 @@ msgstr "Overige" msgid "Other options" msgstr "Overige instellingen" -#: lib/action.php:144 -#, php-format -msgid "%s - %s" -msgstr "%s - %s" - #: lib/action.php:159 msgid "Untitled page" msgstr "Naamloze pagina" -#: lib/action.php:426 +#: lib/action.php:427 msgid "Primary site navigation" msgstr "Primaire sitenavigatie" -#: lib/action.php:432 +#: lib/action.php:433 msgid "Home" msgstr "Start" -#: lib/action.php:432 +#: lib/action.php:433 msgid "Personal profile and friends timeline" msgstr "Persoonlijk profiel en tijdlijn van vrienden" -#: lib/action.php:434 +#: lib/action.php:435 msgid "Account" msgstr "Gebruiker" -#: lib/action.php:434 +#: lib/action.php:435 msgid "Change your email, avatar, password, profile" msgstr "Uw e-mailadres, avatar, wachtwoord of profiel wijzigen" -#: lib/action.php:437 +#: lib/action.php:438 msgid "Connect" msgstr "Koppelen" -#: lib/action.php:437 +#: lib/action.php:438 msgid "Connect to services" msgstr "Met diensten verbinden" -#: lib/action.php:441 +#: lib/action.php:442 msgid "Change site configuration" msgstr "Websiteinstellingen wijzigen" -#: lib/action.php:445 lib/subgroupnav.php:105 +#: lib/action.php:446 lib/subgroupnav.php:105 msgid "Invite" msgstr "Uitnodigen" -#: lib/action.php:446 lib/subgroupnav.php:106 +#: lib/action.php:447 lib/subgroupnav.php:106 #, php-format msgid "Invite friends and colleagues to join you on %s" msgstr "Vrienden en collega's uitnodigen om u te vergezellen op %s" -#: lib/action.php:451 +#: lib/action.php:452 msgid "Logout" msgstr "Afmelden" -#: lib/action.php:451 +#: lib/action.php:452 msgid "Logout from the site" msgstr "Van de site afmelden" -#: lib/action.php:456 +#: lib/action.php:457 msgid "Create an account" msgstr "Gebruiker aanmaken" -#: lib/action.php:459 +#: lib/action.php:460 msgid "Login to the site" msgstr "Bij de site aanmelden" -#: lib/action.php:462 lib/action.php:725 +#: lib/action.php:463 lib/action.php:726 msgid "Help" msgstr "Help" -#: lib/action.php:462 +#: lib/action.php:463 msgid "Help me!" msgstr "Help me!" -#: lib/action.php:465 lib/searchaction.php:127 +#: lib/action.php:466 lib/searchaction.php:127 msgid "Search" msgstr "Zoeken" -#: lib/action.php:465 +#: lib/action.php:466 msgid "Search for people or text" msgstr "Naar gebruikers of tekst zoeken" -#: lib/action.php:486 +#: lib/action.php:487 msgid "Site notice" msgstr "Mededeling van de website" -#: lib/action.php:552 +#: lib/action.php:553 msgid "Local views" msgstr "Lokale weergaven" -#: lib/action.php:618 +#: lib/action.php:619 msgid "Page notice" msgstr "Mededeling van de pagina" -#: lib/action.php:720 +#: lib/action.php:721 msgid "Secondary site navigation" msgstr "Secundaire sitenavigatie" -#: lib/action.php:727 +#: lib/action.php:728 msgid "About" msgstr "Over" -#: lib/action.php:729 +#: lib/action.php:730 msgid "FAQ" msgstr "Veel gestelde vragen" -#: lib/action.php:733 +#: lib/action.php:734 msgid "TOS" msgstr "Gebruiksvoorwaarden" -#: lib/action.php:736 +#: lib/action.php:737 msgid "Privacy" msgstr "Privacy" -#: lib/action.php:738 +#: lib/action.php:739 msgid "Source" msgstr "Broncode" -#: lib/action.php:740 +#: lib/action.php:743 msgid "Contact" msgstr "Contact" -#: lib/action.php:742 +#: lib/action.php:745 msgid "Badge" msgstr "Widget" -#: lib/action.php:770 +#: lib/action.php:773 msgid "StatusNet software license" msgstr "Licentie van de StatusNet-software" -#: lib/action.php:773 +#: lib/action.php:776 #, php-format msgid "" "**%%site.name%%** is a microblogging service brought to you by [%%site." @@ -4329,12 +4311,12 @@ msgstr "" "**%%site.name%%** is een microblogdienst van [%%site.broughtby%%](%%site." "broughtbyurl%%). " -#: lib/action.php:775 +#: lib/action.php:778 #, php-format msgid "**%%site.name%%** is a microblogging service. " msgstr "**%%site.name%%** is een microblogdienst. " -#: lib/action.php:777 +#: lib/action.php:780 #, php-format msgid "" "It runs the [StatusNet](http://status.net/) microblogging software, version %" @@ -4345,31 +4327,31 @@ msgstr "" "versie %s, beschikbaar onder de [GNU Affero General Public License](http://" "www.fsf.org/licensing/licenses/agpl-3.0.html)." -#: lib/action.php:791 +#: lib/action.php:794 msgid "Site content license" msgstr "Licentie voor siteinhoud" -#: lib/action.php:800 +#: lib/action.php:803 msgid "All " msgstr "Alle " -#: lib/action.php:805 +#: lib/action.php:808 msgid "license." msgstr "licentie." -#: lib/action.php:1099 +#: lib/action.php:1102 msgid "Pagination" msgstr "Paginering" -#: lib/action.php:1108 +#: lib/action.php:1111 msgid "After" msgstr "Later" -#: lib/action.php:1116 +#: lib/action.php:1119 msgid "Before" msgstr "Eerder" -#: lib/action.php:1164 +#: lib/action.php:1167 msgid "There was a problem with your session token." msgstr "Er is een probleem met uw sessietoken." @@ -4377,27 +4359,31 @@ msgstr "Er is een probleem met uw sessietoken." msgid "You cannot make changes to this site." msgstr "U mag geen wijzigingen maken aan deze website." -#: lib/adminpanelaction.php:195 +#: lib/adminpanelaction.php:107 +msgid "Changes to that panel are not allowed." +msgstr "Wijzigingen aan dat venster zijn niet toegestaan." + +#: lib/adminpanelaction.php:206 msgid "showForm() not implemented." msgstr "showForm() is niet geïmplementeerd." -#: lib/adminpanelaction.php:224 +#: lib/adminpanelaction.php:235 msgid "saveSettings() not implemented." msgstr "saveSettings() is nog niet geïmplementeerd." -#: lib/adminpanelaction.php:247 +#: lib/adminpanelaction.php:258 msgid "Unable to delete design setting." msgstr "Het was niet mogelijk om de ontwerpinstellingen te verwijderen." -#: lib/adminpanelaction.php:300 +#: lib/adminpanelaction.php:312 msgid "Basic site configuration" msgstr "Basisinstellingen voor de website" -#: lib/adminpanelaction.php:303 +#: lib/adminpanelaction.php:317 msgid "Design configuration" msgstr "Instellingen vormgeving" -#: lib/adminpanelaction.php:306 lib/adminpanelaction.php:309 +#: lib/adminpanelaction.php:322 lib/adminpanelaction.php:327 msgid "Paths configuration" msgstr "Padinstellingen" @@ -4421,11 +4407,19 @@ msgstr "Mededelingen die deze bijlage bevatten" msgid "Tags for this attachment" msgstr "Labels voor deze bijlage" +#: lib/authenticationplugin.php:182 lib/authenticationplugin.php:187 +msgid "Password changing failed" +msgstr "Wachtwoord wijzigen is mislukt" + +#: lib/authenticationplugin.php:197 +msgid "Password changing is not allowed" +msgstr "Wachtwoord wijzigen is niet toegestaan" + #: lib/channel.php:138 lib/channel.php:158 msgid "Command results" msgstr "Commandoresultaten" -#: lib/channel.php:210 +#: lib/channel.php:210 lib/mailhandler.php:142 msgid "Command complete" msgstr "Het commando is uitgevoerd" @@ -4439,8 +4433,8 @@ msgstr "Dit commando is nog niet geïmplementeerd." #: lib/command.php:88 #, php-format -msgid "Could not find a user with nickname %s" -msgstr "De gebruiker %s is niet aangetroffen" +msgid "Could not find a user with nickname %s." +msgstr "De gebruiker %s is niet aangetroffen." #: lib/command.php:92 msgid "It does not make a lot of sense to nudge yourself!" @@ -4448,8 +4442,8 @@ msgstr "Het heeft niet zoveel zin om uzelf te porren..." #: lib/command.php:99 #, php-format -msgid "Nudge sent to %s" -msgstr "De por naar %s is verzonden" +msgid "Nudge sent to %s." +msgstr "De por naar %s is verzonden." #: lib/command.php:126 #, php-format @@ -4463,34 +4457,34 @@ msgstr "" "Mededelingen: %3$s" #: lib/command.php:152 lib/command.php:399 lib/command.php:460 -msgid "Notice with that id does not exist" -msgstr "Er bestaat geen mededeling met dat ID" +msgid "Notice with that id does not exist." +msgstr "Er bestaat geen mededeling met dat ID." #: lib/command.php:168 lib/command.php:415 lib/command.php:476 #: lib/command.php:532 -msgid "User has no last notice" -msgstr "Deze gebruiker heeft geen laatste mededeling" +msgid "User has no last notice." +msgstr "Deze gebruiker heeft geen laatste mededeling." #: lib/command.php:190 msgid "Notice marked as fave." msgstr "De mededeling is op de favorietenlijst geplaatst." -#: lib/command.php:315 +#: lib/command.php:284 #, php-format -msgid "%1$s (%2$s)" -msgstr "%1$s (%2$s)" +msgid "Could not remove user %1$s to group %2$s." +msgstr "De gebruiker %1$s kon niet uit de groep %2$s verwijderd worden." #: lib/command.php:318 #, php-format -msgid "Fullname: %s" +msgid "Full name: %s" msgstr "Volledige naam: %s" -#: lib/command.php:321 +#: lib/command.php:321 lib/mail.php:254 #, php-format msgid "Location: %s" msgstr "Locatie: %s" -#: lib/command.php:324 +#: lib/command.php:324 lib/mail.php:256 #, php-format msgid "Homepage: %s" msgstr "Thuispagina: %s" @@ -4502,27 +4496,19 @@ msgstr "Over: %s" #: lib/command.php:358 scripts/xmppdaemon.php:301 #, php-format -msgid "Message too long - maximum is %d characters, you sent %d" +msgid "Message too long - maximum is %1$d characters, you sent %2$d." msgstr "" -"Het bericht te is lang. De maximale lengte is %d tekens. De lengte van uw " -"bericht was %d" +"Het bericht te is lang. De maximale lengte is %1$d tekens. De lengte van uw " +"bericht was %2$d." #: lib/command.php:378 msgid "Error sending direct message." msgstr "Er is een fout opgetreden bij het verzonden van het directe bericht." -#: lib/command.php:422 -msgid "Cannot repeat your own notice" -msgstr "U kunt uw eigen mededelingen niet herhalen." - -#: lib/command.php:427 -msgid "Already repeated that notice" -msgstr "U hebt die mededeling al herhaald." - #: lib/command.php:435 #, php-format -msgid "Notice from %s repeated" -msgstr "De mededeling van %s is herhaald" +msgid "Notice from %s repeated." +msgstr "De mededeling van %s is herhaald." #: lib/command.php:437 msgid "Error repeating notice." @@ -4530,23 +4516,23 @@ msgstr "Er is een fout opgetreden bij het herhalen van de mededeling." #: lib/command.php:491 #, php-format -msgid "Notice too long - maximum is %d characters, you sent %d" +msgid "Notice too long - maximum is %1$d characters, you sent %2$d." msgstr "" -"De mededeling is te lang. De maximale lengte is %d tekens. Uw mededeling " -"bevatte %d tekens" +"De mededeling is te lang. De maximale lengte is %1$d tekens. Uw mededeling " +"bevatte %2$d tekens." #: lib/command.php:500 #, php-format -msgid "Reply to %s sent" -msgstr "Het antwoord aan %s is verzonden" +msgid "Reply to %s sent." +msgstr "Het antwoord aan %s is verzonden." #: lib/command.php:502 msgid "Error saving notice." msgstr "Er is een fout opgetreden bij het opslaan van de mededeling." #: lib/command.php:556 -msgid "Specify the name of the user to subscribe to" -msgstr "Geef de naam op van de gebruiker waarop u wilt abonneren" +msgid "Specify the name of the user to subscribe to." +msgstr "Geef de naam op van de gebruiker waarop u wilt abonneren." #: lib/command.php:563 #, php-format @@ -4554,9 +4540,9 @@ msgid "Subscribed to %s" msgstr "Geabonneerd op %s" #: lib/command.php:584 -msgid "Specify the name of the user to unsubscribe from" +msgid "Specify the name of the user to unsubscribe from." msgstr "" -"Geef de naam op van de gebruiker waarvoor u het abonnement wilt opzeggen" +"Geef de naam op van de gebruiker waarvoor u het abonnement wilt opzeggen." #: lib/command.php:591 #, php-format @@ -4584,20 +4570,20 @@ msgid "Can't turn on notification." msgstr "Het is niet mogelijk de notificatie uit te schakelen." #: lib/command.php:650 -msgid "Login command is disabled" -msgstr "Het aanmeldcommando is uitgeschakeld" +msgid "Login command is disabled." +msgstr "Het aanmeldcommando is uitgeschakeld." #: lib/command.php:664 #, php-format -msgid "Could not create login token for %s" -msgstr "Het was niet mogelijk een aanmeldtoken aan te maken voor %s" +msgid "Could not create login token for %s." +msgstr "Het was niet mogelijk een aanmeldtoken aan te maken voor %s." #: lib/command.php:669 #, php-format -msgid "This link is useable only once, and is good for only 2 minutes: %s" +msgid "This link is useable only once, and is good for only 2 minutes: %s." msgstr "" "Deze verwijzing kan slechts één keer gebruikt worden en is twee minuten " -"geldig: %s" +"geldig: %s." #: lib/command.php:685 msgid "You are not subscribed to anyone." @@ -4826,10 +4812,6 @@ msgstr "Beschrijf de groep of het onderwerp" msgid "Describe the group or topic in %d characters" msgstr "Beschrijf de groep of het onderwerp in %d tekens" -#: lib/groupeditform.php:172 -msgid "Description" -msgstr "Beschrijving" - #: lib/groupeditform.php:179 msgid "" "Location for the group, if any, like \"City, State (or Region), Country\"" @@ -5013,24 +4995,10 @@ msgstr "" "----\n" "Wijzig uw e-mailadres of instellingen op %8$s\n" -#: lib/mail.php:254 -#, php-format -msgid "Location: %s\n" -msgstr "Locatie: %s\n" - -#: lib/mail.php:256 -#, php-format -msgid "Homepage: %s\n" -msgstr "Thuispagina: %s\n" - #: lib/mail.php:258 #, php-format -msgid "" -"Bio: %s\n" -"\n" -msgstr "" -"Beschrijving: %s\n" -"\n" +msgid "Bio: %s" +msgstr "Beschrijving: %s" #: lib/mail.php:286 #, php-format @@ -5228,6 +5196,27 @@ msgstr "" msgid "from" msgstr "van" +#: lib/mailhandler.php:37 +msgid "Could not parse message." +msgstr "Het was niet mogelijk het bericht te verwerken." + +#: lib/mailhandler.php:42 +msgid "Not a registered user." +msgstr "Geen geregistreerde gebruiker" + +#: lib/mailhandler.php:46 +msgid "Sorry, that is not your incoming email address." +msgstr "Dit is niet uw inkomende e-mailadres." + +#: lib/mailhandler.php:50 +msgid "Sorry, no incoming email allowed." +msgstr "Inkomende e-mail is niet toegestaan." + +#: lib/mailhandler.php:228 +#, php-format +msgid "Unsupported message type: %s" +msgstr "Niet ondersteund berichttype: %s" + #: lib/mediafile.php:98 lib/mediafile.php:123 msgid "There was a database error while saving your file. Please try again." msgstr "" @@ -5265,16 +5254,16 @@ msgid "File upload stopped by extension." msgstr "Het uploaden van het bestand is tegengehouden door een uitbreiding." #: lib/mediafile.php:179 lib/mediafile.php:216 -msgid "File exceeds user's quota!" -msgstr "Met dit bestand wordt het quotum van de gebruiker overschreden!" +msgid "File exceeds user's quota." +msgstr "Met dit bestand wordt het quotum van de gebruiker overschreden." #: lib/mediafile.php:196 lib/mediafile.php:233 msgid "File could not be moved to destination directory." msgstr "Het bestand kon niet verplaatst worden naar de doelmap." #: lib/mediafile.php:201 lib/mediafile.php:237 -msgid "Could not determine file's mime-type!" -msgstr "Het was niet mogelijk het MIME-type van het bestand te bepalen!" +msgid "Could not determine file's MIME type." +msgstr "Het was niet mogelijk het MIME-type van het bestand te bepalen." #: lib/mediafile.php:270 #, php-format @@ -5283,7 +5272,7 @@ msgstr " Probeer een ander %s-formaat te gebruiken." #: lib/mediafile.php:275 #, php-format -msgid "%s is not a supported filetype on this server." +msgid "%s is not a supported file type on this server." msgstr "Het bestandstype %s wordt door deze server niet ondersteund." #: lib/messageform.php:120 @@ -5316,8 +5305,16 @@ msgid "Attach a file" msgstr "Bestand toevoegen" #: lib/noticeform.php:212 -msgid "Share your location" -msgstr "Uw locatie bekend maken" +msgid "Share my location." +msgstr "Mijn locatie bekend maken." + +#: lib/noticeform.php:214 +msgid "Do not share my location." +msgstr "Mijn locatie niet bekend maken." + +#: lib/noticeform.php:215 +msgid "Hide this info" +msgstr "Deze informatie verbergen" #: lib/noticelist.php:428 #, php-format @@ -5434,6 +5431,10 @@ msgstr "Uw verzonden berichten" msgid "Tags in %s's notices" msgstr "Labels in de mededelingen van %s" +#: lib/plugin.php:114 +msgid "Unknown" +msgstr "Onbekend" + #: lib/profileaction.php:109 lib/profileaction.php:192 lib/subgroupnav.php:82 msgid "Subscriptions" msgstr "Abonnementen" @@ -5603,10 +5604,6 @@ msgstr "Gebruikerslabelwolk als zelf gelabeld" msgid "People Tagcloud as tagged" msgstr "Gebruikerslabelwolk" -#: lib/subscriptionlist.php:126 -msgid "(none)" -msgstr "(geen)" - #: lib/tagcloudsection.php:56 msgid "None" msgstr "Geen" @@ -5720,19 +5717,3 @@ msgstr "%s is geen geldige kleur." #, php-format msgid "%s is not a valid color! Use 3 or 6 hex chars." msgstr "%s is geen geldige kleur. Gebruik drie of zes hexadecimale tekens." - -#: scripts/maildaemon.php:48 -msgid "Could not parse message." -msgstr "Het was niet mogelijk het bericht te verwerken." - -#: scripts/maildaemon.php:53 -msgid "Not a registered user." -msgstr "Geen geregistreerde gebruiker" - -#: scripts/maildaemon.php:57 -msgid "Sorry, that is not your incoming email address." -msgstr "Dit is niet uw inkomende e-mailadres." - -#: scripts/maildaemon.php:61 -msgid "Sorry, no incoming email allowed." -msgstr "Inkomende e-mail is niet toegestaan." diff --git a/locale/nn/LC_MESSAGES/statusnet.po b/locale/nn/LC_MESSAGES/statusnet.po index 59d3d5f70..50a2a9d3b 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-01-03 10:37+0000\n" -"PO-Revision-Date: 2010-01-03 10:38:27+0000\n" +"POT-Creation-Date: 2010-01-10 11:27+0000\n" +"PO-Revision-Date: 2010-01-10 11:28:45+0000\n" "Language-Team: Norwegian Nynorsk\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha (r60575); Translate extension (2009-12-06)\n" +"X-Generator: MediaWiki 1.16alpha (r60888); Translate extension (2010-01-04)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: nn\n" "X-Message-Group: out-statusnet\n" @@ -50,11 +50,6 @@ msgstr "Dette emneord finst ikkje." msgid "No such user." msgstr "Brukaren finst ikkje." -#: actions/all.php:84 -#, php-format -msgid "%s and friends, page %d" -msgstr "%s med vener, side %d" - #: actions/all.php:86 actions/all.php:167 actions/allrss.php:115 #: actions/apitimelinefriends.php:115 actions/apitimelinehome.php:115 #: lib/personalgroupnav.php:100 @@ -93,8 +88,8 @@ msgstr "" #: actions/all.php:134 #, php-format msgid "" -"You can try to [nudge %s](../%s) from his profile or [post something to his " -"or her attention](%%%%action.newnotice%%%%?status_textarea=%s)." +"You can try to [nudge %1$s](../%2$s) from his profile or [post something to " +"his or her attention](%%%%action.newnotice%%%%?status_textarea=%3$s)." msgstr "" #: actions/all.php:137 actions/replies.php:209 actions/showstream.php:202 @@ -120,6 +115,23 @@ msgstr "Oppdateringar frÃ¥ %1$s og vener pÃ¥ %2$s!" #: actions/apiaccountupdateprofile.php:97 #: actions/apiaccountupdateprofilebackgroundimage.php:94 #: actions/apiaccountupdateprofilecolors.php:118 +#: actions/apidirectmessage.php:156 actions/apifavoritecreate.php:99 +#: actions/apifavoritedestroy.php:100 actions/apifriendshipscreate.php:100 +#: actions/apifriendshipsdestroy.php:100 actions/apifriendshipsshow.php:129 +#: actions/apigroupcreate.php:136 actions/apigroupismember.php:114 +#: actions/apigroupjoin.php:155 actions/apigroupleave.php:141 +#: actions/apigrouplist.php:132 actions/apigrouplistall.php:120 +#: actions/apigroupmembership.php:106 actions/apigroupshow.php:105 +#: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102 +#: actions/apistatusesretweets.php:112 actions/apistatusesshow.php:108 +#: actions/apistatusnetconfig.php:133 actions/apistatusnetversion.php:93 +#: actions/apisubscriptions.php:111 actions/apitimelinefavorites.php:146 +#: actions/apitimelinefriends.php:156 actions/apitimelinegroup.php:150 +#: actions/apitimelinehome.php:156 actions/apitimelinementions.php:151 +#: actions/apitimelinepublic.php:131 actions/apitimelineretweetedbyme.php:122 +#: actions/apitimelineretweetedtome.php:121 +#: actions/apitimelineretweetsofme.php:122 actions/apitimelinetag.php:141 +#: actions/apitimelineuser.php:165 actions/apiusershow.php:101 #, fuzzy msgid "API method not found." msgstr "Fann ikkje API-metode." @@ -178,6 +190,9 @@ msgstr "" #: actions/apiaccountupdateprofilebackgroundimage.php:146 #: actions/apiaccountupdateprofilecolors.php:164 #: actions/apiaccountupdateprofilecolors.php:174 +#: actions/groupdesignsettings.php:287 actions/groupdesignsettings.php:297 +#: actions/userdesignsettings.php:210 actions/userdesignsettings.php:220 +#: actions/userdesignsettings.php:263 actions/userdesignsettings.php:273 #, fuzzy msgid "Unable to save your design settings." msgstr "Klarte ikkje Ã¥ lagra Twitter-innstillingane dine!" @@ -221,26 +236,6 @@ msgstr "Direkte meldingar til %s" msgid "All the direct messages sent to %s" msgstr "Alle direkte meldingar sendt til %s" -#: actions/apidirectmessage.php:156 actions/apifavoritecreate.php:99 -#: actions/apifavoritedestroy.php:100 actions/apifriendshipscreate.php:100 -#: actions/apifriendshipsdestroy.php:100 actions/apifriendshipsshow.php:129 -#: actions/apigroupcreate.php:136 actions/apigroupismember.php:114 -#: actions/apigroupjoin.php:155 actions/apigroupleave.php:141 -#: actions/apigrouplist.php:132 actions/apigrouplistall.php:120 -#: actions/apigroupmembership.php:106 actions/apigroupshow.php:105 -#: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102 -#: actions/apistatusesretweets.php:112 actions/apistatusesshow.php:108 -#: actions/apistatusnetconfig.php:133 actions/apistatusnetversion.php:93 -#: actions/apisubscriptions.php:111 actions/apitimelinefavorites.php:146 -#: actions/apitimelinefriends.php:156 actions/apitimelinegroup.php:150 -#: actions/apitimelinehome.php:156 actions/apitimelinementions.php:151 -#: actions/apitimelinepublic.php:131 actions/apitimelineretweetedbyme.php:122 -#: actions/apitimelineretweetedtome.php:121 -#: actions/apitimelineretweetsofme.php:122 actions/apitimelinetag.php:141 -#: actions/apitimelineuser.php:165 actions/apiusershow.php:101 -msgid "API method not found!" -msgstr "Fann ikkje API-metode." - #: actions/apidirectmessagenew.php:126 msgid "No message text!" msgstr "Inga meldingstekst!" @@ -265,7 +260,7 @@ msgstr "Fann ingen status med den ID-en." #: actions/apifavoritecreate.php:119 #, fuzzy -msgid "This status is already a favorite!" +msgid "This status is already a favorite." msgstr "Denne notisen er alt ein favoritt!" #: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:176 @@ -274,7 +269,7 @@ msgstr "Kunne ikkje lagre favoritt." #: actions/apifavoritedestroy.php:122 #, fuzzy -msgid "That status is not a favorite!" +msgid "That status is not a favorite." msgstr "Denne notisen er ikkje ein favoritt!" #: actions/apifavoritedestroy.php:134 actions/disfavor.php:87 @@ -296,8 +291,9 @@ msgid "Could not unfollow user: User not found." msgstr "Fann ikkje brukaren, so han kan ikkje fylgjast" #: actions/apifriendshipsdestroy.php:120 -msgid "You cannot unfollow yourself!" -msgstr "" +#, fuzzy +msgid "You cannot unfollow yourself." +msgstr "Kan ikkje oppdatera brukar." #: actions/apifriendshipsexists.php:94 msgid "Two user ids or screen_names must be supplied." @@ -384,7 +380,7 @@ msgstr "" msgid "Group not found!" msgstr "Fann ikkje API-metode." -#: actions/apigroupjoin.php:110 +#: actions/apigroupjoin.php:110 actions/joingroup.php:90 lib/command.php:217 #, fuzzy msgid "You are already a member of that group." msgstr "Du er allereie medlem av den gruppa" @@ -393,9 +389,9 @@ msgstr "Du er allereie medlem av den gruppa" msgid "You have been blocked from that group by the admin." msgstr "" -#: actions/apigroupjoin.php:138 +#: actions/apigroupjoin.php:138 actions/joingroup.php:128 lib/command.php:234 #, fuzzy, php-format -msgid "Could not join user %s to group %s." +msgid "Could not join user %1$s to group %2$s." msgstr "Kunne ikkje melde brukaren %s inn i gruppa %s" #: actions/apigroupleave.php:114 @@ -403,9 +399,9 @@ msgstr "Kunne ikkje melde brukaren %s inn i gruppa %s" msgid "You are not a member of this group." msgstr "Du er ikkje medlem av den gruppa." -#: actions/apigroupleave.php:124 +#: actions/apigroupleave.php:124 actions/leavegroup.php:127 #, fuzzy, php-format -msgid "Could not remove user %s to group %s." +msgid "Could not remove user %1$s from group %2$s." msgstr "Kunne ikkje fjerne %s fra %s gruppa " #: actions/apigrouplist.php:95 @@ -413,11 +409,6 @@ msgstr "Kunne ikkje fjerne %s fra %s gruppa " msgid "%s's groups" msgstr "%s grupper" -#: actions/apigrouplist.php:103 -#, fuzzy, php-format -msgid "Groups %s is a member of on %s." -msgstr "Grupper %s er medlem av" - #: actions/apigrouplistall.php:90 actions/usergroups.php:62 #, php-format msgid "%s groups" @@ -441,12 +432,12 @@ msgstr "Du kan ikkje sletta statusen til ein annan brukar." msgid "No such notice." msgstr "Denne notisen finst ikkje." -#: actions/apistatusesretweet.php:83 +#: actions/apistatusesretweet.php:83 lib/command.php:422 #, fuzzy msgid "Cannot repeat your own notice." msgstr "Kan ikkje slÃ¥ pÃ¥ notifikasjon." -#: actions/apistatusesretweet.php:91 +#: actions/apistatusesretweet.php:91 lib/command.php:427 #, fuzzy msgid "Already repeated that notice." msgstr "Slett denne notisen" @@ -461,7 +452,7 @@ msgid "No status with that ID found." msgstr "Fann ingen status med den ID-en." #: actions/apistatusesupdate.php:157 actions/newnotice.php:155 -#: scripts/maildaemon.php:71 +#: lib/mailhandler.php:60 #, fuzzy, php-format msgid "That's too long. Max notice size is %d chars." msgstr "Det er for langt! Ein notis kan berre innehalde 140 teikn." @@ -481,13 +472,13 @@ msgid "Unsupported format." msgstr "Støttar ikkje bileteformatet." #: actions/apitimelinefavorites.php:108 -#, php-format -msgid "%s / Favorites from %s" +#, fuzzy, php-format +msgid "%1$s / Favorites from %2$s" msgstr "%s / Favorittar frÃ¥ %s" #: actions/apitimelinefavorites.php:120 -#, php-format -msgid "%s updates favorited by %s / %s." +#, fuzzy, php-format +msgid "%1$s updates favorited by %2$s / %2$s." msgstr "%s oppdateringar favorisert av %s / %s." #: actions/apitimelinegroup.php:109 actions/apitimelineuser.php:118 @@ -556,8 +547,11 @@ msgstr "Finst ikkje." msgid "No such attachment." msgstr "Slikt dokument finst ikkje." -#: actions/avatarbynickname.php:59 actions/grouprss.php:91 -#: actions/leavegroup.php:76 +#: actions/avatarbynickname.php:59 actions/blockedfromgroup.php:73 +#: actions/editgroup.php:84 actions/groupdesignsettings.php:84 +#: actions/grouplogo.php:86 actions/groupmembers.php:76 +#: actions/grouprss.php:91 actions/joingroup.php:76 actions/leavegroup.php:76 +#: actions/showgroup.php:121 msgid "No nickname." msgstr "Ingen kallenamn." @@ -580,8 +574,8 @@ msgid "You can upload your personal avatar. The maximum file size is %s." msgstr "Du kan laste opp ein personleg avatar." #: actions/avatarsettings.php:106 actions/avatarsettings.php:185 -#: actions/grouplogo.php:178 actions/remotesubscribe.php:191 -#: actions/userauthorization.php:72 actions/userrss.php:103 +#: actions/remotesubscribe.php:191 actions/userauthorization.php:72 +#: actions/userrss.php:103 msgid "User without matching profile" msgstr "Kan ikkje finne brukar" @@ -613,9 +607,9 @@ msgstr "Last opp" msgid "Crop" msgstr "Skaler" -#: actions/avatarsettings.php:268 actions/disfavor.php:74 -#: actions/emailsettings.php:238 actions/favor.php:75 actions/geocode.php:50 -#: actions/groupblock.php:66 actions/grouplogo.php:309 +#: actions/avatarsettings.php:268 actions/deletenotice.php:157 +#: actions/disfavor.php:74 actions/emailsettings.php:238 actions/favor.php:75 +#: actions/geocode.php:50 actions/groupblock.php:66 actions/grouplogo.php:309 #: actions/groupunblock.php:66 actions/imsettings.php:206 #: actions/invite.php:56 actions/login.php:135 actions/makeadmin.php:66 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80 @@ -697,19 +691,15 @@ msgstr "Blokkér denne brukaren" msgid "Failed to save block information." msgstr "Lagring av informasjon feila." -#: actions/blockedfromgroup.php:73 actions/editgroup.php:84 -#: actions/groupdesignsettings.php:84 actions/grouplogo.php:86 -#: actions/groupmembers.php:76 actions/joingroup.php:76 -#: actions/showgroup.php:121 -msgid "No nickname" -msgstr "Ingen kallenamn" - #: actions/blockedfromgroup.php:80 actions/editgroup.php:96 +#: actions/foafgroup.php:44 actions/foafgroup.php:62 actions/groupblock.php:86 #: actions/groupbyid.php:83 actions/groupdesignsettings.php:97 #: actions/grouplogo.php:99 actions/groupmembers.php:83 -#: actions/joingroup.php:83 actions/showgroup.php:137 -msgid "No such group" -msgstr "Fann ikkje gruppa" +#: actions/grouprss.php:98 actions/groupunblock.php:86 +#: actions/joingroup.php:83 actions/leavegroup.php:83 actions/makeadmin.php:86 +#: actions/showgroup.php:137 lib/command.php:212 lib/command.php:263 +msgid "No such group." +msgstr "Denne gruppa finst ikkje." #: actions/blockedfromgroup.php:90 #, fuzzy, php-format @@ -718,7 +708,7 @@ msgstr "Brukarprofil" #: actions/blockedfromgroup.php:93 #, fuzzy, php-format -msgid "%s blocked profiles, page %d" +msgid "%1$s blocked profiles, page %2$d" msgstr "%s med vener, side %d" #: actions/blockedfromgroup.php:108 @@ -837,11 +827,6 @@ msgstr "Kan ikkje sletta notisen." msgid "Delete this notice" msgstr "Slett denne notisen" -#: actions/deletenotice.php:157 -#, fuzzy -msgid "There was a problem with your session token. Try again, please." -msgstr "Der var eit problem med sesjonen din. Vennlegst prøv pÃ¥ nytt." - #: actions/deleteuser.php:67 #, fuzzy msgid "You cannot delete users." @@ -869,7 +854,7 @@ msgid "Delete this user" msgstr "Slett denne notisen" #: actions/designadminpanel.php:62 lib/accountsettingsaction.php:124 -#: lib/adminpanelaction.php:302 lib/groupnav.php:119 +#: lib/adminpanelaction.php:316 lib/groupnav.php:119 msgid "Design" msgstr "" @@ -1017,7 +1002,8 @@ msgstr "Du mÃ¥ være logga inn for Ã¥ lage ei gruppe." #: actions/editgroup.php:103 actions/editgroup.php:168 #: actions/groupdesignsettings.php:104 actions/grouplogo.php:106 -msgid "You must be an admin to edit the group" +#, fuzzy +msgid "You must be an admin to edit the group." msgstr "Du mÃ¥ være administrator for Ã¥ redigere gruppa" #: actions/editgroup.php:154 @@ -1043,7 +1029,8 @@ msgid "Options saved." msgstr "Lagra innstillingar." #: actions/emailsettings.php:60 -msgid "Email Settings" +#, fuzzy +msgid "Email settings" msgstr "Epostinnstillingar" #: actions/emailsettings.php:71 @@ -1080,8 +1067,9 @@ msgid "Cancel" msgstr "Avbryt" #: actions/emailsettings.php:121 -msgid "Email Address" -msgstr "Epostadresse" +#, fuzzy +msgid "Email address" +msgstr "Epostadresser" #: actions/emailsettings.php:123 msgid "Email address, like \"UserName@example.org\"" @@ -1156,9 +1144,10 @@ msgstr "Ingen epostadresse." msgid "Cannot normalize that email address" msgstr "Klarar ikkje normalisera epostadressa" -#: actions/emailsettings.php:331 actions/siteadminpanel.php:157 -msgid "Not a valid email address" -msgstr "Ikkje ei gyldig epostadresse" +#: actions/emailsettings.php:331 actions/register.php:201 +#: actions/siteadminpanel.php:157 +msgid "Not a valid email address." +msgstr "Ikkje ei gyldig epostadresse." #: actions/emailsettings.php:334 msgid "That is already your email address." @@ -1342,19 +1331,12 @@ msgstr "Ukjend versjon av OMB-protokollen." msgid "Error updating remote profile" msgstr "Feil ved oppdatering av ekstern profil" -#: actions/foafgroup.php:44 actions/foafgroup.php:62 actions/groupblock.php:86 -#: actions/grouprss.php:98 actions/groupunblock.php:86 -#: actions/leavegroup.php:83 actions/makeadmin.php:86 lib/command.php:212 -#: lib/command.php:263 -msgid "No such group." -msgstr "Denne gruppa finst ikkje." - -#: actions/getfile.php:75 +#: actions/getfile.php:79 #, fuzzy msgid "No such file." msgstr "Denne notisen finst ikkje." -#: actions/getfile.php:79 +#: actions/getfile.php:83 #, fuzzy msgid "Cannot read file." msgstr "Mista fila vÃ¥r." @@ -1367,7 +1349,7 @@ msgstr "Ingen vald profil." #: actions/groupblock.php:76 actions/groupunblock.php:76 #: actions/makeadmin.php:76 actions/subedit.php:53 actions/tagother.php:46 -#: lib/profileformaction.php:77 +#: actions/unsubscribe.php:84 lib/profileformaction.php:77 msgid "No profile with that ID." msgstr "Fann ingen profil med den IDen." @@ -1399,9 +1381,9 @@ msgstr "Blokker brukaren" #: actions/groupblock.php:162 #, php-format msgid "" -"Are you sure you want to block user \"%s\" from the group \"%s\"? They will " -"be removed from the group, unable to post, and unable to subscribe to the " -"group in the future." +"Are you sure you want to block user \"%1$s\" from the group \"%2$s\"? They " +"will be removed from the group, unable to post, and unable to subscribe to " +"the group in the future." msgstr "" #: actions/groupblock.php:178 @@ -1418,8 +1400,9 @@ msgstr "Ei liste over brukarane i denne gruppa." msgid "Database error blocking user from group." msgstr "" -#: actions/groupbyid.php:74 -msgid "No ID" +#: actions/groupbyid.php:74 actions/userbyid.php:70 +#, fuzzy +msgid "No ID." msgstr "Ingen ID" #: actions/groupdesignsettings.php:68 @@ -1444,13 +1427,6 @@ msgstr "" msgid "Couldn't update your design." msgstr "Kan ikkje oppdatera brukar." -#: actions/groupdesignsettings.php:287 actions/groupdesignsettings.php:297 -#: actions/userdesignsettings.php:210 actions/userdesignsettings.php:220 -#: actions/userdesignsettings.php:263 actions/userdesignsettings.php:273 -#, fuzzy -msgid "Unable to save your design settings!" -msgstr "Klarte ikkje Ã¥ lagra Twitter-innstillingane dine!" - #: actions/groupdesignsettings.php:308 actions/userdesignsettings.php:231 #, fuzzy msgid "Design preferences saved." @@ -1466,6 +1442,11 @@ msgid "" "You can upload a logo image for your group. The maximum file size is %s." msgstr "Du kan lasta opp ein logo for gruppa." +#: actions/grouplogo.php:178 +#, fuzzy +msgid "User without matching profile." +msgstr "Kan ikkje finne brukar" + #: actions/grouplogo.php:362 #, fuzzy msgid "Pick a square area of the image to be the logo." @@ -1485,15 +1466,15 @@ msgid "%s group members" msgstr "%s medlemmar i gruppa" #: actions/groupmembers.php:96 -#, php-format -msgid "%s group members, page %d" +#, fuzzy, php-format +msgid "%1$s group members, page %2$d" msgstr "%s medlemmar i gruppa, side %d" #: actions/groupmembers.php:111 msgid "A list of the users in this group." msgstr "Ei liste over brukarane i denne gruppa." -#: actions/groupmembers.php:175 lib/action.php:441 lib/groupnav.php:107 +#: actions/groupmembers.php:175 lib/action.php:442 lib/groupnav.php:107 msgid "Admin" msgstr "Administrator" @@ -1591,7 +1572,8 @@ msgid "Error removing the block." msgstr "Feil ved fjerning av blokka." #: actions/imsettings.php:59 -msgid "IM Settings" +#, fuzzy +msgid "IM settings" msgstr "Ljonmeldinginnstillingar" #: actions/imsettings.php:70 @@ -1622,7 +1604,8 @@ msgstr "" "instruksjonar (la du %s til venelista di?)" #: actions/imsettings.php:124 -msgid "IM Address" +#, fuzzy +msgid "IM address" msgstr "Ljonmeldingadresse" #: actions/imsettings.php:126 @@ -1683,11 +1666,6 @@ msgstr "" msgid "That is not your Jabber ID." msgstr "Det er ikkje din Jabber ID." -#: actions/inbox.php:59 -#, php-format -msgid "Inbox for %s - page %d" -msgstr "Innboks for %s - side %d" - #: actions/inbox.php:62 #, php-format msgid "Inbox for %s" @@ -1723,10 +1701,10 @@ msgstr "Invitér nye brukarar" msgid "You are already subscribed to these users:" msgstr "Du tingar allereie oppdatering frÃ¥ desse brukarane:" -#: actions/invite.php:131 actions/invite.php:139 +#: actions/invite.php:131 actions/invite.php:139 lib/command.php:315 #, php-format -msgid "%s (%s)" -msgstr "%s (%s)" +msgid "%1$s (%2$s)" +msgstr "%1$s (%2$s)" #: actions/invite.php:136 msgid "" @@ -1769,7 +1747,7 @@ msgstr "Personleg melding" msgid "Optionally add a personal message to the invitation." msgstr "Eventuelt legg til ei personleg melding til invitasjonen." -#: actions/invite.php:197 lib/messageform.php:178 lib/noticeform.php:232 +#: actions/invite.php:197 lib/messageform.php:178 lib/noticeform.php:234 msgid "Send" msgstr "Send" @@ -1834,18 +1812,9 @@ msgstr "" msgid "You must be logged in to join a group." msgstr "Du mÃ¥ være logga inn for Ã¥ bli med i ei gruppe." -#: actions/joingroup.php:90 lib/command.php:217 -msgid "You are already a member of that group" -msgstr "Du er allereie medlem av den gruppa" - -#: actions/joingroup.php:128 lib/command.php:234 -#, php-format -msgid "Could not join user %s to group %s" -msgstr "Kunne ikkje melde brukaren %s inn i gruppa %s" - #: actions/joingroup.php:135 lib/command.php:239 -#, php-format -msgid "%s joined group %s" +#, fuzzy, php-format +msgid "%1$s joined group %2$s" msgstr "%s blei medlem av gruppe %s" #: actions/leavegroup.php:60 @@ -1860,14 +1829,9 @@ msgstr "Du er ikkje medlem av den gruppa." msgid "Could not find membership record." msgstr "Kan ikkje finne brukar." -#: actions/leavegroup.php:127 lib/command.php:284 -#, php-format -msgid "Could not remove user %s to group %s" -msgstr "Kunne ikkje fjerne %s fra %s gruppa " - #: actions/leavegroup.php:134 lib/command.php:289 -#, php-format -msgid "%s left group %s" +#, fuzzy, php-format +msgid "%1$s left group %2$s" msgstr "%s forlot %s gruppa" #: actions/login.php:83 actions/register.php:137 @@ -1888,7 +1852,7 @@ msgstr "Feil brukarnamn eller passord" msgid "Error setting user. You are probably not authorized." msgstr "Ikkje autorisert." -#: actions/login.php:208 actions/login.php:261 lib/action.php:459 +#: actions/login.php:208 actions/login.php:261 lib/action.php:460 #: lib/logingroupnav.php:79 msgid "Login" msgstr "Logg inn" @@ -1943,19 +1907,19 @@ msgid "Only an admin can make another user an admin." msgstr "" #: actions/makeadmin.php:95 -#, php-format -msgid "%s is already an admin for group \"%s\"." -msgstr "" +#, fuzzy, php-format +msgid "%1$s is already an admin for group \"%2$s\"." +msgstr "Brukar har blokkert deg." #: actions/makeadmin.php:132 -#, php-format -msgid "Can't get membership record for %s in group %s" -msgstr "" +#, fuzzy, php-format +msgid "Can't get membership record for %1$s in group %2$s." +msgstr "Kunne ikkje fjerne %s fra %s gruppa " #: actions/makeadmin.php:145 -#, php-format -msgid "Can't make %s an admin for group %s" -msgstr "" +#, fuzzy, php-format +msgid "Can't make %1$s an admin for group %2$s." +msgstr "Du mÃ¥ være administrator for Ã¥ redigere gruppa" #: actions/microsummary.php:69 msgid "No current status" @@ -1999,8 +1963,8 @@ msgid "Message sent" msgstr "Melding" #: actions/newmessage.php:185 lib/command.php:376 -#, php-format -msgid "Direct message to %s sent" +#, fuzzy, php-format +msgid "Direct message to %s sent." msgstr "Direkte melding til %s sendt" #: actions/newmessage.php:210 actions/newnotice.php:245 lib/channel.php:170 @@ -2030,7 +1994,7 @@ msgstr "Tekstsøk" #: actions/noticesearch.php:91 #, fuzzy, php-format -msgid "Search results for \"%s\" on %s" +msgid "Search results for \"%1$s\" on %2$s" msgstr " Søkestraum for «%s»" #: actions/noticesearch.php:121 @@ -2136,11 +2100,6 @@ msgstr "" msgid "URL shortening service is too long (max 50 chars)." msgstr "Adressa til forkortingstenesta er for lang (maksimalt 50 teikn)." -#: actions/outbox.php:58 -#, php-format -msgid "Outbox for %s - page %d" -msgstr "Utboks for %s - side %d" - #: actions/outbox.php:61 #, php-format msgid "Outbox for %s" @@ -2211,7 +2170,7 @@ msgstr "Klarar ikkje lagra nytt passord." msgid "Password saved." msgstr "Lagra passord." -#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:308 +#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:326 msgid "Paths" msgstr "" @@ -2244,7 +2203,7 @@ msgid "Invalid SSL server. The maximum length is 255 characters." msgstr "" #: actions/pathsadminpanel.php:217 actions/siteadminpanel.php:58 -#: lib/adminpanelaction.php:299 +#: lib/adminpanelaction.php:311 #, fuzzy msgid "Site" msgstr "Invitér" @@ -2346,8 +2305,9 @@ msgid "When to use SSL" msgstr "" #: actions/pathsadminpanel.php:308 -msgid "SSL Server" -msgstr "" +#, fuzzy +msgid "SSL server" +msgstr "Gjenopprett" #: actions/pathsadminpanel.php:309 msgid "Server to direct SSL requests to" @@ -2377,8 +2337,8 @@ msgid "Not a valid people tag: %s" msgstr "Ikkje gyldig merkelapp: %s" #: actions/peopletag.php:144 -#, php-format -msgid "Users self-tagged with %s - page %d" +#, fuzzy, php-format +msgid "Users self-tagged with %1$s - page %2$d" msgstr "Brukarar sjølv-merka med %s, side %d" #: actions/postnotice.php:84 @@ -2387,7 +2347,7 @@ msgstr "Ugyldig notisinnhald" #: actions/postnotice.php:90 #, php-format -msgid "Notice license ‘%s’ is not compatible with site license ‘%s’." +msgid "Notice license ‘%1$s’ is not compatible with site license ‘%2$s’." msgstr "" #: actions/profilesettings.php:60 @@ -2511,20 +2471,20 @@ msgstr "Ugyldig merkelapp: %s" msgid "Couldn't update user for autosubscribe." msgstr "Kan ikkje oppdatera brukar for automatisk tinging." -#: actions/profilesettings.php:354 +#: actions/profilesettings.php:359 #, fuzzy msgid "Couldn't save location prefs." msgstr "Kan ikkje lagra merkelapp." -#: actions/profilesettings.php:366 +#: actions/profilesettings.php:371 msgid "Couldn't save profile." msgstr "Kan ikkje lagra profil." -#: actions/profilesettings.php:374 +#: actions/profilesettings.php:379 msgid "Couldn't save tags." msgstr "Kan ikkje lagra merkelapp." -#: actions/profilesettings.php:382 lib/adminpanelaction.php:126 +#: actions/profilesettings.php:387 lib/adminpanelaction.php:137 msgid "Settings saved." msgstr "Lagra innstillingar." @@ -2622,7 +2582,7 @@ msgid "" "one!" msgstr "" -#: actions/publictagcloud.php:135 +#: actions/publictagcloud.php:131 msgid "Tag cloud" msgstr "Emne sky" @@ -2761,7 +2721,7 @@ msgstr "Feil med stadfestingskode." msgid "Registration successful" msgstr "Registreringa gikk bra" -#: actions/register.php:114 actions/register.php:502 lib/action.php:456 +#: actions/register.php:114 actions/register.php:502 lib/action.php:457 #: lib/logingroupnav.php:85 msgid "Register" msgstr "Registrér" @@ -2774,10 +2734,6 @@ msgstr "Registrering ikkje tillatt." msgid "You can't register if you don't agree to the license." msgstr "Du kan ikkje registrera deg om du ikkje godtek vilkÃ¥ra i lisensen." -#: actions/register.php:201 -msgid "Not a valid email address." -msgstr "Ikkje ei gyldig epostadresse." - #: actions/register.php:212 msgid "Email address already exists." msgstr "Epostadressa finst allereie." @@ -2838,12 +2794,12 @@ msgstr "" "telefonnummer." #: actions/register.php:537 -#, php-format +#, fuzzy, php-format msgid "" -"Congratulations, %s! And welcome to %%%%site.name%%%%. From here, you may " +"Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may " "want to...\n" "\n" -"* Go to [your profile](%s) and post your first message.\n" +"* Go to [your profile](%2$s) and post your first message.\n" "* Add a [Jabber/GTalk address](%%%%action.imsettings%%%%) so you can send " "notices through instant messages.\n" "* [Search for people](%%%%action.peoplesearch%%%%) that you may know or that " @@ -2974,11 +2930,6 @@ msgstr "Lag" msgid "Replies to %s" msgstr "Svar til %s" -#: actions/replies.php:127 -#, php-format -msgid "Replies to %s, page %d" -msgstr "Svar til %s, side %d" - #: actions/replies.php:144 #, fuzzy, php-format msgid "Replies feed for %s (RSS 1.0)" @@ -2997,8 +2948,8 @@ msgstr "Notisstraum for %s" #: actions/replies.php:198 #, php-format msgid "" -"This is the timeline showing replies to %s but %s hasn't received a notice " -"to his attention yet." +"This is the timeline showing replies to %1$s but %2$s hasn't received a " +"notice to his attention yet." msgstr "" #: actions/replies.php:203 @@ -3011,8 +2962,8 @@ msgstr "" #: actions/replies.php:205 #, php-format msgid "" -"You can try to [nudge %s](../%s) or [post something to his or her attention]" -"(%%%%action.newnotice%%%%?status_textarea=%s)." +"You can try to [nudge %1$s](../%2$s) or [post something to his or her " +"attention](%%%%action.newnotice%%%%?status_textarea=%3$s)." msgstr "" #: actions/repliesrss.php:72 @@ -3030,11 +2981,6 @@ msgstr "Du kan ikkje sende melding til denne brukaren." msgid "User is already sandboxed." msgstr "Brukar har blokkert deg." -#: actions/showfavorites.php:79 -#, fuzzy, php-format -msgid "%s's favorite notices, page %d" -msgstr "%s favoritt meldingar, side %d" - #: actions/showfavorites.php:132 msgid "Could not retrieve favorite notices." msgstr "Kunne ikkje hente fram favorittane." @@ -3084,11 +3030,6 @@ msgstr "" msgid "%s group" msgstr "%s gruppe" -#: actions/showgroup.php:84 -#, php-format -msgid "%s group, page %d" -msgstr "%s gruppe, side %d" - #: actions/showgroup.php:218 msgid "Group profile" msgstr "Gruppe profil" @@ -3137,7 +3078,7 @@ msgstr "Medlemmar" #: actions/showgroup.php:386 lib/profileaction.php:117 #: lib/profileaction.php:148 lib/profileaction.php:236 lib/section.php:95 -#: lib/tagcloudsection.php:71 +#: lib/subscriptionlist.php:126 lib/tagcloudsection.php:71 msgid "(None)" msgstr "(Ingen)" @@ -3208,14 +3149,9 @@ msgstr "Melding lagra" msgid " tagged %s" msgstr "Notisar merka med %s" -#: actions/showstream.php:79 -#, php-format -msgid "%s, page %d" -msgstr "%s, side %d" - #: actions/showstream.php:122 #, fuzzy, php-format -msgid "Notice feed for %s tagged %s (RSS 1.0)" +msgid "Notice feed for %1$s tagged %2$s (RSS 1.0)" msgstr "Notisstraum for %s gruppa" #: actions/showstream.php:129 @@ -3240,7 +3176,7 @@ msgstr "Utboks for %s" #: actions/showstream.php:191 #, php-format -msgid "This is the timeline for %s but %s hasn't posted anything yet." +msgid "This is the timeline for %1$s but %2$s hasn't posted anything yet." msgstr "" #: actions/showstream.php:196 @@ -3252,8 +3188,8 @@ msgstr "" #: actions/showstream.php:198 #, php-format msgid "" -"You can try to nudge %s or [post something to his or her attention](%%%%" -"action.newnotice%%%%?status_textarea=%s)." +"You can try to nudge %1$s or [post something to his or her attention](%%%%" +"action.newnotice%%%%?status_textarea=%2$s)." msgstr "" #: actions/showstream.php:234 @@ -3300,12 +3236,12 @@ msgstr "" #: actions/siteadminpanel.php:154 #, fuzzy -msgid "You must have a valid contact email address" +msgid "You must have a valid contact email address." msgstr "Ikkje ei gyldig epostadresse" #: actions/siteadminpanel.php:172 #, php-format -msgid "Unknown language \"%s\"" +msgid "Unknown language \"%s\"." msgstr "" #: actions/siteadminpanel.php:179 @@ -3496,7 +3432,8 @@ msgid "Save site settings" msgstr "Avatar-innstillingar" #: actions/smssettings.php:58 -msgid "SMS Settings" +#, fuzzy +msgid "SMS settings" msgstr "SMS innstillingar" #: actions/smssettings.php:69 @@ -3526,7 +3463,8 @@ msgid "Enter the code you received on your phone." msgstr "Skriv inn koden du fekk pÃ¥ telefonen." #: actions/smssettings.php:138 -msgid "SMS Phone number" +#, fuzzy +msgid "SMS phone number" msgstr "SMS telefon nummer" #: actions/smssettings.php:140 @@ -3617,8 +3555,8 @@ msgid "%s subscribers" msgstr "%s tingarar" #: actions/subscribers.php:52 -#, php-format -msgid "%s subscribers, page %d" +#, fuzzy, php-format +msgid "%1$s subscribers, page %2$d" msgstr "%s tingarar, side %d" #: actions/subscribers.php:63 @@ -3654,8 +3592,8 @@ msgid "%s subscriptions" msgstr "%s tingarar" #: actions/subscriptions.php:54 -#, php-format -msgid "%s subscriptions, page %d" +#, fuzzy, php-format +msgid "%1$s subscriptions, page %2$d" msgstr "%s tingingar, side %d" #: actions/subscriptions.php:65 @@ -3690,11 +3628,6 @@ msgstr "Jabber" msgid "SMS" msgstr "SMS" -#: actions/tag.php:68 -#, php-format -msgid "Notices tagged with %s, page %d" -msgstr "Notisar merka med %s, side %d" - #: actions/tag.php:86 #, fuzzy, php-format msgid "Notice feed for tag %s (RSS 1.0)" @@ -3784,20 +3717,17 @@ msgstr "Brukaren har inga profil." msgid "No profile id in request." msgstr "Ingen profil-ID i førespurnaden." -#: actions/unsubscribe.php:84 -msgid "No profile with that id." -msgstr "Fann ingen profil med den IDen." - #: actions/unsubscribe.php:98 msgid "Unsubscribed" msgstr "Fjerna tinging" #: actions/updateprofile.php:62 actions/userauthorization.php:330 #, php-format -msgid "Listenee stream license ‘%s’ is not compatible with site license ‘%s’." +msgid "" +"Listenee stream license ‘%1$s’ is not compatible with site license ‘%2$s’." msgstr "" -#: actions/useradminpanel.php:58 lib/adminpanelaction.php:305 +#: actions/useradminpanel.php:58 lib/adminpanelaction.php:321 #: lib/personalgroupnav.php:115 msgid "User" msgstr "Brukar" @@ -3904,7 +3834,7 @@ msgstr "" "Sjekk desse detaljane og forsikre deg om at du vil abonnere pÃ¥ denne " "brukaren sine notisar. Vist du ikkje har bedt om dette, klikk \"Avbryt\"" -#: actions/userauthorization.php:188 +#: actions/userauthorization.php:188 actions/version.php:165 #, fuzzy msgid "License" msgstr "lisens." @@ -3962,7 +3892,7 @@ msgstr "" #: actions/userauthorization.php:296 #, php-format -msgid "Listener URI ‘%s’ not found here" +msgid "Listener URI ‘%s’ not found here." msgstr "" #: actions/userauthorization.php:301 @@ -3995,11 +3925,6 @@ msgstr "Kan ikkje lesa brukarbilete-URL «%s»" msgid "Wrong image type for avatar URL ‘%s’." msgstr "Feil biletetype for '%s'" -#: actions/userbyid.php:70 -#, fuzzy -msgid "No ID." -msgstr "Ingen ID" - #: actions/userdesignsettings.php:76 lib/designsettings.php:65 #, fuzzy msgid "Profile design" @@ -4015,11 +3940,6 @@ msgstr "" msgid "Enjoy your hotdog!" msgstr "" -#: actions/usergroups.php:64 -#, php-format -msgid "%s groups, page %d" -msgstr "%s grupper, side %d" - #: actions/usergroups.php:130 #, fuzzy msgid "Search for more groups" @@ -4035,6 +3955,72 @@ msgstr "Du er ikkje medlem av den gruppa." msgid "Try [searching for groups](%%action.groupsearch%%) and joining them." msgstr "" +#: actions/version.php:73 +#, fuzzy, php-format +msgid "StatusNet %s" +msgstr "Statistikk" + +#: actions/version.php:153 +#, php-format +msgid "" +"This site is powered by %1$s version %2$s, Copyright 2008-2010 StatusNet, " +"Inc. and contributors." +msgstr "" + +#: actions/version.php:157 +#, fuzzy +msgid "StatusNet" +msgstr "Lasta opp brukarbilete." + +#: actions/version.php:161 +msgid "Contributors" +msgstr "" + +#: actions/version.php:168 +msgid "" +"StatusNet is free software: you can redistribute it and/or modify it under " +"the terms of the GNU Affero General Public License as published by the Free " +"Software Foundation, either version 3 of the License, or (at your option) " +"any later version. " +msgstr "" + +#: actions/version.php:174 +msgid "" +"This program is distributed in the hope that it will be useful, but WITHOUT " +"ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or " +"FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License " +"for more details. " +msgstr "" + +#: actions/version.php:180 +#, php-format +msgid "" +"You should have received a copy of the GNU Affero General Public License " +"along with this program. If not, see %s." +msgstr "" + +#: actions/version.php:189 +msgid "Plugins" +msgstr "" + +#: actions/version.php:195 +#, fuzzy +msgid "Name" +msgstr "Kallenamn" + +#: actions/version.php:196 lib/action.php:741 +#, fuzzy +msgid "Version" +msgstr "Personleg" + +#: actions/version.php:197 +msgid "Author(s)" +msgstr "" + +#: actions/version.php:198 lib/groupeditform.php:172 +msgid "Description" +msgstr "Beskriving" + #: classes/File.php:137 #, php-format msgid "" @@ -4106,7 +4092,7 @@ msgstr "Eit problem oppstod ved lagring av notis." msgid "DB error inserting reply: %s" msgstr "Databasefeil, kan ikkje lagra svar: %s" -#: classes/Notice.php:1361 +#: classes/Notice.php:1359 #, fuzzy, php-format msgid "RT @%1$s %2$s" msgstr "%1$s (%2$s)" @@ -4153,140 +4139,135 @@ msgstr "Anna" msgid "Other options" msgstr "Andre val" -#: lib/action.php:144 -#, php-format -msgid "%s - %s" -msgstr "%s - %s" - #: lib/action.php:159 msgid "Untitled page" msgstr "Ingen tittel" -#: lib/action.php:426 +#: lib/action.php:427 msgid "Primary site navigation" msgstr "Navigasjon for hovudsida" -#: lib/action.php:432 +#: lib/action.php:433 msgid "Home" msgstr "Heim" -#: lib/action.php:432 +#: lib/action.php:433 msgid "Personal profile and friends timeline" msgstr "Personleg profil og oversyn over vener" -#: lib/action.php:434 +#: lib/action.php:435 msgid "Account" msgstr "Konto" -#: lib/action.php:434 +#: lib/action.php:435 msgid "Change your email, avatar, password, profile" msgstr "Endra e-posten, avataren, passordet eller profilen" -#: lib/action.php:437 +#: lib/action.php:438 msgid "Connect" msgstr "Kopla til" -#: lib/action.php:437 +#: lib/action.php:438 #, fuzzy msgid "Connect to services" msgstr "Klarte ikkje Ã¥ omdirigera til tenaren: %s" -#: lib/action.php:441 +#: lib/action.php:442 #, fuzzy msgid "Change site configuration" msgstr "Navigasjon for hovudsida" -#: lib/action.php:445 lib/subgroupnav.php:105 +#: lib/action.php:446 lib/subgroupnav.php:105 msgid "Invite" msgstr "Invitér" -#: lib/action.php:446 lib/subgroupnav.php:106 +#: lib/action.php:447 lib/subgroupnav.php:106 #, php-format msgid "Invite friends and colleagues to join you on %s" msgstr "Inviter vennar og kollega til Ã¥ bli med deg pÃ¥ %s" -#: lib/action.php:451 +#: lib/action.php:452 msgid "Logout" msgstr "Logg ut" -#: lib/action.php:451 +#: lib/action.php:452 msgid "Logout from the site" msgstr "Logg ut or sida" -#: lib/action.php:456 +#: lib/action.php:457 msgid "Create an account" msgstr "Opprett ny konto" -#: lib/action.php:459 +#: lib/action.php:460 msgid "Login to the site" msgstr "Logg inn or sida" -#: lib/action.php:462 lib/action.php:725 +#: lib/action.php:463 lib/action.php:726 msgid "Help" msgstr "Hjelp" -#: lib/action.php:462 +#: lib/action.php:463 msgid "Help me!" msgstr "Hjelp meg!" -#: lib/action.php:465 lib/searchaction.php:127 +#: lib/action.php:466 lib/searchaction.php:127 msgid "Search" msgstr "Søk" -#: lib/action.php:465 +#: lib/action.php:466 msgid "Search for people or text" msgstr "Søk etter folk eller innhald" -#: lib/action.php:486 +#: lib/action.php:487 msgid "Site notice" msgstr "Statusmelding" -#: lib/action.php:552 +#: lib/action.php:553 msgid "Local views" msgstr "Lokale syningar" -#: lib/action.php:618 +#: lib/action.php:619 msgid "Page notice" msgstr "Sidenotis" -#: lib/action.php:720 +#: lib/action.php:721 msgid "Secondary site navigation" msgstr "AndrenivÃ¥s side navigasjon" -#: lib/action.php:727 +#: lib/action.php:728 msgid "About" msgstr "Om" -#: lib/action.php:729 +#: lib/action.php:730 msgid "FAQ" msgstr "OSS" -#: lib/action.php:733 +#: lib/action.php:734 msgid "TOS" msgstr "" -#: lib/action.php:736 +#: lib/action.php:737 msgid "Privacy" msgstr "Personvern" -#: lib/action.php:738 +#: lib/action.php:739 msgid "Source" msgstr "Kjeldekode" -#: lib/action.php:740 +#: lib/action.php:743 msgid "Contact" msgstr "Kontakt" -#: lib/action.php:742 +#: lib/action.php:745 #, fuzzy msgid "Badge" msgstr "Dult" -#: lib/action.php:770 +#: lib/action.php:773 msgid "StatusNet software license" msgstr "StatusNets programvarelisens" -#: lib/action.php:773 +#: lib/action.php:776 #, php-format msgid "" "**%%site.name%%** is a microblogging service brought to you by [%%site." @@ -4295,12 +4276,12 @@ msgstr "" "**%%site.name%%** er ei mikrobloggingteneste av [%%site.broughtby%%](%%site." "broughtbyurl%%). " -#: lib/action.php:775 +#: lib/action.php:778 #, php-format msgid "**%%site.name%%** is a microblogging service. " msgstr "**%%site.name%%** er ei mikrobloggingteneste. " -#: lib/action.php:777 +#: lib/action.php:780 #, php-format msgid "" "It runs the [StatusNet](http://status.net/) microblogging software, version %" @@ -4311,32 +4292,32 @@ msgstr "" "%s, tilgjengeleg under [GNU Affero General Public License](http://www.fsf." "org/licensing/licenses/agpl-3.0.html)." -#: lib/action.php:791 +#: lib/action.php:794 #, fuzzy msgid "Site content license" msgstr "StatusNets programvarelisens" -#: lib/action.php:800 +#: lib/action.php:803 msgid "All " msgstr "Alle" -#: lib/action.php:805 +#: lib/action.php:808 msgid "license." msgstr "lisens." -#: lib/action.php:1099 +#: lib/action.php:1102 msgid "Pagination" msgstr "Paginering" -#: lib/action.php:1108 +#: lib/action.php:1111 msgid "After" msgstr "« Etter" -#: lib/action.php:1116 +#: lib/action.php:1119 msgid "Before" msgstr "Før »" -#: lib/action.php:1164 +#: lib/action.php:1167 msgid "There was a problem with your session token." msgstr "Det var eit problem med sesjons billetten din." @@ -4345,32 +4326,37 @@ msgstr "Det var eit problem med sesjons billetten din." msgid "You cannot make changes to this site." msgstr "Du kan ikkje sende melding til denne brukaren." -#: lib/adminpanelaction.php:195 +#: lib/adminpanelaction.php:107 +#, fuzzy +msgid "Changes to that panel are not allowed." +msgstr "Registrering ikkje tillatt." + +#: lib/adminpanelaction.php:206 #, fuzzy msgid "showForm() not implemented." msgstr "Kommando ikkje implementert." -#: lib/adminpanelaction.php:224 +#: lib/adminpanelaction.php:235 #, fuzzy msgid "saveSettings() not implemented." msgstr "Kommando ikkje implementert." -#: lib/adminpanelaction.php:247 +#: lib/adminpanelaction.php:258 #, fuzzy msgid "Unable to delete design setting." msgstr "Klarte ikkje Ã¥ lagra Twitter-innstillingane dine!" -#: lib/adminpanelaction.php:300 +#: lib/adminpanelaction.php:312 #, fuzzy msgid "Basic site configuration" msgstr "Stadfesting av epostadresse" -#: lib/adminpanelaction.php:303 +#: lib/adminpanelaction.php:317 #, fuzzy msgid "Design configuration" msgstr "SMS bekreftelse" -#: lib/adminpanelaction.php:306 lib/adminpanelaction.php:309 +#: lib/adminpanelaction.php:322 lib/adminpanelaction.php:327 #, fuzzy msgid "Paths configuration" msgstr "SMS bekreftelse" @@ -4396,11 +4382,21 @@ msgstr "" msgid "Tags for this attachment" msgstr "" +#: lib/authenticationplugin.php:182 lib/authenticationplugin.php:187 +#, fuzzy +msgid "Password changing failed" +msgstr "Endra passord" + +#: lib/authenticationplugin.php:197 +#, fuzzy +msgid "Password changing is not allowed" +msgstr "Endra passord" + #: lib/channel.php:138 lib/channel.php:158 msgid "Command results" msgstr "Resultat frÃ¥ kommandoen" -#: lib/channel.php:210 +#: lib/channel.php:210 lib/mailhandler.php:142 msgid "Command complete" msgstr "Kommandoen utførd" @@ -4414,7 +4410,7 @@ msgstr "Orsak, men kommandoen er ikkje laga enno." #: lib/command.php:88 #, fuzzy, php-format -msgid "Could not find a user with nickname %s" +msgid "Could not find a user with nickname %s." msgstr "Kan ikkje oppdatera brukar med stadfesta e-postadresse." #: lib/command.php:92 @@ -4423,7 +4419,7 @@ msgstr "" #: lib/command.php:99 #, fuzzy, php-format -msgid "Nudge sent to %s" +msgid "Nudge sent to %s." msgstr "Dytta!" #: lib/command.php:126 @@ -4435,34 +4431,36 @@ msgid "" msgstr "" #: lib/command.php:152 lib/command.php:399 lib/command.php:460 -msgid "Notice with that id does not exist" -msgstr "" +#, fuzzy +msgid "Notice with that id does not exist." +msgstr "Fann ingen profil med den IDen." #: lib/command.php:168 lib/command.php:415 lib/command.php:476 #: lib/command.php:532 -msgid "User has no last notice" +#, fuzzy +msgid "User has no last notice." msgstr "Brukaren har ikkje siste notis" #: lib/command.php:190 msgid "Notice marked as fave." msgstr "Notis markert som favoritt." -#: lib/command.php:315 -#, php-format -msgid "%1$s (%2$s)" -msgstr "%1$s (%2$s)" +#: lib/command.php:284 +#, fuzzy, php-format +msgid "Could not remove user %1$s to group %2$s." +msgstr "Kunne ikkje fjerne %s fra %s gruppa " #: lib/command.php:318 -#, php-format -msgid "Fullname: %s" +#, fuzzy, php-format +msgid "Full name: %s" msgstr "Fullt namn: %s" -#: lib/command.php:321 +#: lib/command.php:321 lib/mail.php:254 #, php-format msgid "Location: %s" msgstr "Stad: %s" -#: lib/command.php:324 +#: lib/command.php:324 lib/mail.php:256 #, php-format msgid "Homepage: %s" msgstr "Heimeside: %s" @@ -4474,26 +4472,16 @@ msgstr "Om: %s" #: lib/command.php:358 scripts/xmppdaemon.php:301 #, fuzzy, php-format -msgid "Message too long - maximum is %d characters, you sent %d" +msgid "Message too long - maximum is %1$d characters, you sent %2$d." msgstr "Melding for lang - maksimum 140 teikn, du skreiv %d" #: lib/command.php:378 msgid "Error sending direct message." msgstr "Ein feil oppstod ved sending av direkte melding." -#: lib/command.php:422 -#, fuzzy -msgid "Cannot repeat your own notice" -msgstr "Kan ikkje slÃ¥ pÃ¥ notifikasjon." - -#: lib/command.php:427 -#, fuzzy -msgid "Already repeated that notice" -msgstr "Slett denne notisen" - #: lib/command.php:435 #, fuzzy, php-format -msgid "Notice from %s repeated" +msgid "Notice from %s repeated." msgstr "Melding lagra" #: lib/command.php:437 @@ -4503,12 +4491,12 @@ msgstr "Eit problem oppstod ved lagring av notis." #: lib/command.php:491 #, fuzzy, php-format -msgid "Notice too long - maximum is %d characters, you sent %d" +msgid "Notice too long - maximum is %1$d characters, you sent %2$d." msgstr "Melding for lang - maksimum 140 teikn, du skreiv %d" #: lib/command.php:500 #, fuzzy, php-format -msgid "Reply to %s sent" +msgid "Reply to %s sent." msgstr "Svar pÃ¥ denne notisen" #: lib/command.php:502 @@ -4517,7 +4505,8 @@ msgid "Error saving notice." msgstr "Eit problem oppstod ved lagring av notis." #: lib/command.php:556 -msgid "Specify the name of the user to subscribe to" +#, fuzzy +msgid "Specify the name of the user to subscribe to." msgstr "Spesifer namnet til brukaren du vil tinge" #: lib/command.php:563 @@ -4526,7 +4515,8 @@ msgid "Subscribed to %s" msgstr "Tingar %s" #: lib/command.php:584 -msgid "Specify the name of the user to unsubscribe from" +#, fuzzy +msgid "Specify the name of the user to unsubscribe from." msgstr "Spesifer namnet til brukar du vil fjerne tinging pÃ¥" #: lib/command.php:591 @@ -4555,17 +4545,17 @@ msgid "Can't turn on notification." msgstr "Kan ikkje slÃ¥ pÃ¥ notifikasjon." #: lib/command.php:650 -msgid "Login command is disabled" +msgid "Login command is disabled." msgstr "" #: lib/command.php:664 #, fuzzy, php-format -msgid "Could not create login token for %s" +msgid "Could not create login token for %s." msgstr "Kunne ikkje lagre favoritt." #: lib/command.php:669 #, php-format -msgid "This link is useable only once, and is good for only 2 minutes: %s" +msgid "This link is useable only once, and is good for only 2 minutes: %s." msgstr "" #: lib/command.php:685 @@ -4762,10 +4752,6 @@ msgstr "Beskriv gruppa eller emnet med 140 teikn" msgid "Describe the group or topic in %d characters" msgstr "Beskriv gruppa eller emnet med 140 teikn" -#: lib/groupeditform.php:172 -msgid "Description" -msgstr "Beskriving" - #: lib/groupeditform.php:179 msgid "" "Location for the group, if any, like \"City, State (or Region), Country\"" @@ -4931,21 +4917,9 @@ msgstr "" "Beste helsing,\n" "%4$s.\n" -#: lib/mail.php:254 -#, php-format -msgid "Location: %s\n" -msgstr "Stad: %s\n" - -#: lib/mail.php:256 -#, php-format -msgid "Homepage: %s\n" -msgstr "Heimeside: %s\n" - #: lib/mail.php:258 -#, php-format -msgid "" -"Bio: %s\n" -"\n" +#, fuzzy, php-format +msgid "Bio: %s" msgstr "" "Bio: %s\n" "\n" @@ -5090,6 +5064,27 @@ msgstr "" msgid "from" msgstr " frÃ¥ " +#: lib/mailhandler.php:37 +msgid "Could not parse message." +msgstr "Kunne ikkje prosessera melding." + +#: lib/mailhandler.php:42 +msgid "Not a registered user." +msgstr "Ikkje ein registrert brukar." + +#: lib/mailhandler.php:46 +msgid "Sorry, that is not your incoming email address." +msgstr "Beklager, det er ikkje di inngÃ¥ande epost addresse." + +#: lib/mailhandler.php:50 +msgid "Sorry, no incoming email allowed." +msgstr "Beklager, inngÃ¥ande epost er ikkje tillatt." + +#: lib/mailhandler.php:228 +#, fuzzy, php-format +msgid "Unsupported message type: %s" +msgstr "Støttar ikkje bileteformatet." + #: lib/mediafile.php:98 lib/mediafile.php:123 msgid "There was a database error while saving your file. Please try again." msgstr "" @@ -5121,7 +5116,7 @@ msgid "File upload stopped by extension." msgstr "" #: lib/mediafile.php:179 lib/mediafile.php:216 -msgid "File exceeds user's quota!" +msgid "File exceeds user's quota." msgstr "" #: lib/mediafile.php:196 lib/mediafile.php:233 @@ -5129,7 +5124,8 @@ msgid "File could not be moved to destination directory." msgstr "" #: lib/mediafile.php:201 lib/mediafile.php:237 -msgid "Could not determine file's mime-type!" +#, fuzzy +msgid "Could not determine file's MIME type." msgstr "Kan ikkje hente offentleg straum." #: lib/mediafile.php:270 @@ -5139,7 +5135,7 @@ msgstr "" #: lib/mediafile.php:275 #, php-format -msgid "%s is not a supported filetype on this server." +msgid "%s is not a supported file type on this server." msgstr "" #: lib/messageform.php:120 @@ -5172,7 +5168,17 @@ msgid "Attach a file" msgstr "" #: lib/noticeform.php:212 -msgid "Share your location" +#, fuzzy +msgid "Share my location." +msgstr "Kan ikkje lagra merkelapp." + +#: lib/noticeform.php:214 +#, fuzzy +msgid "Do not share my location." +msgstr "Kan ikkje lagra merkelapp." + +#: lib/noticeform.php:215 +msgid "Hide this info" msgstr "" #: lib/noticelist.php:428 @@ -5295,6 +5301,11 @@ msgstr "Dine sende meldingar" msgid "Tags in %s's notices" msgstr "Merkelappar i %s sine notisar" +#: lib/plugin.php:114 +#, fuzzy +msgid "Unknown" +msgstr "Uventa handling." + #: lib/profileaction.php:109 lib/profileaction.php:192 lib/subgroupnav.php:82 msgid "Subscriptions" msgstr "Tingingar" @@ -5476,10 +5487,6 @@ msgstr "" msgid "People Tagcloud as tagged" msgstr "" -#: lib/subscriptionlist.php:126 -msgid "(none)" -msgstr "(ingen)" - #: lib/tagcloudsection.php:56 msgid "None" msgstr "Ingen" @@ -5597,19 +5604,3 @@ msgstr "Heimesida er ikkje ei gyldig internettadresse." #, php-format msgid "%s is not a valid color! Use 3 or 6 hex chars." msgstr "" - -#: scripts/maildaemon.php:48 -msgid "Could not parse message." -msgstr "Kunne ikkje prosessera melding." - -#: scripts/maildaemon.php:53 -msgid "Not a registered user." -msgstr "Ikkje ein registrert brukar." - -#: scripts/maildaemon.php:57 -msgid "Sorry, that is not your incoming email address." -msgstr "Beklager, det er ikkje di inngÃ¥ande epost addresse." - -#: scripts/maildaemon.php:61 -msgid "Sorry, no incoming email allowed." -msgstr "Beklager, inngÃ¥ande epost er ikkje tillatt." diff --git a/locale/pl/LC_MESSAGES/statusnet.po b/locale/pl/LC_MESSAGES/statusnet.po index 1b72b8a99..694f1a6df 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-01-03 10:37+0000\n" -"PO-Revision-Date: 2010-01-03 10:38:33+0000\n" +"POT-Creation-Date: 2010-01-10 11:27+0000\n" +"PO-Revision-Date: 2010-01-10 11:28:51+0000\n" "Last-Translator: Piotr DrÄ…g <piotrdrag@gmail.com>\n" "Language-Team: Polish <pl@li.org>\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.16alpha (r60575); Translate extension (2009-12-06)\n" +"X-Generator: MediaWiki 1.16alpha (r60888); Translate extension (2010-01-04)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: pl\n" "X-Message-Group: out-statusnet\n" @@ -55,11 +55,6 @@ msgstr "Nie ma takiej strony" msgid "No such user." msgstr "Brak takiego użytkownika." -#: actions/all.php:84 -#, php-format -msgid "%s and friends, page %d" -msgstr "Użytkownik %s i przyjaciele, strona %d" - #: actions/all.php:86 actions/all.php:167 actions/allrss.php:115 #: actions/apitimelinefriends.php:115 actions/apitimelinehome.php:115 #: lib/personalgroupnav.php:100 @@ -100,10 +95,10 @@ msgstr "" "wysÅ‚ać coÅ› samemu." #: actions/all.php:134 -#, php-format +#, fuzzy, php-format msgid "" -"You can try to [nudge %s](../%s) from his profile or [post something to his " -"or her attention](%%%%action.newnotice%%%%?status_textarea=%s)." +"You can try to [nudge %1$s](../%2$s) from his profile or [post something to " +"his or her attention](%%%%action.newnotice%%%%?status_textarea=%3$s)." msgstr "" "Można spróbować [szturchnąć użytkownika %s](../%s) z jego profilu lub " "[wysÅ‚ać coÅ› wymagajÄ…cego jego uwagi](%%%%action.newnotice%%%%?" @@ -133,6 +128,23 @@ msgstr "Aktualizacje z %1$s i przyjaciół na %2$s." #: actions/apiaccountupdateprofile.php:97 #: actions/apiaccountupdateprofilebackgroundimage.php:94 #: actions/apiaccountupdateprofilecolors.php:118 +#: actions/apidirectmessage.php:156 actions/apifavoritecreate.php:99 +#: actions/apifavoritedestroy.php:100 actions/apifriendshipscreate.php:100 +#: actions/apifriendshipsdestroy.php:100 actions/apifriendshipsshow.php:129 +#: actions/apigroupcreate.php:136 actions/apigroupismember.php:114 +#: actions/apigroupjoin.php:155 actions/apigroupleave.php:141 +#: actions/apigrouplist.php:132 actions/apigrouplistall.php:120 +#: actions/apigroupmembership.php:106 actions/apigroupshow.php:105 +#: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102 +#: actions/apistatusesretweets.php:112 actions/apistatusesshow.php:108 +#: actions/apistatusnetconfig.php:133 actions/apistatusnetversion.php:93 +#: actions/apisubscriptions.php:111 actions/apitimelinefavorites.php:146 +#: actions/apitimelinefriends.php:156 actions/apitimelinegroup.php:150 +#: actions/apitimelinehome.php:156 actions/apitimelinementions.php:151 +#: actions/apitimelinepublic.php:131 actions/apitimelineretweetedbyme.php:122 +#: actions/apitimelineretweetedtome.php:121 +#: actions/apitimelineretweetsofme.php:122 actions/apitimelinetag.php:141 +#: actions/apitimelineuser.php:165 actions/apiusershow.php:101 msgid "API method not found." msgstr "Nie odnaleziono metody API." @@ -191,6 +203,9 @@ msgstr "" #: actions/apiaccountupdateprofilebackgroundimage.php:146 #: actions/apiaccountupdateprofilecolors.php:164 #: actions/apiaccountupdateprofilecolors.php:174 +#: actions/groupdesignsettings.php:287 actions/groupdesignsettings.php:297 +#: actions/userdesignsettings.php:210 actions/userdesignsettings.php:220 +#: actions/userdesignsettings.php:263 actions/userdesignsettings.php:273 msgid "Unable to save your design settings." msgstr "Nie można zapisać ustawieÅ„ wyglÄ…du." @@ -231,26 +246,6 @@ msgstr "BezpoÅ›rednia wiadomość do użytkownika %s" msgid "All the direct messages sent to %s" msgstr "Wszystkie bezpoÅ›rednie wiadomoÅ›ci wysÅ‚ane do użytkownika %s" -#: actions/apidirectmessage.php:156 actions/apifavoritecreate.php:99 -#: actions/apifavoritedestroy.php:100 actions/apifriendshipscreate.php:100 -#: actions/apifriendshipsdestroy.php:100 actions/apifriendshipsshow.php:129 -#: actions/apigroupcreate.php:136 actions/apigroupismember.php:114 -#: actions/apigroupjoin.php:155 actions/apigroupleave.php:141 -#: actions/apigrouplist.php:132 actions/apigrouplistall.php:120 -#: actions/apigroupmembership.php:106 actions/apigroupshow.php:105 -#: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102 -#: actions/apistatusesretweets.php:112 actions/apistatusesshow.php:108 -#: actions/apistatusnetconfig.php:133 actions/apistatusnetversion.php:93 -#: actions/apisubscriptions.php:111 actions/apitimelinefavorites.php:146 -#: actions/apitimelinefriends.php:156 actions/apitimelinegroup.php:150 -#: actions/apitimelinehome.php:156 actions/apitimelinementions.php:151 -#: actions/apitimelinepublic.php:131 actions/apitimelineretweetedbyme.php:122 -#: actions/apitimelineretweetedtome.php:121 -#: actions/apitimelineretweetsofme.php:122 actions/apitimelinetag.php:141 -#: actions/apitimelineuser.php:165 actions/apiusershow.php:101 -msgid "API method not found!" -msgstr "Nie odnaleziono metody API." - #: actions/apidirectmessagenew.php:126 msgid "No message text!" msgstr "Brak tekstu wiadomoÅ›ci." @@ -276,7 +271,8 @@ msgid "No status found with that ID." msgstr "Nie odnaleziono stanów z tym identyfikatorem." #: actions/apifavoritecreate.php:119 -msgid "This status is already a favorite!" +#, fuzzy +msgid "This status is already a favorite." msgstr "Ten stan jest już ulubiony." #: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:176 @@ -284,7 +280,8 @@ msgid "Could not create favorite." msgstr "Nie można utworzyć ulubionego wpisu." #: actions/apifavoritedestroy.php:122 -msgid "That status is not a favorite!" +#, fuzzy +msgid "That status is not a favorite." msgstr "Ten stan nie jest ulubiony." #: actions/apifavoritedestroy.php:134 actions/disfavor.php:87 @@ -306,7 +303,8 @@ msgstr "" "Nie można zrezygnować z obserwacji użytkownika: nie odnaleziono użytkownika." #: actions/apifriendshipsdestroy.php:120 -msgid "You cannot unfollow yourself!" +#, fuzzy +msgid "You cannot unfollow yourself." msgstr "Nie można zrezygnować z obserwacji samego siebie." #: actions/apifriendshipsexists.php:94 @@ -391,7 +389,7 @@ msgstr "Alias nie może być taki sam jak pseudonim." msgid "Group not found!" msgstr "Nie odnaleziono grupy." -#: actions/apigroupjoin.php:110 +#: actions/apigroupjoin.php:110 actions/joingroup.php:90 lib/command.php:217 msgid "You are already a member of that group." msgstr "JesteÅ› już czÅ‚onkiem tej grupy." @@ -399,18 +397,18 @@ msgstr "JesteÅ› już czÅ‚onkiem tej grupy." msgid "You have been blocked from that group by the admin." msgstr "ZostaÅ‚eÅ› zablokowany w tej grupie przez administratora." -#: actions/apigroupjoin.php:138 -#, php-format -msgid "Could not join user %s to group %s." +#: actions/apigroupjoin.php:138 actions/joingroup.php:128 lib/command.php:234 +#, fuzzy, php-format +msgid "Could not join user %1$s to group %2$s." msgstr "Nie można doÅ‚Ä…czyć użytkownika %s do grupy %s." #: actions/apigroupleave.php:114 msgid "You are not a member of this group." msgstr "Nie jesteÅ› czÅ‚onkiem tej grupy." -#: actions/apigroupleave.php:124 -#, php-format -msgid "Could not remove user %s to group %s." +#: actions/apigroupleave.php:124 actions/leavegroup.php:127 +#, fuzzy, php-format +msgid "Could not remove user %1$s from group %2$s." msgstr "Nie można usunąć użytkownika %s z grupy %s." #: actions/apigrouplist.php:95 @@ -418,11 +416,6 @@ msgstr "Nie można usunąć użytkownika %s z grupy %s." msgid "%s's groups" msgstr "Grupy użytkownika %s" -#: actions/apigrouplist.php:103 -#, php-format -msgid "Groups %s is a member of on %s." -msgstr "Grupy %s sÄ… czÅ‚onkiem na %s." - #: actions/apigrouplistall.php:90 actions/usergroups.php:62 #, php-format msgid "%s groups" @@ -446,11 +439,11 @@ msgstr "Nie można usuwać stanów innych użytkowników." msgid "No such notice." msgstr "Nie ma takiego wpisu." -#: actions/apistatusesretweet.php:83 +#: actions/apistatusesretweet.php:83 lib/command.php:422 msgid "Cannot repeat your own notice." msgstr "Nie można powtórzyć wÅ‚asnego wpisu." -#: actions/apistatusesretweet.php:91 +#: actions/apistatusesretweet.php:91 lib/command.php:427 msgid "Already repeated that notice." msgstr "Już powtórzono ten wpis." @@ -463,7 +456,7 @@ msgid "No status with that ID found." msgstr "Nie odnaleziono stanów z tym identyfikatorem." #: actions/apistatusesupdate.php:157 actions/newnotice.php:155 -#: scripts/maildaemon.php:71 +#: lib/mailhandler.php:60 #, php-format msgid "That's too long. Max notice size is %d chars." msgstr "Wpis jest za dÅ‚ugi. Maksymalna dÅ‚ugość wynosi %d znaków." @@ -482,13 +475,13 @@ msgid "Unsupported format." msgstr "NieobsÅ‚ugiwany format." #: actions/apitimelinefavorites.php:108 -#, php-format -msgid "%s / Favorites from %s" +#, fuzzy, php-format +msgid "%1$s / Favorites from %2$s" msgstr "%s/ulubione wpisy od %s" #: actions/apitimelinefavorites.php:120 -#, php-format -msgid "%s updates favorited by %s / %s." +#, fuzzy, php-format +msgid "%1$s updates favorited by %2$s / %2$s." msgstr "Użytkownik %s aktualizuje ulubione wedÅ‚ug %s/%s." #: actions/apitimelinegroup.php:109 actions/apitimelineuser.php:118 @@ -556,8 +549,11 @@ msgstr "Nie odnaleziono." msgid "No such attachment." msgstr "Nie ma takiego zaÅ‚Ä…cznika." -#: actions/avatarbynickname.php:59 actions/grouprss.php:91 -#: actions/leavegroup.php:76 +#: actions/avatarbynickname.php:59 actions/blockedfromgroup.php:73 +#: actions/editgroup.php:84 actions/groupdesignsettings.php:84 +#: actions/grouplogo.php:86 actions/groupmembers.php:76 +#: actions/grouprss.php:91 actions/joingroup.php:76 actions/leavegroup.php:76 +#: actions/showgroup.php:121 msgid "No nickname." msgstr "Brak pseudonimu." @@ -580,8 +576,8 @@ msgid "You can upload your personal avatar. The maximum file size is %s." msgstr "Można wysÅ‚ać osobisty awatar. Maksymalny rozmiar pliku to %s." #: actions/avatarsettings.php:106 actions/avatarsettings.php:185 -#: actions/grouplogo.php:178 actions/remotesubscribe.php:191 -#: actions/userauthorization.php:72 actions/userrss.php:103 +#: actions/remotesubscribe.php:191 actions/userauthorization.php:72 +#: actions/userrss.php:103 msgid "User without matching profile" msgstr "Użytkownik bez odpowiadajÄ…cego profilu" @@ -613,9 +609,9 @@ msgstr "WyÅ›lij" msgid "Crop" msgstr "Przytnij" -#: actions/avatarsettings.php:268 actions/disfavor.php:74 -#: actions/emailsettings.php:238 actions/favor.php:75 actions/geocode.php:50 -#: actions/groupblock.php:66 actions/grouplogo.php:309 +#: actions/avatarsettings.php:268 actions/deletenotice.php:157 +#: actions/disfavor.php:74 actions/emailsettings.php:238 actions/favor.php:75 +#: actions/geocode.php:50 actions/groupblock.php:66 actions/grouplogo.php:309 #: actions/groupunblock.php:66 actions/imsettings.php:206 #: actions/invite.php:56 actions/login.php:135 actions/makeadmin.php:66 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80 @@ -697,19 +693,15 @@ msgstr "Zablokuj tego użytkownika" msgid "Failed to save block information." msgstr "Zapisanie informacji o blokadzie nie powiodÅ‚o siÄ™." -#: actions/blockedfromgroup.php:73 actions/editgroup.php:84 -#: actions/groupdesignsettings.php:84 actions/grouplogo.php:86 -#: actions/groupmembers.php:76 actions/joingroup.php:76 -#: actions/showgroup.php:121 -msgid "No nickname" -msgstr "Brak pseudonimu" - #: actions/blockedfromgroup.php:80 actions/editgroup.php:96 +#: actions/foafgroup.php:44 actions/foafgroup.php:62 actions/groupblock.php:86 #: actions/groupbyid.php:83 actions/groupdesignsettings.php:97 #: actions/grouplogo.php:99 actions/groupmembers.php:83 -#: actions/joingroup.php:83 actions/showgroup.php:137 -msgid "No such group" -msgstr "Nie ma takiej grupy" +#: actions/grouprss.php:98 actions/groupunblock.php:86 +#: actions/joingroup.php:83 actions/leavegroup.php:83 actions/makeadmin.php:86 +#: actions/showgroup.php:137 lib/command.php:212 lib/command.php:263 +msgid "No such group." +msgstr "Nie ma takiej grupy." #: actions/blockedfromgroup.php:90 #, php-format @@ -717,8 +709,8 @@ msgid "%s blocked profiles" msgstr "%s zablokowane profile" #: actions/blockedfromgroup.php:93 -#, php-format -msgid "%s blocked profiles, page %d" +#, fuzzy, php-format +msgid "%1$s blocked profiles, page %2$d" msgstr "%s zablokowane profile, strona %d" #: actions/blockedfromgroup.php:108 @@ -831,10 +823,6 @@ msgstr "Nie usuwaj tego wpisu" msgid "Delete this notice" msgstr "UsuÅ„ ten wpis" -#: actions/deletenotice.php:157 -msgid "There was a problem with your session token. Try again, please." -msgstr "WystÄ…piÅ‚ problem z tokenem sesji. Spróbuj ponownie." - #: actions/deleteuser.php:67 msgid "You cannot delete users." msgstr "Nie można usuwać użytkowników." @@ -860,7 +848,7 @@ msgid "Delete this user" msgstr "UsuÅ„ tego użytkownika" #: actions/designadminpanel.php:62 lib/accountsettingsaction.php:124 -#: lib/adminpanelaction.php:302 lib/groupnav.php:119 +#: lib/adminpanelaction.php:316 lib/groupnav.php:119 msgid "Design" msgstr "WyglÄ…d" @@ -998,7 +986,8 @@ msgstr "Musisz być zalogowany, aby utworzyć grupÄ™." #: actions/editgroup.php:103 actions/editgroup.php:168 #: actions/groupdesignsettings.php:104 actions/grouplogo.php:106 -msgid "You must be an admin to edit the group" +#, fuzzy +msgid "You must be an admin to edit the group." msgstr "Musisz być administratorem, aby zmodyfikować grupÄ™" #: actions/editgroup.php:154 @@ -1023,7 +1012,8 @@ msgid "Options saved." msgstr "Zapisano opcje." #: actions/emailsettings.php:60 -msgid "Email Settings" +#, fuzzy +msgid "Email settings" msgstr "Ustawienia adresu e-mail" #: actions/emailsettings.php:71 @@ -1061,8 +1051,9 @@ msgid "Cancel" msgstr "Anuluj" #: actions/emailsettings.php:121 -msgid "Email Address" -msgstr "Adres e-mail" +#, fuzzy +msgid "Email address" +msgstr "Adresy e-mail" #: actions/emailsettings.php:123 msgid "Email address, like \"UserName@example.org\"" @@ -1135,9 +1126,10 @@ msgstr "Brak adresu e-mail." msgid "Cannot normalize that email address" msgstr "Nie można znormalizować tego adresu e-mail" -#: actions/emailsettings.php:331 actions/siteadminpanel.php:157 -msgid "Not a valid email address" -msgstr "To nie jest prawidÅ‚owy adres e-mail" +#: actions/emailsettings.php:331 actions/register.php:201 +#: actions/siteadminpanel.php:157 +msgid "Not a valid email address." +msgstr "To nie jest prawidÅ‚owy adres e-mail." #: actions/emailsettings.php:334 msgid "That is already your email address." @@ -1320,18 +1312,11 @@ msgstr "Zdalna usÅ‚uga używa nieznanej wersji protokoÅ‚u OMB." msgid "Error updating remote profile" msgstr "BÅ‚Ä…d podczas aktualizowania zdalnego profilu" -#: actions/foafgroup.php:44 actions/foafgroup.php:62 actions/groupblock.php:86 -#: actions/grouprss.php:98 actions/groupunblock.php:86 -#: actions/leavegroup.php:83 actions/makeadmin.php:86 lib/command.php:212 -#: lib/command.php:263 -msgid "No such group." -msgstr "Nie ma takiej grupy." - -#: actions/getfile.php:75 +#: actions/getfile.php:79 msgid "No such file." msgstr "Nie ma takiego pliku." -#: actions/getfile.php:79 +#: actions/getfile.php:83 msgid "Cannot read file." msgstr "Nie można odczytać pliku." @@ -1343,7 +1328,7 @@ msgstr "Nie podano profilu." #: actions/groupblock.php:76 actions/groupunblock.php:76 #: actions/makeadmin.php:76 actions/subedit.php:53 actions/tagother.php:46 -#: lib/profileformaction.php:77 +#: actions/unsubscribe.php:84 lib/profileformaction.php:77 msgid "No profile with that ID." msgstr "Brak profilu o tym identyfikatorze." @@ -1369,11 +1354,11 @@ msgid "Block user from group" msgstr "Zablokuj użytkownika w grupie" #: actions/groupblock.php:162 -#, php-format +#, fuzzy, php-format msgid "" -"Are you sure you want to block user \"%s\" from the group \"%s\"? They will " -"be removed from the group, unable to post, and unable to subscribe to the " -"group in the future." +"Are you sure you want to block user \"%1$s\" from the group \"%2$s\"? They " +"will be removed from the group, unable to post, and unable to subscribe to " +"the group in the future." msgstr "" "JesteÅ› pewny, że chcesz zablokować użytkownika \"%s\" w grupie \"%s\"? " "Zostanie usuniÄ™ty z grupy, nie bÄ™dzie mógÅ‚ wysyÅ‚ać wpisów i subskrybować " @@ -1391,9 +1376,9 @@ msgstr "Zablokuj tego użytkownika w tej grupie" msgid "Database error blocking user from group." msgstr "BÅ‚Ä…d bazy danych podczas blokowania użytkownika w grupie." -#: actions/groupbyid.php:74 -msgid "No ID" -msgstr "Brak identyfikatora" +#: actions/groupbyid.php:74 actions/userbyid.php:70 +msgid "No ID." +msgstr "Brak identyfikatora." #: actions/groupdesignsettings.php:68 msgid "You must be logged in to edit a group." @@ -1414,12 +1399,6 @@ msgstr "Dostosuj wyglÄ…d grupy za pomocÄ… wybranego obrazu tÅ‚a i palety koloró msgid "Couldn't update your design." msgstr "Nie można zaktualizować wyglÄ…du." -#: actions/groupdesignsettings.php:287 actions/groupdesignsettings.php:297 -#: actions/userdesignsettings.php:210 actions/userdesignsettings.php:220 -#: actions/userdesignsettings.php:263 actions/userdesignsettings.php:273 -msgid "Unable to save your design settings!" -msgstr "Nie można zapisać ustawieÅ„ wyglÄ…du." - #: actions/groupdesignsettings.php:308 actions/userdesignsettings.php:231 msgid "Design preferences saved." msgstr "Zapisano preferencje wyglÄ…du." @@ -1434,6 +1413,11 @@ msgid "" "You can upload a logo image for your group. The maximum file size is %s." msgstr "Można wysÅ‚ać obraz logo grupy. Maksymalny rozmiar pliku to %s." +#: actions/grouplogo.php:178 +#, fuzzy +msgid "User without matching profile." +msgstr "Użytkownik bez odpowiadajÄ…cego profilu" + #: actions/grouplogo.php:362 msgid "Pick a square area of the image to be the logo." msgstr "Wybierz kwadratowy obszar obrazu, który bÄ™dzie logo." @@ -1452,15 +1436,15 @@ msgid "%s group members" msgstr "CzÅ‚onkowie grupy %s" #: actions/groupmembers.php:96 -#, php-format -msgid "%s group members, page %d" +#, fuzzy, php-format +msgid "%1$s group members, page %2$d" msgstr "CzÅ‚onkowie grupy %s, strona %d" #: actions/groupmembers.php:111 msgid "A list of the users in this group." msgstr "Lista użytkowników znajdujÄ…cych siÄ™ w tej grupie." -#: actions/groupmembers.php:175 lib/action.php:441 lib/groupnav.php:107 +#: actions/groupmembers.php:175 lib/action.php:442 lib/groupnav.php:107 msgid "Admin" msgstr "Administrator" @@ -1563,7 +1547,8 @@ msgid "Error removing the block." msgstr "BÅ‚Ä…d podczas usuwania blokady." #: actions/imsettings.php:59 -msgid "IM Settings" +#, fuzzy +msgid "IM settings" msgstr "Ustawienia komunikatora" #: actions/imsettings.php:70 @@ -1594,7 +1579,8 @@ msgstr "" "znajomych?)." #: actions/imsettings.php:124 -msgid "IM Address" +#, fuzzy +msgid "IM address" msgstr "Adres komunikatora" #: actions/imsettings.php:126 @@ -1656,11 +1642,6 @@ msgstr "" msgid "That is not your Jabber ID." msgstr "To nie jest twój identyfikator Jabbera." -#: actions/inbox.php:59 -#, php-format -msgid "Inbox for %s - page %d" -msgstr "Odebrane wiadomoÅ›ci użytkownika %s - strona %d" - #: actions/inbox.php:62 #, php-format msgid "Inbox for %s" @@ -1698,10 +1679,10 @@ msgstr "ZaproÅ› nowych użytkowników" msgid "You are already subscribed to these users:" msgstr "JesteÅ› już subskrybowany do tych użytkowników:" -#: actions/invite.php:131 actions/invite.php:139 +#: actions/invite.php:131 actions/invite.php:139 lib/command.php:315 #, php-format -msgid "%s (%s)" -msgstr "%s (%s)" +msgid "%1$s (%2$s)" +msgstr "%1$s (%2$s)" #: actions/invite.php:136 msgid "" @@ -1744,7 +1725,7 @@ msgstr "Osobista wiadomość" msgid "Optionally add a personal message to the invitation." msgstr "Opcjonalnie dodaj osobistÄ… wiadomość do zaproszenia." -#: actions/invite.php:197 lib/messageform.php:178 lib/noticeform.php:232 +#: actions/invite.php:197 lib/messageform.php:178 lib/noticeform.php:234 msgid "Send" msgstr "WyÅ›lij" @@ -1814,18 +1795,9 @@ msgstr "" msgid "You must be logged in to join a group." msgstr "Musisz być zalogowany, aby doÅ‚Ä…czyć do grupy." -#: actions/joingroup.php:90 lib/command.php:217 -msgid "You are already a member of that group" -msgstr "JesteÅ› już czÅ‚onkiem tej grupy" - -#: actions/joingroup.php:128 lib/command.php:234 -#, php-format -msgid "Could not join user %s to group %s" -msgstr "Nie można doÅ‚Ä…czyć użytkownika %s do grupy %s" - #: actions/joingroup.php:135 lib/command.php:239 -#, php-format -msgid "%s joined group %s" +#, fuzzy, php-format +msgid "%1$s joined group %2$s" msgstr "Użytkownik %s doÅ‚Ä…czyÅ‚ do grupy %s" #: actions/leavegroup.php:60 @@ -1840,14 +1812,9 @@ msgstr "Nie jesteÅ› czÅ‚onkiem tej grupy." msgid "Could not find membership record." msgstr "Nie można odnaleźć wpisu czÅ‚onkostwa." -#: actions/leavegroup.php:127 lib/command.php:284 -#, php-format -msgid "Could not remove user %s to group %s" -msgstr "Nie można usunąć użytkownika %s z grupy %s" - #: actions/leavegroup.php:134 lib/command.php:289 -#, php-format -msgid "%s left group %s" +#, fuzzy, php-format +msgid "%1$s left group %2$s" msgstr "Użytkownik %s opuÅ›ciÅ‚ grupÄ™ %s" #: actions/login.php:83 actions/register.php:137 @@ -1866,7 +1833,7 @@ msgstr "Niepoprawna nazwa użytkownika lub hasÅ‚o." msgid "Error setting user. You are probably not authorized." msgstr "BÅ‚Ä…d podczas ustawiania użytkownika. Prawdopodobnie brak upoważnienia." -#: actions/login.php:208 actions/login.php:261 lib/action.php:459 +#: actions/login.php:208 actions/login.php:261 lib/action.php:460 #: lib/logingroupnav.php:79 msgid "Login" msgstr "Zaloguj siÄ™" @@ -1922,18 +1889,18 @@ msgid "Only an admin can make another user an admin." msgstr "Tylko administrator może uczynić innego użytkownika administratorem." #: actions/makeadmin.php:95 -#, php-format -msgid "%s is already an admin for group \"%s\"." +#, fuzzy, php-format +msgid "%1$s is already an admin for group \"%2$s\"." msgstr "Użytkownika %s jest już administratorem grupy \"%s\"." #: actions/makeadmin.php:132 -#, php-format -msgid "Can't get membership record for %s in group %s" +#, fuzzy, php-format +msgid "Can't get membership record for %1$s in group %2$s." msgstr "Nie można uzyskać wpisu czÅ‚onkostwa użytkownika %s w grupie %s" #: actions/makeadmin.php:145 -#, php-format -msgid "Can't make %s an admin for group %s" +#, fuzzy, php-format +msgid "Can't make %1$s an admin for group %2$s." msgstr "Nie można uczynić %s administratorem grupy %s" #: actions/microsummary.php:69 @@ -1975,8 +1942,8 @@ msgid "Message sent" msgstr "WysÅ‚ano wiadomość" #: actions/newmessage.php:185 lib/command.php:376 -#, php-format -msgid "Direct message to %s sent" +#, fuzzy, php-format +msgid "Direct message to %s sent." msgstr "WysÅ‚ano bezpoÅ›redniÄ… wiadomość do użytkownika %s" #: actions/newmessage.php:210 actions/newnotice.php:245 lib/channel.php:170 @@ -2005,8 +1972,8 @@ msgid "Text search" msgstr "Wyszukiwanie tekstu" #: actions/noticesearch.php:91 -#, php-format -msgid "Search results for \"%s\" on %s" +#, fuzzy, php-format +msgid "Search results for \"%1$s\" on %2$s" msgstr "Wyniki wyszukiwania dla \"%s\" na %s" #: actions/noticesearch.php:121 @@ -2115,11 +2082,6 @@ msgstr "WyÅ›wietl lub ukryj ustawienia wyglÄ…du profilu." msgid "URL shortening service is too long (max 50 chars)." msgstr "Adres URL usÅ‚ugi skracania jest za dÅ‚ugi (maksymalnie 50 znaków)." -#: actions/outbox.php:58 -#, php-format -msgid "Outbox for %s - page %d" -msgstr "WysÅ‚ane wiadomoÅ›ci użytkownika %s - strona %d" - #: actions/outbox.php:61 #, php-format msgid "Outbox for %s" @@ -2190,7 +2152,7 @@ msgstr "Nie można zapisać nowego hasÅ‚a." msgid "Password saved." msgstr "Zapisano hasÅ‚o." -#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:308 +#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:326 msgid "Paths" msgstr "Åšcieżki" @@ -2223,7 +2185,7 @@ msgid "Invalid SSL server. The maximum length is 255 characters." msgstr "NieprawidÅ‚owy serwer SSL. Maksymalna dÅ‚ugość to 255 znaków." #: actions/pathsadminpanel.php:217 actions/siteadminpanel.php:58 -#: lib/adminpanelaction.php:299 +#: lib/adminpanelaction.php:311 msgid "Site" msgstr "Strona" @@ -2316,7 +2278,8 @@ msgid "When to use SSL" msgstr "Kiedy używać SSL" #: actions/pathsadminpanel.php:308 -msgid "SSL Server" +#, fuzzy +msgid "SSL server" msgstr "Serwer SSL" #: actions/pathsadminpanel.php:309 @@ -2347,8 +2310,8 @@ msgid "Not a valid people tag: %s" msgstr "NieprawidÅ‚owy znacznik osób: %s" #: actions/peopletag.php:144 -#, php-format -msgid "Users self-tagged with %s - page %d" +#, fuzzy, php-format +msgid "Users self-tagged with %1$s - page %2$d" msgstr "Użytkownicy używajÄ…cy znacznika %s - strona %d" #: actions/postnotice.php:84 @@ -2356,8 +2319,8 @@ msgid "Invalid notice content" msgstr "NieprawidÅ‚owa zawartość wpisu" #: actions/postnotice.php:90 -#, php-format -msgid "Notice license ‘%s’ is not compatible with site license ‘%s’." +#, fuzzy, php-format +msgid "Notice license ‘%1$s’ is not compatible with site license ‘%2$s’." msgstr "Licencja wpisu \"%s\" nie jest zgodna z licencjÄ… strony \"%s\"." #: actions/profilesettings.php:60 @@ -2479,19 +2442,19 @@ msgstr "NieprawidÅ‚owy znacznik: \"%s\"" msgid "Couldn't update user for autosubscribe." msgstr "Nie można zaktualizować użytkownika do automatycznej subskrypcji." -#: actions/profilesettings.php:354 +#: actions/profilesettings.php:359 msgid "Couldn't save location prefs." msgstr "Nie można zapisać preferencji poÅ‚ożenia." -#: actions/profilesettings.php:366 +#: actions/profilesettings.php:371 msgid "Couldn't save profile." msgstr "Nie można zapisać profilu." -#: actions/profilesettings.php:374 +#: actions/profilesettings.php:379 msgid "Couldn't save tags." msgstr "Nie można zapisać znaczników." -#: actions/profilesettings.php:382 lib/adminpanelaction.php:126 +#: actions/profilesettings.php:387 lib/adminpanelaction.php:137 msgid "Settings saved." msgstr "Zapisano ustawienia." @@ -2597,7 +2560,7 @@ msgstr "" "Dlaczego nie [zarejestrujesz konta](%%action.register%%) i zostaniesz " "pierwszym, który go wyÅ›le." -#: actions/publictagcloud.php:135 +#: actions/publictagcloud.php:131 msgid "Tag cloud" msgstr "Chmura znaczników" @@ -2737,7 +2700,7 @@ msgstr "NieprawidÅ‚owy kod zaproszenia." msgid "Registration successful" msgstr "Rejestracja powiodÅ‚a siÄ™" -#: actions/register.php:114 actions/register.php:502 lib/action.php:456 +#: actions/register.php:114 actions/register.php:502 lib/action.php:457 #: lib/logingroupnav.php:85 msgid "Register" msgstr "Zarejestruj siÄ™" @@ -2751,10 +2714,6 @@ msgid "You can't register if you don't agree to the license." msgstr "" "Nie można siÄ™ zarejestrować, jeÅ›li nie zgadzasz siÄ™ z warunkami licencji." -#: actions/register.php:201 -msgid "Not a valid email address." -msgstr "To nie jest prawidÅ‚owy adres e-mail." - #: actions/register.php:212 msgid "Email address already exists." msgstr "Adres e-mail już istnieje." @@ -2814,12 +2773,12 @@ msgstr "" "numer telefonu." #: actions/register.php:537 -#, php-format +#, fuzzy, php-format msgid "" -"Congratulations, %s! And welcome to %%%%site.name%%%%. From here, you may " +"Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may " "want to...\n" "\n" -"* Go to [your profile](%s) and post your first message.\n" +"* Go to [your profile](%2$s) and post your first message.\n" "* Add a [Jabber/GTalk address](%%%%action.imsettings%%%%) so you can send " "notices through instant messages.\n" "* [Search for people](%%%%action.peoplesearch%%%%) that you may know or that " @@ -2943,11 +2902,6 @@ msgstr "Powtórzono." msgid "Replies to %s" msgstr "Odpowiedzi na %s" -#: actions/replies.php:127 -#, php-format -msgid "Replies to %s, page %d" -msgstr "Odpowiedzi na %s, strona %d" - #: actions/replies.php:144 #, php-format msgid "Replies feed for %s (RSS 1.0)" @@ -2964,10 +2918,10 @@ msgid "Replies feed for %s (Atom)" msgstr "KanaÅ‚ odpowiedzi dla użytkownika %s (Atom)" #: actions/replies.php:198 -#, php-format +#, fuzzy, php-format msgid "" -"This is the timeline showing replies to %s but %s hasn't received a notice " -"to his attention yet." +"This is the timeline showing replies to %1$s but %2$s hasn't received a " +"notice to his attention yet." msgstr "" "To jest oÅ› czasu wyÅ›wietlajÄ…ca odpowiedzi na wpisy użytkownika %s, ale %s " "nie otrzymaÅ‚ jeszcze wpisów wymagajÄ…cych jego uwagi." @@ -2982,10 +2936,10 @@ msgstr "" "[doÅ‚Ä…czyć do grup](%%action.groups%%)." #: actions/replies.php:205 -#, php-format +#, fuzzy, php-format msgid "" -"You can try to [nudge %s](../%s) or [post something to his or her attention]" -"(%%%%action.newnotice%%%%?status_textarea=%s)." +"You can try to [nudge %1$s](../%2$s) or [post something to his or her " +"attention](%%%%action.newnotice%%%%?status_textarea=%3$s)." msgstr "" "Można spróbować [szturchnąć użytkownika %s](../%s) lub [wysÅ‚ać coÅ› " "wymagajÄ…cego jego uwagi](%%%%action.newnotice%%%%?status_textarea=%s)." @@ -3003,11 +2957,6 @@ msgstr "Nie można ograniczać użytkowników na tej stronie." msgid "User is already sandboxed." msgstr "Użytkownik jest już ograniczony." -#: actions/showfavorites.php:79 -#, php-format -msgid "%s's favorite notices, page %d" -msgstr "Ulubione wpisy użytkownika %s, strona %d" - #: actions/showfavorites.php:132 msgid "Could not retrieve favorite notices." msgstr "Nie można odebrać ulubionych wpisów." @@ -3065,11 +3014,6 @@ msgstr "To jest sposób na współdzielenie tego, co chcesz." msgid "%s group" msgstr "Grupa %s" -#: actions/showgroup.php:84 -#, php-format -msgid "%s group, page %d" -msgstr "Grupa %s, strona %d" - #: actions/showgroup.php:218 msgid "Group profile" msgstr "Profil grupy" @@ -3118,7 +3062,7 @@ msgstr "CzÅ‚onkowie" #: actions/showgroup.php:386 lib/profileaction.php:117 #: lib/profileaction.php:148 lib/profileaction.php:236 lib/section.php:95 -#: lib/tagcloudsection.php:71 +#: lib/subscriptionlist.php:126 lib/tagcloudsection.php:71 msgid "(None)" msgstr "(Brak)" @@ -3194,14 +3138,9 @@ msgstr "UsuniÄ™to wpis." msgid " tagged %s" msgstr " ze znacznikiem %s" -#: actions/showstream.php:79 -#, php-format -msgid "%s, page %d" -msgstr "%s, strona %d" - #: actions/showstream.php:122 -#, php-format -msgid "Notice feed for %s tagged %s (RSS 1.0)" +#, fuzzy, php-format +msgid "Notice feed for %1$s tagged %2$s (RSS 1.0)" msgstr "KanaÅ‚ wpisów dla %s ze znacznikiem %s (RSS 1.0)" #: actions/showstream.php:129 @@ -3225,8 +3164,8 @@ msgid "FOAF for %s" msgstr "FOAF dla %s" #: actions/showstream.php:191 -#, php-format -msgid "This is the timeline for %s but %s hasn't posted anything yet." +#, fuzzy, php-format +msgid "This is the timeline for %1$s but %2$s hasn't posted anything yet." msgstr "" "To jest oÅ› czasu dla użytkownika %s, ale %s nie nic jeszcze nie wysÅ‚aÅ‚." @@ -3239,10 +3178,10 @@ msgstr "" "teraz jest dobry czas, aby zacząć. :)" #: actions/showstream.php:198 -#, php-format +#, fuzzy, php-format msgid "" -"You can try to nudge %s or [post something to his or her attention](%%%%" -"action.newnotice%%%%?status_textarea=%s)." +"You can try to nudge %1$s or [post something to his or her attention](%%%%" +"action.newnotice%%%%?status_textarea=%2$s)." msgstr "" "Można spróbować szturchnąć użytkownika %s lub [wysÅ‚ać coÅ›, co wymaga jego " "uwagi](%%%%action.newnotice%%%%?status_textarea=%s)." @@ -3294,12 +3233,13 @@ msgid "Site name must have non-zero length." msgstr "Nazwa strony nie może mieć zerowÄ… dÅ‚ugość." #: actions/siteadminpanel.php:154 -msgid "You must have a valid contact email address" +#, fuzzy +msgid "You must have a valid contact email address." msgstr "Należy posiadać prawidÅ‚owy kontaktowy adres e-mail" #: actions/siteadminpanel.php:172 -#, php-format -msgid "Unknown language \"%s\"" +#, fuzzy, php-format +msgid "Unknown language \"%s\"." msgstr "Nieznany jÄ™zyk \"%s\"" #: actions/siteadminpanel.php:179 @@ -3483,7 +3423,8 @@ msgid "Save site settings" msgstr "Zapisz ustawienia strony" #: actions/smssettings.php:58 -msgid "SMS Settings" +#, fuzzy +msgid "SMS settings" msgstr "Ustawienia SMS" #: actions/smssettings.php:69 @@ -3512,7 +3453,8 @@ msgid "Enter the code you received on your phone." msgstr "Podaj kod, który otrzymaÅ‚eÅ› na telefonie." #: actions/smssettings.php:138 -msgid "SMS Phone number" +#, fuzzy +msgid "SMS phone number" msgstr "Numer telefonu SMS" #: actions/smssettings.php:140 @@ -3603,8 +3545,8 @@ msgid "%s subscribers" msgstr "Subskrybenci użytkownika %s" #: actions/subscribers.php:52 -#, php-format -msgid "%s subscribers, page %d" +#, fuzzy, php-format +msgid "%1$s subscribers, page %2$d" msgstr "Subskrybenci użytkownika %s, strona %d" #: actions/subscribers.php:63 @@ -3644,8 +3586,8 @@ msgid "%s subscriptions" msgstr "Subskrypcje użytkownika %s" #: actions/subscriptions.php:54 -#, php-format -msgid "%s subscriptions, page %d" +#, fuzzy, php-format +msgid "%1$s subscriptions, page %2$d" msgstr "Subskrypcje użytkownika %s, strona %d" #: actions/subscriptions.php:65 @@ -3686,11 +3628,6 @@ msgstr "Jabber" msgid "SMS" msgstr "SMS" -#: actions/tag.php:68 -#, php-format -msgid "Notices tagged with %s, page %d" -msgstr "Wpisy ze znacznikiem %s, strona %d" - #: actions/tag.php:86 #, php-format msgid "Notice feed for tag %s (RSS 1.0)" @@ -3775,22 +3712,19 @@ msgstr "Użytkownik nie jest wyciszony." msgid "No profile id in request." msgstr "Brak identyfikatora profilu w żądaniu." -#: actions/unsubscribe.php:84 -msgid "No profile with that id." -msgstr "Brak profilu z tym identyfikatorem." - #: actions/unsubscribe.php:98 msgid "Unsubscribed" msgstr "Zrezygnowano z subskrypcji" #: actions/updateprofile.php:62 actions/userauthorization.php:330 -#, php-format -msgid "Listenee stream license ‘%s’ is not compatible with site license ‘%s’." +#, fuzzy, php-format +msgid "" +"Listenee stream license ‘%1$s’ is not compatible with site license ‘%2$s’." msgstr "" "Licencja nasÅ‚uchiwanego strumienia \"%s\" nie jest zgodna z licencjÄ… strony " "\"%s\"." -#: actions/useradminpanel.php:58 lib/adminpanelaction.php:305 +#: actions/useradminpanel.php:58 lib/adminpanelaction.php:321 #: lib/personalgroupnav.php:115 msgid "User" msgstr "Użytkownik" @@ -3891,7 +3825,7 @@ msgstr "" "wpisy tego użytkownika. Jeżeli nie prosiÅ‚eÅ› o subskrypcjÄ™ czyichÅ› wpisów, " "naciÅ›nij \"Odrzuć\"." -#: actions/userauthorization.php:188 +#: actions/userauthorization.php:188 actions/version.php:165 msgid "License" msgstr "Licencja" @@ -3943,8 +3877,8 @@ msgstr "" "Sprawdź w instrukcjach strony, jak w peÅ‚ni odrzucić subskrypcjÄ™." #: actions/userauthorization.php:296 -#, php-format -msgid "Listener URI ‘%s’ not found here" +#, fuzzy, php-format +msgid "Listener URI ‘%s’ not found here." msgstr "Adres URI nasÅ‚uchujÄ…cego \"%s\" nie zostaÅ‚ tutaj odnaleziony" #: actions/userauthorization.php:301 @@ -3977,10 +3911,6 @@ msgstr "Nie można odczytać adresu URL awatara \"%s\"." msgid "Wrong image type for avatar URL ‘%s’." msgstr "BÅ‚Ä™dny typ obrazu dla adresu URL awatara \"%s\"." -#: actions/userbyid.php:70 -msgid "No ID." -msgstr "Brak identyfikatora." - #: actions/userdesignsettings.php:76 lib/designsettings.php:65 msgid "Profile design" msgstr "WyglÄ…d profilu" @@ -3996,11 +3926,6 @@ msgstr "" msgid "Enjoy your hotdog!" msgstr "Smacznego hot-doga." -#: actions/usergroups.php:64 -#, php-format -msgid "%s groups, page %d" -msgstr "Grupy %s, strona %d" - #: actions/usergroups.php:130 msgid "Search for more groups" msgstr "Wyszukaj wiÄ™cej grup" @@ -4015,6 +3940,73 @@ msgstr "Użytkownik %s nie jest czÅ‚onkiem żadnej grupy." msgid "Try [searching for groups](%%action.groupsearch%%) and joining them." msgstr "Spróbuj [wyszukać grupy](%%action.groupsearch%%) i doÅ‚Ä…czyć do nich." +#: actions/version.php:73 +#, fuzzy, php-format +msgid "StatusNet %s" +msgstr "Statystyki" + +#: actions/version.php:153 +#, php-format +msgid "" +"This site is powered by %1$s version %2$s, Copyright 2008-2010 StatusNet, " +"Inc. and contributors." +msgstr "" + +#: actions/version.php:157 +#, fuzzy +msgid "StatusNet" +msgstr "UsuniÄ™to stan." + +#: actions/version.php:161 +msgid "Contributors" +msgstr "" + +#: actions/version.php:168 +msgid "" +"StatusNet is free software: you can redistribute it and/or modify it under " +"the terms of the GNU Affero General Public License as published by the Free " +"Software Foundation, either version 3 of the License, or (at your option) " +"any later version. " +msgstr "" + +#: actions/version.php:174 +msgid "" +"This program is distributed in the hope that it will be useful, but WITHOUT " +"ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or " +"FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License " +"for more details. " +msgstr "" + +#: actions/version.php:180 +#, php-format +msgid "" +"You should have received a copy of the GNU Affero General Public License " +"along with this program. If not, see %s." +msgstr "" + +#: actions/version.php:189 +msgid "Plugins" +msgstr "" + +#: actions/version.php:195 +#, fuzzy +msgid "Name" +msgstr "Pseudonim" + +#: actions/version.php:196 lib/action.php:741 +#, fuzzy +msgid "Version" +msgstr "Sesje" + +#: actions/version.php:197 +#, fuzzy +msgid "Author(s)" +msgstr "Autor" + +#: actions/version.php:198 lib/groupeditform.php:172 +msgid "Description" +msgstr "Opis" + #: classes/File.php:137 #, php-format msgid "" @@ -4090,7 +4082,7 @@ msgstr "Problem podczas zapisywania wpisu." msgid "DB error inserting reply: %s" msgstr "BÅ‚Ä…d bazy danych podczas wprowadzania odpowiedzi: %s" -#: classes/Notice.php:1361 +#: classes/Notice.php:1359 #, php-format msgid "RT @%1$s %2$s" msgstr "RT @%1$s %2$s" @@ -4136,137 +4128,132 @@ msgstr "Inne" msgid "Other options" msgstr "Inne opcje" -#: lib/action.php:144 -#, php-format -msgid "%s - %s" -msgstr "%s - %s" - #: lib/action.php:159 msgid "Untitled page" msgstr "Strona bez nazwy" -#: lib/action.php:426 +#: lib/action.php:427 msgid "Primary site navigation" msgstr "Główna nawigacja strony" -#: lib/action.php:432 +#: lib/action.php:433 msgid "Home" msgstr "Strona domowa" -#: lib/action.php:432 +#: lib/action.php:433 msgid "Personal profile and friends timeline" msgstr "Profil osobisty i oÅ› czasu przyjaciół" -#: lib/action.php:434 +#: lib/action.php:435 msgid "Account" msgstr "Konto" -#: lib/action.php:434 +#: lib/action.php:435 msgid "Change your email, avatar, password, profile" msgstr "ZmieÅ„ adres e-mail, awatar, hasÅ‚o, profil" -#: lib/action.php:437 +#: lib/action.php:438 msgid "Connect" msgstr "PoÅ‚Ä…cz" -#: lib/action.php:437 +#: lib/action.php:438 msgid "Connect to services" msgstr "PoÅ‚Ä…cz z serwisami" -#: lib/action.php:441 +#: lib/action.php:442 msgid "Change site configuration" msgstr "ZmieÅ„ konfiguracjÄ™ strony" -#: lib/action.php:445 lib/subgroupnav.php:105 +#: lib/action.php:446 lib/subgroupnav.php:105 msgid "Invite" msgstr "ZaproÅ›" -#: lib/action.php:446 lib/subgroupnav.php:106 +#: lib/action.php:447 lib/subgroupnav.php:106 #, php-format msgid "Invite friends and colleagues to join you on %s" msgstr "ZaproÅ› przyjaciół i kolegów do doÅ‚Ä…czenia do ciebie na %s" -#: lib/action.php:451 +#: lib/action.php:452 msgid "Logout" msgstr "Wyloguj siÄ™" -#: lib/action.php:451 +#: lib/action.php:452 msgid "Logout from the site" msgstr "Wyloguj siÄ™ ze strony" -#: lib/action.php:456 +#: lib/action.php:457 msgid "Create an account" msgstr "Utwórz konto" -#: lib/action.php:459 +#: lib/action.php:460 msgid "Login to the site" msgstr "Zaloguj siÄ™ na stronÄ™" -#: lib/action.php:462 lib/action.php:725 +#: lib/action.php:463 lib/action.php:726 msgid "Help" msgstr "Pomoc" -#: lib/action.php:462 +#: lib/action.php:463 msgid "Help me!" msgstr "Pomóż mi." -#: lib/action.php:465 lib/searchaction.php:127 +#: lib/action.php:466 lib/searchaction.php:127 msgid "Search" msgstr "Wyszukaj" -#: lib/action.php:465 +#: lib/action.php:466 msgid "Search for people or text" msgstr "Wyszukaj osoby lub tekst" -#: lib/action.php:486 +#: lib/action.php:487 msgid "Site notice" msgstr "Wpis strony" -#: lib/action.php:552 +#: lib/action.php:553 msgid "Local views" msgstr "Lokalne widoki" -#: lib/action.php:618 +#: lib/action.php:619 msgid "Page notice" msgstr "Wpis strony" -#: lib/action.php:720 +#: lib/action.php:721 msgid "Secondary site navigation" msgstr "Druga nawigacja strony" -#: lib/action.php:727 +#: lib/action.php:728 msgid "About" msgstr "O usÅ‚udze" -#: lib/action.php:729 +#: lib/action.php:730 msgid "FAQ" msgstr "FAQ" -#: lib/action.php:733 +#: lib/action.php:734 msgid "TOS" msgstr "TOS" -#: lib/action.php:736 +#: lib/action.php:737 msgid "Privacy" msgstr "Prywatność" -#: lib/action.php:738 +#: lib/action.php:739 msgid "Source" msgstr "Kod źródÅ‚owy" -#: lib/action.php:740 +#: lib/action.php:743 msgid "Contact" msgstr "Kontakt" -#: lib/action.php:742 +#: lib/action.php:745 msgid "Badge" msgstr "Odznaka" -#: lib/action.php:770 +#: lib/action.php:773 msgid "StatusNet software license" msgstr "Licencja oprogramowania StatusNet" -#: lib/action.php:773 +#: lib/action.php:776 #, php-format msgid "" "**%%site.name%%** is a microblogging service brought to you by [%%site." @@ -4275,12 +4262,12 @@ msgstr "" "**%%site.name%%** jest usÅ‚ugÄ… mikroblogowania prowadzonÄ… przez [%%site." "broughtby%%](%%site.broughtbyurl%%). " -#: lib/action.php:775 +#: lib/action.php:778 #, php-format msgid "**%%site.name%%** is a microblogging service. " msgstr "**%%site.name%%** jest usÅ‚ugÄ… mikroblogowania. " -#: lib/action.php:777 +#: lib/action.php:780 #, php-format msgid "" "It runs the [StatusNet](http://status.net/) microblogging software, version %" @@ -4291,31 +4278,31 @@ msgstr "" "status.net/) w wersji %s, dostÄ™pnego na [Powszechnej Licencji Publicznej GNU " "Affero](http://www.fsf.org/licensing/licenses/agpl-3.0.html)." -#: lib/action.php:791 +#: lib/action.php:794 msgid "Site content license" msgstr "Licencja zawartoÅ›ci strony" -#: lib/action.php:800 +#: lib/action.php:803 msgid "All " msgstr "Wszystko " -#: lib/action.php:805 +#: lib/action.php:808 msgid "license." msgstr "licencja." -#: lib/action.php:1099 +#: lib/action.php:1102 msgid "Pagination" msgstr "Paginacja" -#: lib/action.php:1108 +#: lib/action.php:1111 msgid "After" msgstr "Później" -#: lib/action.php:1116 +#: lib/action.php:1119 msgid "Before" msgstr "WczeÅ›niej" -#: lib/action.php:1164 +#: lib/action.php:1167 msgid "There was a problem with your session token." msgstr "WystÄ…piÅ‚ problem z tokenem sesji." @@ -4323,27 +4310,32 @@ msgstr "WystÄ…piÅ‚ problem z tokenem sesji." msgid "You cannot make changes to this site." msgstr "Nie można wprowadzić zmian strony." -#: lib/adminpanelaction.php:195 +#: lib/adminpanelaction.php:107 +#, fuzzy +msgid "Changes to that panel are not allowed." +msgstr "Rejestracja nie jest dozwolona." + +#: lib/adminpanelaction.php:206 msgid "showForm() not implemented." msgstr "showForm() nie jest zaimplementowane." -#: lib/adminpanelaction.php:224 +#: lib/adminpanelaction.php:235 msgid "saveSettings() not implemented." msgstr "saveSettings() nie jest zaimplementowane." -#: lib/adminpanelaction.php:247 +#: lib/adminpanelaction.php:258 msgid "Unable to delete design setting." msgstr "Nie można usunąć ustawienia wyglÄ…du." -#: lib/adminpanelaction.php:300 +#: lib/adminpanelaction.php:312 msgid "Basic site configuration" msgstr "Podstawowa konfiguracja strony" -#: lib/adminpanelaction.php:303 +#: lib/adminpanelaction.php:317 msgid "Design configuration" msgstr "Konfiguracja wyglÄ…du" -#: lib/adminpanelaction.php:306 lib/adminpanelaction.php:309 +#: lib/adminpanelaction.php:322 lib/adminpanelaction.php:327 msgid "Paths configuration" msgstr "Konfiguracja Å›cieżek" @@ -4367,11 +4359,19 @@ msgstr "Powiadamia, kiedy pojawia siÄ™ ten zaÅ‚Ä…cznik" msgid "Tags for this attachment" msgstr "Znaczniki dla tego zaÅ‚Ä…cznika" +#: lib/authenticationplugin.php:182 lib/authenticationplugin.php:187 +msgid "Password changing failed" +msgstr "Zmiana hasÅ‚a nie powiodÅ‚a siÄ™" + +#: lib/authenticationplugin.php:197 +msgid "Password changing is not allowed" +msgstr "Zmiana hasÅ‚a nie jest dozwolona" + #: lib/channel.php:138 lib/channel.php:158 msgid "Command results" msgstr "Wyniki polecenia" -#: lib/channel.php:210 +#: lib/channel.php:210 lib/mailhandler.php:142 msgid "Command complete" msgstr "ZakoÅ„czono polecenie" @@ -4384,8 +4384,8 @@ msgid "Sorry, this command is not yet implemented." msgstr "Te polecenie nie zostaÅ‚o jeszcze zaimplementowane." #: lib/command.php:88 -#, php-format -msgid "Could not find a user with nickname %s" +#, fuzzy, php-format +msgid "Could not find a user with nickname %s." msgstr "Nie można odnaleźć użytkownika z pseudonimem %s" #: lib/command.php:92 @@ -4393,8 +4393,8 @@ msgid "It does not make a lot of sense to nudge yourself!" msgstr "Szturchanie samego siebie nie ma zbyt wiele sensu." #: lib/command.php:99 -#, php-format -msgid "Nudge sent to %s" +#, fuzzy, php-format +msgid "Nudge sent to %s." msgstr "WysÅ‚ano szturchniÄ™cie do użytkownika %s" #: lib/command.php:126 @@ -4409,34 +4409,36 @@ msgstr "" "Wpisy: %3$s" #: lib/command.php:152 lib/command.php:399 lib/command.php:460 -msgid "Notice with that id does not exist" +#, fuzzy +msgid "Notice with that id does not exist." msgstr "Wpis z tym identyfikatorem nie istnieje" #: lib/command.php:168 lib/command.php:415 lib/command.php:476 #: lib/command.php:532 -msgid "User has no last notice" +#, fuzzy +msgid "User has no last notice." msgstr "Użytkownik nie posiada ostatniego wpisu" #: lib/command.php:190 msgid "Notice marked as fave." msgstr "Zaznaczono wpis jako ulubiony." -#: lib/command.php:315 -#, php-format -msgid "%1$s (%2$s)" -msgstr "%1$s (%2$s)" +#: lib/command.php:284 +#, fuzzy, php-format +msgid "Could not remove user %1$s to group %2$s." +msgstr "Nie można usunąć użytkownika %s z grupy %s" #: lib/command.php:318 -#, php-format -msgid "Fullname: %s" +#, fuzzy, php-format +msgid "Full name: %s" msgstr "ImiÄ™ i nazwisko: %s" -#: lib/command.php:321 +#: lib/command.php:321 lib/mail.php:254 #, php-format msgid "Location: %s" msgstr "PoÅ‚ożenie: %s" -#: lib/command.php:324 +#: lib/command.php:324 lib/mail.php:256 #, php-format msgid "Homepage: %s" msgstr "Strona domowa: %s" @@ -4447,25 +4449,17 @@ msgid "About: %s" msgstr "O mnie: %s" #: lib/command.php:358 scripts/xmppdaemon.php:301 -#, php-format -msgid "Message too long - maximum is %d characters, you sent %d" +#, fuzzy, php-format +msgid "Message too long - maximum is %1$d characters, you sent %2$d." msgstr "Wiadomość jest za dÅ‚uga - maksymalnie %d znaków, wysÅ‚ano %d" #: lib/command.php:378 msgid "Error sending direct message." msgstr "BÅ‚Ä…d podczas wysyÅ‚ania bezpoÅ›redniej wiadomoÅ›ci." -#: lib/command.php:422 -msgid "Cannot repeat your own notice" -msgstr "Nie można powtórzyć wÅ‚asnego wpisu" - -#: lib/command.php:427 -msgid "Already repeated that notice" -msgstr "Już powtórzono ten wpis" - #: lib/command.php:435 -#, php-format -msgid "Notice from %s repeated" +#, fuzzy, php-format +msgid "Notice from %s repeated." msgstr "Powtórzono wpis od użytkownika %s" #: lib/command.php:437 @@ -4473,13 +4467,13 @@ msgid "Error repeating notice." msgstr "BÅ‚Ä…d podczas powtarzania wpisu." #: lib/command.php:491 -#, php-format -msgid "Notice too long - maximum is %d characters, you sent %d" +#, fuzzy, php-format +msgid "Notice too long - maximum is %1$d characters, you sent %2$d." msgstr "Wpis jest za dÅ‚ugi - maksymalnie %d znaków, wysÅ‚ano %d" #: lib/command.php:500 -#, php-format -msgid "Reply to %s sent" +#, fuzzy, php-format +msgid "Reply to %s sent." msgstr "WysÅ‚ano odpowiedź do %s" #: lib/command.php:502 @@ -4487,7 +4481,8 @@ msgid "Error saving notice." msgstr "BÅ‚Ä…d podczas zapisywania wpisu." #: lib/command.php:556 -msgid "Specify the name of the user to subscribe to" +#, fuzzy +msgid "Specify the name of the user to subscribe to." msgstr "Podaj nazwÄ™ użytkownika do subskrybowania" #: lib/command.php:563 @@ -4496,7 +4491,8 @@ msgid "Subscribed to %s" msgstr "Subskrybowano użytkownika %s" #: lib/command.php:584 -msgid "Specify the name of the user to unsubscribe from" +#, fuzzy +msgid "Specify the name of the user to unsubscribe from." msgstr "Podaj nazwÄ™ użytkownika do usuniÄ™cia subskrypcji" #: lib/command.php:591 @@ -4525,17 +4521,18 @@ msgid "Can't turn on notification." msgstr "Nie można wÅ‚Ä…czyć powiadomieÅ„." #: lib/command.php:650 -msgid "Login command is disabled" +#, fuzzy +msgid "Login command is disabled." msgstr "Polecenie logowania jest wyÅ‚Ä…czone" #: lib/command.php:664 -#, php-format -msgid "Could not create login token for %s" +#, fuzzy, php-format +msgid "Could not create login token for %s." msgstr "Nie można utworzyć tokenów loginów dla %s" #: lib/command.php:669 -#, php-format -msgid "This link is useable only once, and is good for only 2 minutes: %s" +#, fuzzy, php-format +msgid "This link is useable only once, and is good for only 2 minutes: %s." msgstr "" "Ten odnoÅ›nik można użyć tylko raz i bÄ™dzie prawidÅ‚owy tylko przez dwie " "minuty: %s" @@ -4767,10 +4764,6 @@ msgstr "Opisz grupÄ™ lub temat" msgid "Describe the group or topic in %d characters" msgstr "Opisz grupÄ™ lub temat w %d znakach" -#: lib/groupeditform.php:172 -msgid "Description" -msgstr "Opis" - #: lib/groupeditform.php:179 msgid "" "Location for the group, if any, like \"City, State (or Region), Country\"" @@ -4956,21 +4949,9 @@ msgstr "" "----\n" "ZmieÅ„ adres e-mail lub opcje powiadamiania na %8$s\n" -#: lib/mail.php:254 -#, php-format -msgid "Location: %s\n" -msgstr "PoÅ‚ożenie: %s\n" - -#: lib/mail.php:256 -#, php-format -msgid "Homepage: %s\n" -msgstr "Strona domowa: %s\n" - #: lib/mail.php:258 -#, php-format -msgid "" -"Bio: %s\n" -"\n" +#, fuzzy, php-format +msgid "Bio: %s" msgstr "" "O mnie: %s\n" "\n" @@ -5171,6 +5152,27 @@ msgstr "" msgid "from" msgstr "z" +#: lib/mailhandler.php:37 +msgid "Could not parse message." +msgstr "Nie można przetworzyć wiadomoÅ›ci." + +#: lib/mailhandler.php:42 +msgid "Not a registered user." +msgstr "To nie jest zarejestrowany użytkownik." + +#: lib/mailhandler.php:46 +msgid "Sorry, that is not your incoming email address." +msgstr "To nie jest przychodzÄ…cy adres e-mail." + +#: lib/mailhandler.php:50 +msgid "Sorry, no incoming email allowed." +msgstr "PrzychodzÄ…cy e-mail nie jest dozwolony." + +#: lib/mailhandler.php:228 +#, fuzzy, php-format +msgid "Unsupported message type: %s" +msgstr "NieobsÅ‚ugiwany format pliku obrazu." + #: lib/mediafile.php:98 lib/mediafile.php:123 msgid "There was a database error while saving your file. Please try again." msgstr "WystÄ…piÅ‚ bÅ‚Ä…d bazy danych podczas zapisywania pliku. Spróbuj ponownie." @@ -5203,7 +5205,8 @@ msgid "File upload stopped by extension." msgstr "WysÅ‚anie pliku zostaÅ‚o zatrzymane przez rozszerzenie." #: lib/mediafile.php:179 lib/mediafile.php:216 -msgid "File exceeds user's quota!" +#, fuzzy +msgid "File exceeds user's quota." msgstr "Plik przekracza przydziaÅ‚ użytkownika." #: lib/mediafile.php:196 lib/mediafile.php:233 @@ -5211,7 +5214,8 @@ msgid "File could not be moved to destination directory." msgstr "Nie można przenieść pliku do katalogu docelowego." #: lib/mediafile.php:201 lib/mediafile.php:237 -msgid "Could not determine file's mime-type!" +#, fuzzy +msgid "Could not determine file's MIME type." msgstr "Nie można okreÅ›lić typu MIME pliku." #: lib/mediafile.php:270 @@ -5220,8 +5224,8 @@ msgid " Try using another %s format." msgstr " Spróbuj innego formatu %s." #: lib/mediafile.php:275 -#, php-format -msgid "%s is not a supported filetype on this server." +#, fuzzy, php-format +msgid "%s is not a supported file type on this server." msgstr "%s nie jest obsÅ‚ugiwanym typem pliku na tym serwerze." #: lib/messageform.php:120 @@ -5254,8 +5258,18 @@ msgid "Attach a file" msgstr "ZaÅ‚Ä…cz plik" #: lib/noticeform.php:212 -msgid "Share your location" -msgstr "Podziel siÄ™ swoim poÅ‚ożeniem" +#, fuzzy +msgid "Share my location." +msgstr "Ujawnij swojÄ… lokalizacjÄ™" + +#: lib/noticeform.php:214 +#, fuzzy +msgid "Do not share my location." +msgstr "Ujawnij swojÄ… lokalizacjÄ™" + +#: lib/noticeform.php:215 +msgid "Hide this info" +msgstr "" #: lib/noticelist.php:428 #, php-format @@ -5371,6 +5385,11 @@ msgstr "WysÅ‚ane wiadomoÅ›ci" msgid "Tags in %s's notices" msgstr "Znaczniki we wpisach użytkownika %s" +#: lib/plugin.php:114 +#, fuzzy +msgid "Unknown" +msgstr "Nieznane dziaÅ‚anie" + #: lib/profileaction.php:109 lib/profileaction.php:192 lib/subgroupnav.php:82 msgid "Subscriptions" msgstr "Subskrypcje" @@ -5540,10 +5559,6 @@ msgstr "Chmura znaczników osób, które same sobie nadaÅ‚y znaczniki" msgid "People Tagcloud as tagged" msgstr "Chmura znaczników osób ze znacznikami" -#: lib/subscriptionlist.php:126 -msgid "(none)" -msgstr "(brak)" - #: lib/tagcloudsection.php:56 msgid "None" msgstr "Brak" @@ -5659,19 +5674,3 @@ msgid "%s is not a valid color! Use 3 or 6 hex chars." msgstr "" "%s nie jest prawidÅ‚owym kolorem. Użyj trzech lub szeÅ›ciu znaków " "szesnastkowych." - -#: scripts/maildaemon.php:48 -msgid "Could not parse message." -msgstr "Nie można przetworzyć wiadomoÅ›ci." - -#: scripts/maildaemon.php:53 -msgid "Not a registered user." -msgstr "To nie jest zarejestrowany użytkownik." - -#: scripts/maildaemon.php:57 -msgid "Sorry, that is not your incoming email address." -msgstr "To nie jest przychodzÄ…cy adres e-mail." - -#: scripts/maildaemon.php:61 -msgid "Sorry, no incoming email allowed." -msgstr "PrzychodzÄ…cy e-mail nie jest dozwolony." diff --git a/locale/pt/LC_MESSAGES/statusnet.po b/locale/pt/LC_MESSAGES/statusnet.po index c8af43117..75b4cd429 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-01-03 10:37+0000\n" -"PO-Revision-Date: 2010-01-03 10:38:36+0000\n" +"POT-Creation-Date: 2010-01-10 11:27+0000\n" +"PO-Revision-Date: 2010-01-10 11:28:55+0000\n" "Language-Team: Portuguese\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha (r60575); Translate extension (2009-12-06)\n" +"X-Generator: MediaWiki 1.16alpha (r60888); Translate extension (2010-01-04)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: pt\n" "X-Message-Group: out-statusnet\n" @@ -51,11 +51,6 @@ msgstr "Página não encontrada." msgid "No such user." msgstr "Utilizador não encontrado." -#: actions/all.php:84 -#, php-format -msgid "%s and friends, page %d" -msgstr "%s e amigos, página %d" - #: actions/all.php:86 actions/all.php:167 actions/allrss.php:115 #: actions/apitimelinefriends.php:115 actions/apitimelinehome.php:115 #: lib/personalgroupnav.php:100 @@ -97,11 +92,11 @@ msgstr "" #: actions/all.php:134 #, php-format msgid "" -"You can try to [nudge %s](../%s) from his profile or [post something to his " -"or her attention](%%%%action.newnotice%%%%?status_textarea=%s)." +"You can try to [nudge %1$s](../%2$s) from his profile or [post something to " +"his or her attention](%%%%action.newnotice%%%%?status_textarea=%3$s)." msgstr "" -"Tente [acotovelar %s](../%s) a partir do perfil ou [publicar qualquer coisa " -"à sua atenção](%%%%action.newnotice%%%%?status_textarea=%s)." +"Pode tentar [dar um toque em %1$s](../%2$s) a partir do perfil ou [publicar " +"qualquer coisa à sua atenção](%%%%action.newnotice%%%%?status_textarea=%3$s)." #: actions/all.php:137 actions/replies.php:209 actions/showstream.php:202 #, php-format @@ -109,8 +104,8 @@ msgid "" "Why not [register an account](%%%%action.register%%%%) and then nudge %s or " "post a notice to his or her attention." msgstr "" -"Podia [registar uma conta](%%%%action.register%%%%) e depois acotovelar %s " -"ou publicar uma nota à sua atenção." +"Podia [registar uma conta](%%%%action.register%%%%) e depois dar um toque em " +"%s ou publicar uma nota à sua atenção." #: actions/all.php:165 msgid "You and friends" @@ -127,6 +122,23 @@ msgstr "Actualizações de %1$s e amigos no %2$s!" #: actions/apiaccountupdateprofile.php:97 #: actions/apiaccountupdateprofilebackgroundimage.php:94 #: actions/apiaccountupdateprofilecolors.php:118 +#: actions/apidirectmessage.php:156 actions/apifavoritecreate.php:99 +#: actions/apifavoritedestroy.php:100 actions/apifriendshipscreate.php:100 +#: actions/apifriendshipsdestroy.php:100 actions/apifriendshipsshow.php:129 +#: actions/apigroupcreate.php:136 actions/apigroupismember.php:114 +#: actions/apigroupjoin.php:155 actions/apigroupleave.php:141 +#: actions/apigrouplist.php:132 actions/apigrouplistall.php:120 +#: actions/apigroupmembership.php:106 actions/apigroupshow.php:105 +#: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102 +#: actions/apistatusesretweets.php:112 actions/apistatusesshow.php:108 +#: actions/apistatusnetconfig.php:133 actions/apistatusnetversion.php:93 +#: actions/apisubscriptions.php:111 actions/apitimelinefavorites.php:146 +#: actions/apitimelinefriends.php:156 actions/apitimelinegroup.php:150 +#: actions/apitimelinehome.php:156 actions/apitimelinementions.php:151 +#: actions/apitimelinepublic.php:131 actions/apitimelineretweetedbyme.php:122 +#: actions/apitimelineretweetedtome.php:121 +#: actions/apitimelineretweetsofme.php:122 actions/apitimelinetag.php:141 +#: actions/apitimelineuser.php:165 actions/apiusershow.php:101 msgid "API method not found." msgstr "Método da API não encontrado." @@ -185,6 +197,9 @@ msgstr "" #: actions/apiaccountupdateprofilebackgroundimage.php:146 #: actions/apiaccountupdateprofilecolors.php:164 #: actions/apiaccountupdateprofilecolors.php:174 +#: actions/groupdesignsettings.php:287 actions/groupdesignsettings.php:297 +#: actions/userdesignsettings.php:210 actions/userdesignsettings.php:220 +#: actions/userdesignsettings.php:263 actions/userdesignsettings.php:273 msgid "Unable to save your design settings." msgstr "Não foi possÃvel gravar as configurações do design." @@ -225,26 +240,6 @@ msgstr "Mensagens directas para %s" msgid "All the direct messages sent to %s" msgstr "Todas as mensagens directas enviadas para %s" -#: actions/apidirectmessage.php:156 actions/apifavoritecreate.php:99 -#: actions/apifavoritedestroy.php:100 actions/apifriendshipscreate.php:100 -#: actions/apifriendshipsdestroy.php:100 actions/apifriendshipsshow.php:129 -#: actions/apigroupcreate.php:136 actions/apigroupismember.php:114 -#: actions/apigroupjoin.php:155 actions/apigroupleave.php:141 -#: actions/apigrouplist.php:132 actions/apigrouplistall.php:120 -#: actions/apigroupmembership.php:106 actions/apigroupshow.php:105 -#: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102 -#: actions/apistatusesretweets.php:112 actions/apistatusesshow.php:108 -#: actions/apistatusnetconfig.php:133 actions/apistatusnetversion.php:93 -#: actions/apisubscriptions.php:111 actions/apitimelinefavorites.php:146 -#: actions/apitimelinefriends.php:156 actions/apitimelinegroup.php:150 -#: actions/apitimelinehome.php:156 actions/apitimelinementions.php:151 -#: actions/apitimelinepublic.php:131 actions/apitimelineretweetedbyme.php:122 -#: actions/apitimelineretweetedtome.php:121 -#: actions/apitimelineretweetsofme.php:122 actions/apitimelinetag.php:141 -#: actions/apitimelineuser.php:165 actions/apiusershow.php:101 -msgid "API method not found!" -msgstr "Método da API não encontrado!" - #: actions/apidirectmessagenew.php:126 msgid "No message text!" msgstr "Mensagem não tem texto!" @@ -269,7 +264,8 @@ msgid "No status found with that ID." msgstr "Nenhum estado encontrado com esse ID." #: actions/apifavoritecreate.php:119 -msgid "This status is already a favorite!" +#, fuzzy +msgid "This status is already a favorite." msgstr "Este estado já é um favorito!" #: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:176 @@ -277,7 +273,8 @@ msgid "Could not create favorite." msgstr "Não foi possÃvel criar o favorito." #: actions/apifavoritedestroy.php:122 -msgid "That status is not a favorite!" +#, fuzzy +msgid "That status is not a favorite." msgstr "Esse estado não é um favorito!" #: actions/apifavoritedestroy.php:134 actions/disfavor.php:87 @@ -299,7 +296,8 @@ msgstr "" "Não foi possÃvel deixar de seguir utilizador: Utilizador não encontrado." #: actions/apifriendshipsdestroy.php:120 -msgid "You cannot unfollow yourself!" +#, fuzzy +msgid "You cannot unfollow yourself." msgstr "Não pode deixar de seguir-se a si próprio!" #: actions/apifriendshipsexists.php:94 @@ -384,7 +382,7 @@ msgstr "Os cognomes não podem ser iguais à alcunha." msgid "Group not found!" msgstr "Grupo não foi encontrado!" -#: actions/apigroupjoin.php:110 +#: actions/apigroupjoin.php:110 actions/joingroup.php:90 lib/command.php:217 msgid "You are already a member of that group." msgstr "Já é membro desse grupo." @@ -392,30 +390,25 @@ msgstr "Já é membro desse grupo." msgid "You have been blocked from that group by the admin." msgstr "Foi bloqueado desse grupo pelo administrador." -#: actions/apigroupjoin.php:138 +#: actions/apigroupjoin.php:138 actions/joingroup.php:128 lib/command.php:234 #, php-format -msgid "Could not join user %s to group %s." -msgstr "Não foi possÃvel adicionar %s ao grupo %s." +msgid "Could not join user %1$s to group %2$s." +msgstr "Não foi possÃvel adicionar %1$s ao grupo %2$s." #: actions/apigroupleave.php:114 msgid "You are not a member of this group." msgstr "Não é membro deste grupo." -#: actions/apigroupleave.php:124 +#: actions/apigroupleave.php:124 actions/leavegroup.php:127 #, php-format -msgid "Could not remove user %s to group %s." -msgstr "Não foi possÃvel remover %s do grupo %s." +msgid "Could not remove user %1$s from group %2$s." +msgstr "Não foi possÃvel remover %1$s do grupo %2$s." #: actions/apigrouplist.php:95 #, php-format msgid "%s's groups" msgstr "Grupos de %s" -#: actions/apigrouplist.php:103 -#, php-format -msgid "Groups %s is a member of on %s." -msgstr "Grupos de que %s é membro em %s." - #: actions/apigrouplistall.php:90 actions/usergroups.php:62 #, php-format msgid "%s groups" @@ -439,11 +432,11 @@ msgstr "Não pode apagar o estado de outro utilizador." msgid "No such notice." msgstr "Nota não encontrada." -#: actions/apistatusesretweet.php:83 +#: actions/apistatusesretweet.php:83 lib/command.php:422 msgid "Cannot repeat your own notice." msgstr "Não pode repetir a sua própria nota." -#: actions/apistatusesretweet.php:91 +#: actions/apistatusesretweet.php:91 lib/command.php:427 msgid "Already repeated that notice." msgstr "Já repetiu essa nota." @@ -456,7 +449,7 @@ msgid "No status with that ID found." msgstr "Não foi encontrado um estado com esse ID." #: actions/apistatusesupdate.php:157 actions/newnotice.php:155 -#: scripts/maildaemon.php:71 +#: lib/mailhandler.php:60 #, php-format msgid "That's too long. Max notice size is %d chars." msgstr "Demasiado longo. Tamanho máx. das notas é %d caracteres." @@ -476,13 +469,13 @@ msgstr "Formato não suportado." #: actions/apitimelinefavorites.php:108 #, php-format -msgid "%s / Favorites from %s" -msgstr "%s / Favoritas de %s" +msgid "%1$s / Favorites from %2$s" +msgstr "%1$s / Favoritas de %2$s" #: actions/apitimelinefavorites.php:120 #, php-format -msgid "%s updates favorited by %s / %s." -msgstr "%s actualizações preferidas por %s / %s" +msgid "%1$s updates favorited by %2$s / %2$s." +msgstr "%1$s actualizações preferidas por %2$s / %2$s." #: actions/apitimelinegroup.php:109 actions/apitimelineuser.php:118 #: actions/grouprss.php:131 actions/userrss.php:90 @@ -549,8 +542,11 @@ msgstr "Não encontrado." msgid "No such attachment." msgstr "Anexo não encontrado." -#: actions/avatarbynickname.php:59 actions/grouprss.php:91 -#: actions/leavegroup.php:76 +#: actions/avatarbynickname.php:59 actions/blockedfromgroup.php:73 +#: actions/editgroup.php:84 actions/groupdesignsettings.php:84 +#: actions/grouplogo.php:86 actions/groupmembers.php:76 +#: actions/grouprss.php:91 actions/joingroup.php:76 actions/leavegroup.php:76 +#: actions/showgroup.php:121 msgid "No nickname." msgstr "Nenhuma alcunha." @@ -573,8 +569,8 @@ msgid "You can upload your personal avatar. The maximum file size is %s." msgstr "Pode carregar o seu avatar pessoal. O tamanho máximo do ficheiro é %s." #: actions/avatarsettings.php:106 actions/avatarsettings.php:185 -#: actions/grouplogo.php:178 actions/remotesubscribe.php:191 -#: actions/userauthorization.php:72 actions/userrss.php:103 +#: actions/remotesubscribe.php:191 actions/userauthorization.php:72 +#: actions/userrss.php:103 msgid "User without matching profile" msgstr "Utilizador sem perfil correspondente" @@ -606,9 +602,9 @@ msgstr "Carregar" msgid "Crop" msgstr "Cortar" -#: actions/avatarsettings.php:268 actions/disfavor.php:74 -#: actions/emailsettings.php:238 actions/favor.php:75 actions/geocode.php:50 -#: actions/groupblock.php:66 actions/grouplogo.php:309 +#: actions/avatarsettings.php:268 actions/deletenotice.php:157 +#: actions/disfavor.php:74 actions/emailsettings.php:238 actions/favor.php:75 +#: actions/geocode.php:50 actions/groupblock.php:66 actions/grouplogo.php:309 #: actions/groupunblock.php:66 actions/imsettings.php:206 #: actions/invite.php:56 actions/login.php:135 actions/makeadmin.php:66 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80 @@ -691,19 +687,15 @@ msgstr "Bloquear este utilizador" msgid "Failed to save block information." msgstr "Não foi possÃvel gravar informação do bloqueio." -#: actions/blockedfromgroup.php:73 actions/editgroup.php:84 -#: actions/groupdesignsettings.php:84 actions/grouplogo.php:86 -#: actions/groupmembers.php:76 actions/joingroup.php:76 -#: actions/showgroup.php:121 -msgid "No nickname" -msgstr "Sem alcunha" - #: actions/blockedfromgroup.php:80 actions/editgroup.php:96 +#: actions/foafgroup.php:44 actions/foafgroup.php:62 actions/groupblock.php:86 #: actions/groupbyid.php:83 actions/groupdesignsettings.php:97 #: actions/grouplogo.php:99 actions/groupmembers.php:83 -#: actions/joingroup.php:83 actions/showgroup.php:137 -msgid "No such group" -msgstr "Grupo não existe" +#: actions/grouprss.php:98 actions/groupunblock.php:86 +#: actions/joingroup.php:83 actions/leavegroup.php:83 actions/makeadmin.php:86 +#: actions/showgroup.php:137 lib/command.php:212 lib/command.php:263 +msgid "No such group." +msgstr "Grupo não foi encontrado." #: actions/blockedfromgroup.php:90 #, php-format @@ -712,8 +704,8 @@ msgstr "%s perfis bloqueados" #: actions/blockedfromgroup.php:93 #, php-format -msgid "%s blocked profiles, page %d" -msgstr "%s perfis bloqueados, página %d" +msgid "%1$s blocked profiles, page %2$d" +msgstr "Perfis bloqueados de %1$s, página %2$d" #: actions/blockedfromgroup.php:108 msgid "A list of the users blocked from joining this group." @@ -825,11 +817,6 @@ msgstr "Não apagar esta nota" msgid "Delete this notice" msgstr "Apagar esta nota" -#: actions/deletenotice.php:157 -msgid "There was a problem with your session token. Try again, please." -msgstr "" -"Ocorreu um problema com o seu código de sessão. Tente novamente, por favor." - #: actions/deleteuser.php:67 msgid "You cannot delete users." msgstr "Não pode apagar utilizadores." @@ -855,7 +842,7 @@ msgid "Delete this user" msgstr "Apagar este utilizador" #: actions/designadminpanel.php:62 lib/accountsettingsaction.php:124 -#: lib/adminpanelaction.php:302 lib/groupnav.php:119 +#: lib/adminpanelaction.php:316 lib/groupnav.php:119 msgid "Design" msgstr "Design" @@ -995,7 +982,8 @@ msgstr "Tem de iniciar uma sessão para criar o grupo." #: actions/editgroup.php:103 actions/editgroup.php:168 #: actions/groupdesignsettings.php:104 actions/grouplogo.php:106 -msgid "You must be an admin to edit the group" +#, fuzzy +msgid "You must be an admin to edit the group." msgstr "Tem de ser administrador para editar o grupo" #: actions/editgroup.php:154 @@ -1020,7 +1008,8 @@ msgid "Options saved." msgstr "Opções gravadas." #: actions/emailsettings.php:60 -msgid "Email Settings" +#, fuzzy +msgid "Email settings" msgstr "Configurações do correio electrónico" #: actions/emailsettings.php:71 @@ -1057,8 +1046,9 @@ msgid "Cancel" msgstr "Cancelar" #: actions/emailsettings.php:121 -msgid "Email Address" -msgstr "Endereço electrónico" +#, fuzzy +msgid "Email address" +msgstr "Endereços de correio electrónico" #: actions/emailsettings.php:123 msgid "Email address, like \"UserName@example.org\"" @@ -1113,7 +1103,7 @@ msgstr "" #: actions/emailsettings.php:179 msgid "Allow friends to nudge me and send me an email." -msgstr "Permitir que amigos me acotovelem e enviem mensagens electrónicas." +msgstr "Permitir que amigos me dêm toques e enviem mensagens electrónicas." #: actions/emailsettings.php:185 msgid "I want to post notices by email." @@ -1136,9 +1126,10 @@ msgstr "Sem endereço de correio electrónico." msgid "Cannot normalize that email address" msgstr "Não é possÃvel normalizar esse endereço electrónico" -#: actions/emailsettings.php:331 actions/siteadminpanel.php:157 -msgid "Not a valid email address" -msgstr "Endereço electrónico inválido." +#: actions/emailsettings.php:331 actions/register.php:201 +#: actions/siteadminpanel.php:157 +msgid "Not a valid email address." +msgstr "Correio electrónico é inválido." #: actions/emailsettings.php:334 msgid "That is already your email address." @@ -1320,18 +1311,11 @@ msgstr "Serviço remoto usa uma versão desconhecida do protocolo OMB." msgid "Error updating remote profile" msgstr "Erro ao actualizar o perfil remoto" -#: actions/foafgroup.php:44 actions/foafgroup.php:62 actions/groupblock.php:86 -#: actions/grouprss.php:98 actions/groupunblock.php:86 -#: actions/leavegroup.php:83 actions/makeadmin.php:86 lib/command.php:212 -#: lib/command.php:263 -msgid "No such group." -msgstr "Grupo não foi encontrado." - -#: actions/getfile.php:75 +#: actions/getfile.php:79 msgid "No such file." msgstr "Ficheiro não foi encontrado." -#: actions/getfile.php:79 +#: actions/getfile.php:83 msgid "Cannot read file." msgstr "Não foi possÃvel ler o ficheiro." @@ -1343,7 +1327,7 @@ msgstr "Não foi especificado um perfil." #: actions/groupblock.php:76 actions/groupunblock.php:76 #: actions/makeadmin.php:76 actions/subedit.php:53 actions/tagother.php:46 -#: lib/profileformaction.php:77 +#: actions/unsubscribe.php:84 lib/profileformaction.php:77 msgid "No profile with that ID." msgstr "Não foi encontrado um perfil com essa identificação." @@ -1371,12 +1355,12 @@ msgstr "Bloquear acesso do utilizador ao grupo" #: actions/groupblock.php:162 #, php-format msgid "" -"Are you sure you want to block user \"%s\" from the group \"%s\"? They will " -"be removed from the group, unable to post, and unable to subscribe to the " -"group in the future." +"Are you sure you want to block user \"%1$s\" from the group \"%2$s\"? They " +"will be removed from the group, unable to post, and unable to subscribe to " +"the group in the future." msgstr "" -"Tem a certeza de que quer bloquear o acesso do utilizador \"%s\" ao grupo \"%" -"s\"? Ele será removido do grupo, impossibilitado de publicar e " +"Tem a certeza de que quer bloquear o acesso do utilizador \"%1$s\" ao grupo " +"\"%2$s\"? Ele será removido do grupo, impossibilitado de publicar e " "impossibilitado de subscrever o grupo no futuro." #: actions/groupblock.php:178 @@ -1391,9 +1375,9 @@ msgstr "Bloquear acesso deste utilizador a este grupo" msgid "Database error blocking user from group." msgstr "Erro na base de dados ao bloquear acesso do utilizador ao grupo." -#: actions/groupbyid.php:74 -msgid "No ID" -msgstr "Sem ID" +#: actions/groupbyid.php:74 actions/userbyid.php:70 +msgid "No ID." +msgstr "Sem ID." #: actions/groupdesignsettings.php:68 msgid "You must be logged in to edit a group." @@ -1416,12 +1400,6 @@ msgstr "" msgid "Couldn't update your design." msgstr "Não foi possÃvel actualizar o design." -#: actions/groupdesignsettings.php:287 actions/groupdesignsettings.php:297 -#: actions/userdesignsettings.php:210 actions/userdesignsettings.php:220 -#: actions/userdesignsettings.php:263 actions/userdesignsettings.php:273 -msgid "Unable to save your design settings!" -msgstr "Não foi possÃvel actualizar as suas configurações do design!" - #: actions/groupdesignsettings.php:308 actions/userdesignsettings.php:231 msgid "Design preferences saved." msgstr "Preferências do design foram gravadas." @@ -1438,6 +1416,11 @@ msgstr "" "Pode carregar uma imagem para logótipo do seu grupo. O tamanho máximo do " "ficheiro é %s." +#: actions/grouplogo.php:178 +#, fuzzy +msgid "User without matching profile." +msgstr "Utilizador sem perfil correspondente" + #: actions/grouplogo.php:362 msgid "Pick a square area of the image to be the logo." msgstr "Escolha uma área quadrada da imagem para ser o logótipo." @@ -1457,14 +1440,14 @@ msgstr "Membros do grupo %s" #: actions/groupmembers.php:96 #, php-format -msgid "%s group members, page %d" -msgstr "Membros do grupo %s, página %d" +msgid "%1$s group members, page %2$d" +msgstr "Membros do grupo %1$s, página %2$d" #: actions/groupmembers.php:111 msgid "A list of the users in this group." msgstr "Uma lista dos utilizadores neste grupo." -#: actions/groupmembers.php:175 lib/action.php:441 lib/groupnav.php:107 +#: actions/groupmembers.php:175 lib/action.php:442 lib/groupnav.php:107 msgid "Admin" msgstr "Admin" @@ -1567,7 +1550,8 @@ msgid "Error removing the block." msgstr "Erro ao remover o bloqueio." #: actions/imsettings.php:59 -msgid "IM Settings" +#, fuzzy +msgid "IM settings" msgstr "Definições de IM" #: actions/imsettings.php:70 @@ -1598,7 +1582,8 @@ msgstr "" "amigos?)" #: actions/imsettings.php:124 -msgid "IM Address" +#, fuzzy +msgid "IM address" msgstr "Endereço IM" #: actions/imsettings.php:126 @@ -1660,11 +1645,6 @@ msgstr "" msgid "That is not your Jabber ID." msgstr "Esse não é o seu Jabber ID." -#: actions/inbox.php:59 -#, php-format -msgid "Inbox for %s - page %d" -msgstr "Caixa de entrada de %s - página %d" - #: actions/inbox.php:62 #, php-format msgid "Inbox for %s" @@ -1704,10 +1684,10 @@ msgstr "Convidar novos utilizadores" msgid "You are already subscribed to these users:" msgstr "Já subscreveu estes utilizadores:" -#: actions/invite.php:131 actions/invite.php:139 +#: actions/invite.php:131 actions/invite.php:139 lib/command.php:315 #, php-format -msgid "%s (%s)" -msgstr "%s (%s)" +msgid "%1$s (%2$s)" +msgstr "%1$s (%2$s)" #: actions/invite.php:136 msgid "" @@ -1749,7 +1729,7 @@ msgstr "Mensagem pessoal" msgid "Optionally add a personal message to the invitation." msgstr "Pode optar por acrescentar uma mensagem pessoal ao convite" -#: actions/invite.php:197 lib/messageform.php:178 lib/noticeform.php:232 +#: actions/invite.php:197 lib/messageform.php:178 lib/noticeform.php:234 msgid "Send" msgstr "Enviar" @@ -1818,19 +1798,10 @@ msgstr "" msgid "You must be logged in to join a group." msgstr "Precisa de iniciar uma sessão para se juntar a um grupo." -#: actions/joingroup.php:90 lib/command.php:217 -msgid "You are already a member of that group" -msgstr "Já é membro desse grupo" - -#: actions/joingroup.php:128 lib/command.php:234 -#, php-format -msgid "Could not join user %s to group %s" -msgstr "Não foi possÃvel juntar o utilizador %s ao grupo %s" - #: actions/joingroup.php:135 lib/command.php:239 #, php-format -msgid "%s joined group %s" -msgstr "%s juntou-se ao grupo %s" +msgid "%1$s joined group %2$s" +msgstr "%1$s juntou-se ao grupo %2$s" #: actions/leavegroup.php:60 msgid "You must be logged in to leave a group." @@ -1844,15 +1815,10 @@ msgstr "Não é um membro desse grupo." msgid "Could not find membership record." msgstr "Não foi encontrado um registo de membro de grupo." -#: actions/leavegroup.php:127 lib/command.php:284 -#, php-format -msgid "Could not remove user %s to group %s" -msgstr "Não foi possÃvel remover o utilizador %s do grupo %s" - #: actions/leavegroup.php:134 lib/command.php:289 #, php-format -msgid "%s left group %s" -msgstr "%s deixou o grupo %s" +msgid "%1$s left group %2$s" +msgstr "%1$s deixou o grupo %2$s" #: actions/login.php:83 actions/register.php:137 msgid "Already logged in." @@ -1870,7 +1836,7 @@ msgstr "Nome de utilizador ou palavra-chave incorrectos." msgid "Error setting user. You are probably not authorized." msgstr "Erro ao preparar o utilizador. Provavelmente não está autorizado." -#: actions/login.php:208 actions/login.php:261 lib/action.php:459 +#: actions/login.php:208 actions/login.php:261 lib/action.php:460 #: lib/logingroupnav.php:79 msgid "Login" msgstr "Entrar" @@ -1927,18 +1893,18 @@ msgstr "Só um administrador pode tornar outro utilizador num administrador." #: actions/makeadmin.php:95 #, php-format -msgid "%s is already an admin for group \"%s\"." -msgstr "%s já é um administrador do grupo \"%s\"." +msgid "%1$s is already an admin for group \"%2$s\"." +msgstr "%1$s já é um administrador do grupo \"%2$s\"." #: actions/makeadmin.php:132 -#, php-format -msgid "Can't get membership record for %s in group %s" -msgstr "Não existe registo de %s ter entrado no grupo %s" +#, fuzzy, php-format +msgid "Can't get membership record for %1$s in group %2$s." +msgstr "Não existe registo de %1$s ter entrado no grupo %2$s" #: actions/makeadmin.php:145 -#, php-format -msgid "Can't make %s an admin for group %s" -msgstr "Não é possÃvel tornar %s administrador do grupo %s" +#, fuzzy, php-format +msgid "Can't make %1$s an admin for group %2$s." +msgstr "Não é possÃvel tornar %1$s administrador do grupo %2$s" #: actions/microsummary.php:69 msgid "No current status" @@ -1979,8 +1945,8 @@ msgid "Message sent" msgstr "Mensagem enviada" #: actions/newmessage.php:185 lib/command.php:376 -#, php-format -msgid "Direct message to %s sent" +#, fuzzy, php-format +msgid "Direct message to %s sent." msgstr "Mensagem directa para %s enviada" #: actions/newmessage.php:210 actions/newnotice.php:245 lib/channel.php:170 @@ -2010,8 +1976,8 @@ msgstr "Pesquisa de texto" #: actions/noticesearch.php:91 #, php-format -msgid "Search results for \"%s\" on %s" -msgstr "Resultados da pesquisa de \"%s\" em %s" +msgid "Search results for \"%1$s\" on %2$s" +msgstr "Resultados da pesquisa de \"%1$s\" em %2$s" #: actions/noticesearch.php:121 #, php-format @@ -2045,16 +2011,16 @@ msgstr "Actualizações que contêm o termo \"%1$s\" em %2$s!" msgid "" "This user doesn't allow nudges or hasn't confirmed or set his email yet." msgstr "" -"Este utilizador não aceita cotoveladas ou ainda não confirmou ou forneceu o " +"Este utilizador não aceita toques ou ainda não forneceu ou confirmou o " "endereço electrónico." #: actions/nudge.php:94 msgid "Nudge sent" -msgstr "Cotovelada enviada" +msgstr "Toque enviado" #: actions/nudge.php:97 msgid "Nudge sent!" -msgstr "Cotovelada enviada!" +msgstr "Toque enviado!" #: actions/oembed.php:79 actions/shownotice.php:100 msgid "Notice has no profile" @@ -2118,11 +2084,6 @@ msgstr "Mostrar ou esconder designs para o perfil." msgid "URL shortening service is too long (max 50 chars)." msgstr "Serviço de compactação de URLs demasiado extenso (máx. 50 caracteres)" -#: actions/outbox.php:58 -#, php-format -msgid "Outbox for %s - page %d" -msgstr "Caixa de saÃda de %s - página %d" - #: actions/outbox.php:61 #, php-format msgid "Outbox for %s" @@ -2194,7 +2155,7 @@ msgstr "Não é possÃvel guardar a nova palavra-chave." msgid "Password saved." msgstr "Palavra-chave gravada." -#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:308 +#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:326 msgid "Paths" msgstr "Localizações" @@ -2227,7 +2188,7 @@ msgid "Invalid SSL server. The maximum length is 255 characters." msgstr "Servidor SSL inválido. O tamanho máximo é 255 caracteres." #: actions/pathsadminpanel.php:217 actions/siteadminpanel.php:58 -#: lib/adminpanelaction.php:299 +#: lib/adminpanelaction.php:311 msgid "Site" msgstr "Site" @@ -2320,7 +2281,8 @@ msgid "When to use SSL" msgstr "Quando usar SSL" #: actions/pathsadminpanel.php:308 -msgid "SSL Server" +#, fuzzy +msgid "SSL server" msgstr "Servidor SSL" #: actions/pathsadminpanel.php:309 @@ -2352,8 +2314,8 @@ msgstr "Categoria de pessoas inválida: %s" #: actions/peopletag.php:144 #, php-format -msgid "Users self-tagged with %s - page %d" -msgstr "Utilizadores auto-categorizados com %s - página %d" +msgid "Users self-tagged with %1$s - page %2$d" +msgstr "Utilizadores auto-categorizados com %1$s - página %2$d" #: actions/postnotice.php:84 msgid "Invalid notice content" @@ -2361,8 +2323,9 @@ msgstr "Conteúdo da nota é inválido" #: actions/postnotice.php:90 #, php-format -msgid "Notice license ‘%s’ is not compatible with site license ‘%s’." -msgstr "A licença ‘%s’ da nota não é compatÃvel com a licença ‘%s’ do site." +msgid "Notice license ‘%1$s’ is not compatible with site license ‘%2$s’." +msgstr "" +"A licença ‘%1$s’ da nota não é compatÃvel com a licença ‘%2$s’ do site." #: actions/profilesettings.php:60 msgid "Profile settings" @@ -2425,7 +2388,7 @@ msgstr "Onde está, por ex. \"Cidade, Região, PaÃs\"" #: actions/profilesettings.php:138 msgid "Share my current location when posting notices" -msgstr "Compartilhar a minha localização presente ao publicar notas" +msgstr "Partilhar a minha localização presente ao publicar notas" #: actions/profilesettings.php:145 actions/tagother.php:149 #: actions/tagother.php:209 lib/subscriptionlist.php:106 @@ -2484,19 +2447,19 @@ msgstr "Categoria inválida: \"%s\"" msgid "Couldn't update user for autosubscribe." msgstr "Não foi possÃvel actualizar o utilizador para subscrição automática." -#: actions/profilesettings.php:354 +#: actions/profilesettings.php:359 msgid "Couldn't save location prefs." msgstr "Não foi possÃvel gravar as preferências de localização." -#: actions/profilesettings.php:366 +#: actions/profilesettings.php:371 msgid "Couldn't save profile." msgstr "Não foi possÃvel gravar o perfil." -#: actions/profilesettings.php:374 +#: actions/profilesettings.php:379 msgid "Couldn't save tags." msgstr "Não foi possÃvel gravar as categorias." -#: actions/profilesettings.php:382 lib/adminpanelaction.php:126 +#: actions/profilesettings.php:387 lib/adminpanelaction.php:137 msgid "Settings saved." msgstr "Configurações gravadas." @@ -2605,7 +2568,7 @@ msgstr "" "Podia [registar uma conta](%%action.register%%) e ser a primeira pessoa a " "publicar uma!" -#: actions/publictagcloud.php:135 +#: actions/publictagcloud.php:131 msgid "Tag cloud" msgstr "Nuvem de categorias" @@ -2748,7 +2711,7 @@ msgstr "Desculpe, código de convite inválido." msgid "Registration successful" msgstr "Registo efectuado" -#: actions/register.php:114 actions/register.php:502 lib/action.php:456 +#: actions/register.php:114 actions/register.php:502 lib/action.php:457 #: lib/logingroupnav.php:85 msgid "Register" msgstr "Registar" @@ -2761,10 +2724,6 @@ msgstr "Registo não é permitido." msgid "You can't register if you don't agree to the license." msgstr "Não se pode registar se não aceita a licença." -#: actions/register.php:201 -msgid "Not a valid email address." -msgstr "Correio electrónico é inválido." - #: actions/register.php:212 msgid "Email address already exists." msgstr "Correio electrónico já existe." @@ -2827,10 +2786,10 @@ msgstr "" #: actions/register.php:537 #, php-format msgid "" -"Congratulations, %s! And welcome to %%%%site.name%%%%. From here, you may " +"Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may " "want to...\n" "\n" -"* Go to [your profile](%s) and post your first message.\n" +"* Go to [your profile](%2$s) and post your first message.\n" "* Add a [Jabber/GTalk address](%%%%action.imsettings%%%%) so you can send " "notices through instant messages.\n" "* [Search for people](%%%%action.peoplesearch%%%%) that you may know or that " @@ -2842,17 +2801,17 @@ msgid "" "\n" "Thanks for signing up and we hope you enjoy using this service." msgstr "" -"Parabéns, %s! Bem-vindo(a) ao site %%%%site.name%%%%. A partir daqui, " +"Parabéns, %1$s! Bem-vindo(a) ao site %%%%site.name%%%%. A partir daqui, " "pode...\n" "\n" -"* Visitar o [seu perfil](%s) e enviar a primeira mensagem.\n" +"* Visitar o [seu perfil](%2$s) e enviar a primeira mensagem.\n" "* Adicionar um [endereço Jabber/GTalk](%%%%action.imsettings%%%%) de forma a " "poder enviar notas por mensagens instantâneas.\n" "* [Procurar pessoas](%%%%action.peoplesearch%%%%) que conheça ou que " "partilhem os seus interesses. \n" "* Actualizar as suas [configurações de perfil](%%%%action.profilesettings%%%" "%) para contar mais acerca de si aos outros.\n" -"* Ler a [documentação em linha](%%%%doc.help%%%%) para conhecer " +"* Ler a [documentação online](%%%%doc.help%%%%) para conhecer " "funcionalidades que lhe tenham escapado. \n" "\n" "Obrigado por se ter registado e esperamos que se divirta usando este serviço." @@ -2954,11 +2913,6 @@ msgstr "Repetida!" msgid "Replies to %s" msgstr "Respostas a %s" -#: actions/replies.php:127 -#, php-format -msgid "Replies to %s, page %d" -msgstr "Respostas a %s, página %d" - #: actions/replies.php:144 #, php-format msgid "Replies feed for %s (RSS 1.0)" @@ -2977,10 +2931,10 @@ msgstr "Feed de respostas a %s (Atom)" #: actions/replies.php:198 #, php-format msgid "" -"This is the timeline showing replies to %s but %s hasn't received a notice " -"to his attention yet." +"This is the timeline showing replies to %1$s but %2$s hasn't received a " +"notice to his attention yet." msgstr "" -"Estas são as notas de resposta a %s, mas %s ainda não recebeu nenhuma " +"Estas são as notas de resposta a %1$s, mas %2$s ainda não recebeu nenhuma " "resposta." #: actions/replies.php:203 @@ -2995,11 +2949,11 @@ msgstr "" #: actions/replies.php:205 #, php-format msgid "" -"You can try to [nudge %s](../%s) or [post something to his or her attention]" -"(%%%%action.newnotice%%%%?status_textarea=%s)." +"You can try to [nudge %1$s](../%2$s) or [post something to his or her " +"attention](%%%%action.newnotice%%%%?status_textarea=%3$s)." msgstr "" -"Pode tentar [acotovelar %s](../%s) ou [publicar algo à atenção dele(a)](%%%%" -"action.newnotice%%%%?status_textarea=%s)." +"Pode tentar [dar um toque em %1$s](../%2$s) ou [publicar algo à sua atenção]" +"(%%%%action.newnotice%%%%?status_textarea=%3$s)." #: actions/repliesrss.php:72 #, php-format @@ -3014,11 +2968,6 @@ msgstr "Não pode impedir notas públicas neste site." msgid "User is already sandboxed." msgstr "Utilizador já está impedido de criar notas públicas." -#: actions/showfavorites.php:79 -#, php-format -msgid "%s's favorite notices, page %d" -msgstr "Notas favoritas de %s, página %d" - #: actions/showfavorites.php:132 msgid "Could not retrieve favorite notices." msgstr "Não foi possÃvel importar notas favoritas." @@ -3076,11 +3025,6 @@ msgstr "Esta é uma forma de partilhar aquilo de que gosta." msgid "%s group" msgstr "Grupo %s" -#: actions/showgroup.php:84 -#, php-format -msgid "%s group, page %d" -msgstr "Grupo %s, página %d" - #: actions/showgroup.php:218 msgid "Group profile" msgstr "Perfil do grupo" @@ -3129,7 +3073,7 @@ msgstr "Membros" #: actions/showgroup.php:386 lib/profileaction.php:117 #: lib/profileaction.php:148 lib/profileaction.php:236 lib/section.php:95 -#: lib/tagcloudsection.php:71 +#: lib/subscriptionlist.php:126 lib/tagcloudsection.php:71 msgid "(None)" msgstr "(Nenhum)" @@ -3205,30 +3149,25 @@ msgstr "Avatar actualizado." msgid " tagged %s" msgstr " categorizou %s" -#: actions/showstream.php:79 -#, php-format -msgid "%s, page %d" -msgstr "%s, página %d" - #: actions/showstream.php:122 #, php-format -msgid "Notice feed for %s tagged %s (RSS 1.0)" -msgstr "Feed de notas para %s categorizado %s (RSS 1.0)" +msgid "Notice feed for %1$s tagged %2$s (RSS 1.0)" +msgstr "Feed de notas de %1$s com a categoria %2$s (RSS 1.0)" #: actions/showstream.php:129 #, php-format msgid "Notice feed for %s (RSS 1.0)" -msgstr "Feed de notas para %s (RSS 1.0)" +msgstr "Feed de notas de %s (RSS 1.0)" #: actions/showstream.php:136 #, php-format msgid "Notice feed for %s (RSS 2.0)" -msgstr "Feed de notas para %s (RSS 2.0)" +msgstr "Feed de notas de %s (RSS 2.0)" #: actions/showstream.php:143 #, php-format msgid "Notice feed for %s (Atom)" -msgstr "Feed de notas para %s (Atom)" +msgstr "Feed de notas de %s (Atom)" #: actions/showstream.php:148 #, php-format @@ -3237,8 +3176,8 @@ msgstr "FOAF para %s" #: actions/showstream.php:191 #, php-format -msgid "This is the timeline for %s but %s hasn't posted anything yet." -msgstr "Estas são as notas de %s, mas %s ainda não publicou nenhuma." +msgid "This is the timeline for %1$s but %2$s hasn't posted anything yet." +msgstr "Estas são as notas de %1$s, mas %2$s ainda não publicou nenhuma." #: actions/showstream.php:196 msgid "" @@ -3251,11 +3190,11 @@ msgstr "" #: actions/showstream.php:198 #, php-format msgid "" -"You can try to nudge %s or [post something to his or her attention](%%%%" -"action.newnotice%%%%?status_textarea=%s)." +"You can try to nudge %1$s or [post something to his or her attention](%%%%" +"action.newnotice%%%%?status_textarea=%2$s)." msgstr "" -"Pode tentar acotovelar %s ou [publicar algo que lhe chame a atenção](%%%%" -"action.newnotice%%%%?status_textarea=%s)." +"Pode tentar dar um toque em %1$s ou [publicar algo à sua atenção](%%%%action." +"newnotice%%%%?status_textarea=%2$s)." #: actions/showstream.php:234 #, php-format @@ -3304,12 +3243,13 @@ msgid "Site name must have non-zero length." msgstr "Nome do site não pode ter comprimento zero." #: actions/siteadminpanel.php:154 -msgid "You must have a valid contact email address" +#, fuzzy +msgid "You must have a valid contact email address." msgstr "Tem de ter um endereço válido para o correio electrónico de contacto" #: actions/siteadminpanel.php:172 -#, php-format -msgid "Unknown language \"%s\"" +#, fuzzy, php-format +msgid "Unknown language \"%s\"." msgstr "LÃngua desconhecida \"%s\"" #: actions/siteadminpanel.php:179 @@ -3491,7 +3431,8 @@ msgid "Save site settings" msgstr "Gravar configurações do site" #: actions/smssettings.php:58 -msgid "SMS Settings" +#, fuzzy +msgid "SMS settings" msgstr "Configurações de SMS" #: actions/smssettings.php:69 @@ -3520,7 +3461,8 @@ msgid "Enter the code you received on your phone." msgstr "Introduza o código que recebeu no seu telefone." #: actions/smssettings.php:138 -msgid "SMS Phone number" +#, fuzzy +msgid "SMS phone number" msgstr "Número de telefone para SMS" #: actions/smssettings.php:140 @@ -3613,8 +3555,8 @@ msgstr "Subscritores de %s" #: actions/subscribers.php:52 #, php-format -msgid "%s subscribers, page %d" -msgstr "Subscritores de %s, página %d" +msgid "%1$s subscribers, page %2$d" +msgstr "Subscritores de %1$s, página %2$d" #: actions/subscribers.php:63 msgid "These are the people who listen to your notices." @@ -3654,8 +3596,8 @@ msgstr "Subscrições de %s" #: actions/subscriptions.php:54 #, php-format -msgid "%s subscriptions, page %d" -msgstr "Subscrições de %s, página %d" +msgid "%1$s subscriptions, page %2$d" +msgstr "Subscrições de %1$s, página %2$d" #: actions/subscriptions.php:65 msgid "These are the people whose notices you listen to." @@ -3695,11 +3637,6 @@ msgstr "Jabber" msgid "SMS" msgstr "SMS" -#: actions/tag.php:68 -#, php-format -msgid "Notices tagged with %s, page %d" -msgstr "Notas categorizadas com %s, página %d" - #: actions/tag.php:86 #, php-format msgid "Notice feed for tag %s (RSS 1.0)" @@ -3783,21 +3720,19 @@ msgstr "Utilizador não está silenciado." msgid "No profile id in request." msgstr "O pedido não tem a identificação do perfil." -#: actions/unsubscribe.php:84 -msgid "No profile with that id." -msgstr "Não existe um perfil com essa identificação." - #: actions/unsubscribe.php:98 msgid "Unsubscribed" msgstr "Subscrição cancelada" #: actions/updateprofile.php:62 actions/userauthorization.php:330 #, php-format -msgid "Listenee stream license ‘%s’ is not compatible with site license ‘%s’." +msgid "" +"Listenee stream license ‘%1$s’ is not compatible with site license ‘%2$s’." msgstr "" -"Licença ‘%s’ da listenee stream não é compatÃvel com a licença ‘%s’ do site." +"Licença ‘%1$s’ da listenee stream não é compatÃvel com a licença ‘%2$s’ do " +"site." -#: actions/useradminpanel.php:58 lib/adminpanelaction.php:305 +#: actions/useradminpanel.php:58 lib/adminpanelaction.php:321 #: lib/personalgroupnav.php:115 msgid "User" msgstr "Utilizador" @@ -3898,7 +3833,7 @@ msgstr "" "subscrever as notas deste utilizador. Se não fez um pedido para subscrever " "as notas de alguém, simplesmente clique \"Rejeitar\"." -#: actions/userauthorization.php:188 +#: actions/userauthorization.php:188 actions/version.php:165 msgid "License" msgstr "Licença" @@ -3953,8 +3888,8 @@ msgstr "" #: actions/userauthorization.php:296 #, php-format -msgid "Listener URI ‘%s’ not found here" -msgstr "Listener URI ‘%s’ não foi encontrado aqui" +msgid "Listener URI ‘%s’ not found here." +msgstr "A listener URI ‘%s’ não foi encontrada aqui." #: actions/userauthorization.php:301 #, php-format @@ -3986,10 +3921,6 @@ msgstr "Não é possÃvel ler a URL do avatar ‘%s’." msgid "Wrong image type for avatar URL ‘%s’." msgstr "Tipo de imagem incorrecto para o avatar da URL ‘%s’." -#: actions/userbyid.php:70 -msgid "No ID." -msgstr "Sem ID." - #: actions/userdesignsettings.php:76 lib/designsettings.php:65 msgid "Profile design" msgstr "Design do perfil" @@ -4006,11 +3937,6 @@ msgstr "" msgid "Enjoy your hotdog!" msgstr "Disfrute do seu cachorro-quente!" -#: actions/usergroups.php:64 -#, php-format -msgid "%s groups, page %d" -msgstr "Grupos de %s, página %d" - #: actions/usergroups.php:130 msgid "Search for more groups" msgstr "Procurar mais grupos" @@ -4025,6 +3951,80 @@ msgstr "%s não é membro de nenhum grupo." msgid "Try [searching for groups](%%action.groupsearch%%) and joining them." msgstr "Tente [pesquisar grupos](%%action.groupsearch%%) e juntar-se a eles." +#: actions/version.php:73 +#, php-format +msgid "StatusNet %s" +msgstr "StatusNet %s" + +#: actions/version.php:153 +#, php-format +msgid "" +"This site is powered by %1$s version %2$s, Copyright 2008-2010 StatusNet, " +"Inc. and contributors." +msgstr "" +"Este site utiliza o %1$s versão %2$s, (c) 2008-2010 StatusNet, Inc. e " +"colaboradores." + +#: actions/version.php:157 +msgid "StatusNet" +msgstr "StatusNet" + +#: actions/version.php:161 +msgid "Contributors" +msgstr "Colaboradores" + +#: actions/version.php:168 +msgid "" +"StatusNet is free software: you can redistribute it and/or modify it under " +"the terms of the GNU Affero General Public License as published by the Free " +"Software Foundation, either version 3 of the License, or (at your option) " +"any later version. " +msgstr "" +"O StatusNet é software livre: pode ser distribuÃdo e/ou modificado nos " +"termos da licença GNU Affero General Public License publicada pela Free " +"Software Foundation, que na versão 3 da Licença, quer (por sua opção) " +"qualquer versão posterior. " + +#: actions/version.php:174 +msgid "" +"This program is distributed in the hope that it will be useful, but WITHOUT " +"ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or " +"FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License " +"for more details. " +msgstr "" +"Este programa é distribuÃdo na esperança de que venha a ser útil, mas SEM " +"QUALQUER GARANTIA. Consulte a GNU Affero General Public License para mais " +"informações. " + +#: actions/version.php:180 +#, php-format +msgid "" +"You should have received a copy of the GNU Affero General Public License " +"along with this program. If not, see %s." +msgstr "" +"Juntamente com este programa deve ter recebido uma cópia da GNU Affero " +"General Public License. Se não a tiver recebido, consulte %s." + +#: actions/version.php:189 +msgid "Plugins" +msgstr "Plugins" + +#: actions/version.php:195 +msgid "Name" +msgstr "Nome" + +#: actions/version.php:196 lib/action.php:741 +msgid "Version" +msgstr "Versão" + +#: actions/version.php:197 +msgid "Author(s)" +msgstr "Autores" + +#: actions/version.php:198 lib/groupeditform.php:172 +msgid "Description" +msgstr "Descrição" + #: classes/File.php:137 #, php-format msgid "" @@ -4098,7 +4098,7 @@ msgstr "Problema na gravação da nota." msgid "DB error inserting reply: %s" msgstr "Ocorreu um erro na base de dados ao inserir a resposta: %s" -#: classes/Notice.php:1361 +#: classes/Notice.php:1359 #, php-format msgid "RT @%1$s %2$s" msgstr "RT @%1$s %2$s" @@ -4144,137 +4144,132 @@ msgstr "Outras" msgid "Other options" msgstr "Outras opções" -#: lib/action.php:144 -#, php-format -msgid "%s - %s" -msgstr "%s - %s" - #: lib/action.php:159 msgid "Untitled page" msgstr "Página sem tÃtulo" -#: lib/action.php:426 +#: lib/action.php:427 msgid "Primary site navigation" msgstr "Navegação primária deste site" -#: lib/action.php:432 +#: lib/action.php:433 msgid "Home" msgstr "InÃcio" -#: lib/action.php:432 +#: lib/action.php:433 msgid "Personal profile and friends timeline" msgstr "Perfil pessoal e notas dos amigos" -#: lib/action.php:434 +#: lib/action.php:435 msgid "Account" msgstr "Conta" -#: lib/action.php:434 +#: lib/action.php:435 msgid "Change your email, avatar, password, profile" msgstr "Altere o seu endereço electrónico, avatar, palavra-chave, perfil" -#: lib/action.php:437 +#: lib/action.php:438 msgid "Connect" msgstr "Ligar" -#: lib/action.php:437 +#: lib/action.php:438 msgid "Connect to services" msgstr "Ligar aos serviços" -#: lib/action.php:441 +#: lib/action.php:442 msgid "Change site configuration" msgstr "Alterar a configuração do site" -#: lib/action.php:445 lib/subgroupnav.php:105 +#: lib/action.php:446 lib/subgroupnav.php:105 msgid "Invite" msgstr "Convidar" -#: lib/action.php:446 lib/subgroupnav.php:106 +#: lib/action.php:447 lib/subgroupnav.php:106 #, php-format msgid "Invite friends and colleagues to join you on %s" msgstr "Convidar amigos e colegas para se juntarem a si em %s" -#: lib/action.php:451 +#: lib/action.php:452 msgid "Logout" msgstr "Sair" -#: lib/action.php:451 +#: lib/action.php:452 msgid "Logout from the site" msgstr "Terminar esta sessão" -#: lib/action.php:456 +#: lib/action.php:457 msgid "Create an account" msgstr "Criar uma conta" -#: lib/action.php:459 +#: lib/action.php:460 msgid "Login to the site" msgstr "Iniciar uma sessão" -#: lib/action.php:462 lib/action.php:725 +#: lib/action.php:463 lib/action.php:726 msgid "Help" msgstr "Ajuda" -#: lib/action.php:462 +#: lib/action.php:463 msgid "Help me!" msgstr "Ajudem-me!" -#: lib/action.php:465 lib/searchaction.php:127 +#: lib/action.php:466 lib/searchaction.php:127 msgid "Search" msgstr "Pesquisa" -#: lib/action.php:465 +#: lib/action.php:466 msgid "Search for people or text" msgstr "Procurar pessoas ou pesquisar texto" -#: lib/action.php:486 +#: lib/action.php:487 msgid "Site notice" msgstr "Aviso do site" -#: lib/action.php:552 +#: lib/action.php:553 msgid "Local views" msgstr "Vistas locais" -#: lib/action.php:618 +#: lib/action.php:619 msgid "Page notice" msgstr "Aviso da página" -#: lib/action.php:720 +#: lib/action.php:721 msgid "Secondary site navigation" msgstr "Navegação secundária deste site" -#: lib/action.php:727 +#: lib/action.php:728 msgid "About" msgstr "Sobre" -#: lib/action.php:729 +#: lib/action.php:730 msgid "FAQ" msgstr "FAQ" -#: lib/action.php:733 +#: lib/action.php:734 msgid "TOS" msgstr "Condições do Serviço" -#: lib/action.php:736 +#: lib/action.php:737 msgid "Privacy" msgstr "Privacidade" -#: lib/action.php:738 +#: lib/action.php:739 msgid "Source" msgstr "Código" -#: lib/action.php:740 +#: lib/action.php:743 msgid "Contact" msgstr "Contacto" -#: lib/action.php:742 +#: lib/action.php:745 msgid "Badge" msgstr "Emblema" -#: lib/action.php:770 +#: lib/action.php:773 msgid "StatusNet software license" msgstr "Licença de software do StatusNet" -#: lib/action.php:773 +#: lib/action.php:776 #, php-format msgid "" "**%%site.name%%** is a microblogging service brought to you by [%%site." @@ -4283,12 +4278,12 @@ msgstr "" "**%%site.name%%** é um serviço de microblogues disponibilizado por [%%site." "broughtby%%](%%site.broughtbyurl%%). " -#: lib/action.php:775 +#: lib/action.php:778 #, php-format msgid "**%%site.name%%** is a microblogging service. " msgstr "**%%site.name%%** é um serviço de microblogues. " -#: lib/action.php:777 +#: lib/action.php:780 #, php-format msgid "" "It runs the [StatusNet](http://status.net/) microblogging software, version %" @@ -4299,31 +4294,31 @@ msgstr "" "disponibilizado nos termos da [GNU Affero General Public License](http://www." "fsf.org/licensing/licenses/agpl-3.0.html)." -#: lib/action.php:791 +#: lib/action.php:794 msgid "Site content license" msgstr "Licença de conteúdos do site" -#: lib/action.php:800 +#: lib/action.php:803 msgid "All " msgstr "Tudo " -#: lib/action.php:805 +#: lib/action.php:808 msgid "license." msgstr "licença." -#: lib/action.php:1099 +#: lib/action.php:1102 msgid "Pagination" msgstr "Paginação" -#: lib/action.php:1108 +#: lib/action.php:1111 msgid "After" msgstr "Posteriores" -#: lib/action.php:1116 +#: lib/action.php:1119 msgid "Before" msgstr "Anteriores" -#: lib/action.php:1164 +#: lib/action.php:1167 msgid "There was a problem with your session token." msgstr "Ocorreu um problema com a sua chave de sessão." @@ -4331,27 +4326,31 @@ msgstr "Ocorreu um problema com a sua chave de sessão." msgid "You cannot make changes to this site." msgstr "Não pode fazer alterações a este site." -#: lib/adminpanelaction.php:195 +#: lib/adminpanelaction.php:107 +msgid "Changes to that panel are not allowed." +msgstr "Não são permitidas alterações a esse painel." + +#: lib/adminpanelaction.php:206 msgid "showForm() not implemented." msgstr "showForm() não implementado." -#: lib/adminpanelaction.php:224 +#: lib/adminpanelaction.php:235 msgid "saveSettings() not implemented." msgstr "saveSettings() não implementado." -#: lib/adminpanelaction.php:247 +#: lib/adminpanelaction.php:258 msgid "Unable to delete design setting." msgstr "Não foi possÃvel apagar a configuração do design." -#: lib/adminpanelaction.php:300 +#: lib/adminpanelaction.php:312 msgid "Basic site configuration" msgstr "Configuração básica do site" -#: lib/adminpanelaction.php:303 +#: lib/adminpanelaction.php:317 msgid "Design configuration" msgstr "Configuração do design" -#: lib/adminpanelaction.php:306 lib/adminpanelaction.php:309 +#: lib/adminpanelaction.php:322 lib/adminpanelaction.php:327 msgid "Paths configuration" msgstr "Configuração dos directórios" @@ -4375,11 +4374,19 @@ msgstr "Notas em que este anexo aparece" msgid "Tags for this attachment" msgstr "Categorias para este anexo" +#: lib/authenticationplugin.php:182 lib/authenticationplugin.php:187 +msgid "Password changing failed" +msgstr "Não foi possÃvel mudar a palavra-chave" + +#: lib/authenticationplugin.php:197 +msgid "Password changing is not allowed" +msgstr "Não é permitido mudar a palavra-chave" + #: lib/channel.php:138 lib/channel.php:158 msgid "Command results" msgstr "Resultados do comando" -#: lib/channel.php:210 +#: lib/channel.php:210 lib/mailhandler.php:142 msgid "Command complete" msgstr "Comando terminado" @@ -4392,17 +4399,17 @@ msgid "Sorry, this command is not yet implemented." msgstr "Desculpe, este comando ainda não foi implementado." #: lib/command.php:88 -#, php-format -msgid "Could not find a user with nickname %s" +#, fuzzy, php-format +msgid "Could not find a user with nickname %s." msgstr "Não foi encontrado um utilizador com a alcunha %s" #: lib/command.php:92 msgid "It does not make a lot of sense to nudge yourself!" -msgstr "Não faz muito sentido acotovelar-nos a nós mesmos!" +msgstr "Não faz lá muito sentido dar um toque em nós mesmos!" #: lib/command.php:99 -#, php-format -msgid "Nudge sent to %s" +#, fuzzy, php-format +msgid "Nudge sent to %s." msgstr "Cotovelada enviada a %s" #: lib/command.php:126 @@ -4417,34 +4424,36 @@ msgstr "" "Notas: %3$s" #: lib/command.php:152 lib/command.php:399 lib/command.php:460 -msgid "Notice with that id does not exist" +#, fuzzy +msgid "Notice with that id does not exist." msgstr "Não existe nenhuma nota com essa identificação" #: lib/command.php:168 lib/command.php:415 lib/command.php:476 #: lib/command.php:532 -msgid "User has no last notice" +#, fuzzy +msgid "User has no last notice." msgstr "Utilizador não tem nenhuma última nota" #: lib/command.php:190 msgid "Notice marked as fave." msgstr "Nota marcada como favorita." -#: lib/command.php:315 -#, php-format -msgid "%1$s (%2$s)" -msgstr "%1$s (%2$s)" +#: lib/command.php:284 +#, fuzzy, php-format +msgid "Could not remove user %1$s to group %2$s." +msgstr "Não foi possÃvel remover o utilizador %s do grupo %s" #: lib/command.php:318 -#, php-format -msgid "Fullname: %s" +#, fuzzy, php-format +msgid "Full name: %s" msgstr "Nome completo: %s" -#: lib/command.php:321 +#: lib/command.php:321 lib/mail.php:254 #, php-format msgid "Location: %s" msgstr "Localidade: %s" -#: lib/command.php:324 +#: lib/command.php:324 lib/mail.php:256 #, php-format msgid "Homepage: %s" msgstr "Página de acolhimento: %s" @@ -4455,25 +4464,17 @@ msgid "About: %s" msgstr "Sobre: %s" #: lib/command.php:358 scripts/xmppdaemon.php:301 -#, php-format -msgid "Message too long - maximum is %d characters, you sent %d" +#, fuzzy, php-format +msgid "Message too long - maximum is %1$d characters, you sent %2$d." msgstr "Mensagem demasiado extensa - máx. %d caracteres, enviou %d" #: lib/command.php:378 msgid "Error sending direct message." msgstr "Erro no envio da mensagem directa." -#: lib/command.php:422 -msgid "Cannot repeat your own notice" -msgstr "Não pode repetir a sua própria nota" - -#: lib/command.php:427 -msgid "Already repeated that notice" -msgstr "Já repetiu essa nota" - #: lib/command.php:435 -#, php-format -msgid "Notice from %s repeated" +#, fuzzy, php-format +msgid "Notice from %s repeated." msgstr "Nota de %s repetida" #: lib/command.php:437 @@ -4481,13 +4482,13 @@ msgid "Error repeating notice." msgstr "Erro ao repetir nota." #: lib/command.php:491 -#, php-format -msgid "Notice too long - maximum is %d characters, you sent %d" +#, fuzzy, php-format +msgid "Notice too long - maximum is %1$d characters, you sent %2$d." msgstr "Nota demasiado extensa - máx. %d caracteres, enviou %d" #: lib/command.php:500 -#, php-format -msgid "Reply to %s sent" +#, fuzzy, php-format +msgid "Reply to %s sent." msgstr "Resposta a %s enviada" #: lib/command.php:502 @@ -4495,7 +4496,8 @@ msgid "Error saving notice." msgstr "Erro ao gravar nota." #: lib/command.php:556 -msgid "Specify the name of the user to subscribe to" +#, fuzzy +msgid "Specify the name of the user to subscribe to." msgstr "Introduza o nome do utilizador para subscrever" #: lib/command.php:563 @@ -4504,7 +4506,8 @@ msgid "Subscribed to %s" msgstr "Subscreveu %s" #: lib/command.php:584 -msgid "Specify the name of the user to unsubscribe from" +#, fuzzy +msgid "Specify the name of the user to unsubscribe from." msgstr "Introduza o nome do utilizador para deixar de subscrever" #: lib/command.php:591 @@ -4533,17 +4536,18 @@ msgid "Can't turn on notification." msgstr "Não foi possÃvel ligar a notificação." #: lib/command.php:650 -msgid "Login command is disabled" +#, fuzzy +msgid "Login command is disabled." msgstr "Comando para iniciar sessão foi desactivado" #: lib/command.php:664 -#, php-format -msgid "Could not create login token for %s" +#, fuzzy, php-format +msgid "Could not create login token for %s." msgstr "Não foi possÃvel criar a chave de entrada para %s" #: lib/command.php:669 -#, php-format -msgid "This link is useable only once, and is good for only 2 minutes: %s" +#, fuzzy, php-format +msgid "This link is useable only once, and is good for only 2 minutes: %s." msgstr "" "Esta ligação é utilizável uma única vez e só durante os próximos 2 minutos: %" "s" @@ -4772,10 +4776,6 @@ msgstr "Descreva o grupo ou assunto" msgid "Describe the group or topic in %d characters" msgstr "Descreva o grupo ou o assunto em %d caracteres" -#: lib/groupeditform.php:172 -msgid "Description" -msgstr "Descrição" - #: lib/groupeditform.php:179 msgid "" "Location for the group, if any, like \"City, State (or Region), Country\"" @@ -4958,21 +4958,9 @@ msgstr "" "Altere o seu endereço de correio electrónico ou as opções de notificação em %" "8$s\n" -#: lib/mail.php:254 -#, php-format -msgid "Location: %s\n" -msgstr "Localidade: %s\n" - -#: lib/mail.php:256 -#, php-format -msgid "Homepage: %s\n" -msgstr "Página de acolhimento: %s\n" - #: lib/mail.php:258 -#, php-format -msgid "" -"Bio: %s\n" -"\n" +#, fuzzy, php-format +msgid "Bio: %s" msgstr "" "Bio: %s\n" "\n" @@ -5015,7 +5003,7 @@ msgstr "Confirmação SMS" #: lib/mail.php:463 #, php-format msgid "You've been nudged by %s" -msgstr "%s envia-lhe uma cotovelada" +msgstr "%s enviou-lhe um toque" #: lib/mail.php:467 #, php-format @@ -5172,6 +5160,27 @@ msgstr "" msgid "from" msgstr "de" +#: lib/mailhandler.php:37 +msgid "Could not parse message." +msgstr "Não foi possÃvel fazer a análise sintáctica da mensagem." + +#: lib/mailhandler.php:42 +msgid "Not a registered user." +msgstr "Não é um utilizador registado." + +#: lib/mailhandler.php:46 +msgid "Sorry, that is not your incoming email address." +msgstr "Desculpe, esse não é o seu endereço para receber correio electrónico." + +#: lib/mailhandler.php:50 +msgid "Sorry, no incoming email allowed." +msgstr "Desculpe, não lhe é permitido receber correio electrónico." + +#: lib/mailhandler.php:228 +#, fuzzy, php-format +msgid "Unsupported message type: %s" +msgstr "Formato do ficheiro da imagem não é suportado." + #: lib/mediafile.php:98 lib/mediafile.php:123 msgid "There was a database error while saving your file. Please try again." msgstr "" @@ -5207,7 +5216,8 @@ msgid "File upload stopped by extension." msgstr "Transferência do ficheiro interrompida pela extensão." #: lib/mediafile.php:179 lib/mediafile.php:216 -msgid "File exceeds user's quota!" +#, fuzzy +msgid "File exceeds user's quota." msgstr "Ficheiro excede quota do utilizador!" #: lib/mediafile.php:196 lib/mediafile.php:233 @@ -5215,7 +5225,8 @@ msgid "File could not be moved to destination directory." msgstr "Não foi possÃvel mover o ficheiro para o directório de destino." #: lib/mediafile.php:201 lib/mediafile.php:237 -msgid "Could not determine file's mime-type!" +#, fuzzy +msgid "Could not determine file's MIME type." msgstr "Não foi possÃvel determinar o tipo MIME do ficheiro." #: lib/mediafile.php:270 @@ -5224,8 +5235,8 @@ msgid " Try using another %s format." msgstr " Tente usar outro tipo de %s." #: lib/mediafile.php:275 -#, php-format -msgid "%s is not a supported filetype on this server." +#, fuzzy, php-format +msgid "%s is not a supported file type on this server." msgstr "%s não é um tipo de ficheiro suportado neste servidor." #: lib/messageform.php:120 @@ -5258,8 +5269,16 @@ msgid "Attach a file" msgstr "Anexar um ficheiro" #: lib/noticeform.php:212 -msgid "Share your location" -msgstr "Compartilhe a sua localização" +msgid "Share my location." +msgstr "Partilhar a minha localização." + +#: lib/noticeform.php:214 +msgid "Do not share my location." +msgstr "Não partilhar a minha localização." + +#: lib/noticeform.php:215 +msgid "Hide this info" +msgstr "Ocultar esta informação" #: lib/noticelist.php:428 #, php-format @@ -5308,15 +5327,15 @@ msgstr "Nota repetida" #: lib/nudgeform.php:116 msgid "Nudge this user" -msgstr "Acotovelar este utilizador" +msgstr "Dar um toque neste utilizador" #: lib/nudgeform.php:128 msgid "Nudge" -msgstr "Acotovelar" +msgstr "Dar um toque" #: lib/nudgeform.php:128 msgid "Send a nudge to this user" -msgstr "Enviar cotovelada a este utilizador" +msgstr "Enviar um toque para este utilizador" #: lib/oauthstore.php:283 msgid "Error inserting new profile" @@ -5375,6 +5394,10 @@ msgstr "Mensagens enviadas" msgid "Tags in %s's notices" msgstr "Categorias nas notas de %s" +#: lib/plugin.php:114 +msgid "Unknown" +msgstr "Desconhecida" + #: lib/profileaction.php:109 lib/profileaction.php:192 lib/subgroupnav.php:82 msgid "Subscriptions" msgstr "Subscrições" @@ -5544,10 +5567,6 @@ msgstr "Nuvem da auto-categorização das pessoas" msgid "People Tagcloud as tagged" msgstr "Nuvem da sua categorização das pessoas" -#: lib/subscriptionlist.php:126 -msgid "(none)" -msgstr "(nenhum)" - #: lib/tagcloudsection.php:56 msgid "None" msgstr "Nenhum" @@ -5661,19 +5680,3 @@ msgstr "%s não é uma cor válida!" #, php-format msgid "%s is not a valid color! Use 3 or 6 hex chars." msgstr "%s não é uma cor válida! Use 3 ou 6 caracteres hexadecimais." - -#: scripts/maildaemon.php:48 -msgid "Could not parse message." -msgstr "Não foi possÃvel fazer a análise sintáctica da mensagem." - -#: scripts/maildaemon.php:53 -msgid "Not a registered user." -msgstr "Não é um utilizador registado." - -#: scripts/maildaemon.php:57 -msgid "Sorry, that is not your incoming email address." -msgstr "Desculpe, esse não é o seu endereço para receber correio electrónico." - -#: scripts/maildaemon.php:61 -msgid "Sorry, no incoming email allowed." -msgstr "Desculpe, não lhe é permitido receber correio electrónico." diff --git a/locale/pt_BR/LC_MESSAGES/statusnet.po b/locale/pt_BR/LC_MESSAGES/statusnet.po index 4ebebf074..7fea84d12 100644 --- a/locale/pt_BR/LC_MESSAGES/statusnet.po +++ b/locale/pt_BR/LC_MESSAGES/statusnet.po @@ -10,12 +10,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-01-03 10:37+0000\n" -"PO-Revision-Date: 2010-01-03 10:38:40+0000\n" +"POT-Creation-Date: 2010-01-10 11:27+0000\n" +"PO-Revision-Date: 2010-01-10 11:28:58+0000\n" "Language-Team: Brazilian Portuguese\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha (r60575); Translate extension (2009-12-06)\n" +"X-Generator: MediaWiki 1.16alpha (r60888); Translate extension (2010-01-04)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: pt-br\n" "X-Message-Group: out-statusnet\n" @@ -52,11 +52,6 @@ msgstr "Esta página não existe." msgid "No such user." msgstr "Este usuário não existe." -#: actions/all.php:84 -#, php-format -msgid "%s and friends, page %d" -msgstr "%s e amigos, página %d" - #: actions/all.php:86 actions/all.php:167 actions/allrss.php:115 #: actions/apitimelinefriends.php:115 actions/apitimelinehome.php:115 #: lib/personalgroupnav.php:100 @@ -97,10 +92,10 @@ msgstr "" "publicar algo." #: actions/all.php:134 -#, php-format +#, fuzzy, php-format msgid "" -"You can try to [nudge %s](../%s) from his profile or [post something to his " -"or her attention](%%%%action.newnotice%%%%?status_textarea=%s)." +"You can try to [nudge %1$s](../%2$s) from his profile or [post something to " +"his or her attention](%%%%action.newnotice%%%%?status_textarea=%3$s)." msgstr "" "Você pode tentar [chamar a atenção de %s](../%s) em seu perfil ou [publicar " "alguma coisa que desperte seu interesse](%%%%action.newnotice%%%%?" @@ -130,6 +125,23 @@ msgstr "Atualizações de %1$s e amigos no %2$s!" #: actions/apiaccountupdateprofile.php:97 #: actions/apiaccountupdateprofilebackgroundimage.php:94 #: actions/apiaccountupdateprofilecolors.php:118 +#: actions/apidirectmessage.php:156 actions/apifavoritecreate.php:99 +#: actions/apifavoritedestroy.php:100 actions/apifriendshipscreate.php:100 +#: actions/apifriendshipsdestroy.php:100 actions/apifriendshipsshow.php:129 +#: actions/apigroupcreate.php:136 actions/apigroupismember.php:114 +#: actions/apigroupjoin.php:155 actions/apigroupleave.php:141 +#: actions/apigrouplist.php:132 actions/apigrouplistall.php:120 +#: actions/apigroupmembership.php:106 actions/apigroupshow.php:105 +#: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102 +#: actions/apistatusesretweets.php:112 actions/apistatusesshow.php:108 +#: actions/apistatusnetconfig.php:133 actions/apistatusnetversion.php:93 +#: actions/apisubscriptions.php:111 actions/apitimelinefavorites.php:146 +#: actions/apitimelinefriends.php:156 actions/apitimelinegroup.php:150 +#: actions/apitimelinehome.php:156 actions/apitimelinementions.php:151 +#: actions/apitimelinepublic.php:131 actions/apitimelineretweetedbyme.php:122 +#: actions/apitimelineretweetedtome.php:121 +#: actions/apitimelineretweetsofme.php:122 actions/apitimelinetag.php:141 +#: actions/apitimelineuser.php:165 actions/apiusershow.php:101 msgid "API method not found." msgstr "O método da API não foi encontrado!" @@ -189,6 +201,9 @@ msgstr "" #: actions/apiaccountupdateprofilebackgroundimage.php:146 #: actions/apiaccountupdateprofilecolors.php:164 #: actions/apiaccountupdateprofilecolors.php:174 +#: actions/groupdesignsettings.php:287 actions/groupdesignsettings.php:297 +#: actions/userdesignsettings.php:210 actions/userdesignsettings.php:220 +#: actions/userdesignsettings.php:263 actions/userdesignsettings.php:273 msgid "Unable to save your design settings." msgstr "Não foi possÃvel salvar suas configurações de aparência." @@ -229,26 +244,6 @@ msgstr "Mensagens diretas para %s" msgid "All the direct messages sent to %s" msgstr "Todas as mensagens diretas enviadas para %s" -#: actions/apidirectmessage.php:156 actions/apifavoritecreate.php:99 -#: actions/apifavoritedestroy.php:100 actions/apifriendshipscreate.php:100 -#: actions/apifriendshipsdestroy.php:100 actions/apifriendshipsshow.php:129 -#: actions/apigroupcreate.php:136 actions/apigroupismember.php:114 -#: actions/apigroupjoin.php:155 actions/apigroupleave.php:141 -#: actions/apigrouplist.php:132 actions/apigrouplistall.php:120 -#: actions/apigroupmembership.php:106 actions/apigroupshow.php:105 -#: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102 -#: actions/apistatusesretweets.php:112 actions/apistatusesshow.php:108 -#: actions/apistatusnetconfig.php:133 actions/apistatusnetversion.php:93 -#: actions/apisubscriptions.php:111 actions/apitimelinefavorites.php:146 -#: actions/apitimelinefriends.php:156 actions/apitimelinegroup.php:150 -#: actions/apitimelinehome.php:156 actions/apitimelinementions.php:151 -#: actions/apitimelinepublic.php:131 actions/apitimelineretweetedbyme.php:122 -#: actions/apitimelineretweetedtome.php:121 -#: actions/apitimelineretweetsofme.php:122 actions/apitimelinetag.php:141 -#: actions/apitimelineuser.php:165 actions/apiusershow.php:101 -msgid "API method not found!" -msgstr "O método da API não foi encontrado!" - #: actions/apidirectmessagenew.php:126 msgid "No message text!" msgstr "Nenhuma mensagem de texto!" @@ -274,7 +269,8 @@ msgid "No status found with that ID." msgstr "Não foi encontrado nenhum status com esse ID." #: actions/apifavoritecreate.php:119 -msgid "This status is already a favorite!" +#, fuzzy +msgid "This status is already a favorite." msgstr "Esta mensagem já é favorita!" #: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:176 @@ -282,7 +278,8 @@ msgid "Could not create favorite." msgstr "Não foi possÃvel criar a favorita." #: actions/apifavoritedestroy.php:122 -msgid "That status is not a favorite!" +#, fuzzy +msgid "That status is not a favorite." msgstr "Essa mensagem não é favorita!" #: actions/apifavoritedestroy.php:134 actions/disfavor.php:87 @@ -303,7 +300,8 @@ msgid "Could not unfollow user: User not found." msgstr "Não é possÃvel deixar de seguir o usuário: Usuário não encontrado." #: actions/apifriendshipsdestroy.php:120 -msgid "You cannot unfollow yourself!" +#, fuzzy +msgid "You cannot unfollow yourself." msgstr "Você não pode deixar de seguir você mesmo!" #: actions/apifriendshipsexists.php:94 @@ -390,7 +388,7 @@ msgstr "O apelido não pode ser igual à identificação." msgid "Group not found!" msgstr "O grupo não foi encontrado!" -#: actions/apigroupjoin.php:110 +#: actions/apigroupjoin.php:110 actions/joingroup.php:90 lib/command.php:217 msgid "You are already a member of that group." msgstr "Você já é membro desse grupo." @@ -398,18 +396,18 @@ msgstr "Você já é membro desse grupo." msgid "You have been blocked from that group by the admin." msgstr "O administrador desse grupo bloqueou sua inscrição." -#: actions/apigroupjoin.php:138 -#, php-format -msgid "Could not join user %s to group %s." +#: actions/apigroupjoin.php:138 actions/joingroup.php:128 lib/command.php:234 +#, fuzzy, php-format +msgid "Could not join user %1$s to group %2$s." msgstr "Não foi possÃvel associar o usuário %s ao grupo %s." #: actions/apigroupleave.php:114 msgid "You are not a member of this group." msgstr "Você não é membro deste grupo." -#: actions/apigroupleave.php:124 -#, php-format -msgid "Could not remove user %s to group %s." +#: actions/apigroupleave.php:124 actions/leavegroup.php:127 +#, fuzzy, php-format +msgid "Could not remove user %1$s from group %2$s." msgstr "Não foi possÃvel remover o usuário %s do grupo %s." #: actions/apigrouplist.php:95 @@ -417,11 +415,6 @@ msgstr "Não foi possÃvel remover o usuário %s do grupo %s." msgid "%s's groups" msgstr "Grupos de %s" -#: actions/apigrouplist.php:103 -#, php-format -msgid "Groups %s is a member of on %s." -msgstr "Os grupos dos quais %s é membro no %s." - #: actions/apigrouplistall.php:90 actions/usergroups.php:62 #, php-format msgid "%s groups" @@ -445,11 +438,11 @@ msgstr "Você não pode excluir uma mensagem de outro usuário." msgid "No such notice." msgstr "Essa mensagem não existe." -#: actions/apistatusesretweet.php:83 +#: actions/apistatusesretweet.php:83 lib/command.php:422 msgid "Cannot repeat your own notice." msgstr "Você não pode repetria sua própria mensagem." -#: actions/apistatusesretweet.php:91 +#: actions/apistatusesretweet.php:91 lib/command.php:427 msgid "Already repeated that notice." msgstr "Você já repetiu essa mensagem." @@ -462,7 +455,7 @@ msgid "No status with that ID found." msgstr "Não foi encontrada nenhuma mensagem com esse ID." #: actions/apistatusesupdate.php:157 actions/newnotice.php:155 -#: scripts/maildaemon.php:71 +#: lib/mailhandler.php:60 #, php-format msgid "That's too long. Max notice size is %d chars." msgstr "Está muito extenso. O tamanho máximo é de %s caracteres." @@ -481,13 +474,13 @@ msgid "Unsupported format." msgstr "Formato não suportado." #: actions/apitimelinefavorites.php:108 -#, php-format -msgid "%s / Favorites from %s" +#, fuzzy, php-format +msgid "%1$s / Favorites from %2$s" msgstr "%s / Favoritas de %s" #: actions/apitimelinefavorites.php:120 -#, php-format -msgid "%s updates favorited by %s / %s." +#, fuzzy, php-format +msgid "%1$s updates favorited by %2$s / %2$s." msgstr "%s marcadas como favoritas por %s / %s." #: actions/apitimelinegroup.php:109 actions/apitimelineuser.php:118 @@ -555,8 +548,11 @@ msgstr "Não encontrado." msgid "No such attachment." msgstr "Este anexo não existe." -#: actions/avatarbynickname.php:59 actions/grouprss.php:91 -#: actions/leavegroup.php:76 +#: actions/avatarbynickname.php:59 actions/blockedfromgroup.php:73 +#: actions/editgroup.php:84 actions/groupdesignsettings.php:84 +#: actions/grouplogo.php:86 actions/groupmembers.php:76 +#: actions/grouprss.php:91 actions/joingroup.php:76 actions/leavegroup.php:76 +#: actions/showgroup.php:121 msgid "No nickname." msgstr "Nenhuma identificação." @@ -580,8 +576,8 @@ msgstr "" "Você pode enviar seu avatar pessoal. O tamanho máximo do arquivo é de %s." #: actions/avatarsettings.php:106 actions/avatarsettings.php:185 -#: actions/grouplogo.php:178 actions/remotesubscribe.php:191 -#: actions/userauthorization.php:72 actions/userrss.php:103 +#: actions/remotesubscribe.php:191 actions/userauthorization.php:72 +#: actions/userrss.php:103 msgid "User without matching profile" msgstr "Usuário sem um perfil correspondente" @@ -613,9 +609,9 @@ msgstr "Enviar" msgid "Crop" msgstr "Cortar" -#: actions/avatarsettings.php:268 actions/disfavor.php:74 -#: actions/emailsettings.php:238 actions/favor.php:75 actions/geocode.php:50 -#: actions/groupblock.php:66 actions/grouplogo.php:309 +#: actions/avatarsettings.php:268 actions/deletenotice.php:157 +#: actions/disfavor.php:74 actions/emailsettings.php:238 actions/favor.php:75 +#: actions/geocode.php:50 actions/groupblock.php:66 actions/grouplogo.php:309 #: actions/groupunblock.php:66 actions/imsettings.php:206 #: actions/invite.php:56 actions/login.php:135 actions/makeadmin.php:66 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80 @@ -699,19 +695,15 @@ msgstr "Bloquear este usuário" msgid "Failed to save block information." msgstr "Não foi possÃvel salvar a informação de bloqueio." -#: actions/blockedfromgroup.php:73 actions/editgroup.php:84 -#: actions/groupdesignsettings.php:84 actions/grouplogo.php:86 -#: actions/groupmembers.php:76 actions/joingroup.php:76 -#: actions/showgroup.php:121 -msgid "No nickname" -msgstr "Nenhum apelido" - #: actions/blockedfromgroup.php:80 actions/editgroup.php:96 +#: actions/foafgroup.php:44 actions/foafgroup.php:62 actions/groupblock.php:86 #: actions/groupbyid.php:83 actions/groupdesignsettings.php:97 #: actions/grouplogo.php:99 actions/groupmembers.php:83 -#: actions/joingroup.php:83 actions/showgroup.php:137 -msgid "No such group" -msgstr "Esse grupo não existe" +#: actions/grouprss.php:98 actions/groupunblock.php:86 +#: actions/joingroup.php:83 actions/leavegroup.php:83 actions/makeadmin.php:86 +#: actions/showgroup.php:137 lib/command.php:212 lib/command.php:263 +msgid "No such group." +msgstr "Esse grupo não existe." #: actions/blockedfromgroup.php:90 #, php-format @@ -719,8 +711,8 @@ msgid "%s blocked profiles" msgstr "Perfis bloqueados no %s" #: actions/blockedfromgroup.php:93 -#, php-format -msgid "%s blocked profiles, page %d" +#, fuzzy, php-format +msgid "%1$s blocked profiles, page %2$d" msgstr "Perfis bloqueados no %s, página %d" #: actions/blockedfromgroup.php:108 @@ -833,11 +825,6 @@ msgstr "Não excluir esta mensagem." msgid "Delete this notice" msgstr "Excluir esta mensagem" -#: actions/deletenotice.php:157 -msgid "There was a problem with your session token. Try again, please." -msgstr "" -"Ocorreu um problema com o seu token de sessão. Por favor, tente novamente." - #: actions/deleteuser.php:67 msgid "You cannot delete users." msgstr "Você não pode excluir usuários." @@ -863,7 +850,7 @@ msgid "Delete this user" msgstr "Excluir este usuário" #: actions/designadminpanel.php:62 lib/accountsettingsaction.php:124 -#: lib/adminpanelaction.php:302 lib/groupnav.php:119 +#: lib/adminpanelaction.php:316 lib/groupnav.php:119 msgid "Design" msgstr "Aparência" @@ -1003,7 +990,8 @@ msgstr "Você deve estar autenticado para criar um grupo." #: actions/editgroup.php:103 actions/editgroup.php:168 #: actions/groupdesignsettings.php:104 actions/grouplogo.php:106 -msgid "You must be an admin to edit the group" +#, fuzzy +msgid "You must be an admin to edit the group." msgstr "Você deve ser o administrador do grupo para editá-lo" #: actions/editgroup.php:154 @@ -1028,7 +1016,8 @@ msgid "Options saved." msgstr "As configurações foram salvas." #: actions/emailsettings.php:60 -msgid "Email Settings" +#, fuzzy +msgid "Email settings" msgstr "Configurações do e-mail" #: actions/emailsettings.php:71 @@ -1065,8 +1054,9 @@ msgid "Cancel" msgstr "Cancelar" #: actions/emailsettings.php:121 -msgid "Email Address" -msgstr "Endereço de e-mail" +#, fuzzy +msgid "Email address" +msgstr "Endereços de e-mail" #: actions/emailsettings.php:123 msgid "Email address, like \"UserName@example.org\"" @@ -1143,9 +1133,10 @@ msgstr "Nenhum endereço de e-mail." msgid "Cannot normalize that email address" msgstr "Não foi possÃvel normalizar este endereço de e-mail" -#: actions/emailsettings.php:331 actions/siteadminpanel.php:157 -msgid "Not a valid email address" -msgstr "Não é um endereço de e-mail válido" +#: actions/emailsettings.php:331 actions/register.php:201 +#: actions/siteadminpanel.php:157 +msgid "Not a valid email address." +msgstr "Não é um endereço de e-mail válido." #: actions/emailsettings.php:334 msgid "That is already your email address." @@ -1329,18 +1320,11 @@ msgstr "O serviço remoto usa uma versão desconhecida do protocolo OMB." msgid "Error updating remote profile" msgstr "Ocorreu um erro na atualização do perfil remoto" -#: actions/foafgroup.php:44 actions/foafgroup.php:62 actions/groupblock.php:86 -#: actions/grouprss.php:98 actions/groupunblock.php:86 -#: actions/leavegroup.php:83 actions/makeadmin.php:86 lib/command.php:212 -#: lib/command.php:263 -msgid "No such group." -msgstr "Esse grupo não existe." - -#: actions/getfile.php:75 +#: actions/getfile.php:79 msgid "No such file." msgstr "Esse arquivo não existe." -#: actions/getfile.php:79 +#: actions/getfile.php:83 msgid "Cannot read file." msgstr "Não foi possÃvel ler o arquivo." @@ -1352,7 +1336,7 @@ msgstr "Não foi especificado nenhum perfil." #: actions/groupblock.php:76 actions/groupunblock.php:76 #: actions/makeadmin.php:76 actions/subedit.php:53 actions/tagother.php:46 -#: lib/profileformaction.php:77 +#: actions/unsubscribe.php:84 lib/profileformaction.php:77 msgid "No profile with that ID." msgstr "Não foi encontrado nenhum perfil com esse ID." @@ -1378,11 +1362,11 @@ msgid "Block user from group" msgstr "Bloquear o usuário no grupo" #: actions/groupblock.php:162 -#, php-format +#, fuzzy, php-format msgid "" -"Are you sure you want to block user \"%s\" from the group \"%s\"? They will " -"be removed from the group, unable to post, and unable to subscribe to the " -"group in the future." +"Are you sure you want to block user \"%1$s\" from the group \"%2$s\"? They " +"will be removed from the group, unable to post, and unable to subscribe to " +"the group in the future." msgstr "" "Tem certeza que deseja bloquear o usuário \"%s\" no grupo \"%s\"? Ele será " "removido do grupo e impossibilitado de publicar e de se juntar ao grupo " @@ -1401,9 +1385,9 @@ msgid "Database error blocking user from group." msgstr "" "Ocorreu um erro no banco de dados ao tentar bloquear o usuário no grupo." -#: actions/groupbyid.php:74 -msgid "No ID" -msgstr "Sem ID" +#: actions/groupbyid.php:74 actions/userbyid.php:70 +msgid "No ID." +msgstr "Nenhuma ID." #: actions/groupdesignsettings.php:68 msgid "You must be logged in to edit a group." @@ -1426,12 +1410,6 @@ msgstr "" msgid "Couldn't update your design." msgstr "Não foi possÃvel atualizar a aparência." -#: actions/groupdesignsettings.php:287 actions/groupdesignsettings.php:297 -#: actions/userdesignsettings.php:210 actions/userdesignsettings.php:220 -#: actions/userdesignsettings.php:263 actions/userdesignsettings.php:273 -msgid "Unable to save your design settings!" -msgstr "Não foi possÃvel salvar suas configurações da aparência!" - #: actions/groupdesignsettings.php:308 actions/userdesignsettings.php:231 msgid "Design preferences saved." msgstr "As configurações da aparência foram salvas." @@ -1448,6 +1426,11 @@ msgstr "" "Você pode enviar uma imagem de logo para o seu grupo. O tamanho máximo do " "arquivo é %s." +#: actions/grouplogo.php:178 +#, fuzzy +msgid "User without matching profile." +msgstr "Usuário sem um perfil correspondente" + #: actions/grouplogo.php:362 msgid "Pick a square area of the image to be the logo." msgstr "Selecione uma área quadrada da imagem para definir a logo" @@ -1466,15 +1449,15 @@ msgid "%s group members" msgstr "Membros do grupo %s" #: actions/groupmembers.php:96 -#, php-format -msgid "%s group members, page %d" +#, fuzzy, php-format +msgid "%1$s group members, page %2$d" msgstr "Membros do grupo %s, pág. %d" #: actions/groupmembers.php:111 msgid "A list of the users in this group." msgstr "Uma lista dos usuários deste grupo." -#: actions/groupmembers.php:175 lib/action.php:441 lib/groupnav.php:107 +#: actions/groupmembers.php:175 lib/action.php:442 lib/groupnav.php:107 msgid "Admin" msgstr "Admin" @@ -1577,7 +1560,8 @@ msgid "Error removing the block." msgstr "Erro na remoção do bloqueio." #: actions/imsettings.php:59 -msgid "IM Settings" +#, fuzzy +msgid "IM settings" msgstr "Configurações do MI" #: actions/imsettings.php:70 @@ -1608,7 +1592,8 @@ msgstr "" "contatos?)" #: actions/imsettings.php:124 -msgid "IM Address" +#, fuzzy +msgid "IM address" msgstr "Endereço do MI" #: actions/imsettings.php:126 @@ -1672,11 +1657,6 @@ msgstr "" msgid "That is not your Jabber ID." msgstr "Essa não é sua ID do Jabber." -#: actions/inbox.php:59 -#, php-format -msgid "Inbox for %s - page %d" -msgstr "Recebidas por %s - pág. %d" - #: actions/inbox.php:62 #, php-format msgid "Inbox for %s" @@ -1715,10 +1695,10 @@ msgstr "Convidar novos usuários" msgid "You are already subscribed to these users:" msgstr "Você já está assinando esses usuários:" -#: actions/invite.php:131 actions/invite.php:139 +#: actions/invite.php:131 actions/invite.php:139 lib/command.php:315 #, php-format -msgid "%s (%s)" -msgstr "%s (%s)" +msgid "%1$s (%2$s)" +msgstr "%1$s (%2$s)" #: actions/invite.php:136 msgid "" @@ -1760,7 +1740,7 @@ msgstr "Mensagem pessoal" msgid "Optionally add a personal message to the invitation." msgstr "Você pode, opcionalmente, adicionar uma mensagem pessoal ao convite." -#: actions/invite.php:197 lib/messageform.php:178 lib/noticeform.php:232 +#: actions/invite.php:197 lib/messageform.php:178 lib/noticeform.php:234 msgid "Send" msgstr "Enviar" @@ -1830,18 +1810,9 @@ msgstr "" msgid "You must be logged in to join a group." msgstr "Você deve estar autenticado para se associar a um grupo." -#: actions/joingroup.php:90 lib/command.php:217 -msgid "You are already a member of that group" -msgstr "Você já é um membro desse grupo." - -#: actions/joingroup.php:128 lib/command.php:234 -#, php-format -msgid "Could not join user %s to group %s" -msgstr "Não foi possÃvel associar o usuário %s ao grupo %s" - #: actions/joingroup.php:135 lib/command.php:239 -#, php-format -msgid "%s joined group %s" +#, fuzzy, php-format +msgid "%1$s joined group %2$s" msgstr "%s associou-se ao grupo %s" #: actions/leavegroup.php:60 @@ -1856,14 +1827,9 @@ msgstr "Você não é um membro desse grupo." msgid "Could not find membership record." msgstr "Não foi possÃvel encontrar o registro do membro." -#: actions/leavegroup.php:127 lib/command.php:284 -#, php-format -msgid "Could not remove user %s to group %s" -msgstr "Não foi possÃvel remover o usuário %s do grupo %s" - #: actions/leavegroup.php:134 lib/command.php:289 -#, php-format -msgid "%s left group %s" +#, fuzzy, php-format +msgid "%1$s left group %2$s" msgstr "%s deixou o grupo %s" #: actions/login.php:83 actions/register.php:137 @@ -1883,7 +1849,7 @@ msgid "Error setting user. You are probably not authorized." msgstr "" "Erro na configuração do usuário. Você provavelmente não tem autorização." -#: actions/login.php:208 actions/login.php:261 lib/action.php:459 +#: actions/login.php:208 actions/login.php:261 lib/action.php:460 #: lib/logingroupnav.php:79 msgid "Login" msgstr "Entrar" @@ -1941,18 +1907,18 @@ msgstr "" "usuário." #: actions/makeadmin.php:95 -#, php-format -msgid "%s is already an admin for group \"%s\"." +#, fuzzy, php-format +msgid "%1$s is already an admin for group \"%2$s\"." msgstr "%s já é um administrador do grupo \"%s\"." #: actions/makeadmin.php:132 -#, php-format -msgid "Can't get membership record for %s in group %s" +#, fuzzy, php-format +msgid "Can't get membership record for %1$s in group %2$s." msgstr "Não foi possÃvel obter o registro de membro de %s no grupo %s" #: actions/makeadmin.php:145 -#, php-format -msgid "Can't make %s an admin for group %s" +#, fuzzy, php-format +msgid "Can't make %1$s an admin for group %2$s." msgstr "Não foi possÃvel tornar %s um administrador do grupo %s" #: actions/microsummary.php:69 @@ -1996,8 +1962,8 @@ msgid "Message sent" msgstr "A mensagem foi enviada" #: actions/newmessage.php:185 lib/command.php:376 -#, php-format -msgid "Direct message to %s sent" +#, fuzzy, php-format +msgid "Direct message to %s sent." msgstr "A mensagem direta para %s foi enviada" #: actions/newmessage.php:210 actions/newnotice.php:245 lib/channel.php:170 @@ -2026,8 +1992,8 @@ msgid "Text search" msgstr "Procurar por texto" #: actions/noticesearch.php:91 -#, php-format -msgid "Search results for \"%s\" on %s" +#, fuzzy, php-format +msgid "Search results for \"%1$s\" on %2$s" msgstr "Resultados da procura por \"%s\" no %s" #: actions/noticesearch.php:121 @@ -2136,11 +2102,6 @@ msgstr "Exibir ou esconder as aparências do perfil." msgid "URL shortening service is too long (max 50 chars)." msgstr "O serviço de encolhimento de URL é muito extenso (máx. 50 caracteres)." -#: actions/outbox.php:58 -#, php-format -msgid "Outbox for %s - page %d" -msgstr "Enviadas de %s - pág. %d" - #: actions/outbox.php:61 #, php-format msgid "Outbox for %s" @@ -2213,7 +2174,7 @@ msgstr "Não é possÃvel salvar a nova senha." msgid "Password saved." msgstr "A senha foi salva." -#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:308 +#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:326 msgid "Paths" msgstr "Caminhos" @@ -2247,7 +2208,7 @@ msgstr "" "Servidor SSL inválido. O comprimento máximo deve ser de 255 caracteres." #: actions/pathsadminpanel.php:217 actions/siteadminpanel.php:58 -#: lib/adminpanelaction.php:299 +#: lib/adminpanelaction.php:311 msgid "Site" msgstr "Site" @@ -2340,7 +2301,8 @@ msgid "When to use SSL" msgstr "Quando usar SSL" #: actions/pathsadminpanel.php:308 -msgid "SSL Server" +#, fuzzy +msgid "SSL server" msgstr "Servidor SSL" #: actions/pathsadminpanel.php:309 @@ -2370,8 +2332,8 @@ msgid "Not a valid people tag: %s" msgstr "Não é uma etiqueta de pessoa válida: %s" #: actions/peopletag.php:144 -#, php-format -msgid "Users self-tagged with %s - page %d" +#, fuzzy, php-format +msgid "Users self-tagged with %1$s - page %2$d" msgstr "Usuários auto-etiquetados com %s - pág. %d" #: actions/postnotice.php:84 @@ -2379,8 +2341,8 @@ msgid "Invalid notice content" msgstr "O conteúdo da mensagem é inválido" #: actions/postnotice.php:90 -#, php-format -msgid "Notice license ‘%s’ is not compatible with site license ‘%s’." +#, fuzzy, php-format +msgid "Notice license ‘%1$s’ is not compatible with site license ‘%2$s’." msgstr "" "A licença ‘%s’ da mensagem não é compatÃvel com a licença ‘%s’ do site." @@ -2503,19 +2465,19 @@ msgstr "Etiqueta inválida: \"%s\"" msgid "Couldn't update user for autosubscribe." msgstr "Não foi possÃvel atualizar o usuário para assinar automaticamente." -#: actions/profilesettings.php:354 +#: actions/profilesettings.php:359 msgid "Couldn't save location prefs." msgstr "Não foi possÃvel salvar as preferências de localização." -#: actions/profilesettings.php:366 +#: actions/profilesettings.php:371 msgid "Couldn't save profile." msgstr "Não foi possÃvel salvar o perfil." -#: actions/profilesettings.php:374 +#: actions/profilesettings.php:379 msgid "Couldn't save tags." msgstr "Não foi possÃvel salvar as etiquetas." -#: actions/profilesettings.php:382 lib/adminpanelaction.php:126 +#: actions/profilesettings.php:387 lib/adminpanelaction.php:137 msgid "Settings saved." msgstr "As configurações foram salvas." @@ -2621,7 +2583,7 @@ msgstr "" "Por que você não [registra uma conta](%%action.register%%) pra ser o " "primeiro a publicar?" -#: actions/publictagcloud.php:135 +#: actions/publictagcloud.php:131 msgid "Tag cloud" msgstr "Nuvem de etiquetas" @@ -2766,7 +2728,7 @@ msgstr "Desculpe, mas o código do convite é inválido." msgid "Registration successful" msgstr "Registro realizado com sucesso" -#: actions/register.php:114 actions/register.php:502 lib/action.php:456 +#: actions/register.php:114 actions/register.php:502 lib/action.php:457 #: lib/logingroupnav.php:85 msgid "Register" msgstr "Registrar-se" @@ -2779,10 +2741,6 @@ msgstr "Não é permitido o registro." msgid "You can't register if you don't agree to the license." msgstr "Você não pode se registrar se não aceitar a licença." -#: actions/register.php:201 -msgid "Not a valid email address." -msgstr "Não é um endereço de e-mail válido." - #: actions/register.php:212 msgid "Email address already exists." msgstr "O endereço de e-mail já existe." @@ -2842,12 +2800,12 @@ msgstr "" "e número de telefone." #: actions/register.php:537 -#, php-format +#, fuzzy, php-format msgid "" -"Congratulations, %s! And welcome to %%%%site.name%%%%. From here, you may " +"Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may " "want to...\n" "\n" -"* Go to [your profile](%s) and post your first message.\n" +"* Go to [your profile](%2$s) and post your first message.\n" "* Add a [Jabber/GTalk address](%%%%action.imsettings%%%%) so you can send " "notices through instant messages.\n" "* [Search for people](%%%%action.peoplesearch%%%%) that you may know or that " @@ -2970,11 +2928,6 @@ msgstr "Repetida!" msgid "Replies to %s" msgstr "Respostas para %s" -#: actions/replies.php:127 -#, php-format -msgid "Replies to %s, page %d" -msgstr "Respostas para %s, pag. %d" - #: actions/replies.php:144 #, php-format msgid "Replies feed for %s (RSS 1.0)" @@ -2991,10 +2944,10 @@ msgid "Replies feed for %s (Atom)" msgstr "Fonte de respostas para %s (Atom)" #: actions/replies.php:198 -#, php-format +#, fuzzy, php-format msgid "" -"This is the timeline showing replies to %s but %s hasn't received a notice " -"to his attention yet." +"This is the timeline showing replies to %1$s but %2$s hasn't received a " +"notice to his attention yet." msgstr "" "Esse é o fluxo de mensagens de resposta para %s, mas %s ainda não recebeu " "nenhuma mensagem direcionada a ele(a)." @@ -3009,10 +2962,10 @@ msgstr "" "pessoas ou [associe-se a grupos](%%action.groups%%)." #: actions/replies.php:205 -#, php-format +#, fuzzy, php-format msgid "" -"You can try to [nudge %s](../%s) or [post something to his or her attention]" -"(%%%%action.newnotice%%%%?status_textarea=%s)." +"You can try to [nudge %1$s](../%2$s) or [post something to his or her " +"attention](%%%%action.newnotice%%%%?status_textarea=%3$s)." msgstr "" "Você pode tentar [chamar a atenção de %s](../%s) ou [publicar alguma coisa " "que desperte seu interesse](%%%%action.newnotice%%%%?status_textarea=%s)." @@ -3030,11 +2983,6 @@ msgstr "Você não pode colocar usuários deste site em isolamento." msgid "User is already sandboxed." msgstr "O usuário já está em isolamento." -#: actions/showfavorites.php:79 -#, php-format -msgid "%s's favorite notices, page %d" -msgstr "Mensagens favoritas de %s, pág. %d" - #: actions/showfavorites.php:132 msgid "Could not retrieve favorite notices." msgstr "Não foi possÃvel recuperar as mensagens favoritas." @@ -3092,11 +3040,6 @@ msgstr "Esta é uma forma de compartilhar o que você gosta." msgid "%s group" msgstr "Grupo %s" -#: actions/showgroup.php:84 -#, php-format -msgid "%s group, page %d" -msgstr "Grupo %s, pág. %d" - #: actions/showgroup.php:218 msgid "Group profile" msgstr "Perfil do grupo" @@ -3145,7 +3088,7 @@ msgstr "Membros" #: actions/showgroup.php:386 lib/profileaction.php:117 #: lib/profileaction.php:148 lib/profileaction.php:236 lib/section.php:95 -#: lib/tagcloudsection.php:71 +#: lib/subscriptionlist.php:126 lib/tagcloudsection.php:71 msgid "(None)" msgstr "(Nenhum)" @@ -3221,14 +3164,9 @@ msgstr "A mensagem excluÃda." msgid " tagged %s" msgstr " etiquetada %s" -#: actions/showstream.php:79 -#, php-format -msgid "%s, page %d" -msgstr "%s, pág. %d" - #: actions/showstream.php:122 -#, php-format -msgid "Notice feed for %s tagged %s (RSS 1.0)" +#, fuzzy, php-format +msgid "Notice feed for %1$s tagged %2$s (RSS 1.0)" msgstr "Fonte de mensagens de %s etiquetada %s (RSS 1.0)" #: actions/showstream.php:129 @@ -3252,8 +3190,8 @@ msgid "FOAF for %s" msgstr "FOAF de %s" #: actions/showstream.php:191 -#, php-format -msgid "This is the timeline for %s but %s hasn't posted anything yet." +#, fuzzy, php-format +msgid "This is the timeline for %1$s but %2$s hasn't posted anything yet." msgstr "" "Este é o fluxo público de mensagens de %s, mas %s não publicou nada ainda." @@ -3266,10 +3204,10 @@ msgstr "" "mensagem. Que tal começar agora? :)" #: actions/showstream.php:198 -#, php-format +#, fuzzy, php-format msgid "" -"You can try to nudge %s or [post something to his or her attention](%%%%" -"action.newnotice%%%%?status_textarea=%s)." +"You can try to nudge %1$s or [post something to his or her attention](%%%%" +"action.newnotice%%%%?status_textarea=%2$s)." msgstr "" "Você pode tentar chamar a atenção de %s ou [publicar alguma coisa que " "desperte seu interesse](%%%%action.newnotice%%%%?status_textarea=%s)." @@ -3321,12 +3259,13 @@ msgid "Site name must have non-zero length." msgstr "Você deve digitar alguma coisa para o nome do site." #: actions/siteadminpanel.php:154 -msgid "You must have a valid contact email address" +#, fuzzy +msgid "You must have a valid contact email address." msgstr "Você deve ter um endereço de e-mail para contato válido." #: actions/siteadminpanel.php:172 -#, php-format -msgid "Unknown language \"%s\"" +#, fuzzy, php-format +msgid "Unknown language \"%s\"." msgstr "Idioma desconhecido \"%s\"" #: actions/siteadminpanel.php:179 @@ -3508,7 +3447,8 @@ msgid "Save site settings" msgstr "Salvar as configurações do site" #: actions/smssettings.php:58 -msgid "SMS Settings" +#, fuzzy +msgid "SMS settings" msgstr "Configuração de SMS" #: actions/smssettings.php:69 @@ -3537,7 +3477,8 @@ msgid "Enter the code you received on your phone." msgstr "Informe o código que você recebeu no seu telefone." #: actions/smssettings.php:138 -msgid "SMS Phone number" +#, fuzzy +msgid "SMS phone number" msgstr "Telefone para SMS" #: actions/smssettings.php:140 @@ -3627,8 +3568,8 @@ msgid "%s subscribers" msgstr "Assinantes de %s" #: actions/subscribers.php:52 -#, php-format -msgid "%s subscribers, page %d" +#, fuzzy, php-format +msgid "%1$s subscribers, page %2$d" msgstr "Assinantes de %s, pág. %d" #: actions/subscribers.php:63 @@ -3668,8 +3609,8 @@ msgid "%s subscriptions" msgstr "Assinaturas de %s" #: actions/subscriptions.php:54 -#, php-format -msgid "%s subscriptions, page %d" +#, fuzzy, php-format +msgid "%1$s subscriptions, page %2$d" msgstr "Assinaturas de %s, pág. %d" #: actions/subscriptions.php:65 @@ -3710,11 +3651,6 @@ msgstr "Jabber" msgid "SMS" msgstr "SMS" -#: actions/tag.php:68 -#, php-format -msgid "Notices tagged with %s, page %d" -msgstr "Mensagens etiquetadas com %s, pág. %d" - #: actions/tag.php:86 #, php-format msgid "Notice feed for tag %s (RSS 1.0)" @@ -3798,22 +3734,19 @@ msgstr "O usuário não está silenciado." msgid "No profile id in request." msgstr "Nenhuma ID de perfil na requisição." -#: actions/unsubscribe.php:84 -msgid "No profile with that id." -msgstr "Nenhum perfil com essa ID." - #: actions/unsubscribe.php:98 msgid "Unsubscribed" msgstr "Cancelado" #: actions/updateprofile.php:62 actions/userauthorization.php:330 -#, php-format -msgid "Listenee stream license ‘%s’ is not compatible with site license ‘%s’." +#, fuzzy, php-format +msgid "" +"Listenee stream license ‘%1$s’ is not compatible with site license ‘%2$s’." msgstr "" "A licença '%s' do fluxo do usuário não é compatÃvel com a licença '%s' do " "site." -#: actions/useradminpanel.php:58 lib/adminpanelaction.php:305 +#: actions/useradminpanel.php:58 lib/adminpanelaction.php:321 #: lib/personalgroupnav.php:115 msgid "User" msgstr "Usuário" @@ -3915,7 +3848,7 @@ msgstr "" "as mensagens deste usuário. Se você não solicitou assinar as mensagens de " "alguém, clique em \"Recusar\"." -#: actions/userauthorization.php:188 +#: actions/userauthorization.php:188 actions/version.php:165 msgid "License" msgstr "Licença" @@ -3969,8 +3902,8 @@ msgstr "" "completamente a assinatura." #: actions/userauthorization.php:296 -#, php-format -msgid "Listener URI ‘%s’ not found here" +#, fuzzy, php-format +msgid "Listener URI ‘%s’ not found here." msgstr "A URI ‘%s’ do usuário não foi encontrada aqui" #: actions/userauthorization.php:301 @@ -4003,10 +3936,6 @@ msgstr "Não é possÃvel ler a URL '%s' do avatar." msgid "Wrong image type for avatar URL ‘%s’." msgstr "Tipo de imagem errado para a URL '%s' do avatar." -#: actions/userbyid.php:70 -msgid "No ID." -msgstr "Nenhuma ID." - #: actions/userdesignsettings.php:76 lib/designsettings.php:65 msgid "Profile design" msgstr "Aparência do perfil" @@ -4023,11 +3952,6 @@ msgstr "" msgid "Enjoy your hotdog!" msgstr "Aproveite o seu cachorro-quente!" -#: actions/usergroups.php:64 -#, php-format -msgid "%s groups, page %d" -msgstr "Grupos de %s, pág. %d" - #: actions/usergroups.php:130 msgid "Search for more groups" msgstr "Procurar por outros grupos" @@ -4044,6 +3968,73 @@ msgstr "" "Experimente [procurar por grupos](%%action.groupsearch%%) e associar-se à " "eles." +#: actions/version.php:73 +#, fuzzy, php-format +msgid "StatusNet %s" +msgstr "EstatÃsticas" + +#: actions/version.php:153 +#, php-format +msgid "" +"This site is powered by %1$s version %2$s, Copyright 2008-2010 StatusNet, " +"Inc. and contributors." +msgstr "" + +#: actions/version.php:157 +#, fuzzy +msgid "StatusNet" +msgstr "A mensagem foi excluÃda." + +#: actions/version.php:161 +msgid "Contributors" +msgstr "" + +#: actions/version.php:168 +msgid "" +"StatusNet is free software: you can redistribute it and/or modify it under " +"the terms of the GNU Affero General Public License as published by the Free " +"Software Foundation, either version 3 of the License, or (at your option) " +"any later version. " +msgstr "" + +#: actions/version.php:174 +msgid "" +"This program is distributed in the hope that it will be useful, but WITHOUT " +"ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or " +"FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License " +"for more details. " +msgstr "" + +#: actions/version.php:180 +#, php-format +msgid "" +"You should have received a copy of the GNU Affero General Public License " +"along with this program. If not, see %s." +msgstr "" + +#: actions/version.php:189 +msgid "Plugins" +msgstr "" + +#: actions/version.php:195 +#, fuzzy +msgid "Name" +msgstr "Usuário" + +#: actions/version.php:196 lib/action.php:741 +#, fuzzy +msgid "Version" +msgstr "Sessões" + +#: actions/version.php:197 +#, fuzzy +msgid "Author(s)" +msgstr "Autor" + +#: actions/version.php:198 lib/groupeditform.php:172 +msgid "Description" +msgstr "Descrição" + #: classes/File.php:137 #, php-format msgid "" @@ -4116,7 +4107,7 @@ msgstr "Problema no salvamento da mensagem." msgid "DB error inserting reply: %s" msgstr "Erro no banco de dados na inserção da reposta: %s" -#: classes/Notice.php:1361 +#: classes/Notice.php:1359 #, php-format msgid "RT @%1$s %2$s" msgstr "RT @%1$s %2$s" @@ -4162,137 +4153,132 @@ msgstr "Outras" msgid "Other options" msgstr "Outras opções" -#: lib/action.php:144 -#, php-format -msgid "%s - %s" -msgstr "%s - %s" - #: lib/action.php:159 msgid "Untitled page" msgstr "Página sem tÃtulo" -#: lib/action.php:426 +#: lib/action.php:427 msgid "Primary site navigation" msgstr "Navegação primária no site" -#: lib/action.php:432 +#: lib/action.php:433 msgid "Home" msgstr "InÃcio" -#: lib/action.php:432 +#: lib/action.php:433 msgid "Personal profile and friends timeline" msgstr "Perfil pessoal e fluxo de mensagens dos amigos" -#: lib/action.php:434 +#: lib/action.php:435 msgid "Account" msgstr "Conta" -#: lib/action.php:434 +#: lib/action.php:435 msgid "Change your email, avatar, password, profile" msgstr "Mude seu e-mail, avatar, senha, perfil" -#: lib/action.php:437 +#: lib/action.php:438 msgid "Connect" msgstr "Conectar" -#: lib/action.php:437 +#: lib/action.php:438 msgid "Connect to services" msgstr "Conecte-se a outros serviços" -#: lib/action.php:441 +#: lib/action.php:442 msgid "Change site configuration" msgstr "Mude as configurações do site" -#: lib/action.php:445 lib/subgroupnav.php:105 +#: lib/action.php:446 lib/subgroupnav.php:105 msgid "Invite" msgstr "Convidar" -#: lib/action.php:446 lib/subgroupnav.php:106 +#: lib/action.php:447 lib/subgroupnav.php:106 #, php-format msgid "Invite friends and colleagues to join you on %s" msgstr "Convide seus amigos e colegas para unir-se a você no %s" -#: lib/action.php:451 +#: lib/action.php:452 msgid "Logout" msgstr "Sair" -#: lib/action.php:451 +#: lib/action.php:452 msgid "Logout from the site" msgstr "Sai do site" -#: lib/action.php:456 +#: lib/action.php:457 msgid "Create an account" msgstr "Cria uma conta" -#: lib/action.php:459 +#: lib/action.php:460 msgid "Login to the site" msgstr "Autentique-se no site" -#: lib/action.php:462 lib/action.php:725 +#: lib/action.php:463 lib/action.php:726 msgid "Help" msgstr "Ajuda" -#: lib/action.php:462 +#: lib/action.php:463 msgid "Help me!" msgstr "Ajudem-me!" -#: lib/action.php:465 lib/searchaction.php:127 +#: lib/action.php:466 lib/searchaction.php:127 msgid "Search" msgstr "Procurar" -#: lib/action.php:465 +#: lib/action.php:466 msgid "Search for people or text" msgstr "Procura por pessoas ou textos" -#: lib/action.php:486 +#: lib/action.php:487 msgid "Site notice" msgstr "Mensagem do site" -#: lib/action.php:552 +#: lib/action.php:553 msgid "Local views" msgstr "Visualizações locais" -#: lib/action.php:618 +#: lib/action.php:619 msgid "Page notice" msgstr "NotÃcia da página" -#: lib/action.php:720 +#: lib/action.php:721 msgid "Secondary site navigation" msgstr "Navegação secundária no site" -#: lib/action.php:727 +#: lib/action.php:728 msgid "About" msgstr "Sobre" -#: lib/action.php:729 +#: lib/action.php:730 msgid "FAQ" msgstr "FAQ" -#: lib/action.php:733 +#: lib/action.php:734 msgid "TOS" msgstr "Termos de uso" -#: lib/action.php:736 +#: lib/action.php:737 msgid "Privacy" msgstr "Privacidade" -#: lib/action.php:738 +#: lib/action.php:739 msgid "Source" msgstr "Fonte" -#: lib/action.php:740 +#: lib/action.php:743 msgid "Contact" msgstr "Contato" -#: lib/action.php:742 +#: lib/action.php:745 msgid "Badge" msgstr "Mini-aplicativo" -#: lib/action.php:770 +#: lib/action.php:773 msgid "StatusNet software license" msgstr "Licença do software StatusNet" -#: lib/action.php:773 +#: lib/action.php:776 #, php-format msgid "" "**%%site.name%%** is a microblogging service brought to you by [%%site." @@ -4301,12 +4287,12 @@ msgstr "" "**%%site.name%%** é um serviço de microblog disponibilizado por [%%site." "broughtby%%](%%site.broughtbyurl%%). " -#: lib/action.php:775 +#: lib/action.php:778 #, php-format msgid "**%%site.name%%** is a microblogging service. " msgstr "**%%site.name%%** é um serviço de microblog. " -#: lib/action.php:777 +#: lib/action.php:780 #, php-format msgid "" "It runs the [StatusNet](http://status.net/) microblogging software, version %" @@ -4317,31 +4303,31 @@ msgstr "" "versão %s, disponÃvel sob a [GNU Affero General Public License] (http://www." "fsf.org/licensing/licenses/agpl-3.0.html)." -#: lib/action.php:791 +#: lib/action.php:794 msgid "Site content license" msgstr "Licença do conteúdo do site" -#: lib/action.php:800 +#: lib/action.php:803 msgid "All " msgstr "Todas " -#: lib/action.php:805 +#: lib/action.php:808 msgid "license." msgstr "licença." -#: lib/action.php:1099 +#: lib/action.php:1102 msgid "Pagination" msgstr "Paginação" -#: lib/action.php:1108 +#: lib/action.php:1111 msgid "After" msgstr "Próximo" -#: lib/action.php:1116 +#: lib/action.php:1119 msgid "Before" msgstr "Anterior" -#: lib/action.php:1164 +#: lib/action.php:1167 msgid "There was a problem with your session token." msgstr "Ocorreu um problema com o seu token de sessão." @@ -4349,27 +4335,32 @@ msgstr "Ocorreu um problema com o seu token de sessão." msgid "You cannot make changes to this site." msgstr "Você não pode fazer alterações neste site." -#: lib/adminpanelaction.php:195 +#: lib/adminpanelaction.php:107 +#, fuzzy +msgid "Changes to that panel are not allowed." +msgstr "Não é permitido o registro." + +#: lib/adminpanelaction.php:206 msgid "showForm() not implemented." msgstr "showForm() não implementado." -#: lib/adminpanelaction.php:224 +#: lib/adminpanelaction.php:235 msgid "saveSettings() not implemented." msgstr "saveSettings() não implementado." -#: lib/adminpanelaction.php:247 +#: lib/adminpanelaction.php:258 msgid "Unable to delete design setting." msgstr "Não foi possÃvel excluir as configurações da aparência." -#: lib/adminpanelaction.php:300 +#: lib/adminpanelaction.php:312 msgid "Basic site configuration" msgstr "Configuração básica do site" -#: lib/adminpanelaction.php:303 +#: lib/adminpanelaction.php:317 msgid "Design configuration" msgstr "Configuração da aparência" -#: lib/adminpanelaction.php:306 lib/adminpanelaction.php:309 +#: lib/adminpanelaction.php:322 lib/adminpanelaction.php:327 msgid "Paths configuration" msgstr "Configuração dos caminhos" @@ -4393,11 +4384,21 @@ msgstr "Mensagens onde este anexo aparece" msgid "Tags for this attachment" msgstr "Etiquetas para este anexo" +#: lib/authenticationplugin.php:182 lib/authenticationplugin.php:187 +#, fuzzy +msgid "Password changing failed" +msgstr "Alterar a senha" + +#: lib/authenticationplugin.php:197 +#, fuzzy +msgid "Password changing is not allowed" +msgstr "Alterar a senha" + #: lib/channel.php:138 lib/channel.php:158 msgid "Command results" msgstr "Resultados do comando" -#: lib/channel.php:210 +#: lib/channel.php:210 lib/mailhandler.php:142 msgid "Command complete" msgstr "O comando foi completado" @@ -4410,8 +4411,8 @@ msgid "Sorry, this command is not yet implemented." msgstr "Desculpe, mas esse comando ainda não foi implementado." #: lib/command.php:88 -#, php-format -msgid "Could not find a user with nickname %s" +#, fuzzy, php-format +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:92 @@ -4419,8 +4420,8 @@ msgid "It does not make a lot of sense to nudge yourself!" msgstr "Não faz muito sentido chamar a sua própria atenção!" #: lib/command.php:99 -#, php-format -msgid "Nudge sent to %s" +#, fuzzy, php-format +msgid "Nudge sent to %s." msgstr "Foi enviada a chamada de atenção para %s" #: lib/command.php:126 @@ -4435,34 +4436,36 @@ msgstr "" "Mensagens: %3$s" #: lib/command.php:152 lib/command.php:399 lib/command.php:460 -msgid "Notice with that id does not exist" +#, fuzzy +msgid "Notice with that id does not exist." msgstr "Não existe uma mensagem com essa id" #: lib/command.php:168 lib/command.php:415 lib/command.php:476 #: lib/command.php:532 -msgid "User has no last notice" +#, fuzzy +msgid "User has no last notice." msgstr "O usuário não tem uma \"última mensagem\"" #: lib/command.php:190 msgid "Notice marked as fave." msgstr "Mensagem marcada como favorita." -#: lib/command.php:315 -#, php-format -msgid "%1$s (%2$s)" -msgstr "%1$s (%2$s)" +#: lib/command.php:284 +#, fuzzy, php-format +msgid "Could not remove user %1$s to group %2$s." +msgstr "Não foi possÃvel remover o usuário %s do grupo %s" #: lib/command.php:318 -#, php-format -msgid "Fullname: %s" +#, fuzzy, php-format +msgid "Full name: %s" msgstr "Nome completo: %s" -#: lib/command.php:321 +#: lib/command.php:321 lib/mail.php:254 #, php-format msgid "Location: %s" msgstr "Localização: %s" -#: lib/command.php:324 +#: lib/command.php:324 lib/mail.php:256 #, php-format msgid "Homepage: %s" msgstr "Site: %s" @@ -4473,8 +4476,8 @@ msgid "About: %s" msgstr "Sobre: %s" #: lib/command.php:358 scripts/xmppdaemon.php:301 -#, php-format -msgid "Message too long - maximum is %d characters, you sent %d" +#, fuzzy, php-format +msgid "Message too long - maximum is %1$d characters, you sent %2$d." msgstr "" "A mensagem é muito extensa - o máximo são %d caracteres e você enviou %d" @@ -4482,17 +4485,9 @@ msgstr "" msgid "Error sending direct message." msgstr "Ocorreu um erro durante o envio da mensagem direta." -#: lib/command.php:422 -msgid "Cannot repeat your own notice" -msgstr "Você não pode repetir sua própria mensagem" - -#: lib/command.php:427 -msgid "Already repeated that notice" -msgstr "Você já repetiu essa mensagem" - #: lib/command.php:435 -#, php-format -msgid "Notice from %s repeated" +#, fuzzy, php-format +msgid "Notice from %s repeated." msgstr "Mensagem de %s repetida" #: lib/command.php:437 @@ -4500,14 +4495,14 @@ msgid "Error repeating notice." msgstr "Erro na repetição da mensagem." #: lib/command.php:491 -#, php-format -msgid "Notice too long - maximum is %d characters, you sent %d" +#, fuzzy, php-format +msgid "Notice too long - maximum is %1$d characters, you sent %2$d." msgstr "" "A mensagem é muito extensa - o máximo são %d caracteres e você enviou %d" #: lib/command.php:500 -#, php-format -msgid "Reply to %s sent" +#, fuzzy, php-format +msgid "Reply to %s sent." msgstr "A resposta a %s foi enviada" #: lib/command.php:502 @@ -4515,7 +4510,8 @@ msgid "Error saving notice." msgstr "Erro no salvamento da mensagem." #: lib/command.php:556 -msgid "Specify the name of the user to subscribe to" +#, fuzzy +msgid "Specify the name of the user to subscribe to." msgstr "Especifique o nome do usuário que será assinado" #: lib/command.php:563 @@ -4524,7 +4520,8 @@ msgid "Subscribed to %s" msgstr "Efetuada a assinatura de %s" #: lib/command.php:584 -msgid "Specify the name of the user to unsubscribe from" +#, fuzzy +msgid "Specify the name of the user to unsubscribe from." msgstr "Especifique o nome do usuário cuja assinatura será cancelada" #: lib/command.php:591 @@ -4553,17 +4550,18 @@ msgid "Can't turn on notification." msgstr "Não é possÃvel ligar a notificação." #: lib/command.php:650 -msgid "Login command is disabled" +#, fuzzy +msgid "Login command is disabled." msgstr "O comando para autenticação está desabilitado" #: lib/command.php:664 -#, php-format -msgid "Could not create login token for %s" +#, fuzzy, php-format +msgid "Could not create login token for %s." msgstr "Não foi possÃvel criar o token de autenticação para %s" #: lib/command.php:669 -#, php-format -msgid "This link is useable only once, and is good for only 2 minutes: %s" +#, fuzzy, php-format +msgid "This link is useable only once, and is good for only 2 minutes: %s." msgstr "" "Este link é utilizável somente uma vez e é válido somente por dois minutos: %" "s" @@ -4792,10 +4790,6 @@ msgstr "Descreva o grupo ou tópico" msgid "Describe the group or topic in %d characters" msgstr "Descreva o grupo ou tópico em %d caracteres." -#: lib/groupeditform.php:172 -msgid "Description" -msgstr "Descrição" - #: lib/groupeditform.php:179 msgid "" "Location for the group, if any, like \"City, State (or Region), Country\"" @@ -4979,21 +4973,9 @@ msgstr "" "----\n" "Altere seu endereço de e-mail e suas opções de notificação em %8$s\n" -#: lib/mail.php:254 -#, php-format -msgid "Location: %s\n" -msgstr "Localização: %s\n" - -#: lib/mail.php:256 -#, php-format -msgid "Homepage: %s\n" -msgstr "Site: %s\n" - #: lib/mail.php:258 -#, php-format -msgid "" -"Bio: %s\n" -"\n" +#, fuzzy, php-format +msgid "Bio: %s" msgstr "" "Descrição: %s\n" "\n" @@ -5193,6 +5175,27 @@ msgstr "" msgid "from" msgstr "de" +#: lib/mailhandler.php:37 +msgid "Could not parse message." +msgstr "Não foi possÃvel analisar a mensagem." + +#: lib/mailhandler.php:42 +msgid "Not a registered user." +msgstr "Não é um usuário registrado." + +#: lib/mailhandler.php:46 +msgid "Sorry, that is not your incoming email address." +msgstr "Desculpe-me, mas este não é seu endereço de e-mail para recebimento." + +#: lib/mailhandler.php:50 +msgid "Sorry, no incoming email allowed." +msgstr "Desculpe-me, mas não é permitido o recebimento de e-mails." + +#: lib/mailhandler.php:228 +#, fuzzy, php-format +msgid "Unsupported message type: %s" +msgstr "Formato de imagem não suportado." + #: lib/mediafile.php:98 lib/mediafile.php:123 msgid "There was a database error while saving your file. Please try again." msgstr "" @@ -5230,7 +5233,8 @@ msgid "File upload stopped by extension." msgstr "O arquivo a ser enviado foi barrado por causa de sua extensão." #: lib/mediafile.php:179 lib/mediafile.php:216 -msgid "File exceeds user's quota!" +#, fuzzy +msgid "File exceeds user's quota." msgstr "O arquivo excede a quota do usuário!" #: lib/mediafile.php:196 lib/mediafile.php:233 @@ -5238,7 +5242,8 @@ msgid "File could not be moved to destination directory." msgstr "Não foi possÃvel mover o arquivo para o diretório de destino." #: lib/mediafile.php:201 lib/mediafile.php:237 -msgid "Could not determine file's mime-type!" +#, fuzzy +msgid "Could not determine file's MIME type." msgstr "Não foi possÃvel determinar o mime-type do arquivo!" #: lib/mediafile.php:270 @@ -5247,8 +5252,8 @@ msgid " Try using another %s format." msgstr " Tente usar outro formato %s." #: lib/mediafile.php:275 -#, php-format -msgid "%s is not a supported filetype on this server." +#, fuzzy, php-format +msgid "%s is not a supported file type on this server." msgstr "%s não é um tipo de arquivo suportado neste servidor." #: lib/messageform.php:120 @@ -5281,9 +5286,19 @@ msgid "Attach a file" msgstr "Anexar um arquivo" #: lib/noticeform.php:212 -msgid "Share your location" +#, fuzzy +msgid "Share my location." +msgstr "Indique a sua localização" + +#: lib/noticeform.php:214 +#, fuzzy +msgid "Do not share my location." msgstr "Indique a sua localização" +#: lib/noticeform.php:215 +msgid "Hide this info" +msgstr "" + #: lib/noticelist.php:428 #, php-format msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s" @@ -5398,6 +5413,11 @@ msgstr "Suas mensagens enviadas" msgid "Tags in %s's notices" msgstr "Etiquetas nas mensagens de %s" +#: lib/plugin.php:114 +#, fuzzy +msgid "Unknown" +msgstr "Ação desconhecida" + #: lib/profileaction.php:109 lib/profileaction.php:192 lib/subgroupnav.php:82 msgid "Subscriptions" msgstr "Assinaturas" @@ -5567,10 +5587,6 @@ msgstr "Nuvem de etiquetas pessoais definidas pelas próprios usuários" msgid "People Tagcloud as tagged" msgstr "Nuvem de etiquetas pessoais definidas pelos outros usuário" -#: lib/subscriptionlist.php:126 -msgid "(none)" -msgstr "(nada)" - #: lib/tagcloudsection.php:56 msgid "None" msgstr "Nenhuma" @@ -5684,19 +5700,3 @@ msgstr "%s não é uma cor válida!" #, php-format msgid "%s is not a valid color! Use 3 or 6 hex chars." msgstr "%s não é uma cor válida! Utilize 3 ou 6 caracteres hexadecimais." - -#: scripts/maildaemon.php:48 -msgid "Could not parse message." -msgstr "Não foi possÃvel analisar a mensagem." - -#: scripts/maildaemon.php:53 -msgid "Not a registered user." -msgstr "Não é um usuário registrado." - -#: scripts/maildaemon.php:57 -msgid "Sorry, that is not your incoming email address." -msgstr "Desculpe-me, mas este não é seu endereço de e-mail para recebimento." - -#: scripts/maildaemon.php:61 -msgid "Sorry, no incoming email allowed." -msgstr "Desculpe-me, mas não é permitido o recebimento de e-mails." diff --git a/locale/ru/LC_MESSAGES/statusnet.po b/locale/ru/LC_MESSAGES/statusnet.po index de2737689..4fb91a3e0 100644 --- a/locale/ru/LC_MESSAGES/statusnet.po +++ b/locale/ru/LC_MESSAGES/statusnet.po @@ -10,12 +10,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-01-03 10:37+0000\n" -"PO-Revision-Date: 2010-01-03 10:38:45+0000\n" +"POT-Creation-Date: 2010-01-10 11:27+0000\n" +"PO-Revision-Date: 2010-01-11 00:21:25+0000\n" "Language-Team: Russian\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha (r60575); Translate extension (2009-12-06)\n" +"X-Generator: MediaWiki 1.16alpha (r60910); Translate extension (2010-01-04)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: ru\n" "X-Message-Group: out-statusnet\n" @@ -53,11 +53,6 @@ msgstr "Ðет такой Ñтраницы" msgid "No such user." msgstr "Ðет такого пользователÑ." -#: actions/all.php:84 -#, php-format -msgid "%s and friends, page %d" -msgstr "%s и друзьÑ, Ñтраница %d" - #: actions/all.php:86 actions/all.php:167 actions/allrss.php:115 #: actions/apitimelinefriends.php:115 actions/apitimelinehome.php:115 #: lib/personalgroupnav.php:100 @@ -98,12 +93,12 @@ msgstr "" #: actions/all.php:134 #, php-format msgid "" -"You can try to [nudge %s](../%s) from his profile or [post something to his " -"or her attention](%%%%action.newnotice%%%%?status_textarea=%s)." +"You can try to [nudge %1$s](../%2$s) from his profile or [post something to " +"his or her attention](%%%%action.newnotice%%%%?status_textarea=%3$s)." msgstr "" -"Ð’Ñ‹ можете попробовать [«подтолкнуть» %s](../%s) из Ð¿Ñ€Ð¾Ñ„Ð¸Ð»Ñ Ð¸Ð»Ð¸ [напиÑать что-" -"нибудь Ð´Ð»Ñ Ð¿Ñ€Ð¸Ð²Ð»ÐµÑ‡ÐµÐ½Ð¸Ñ ÐµÐ³Ð¾ или её вниманиÑ](%%%%action.newnotice%%%%?" -"status_textarea=%s)." +"Ð’Ñ‹ можете попробовать [«подтолкнуть» %1$s](../%2$s) из Ð¿Ñ€Ð¾Ñ„Ð¸Ð»Ñ Ð¸Ð»Ð¸ [напиÑать " +"что-нибудь Ð´Ð»Ñ Ð¿Ñ€Ð¸Ð²Ð»ÐµÑ‡ÐµÐ½Ð¸Ñ ÐµÐ³Ð¾ или её вниманиÑ](%%%%action.newnotice%%%%?" +"status_textarea=%3$s)." #: actions/all.php:137 actions/replies.php:209 actions/showstream.php:202 #, php-format @@ -129,6 +124,23 @@ msgstr "Обновлено от %1$s и его друзей на %2$s!" #: actions/apiaccountupdateprofile.php:97 #: actions/apiaccountupdateprofilebackgroundimage.php:94 #: actions/apiaccountupdateprofilecolors.php:118 +#: actions/apidirectmessage.php:156 actions/apifavoritecreate.php:99 +#: actions/apifavoritedestroy.php:100 actions/apifriendshipscreate.php:100 +#: actions/apifriendshipsdestroy.php:100 actions/apifriendshipsshow.php:129 +#: actions/apigroupcreate.php:136 actions/apigroupismember.php:114 +#: actions/apigroupjoin.php:155 actions/apigroupleave.php:141 +#: actions/apigrouplist.php:132 actions/apigrouplistall.php:120 +#: actions/apigroupmembership.php:106 actions/apigroupshow.php:105 +#: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102 +#: actions/apistatusesretweets.php:112 actions/apistatusesshow.php:108 +#: actions/apistatusnetconfig.php:133 actions/apistatusnetversion.php:93 +#: actions/apisubscriptions.php:111 actions/apitimelinefavorites.php:146 +#: actions/apitimelinefriends.php:156 actions/apitimelinegroup.php:150 +#: actions/apitimelinehome.php:156 actions/apitimelinementions.php:151 +#: actions/apitimelinepublic.php:131 actions/apitimelineretweetedbyme.php:122 +#: actions/apitimelineretweetedtome.php:121 +#: actions/apitimelineretweetsofme.php:122 actions/apitimelinetag.php:141 +#: actions/apitimelineuser.php:165 actions/apiusershow.php:101 msgid "API method not found." msgstr "Метод API не найден." @@ -186,6 +198,9 @@ msgstr "" #: actions/apiaccountupdateprofilebackgroundimage.php:146 #: actions/apiaccountupdateprofilecolors.php:164 #: actions/apiaccountupdateprofilecolors.php:174 +#: actions/groupdesignsettings.php:287 actions/groupdesignsettings.php:297 +#: actions/userdesignsettings.php:210 actions/userdesignsettings.php:220 +#: actions/userdesignsettings.php:263 actions/userdesignsettings.php:273 msgid "Unable to save your design settings." msgstr "Ðе удаётÑÑ Ñохранить ваши наÑтройки оформлениÑ!" @@ -226,26 +241,6 @@ msgstr "ПрÑмые ÑÐ¾Ð¾Ð±Ñ‰ÐµÐ½Ð¸Ñ Ð´Ð»Ñ %s" msgid "All the direct messages sent to %s" msgstr "Ð’Ñе прÑмые ÑÐ¾Ð¾Ð±Ñ‰ÐµÐ½Ð¸Ñ Ð¿Ð¾Ñланные Ð´Ð»Ñ %s" -#: actions/apidirectmessage.php:156 actions/apifavoritecreate.php:99 -#: actions/apifavoritedestroy.php:100 actions/apifriendshipscreate.php:100 -#: actions/apifriendshipsdestroy.php:100 actions/apifriendshipsshow.php:129 -#: actions/apigroupcreate.php:136 actions/apigroupismember.php:114 -#: actions/apigroupjoin.php:155 actions/apigroupleave.php:141 -#: actions/apigrouplist.php:132 actions/apigrouplistall.php:120 -#: actions/apigroupmembership.php:106 actions/apigroupshow.php:105 -#: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102 -#: actions/apistatusesretweets.php:112 actions/apistatusesshow.php:108 -#: actions/apistatusnetconfig.php:133 actions/apistatusnetversion.php:93 -#: actions/apisubscriptions.php:111 actions/apitimelinefavorites.php:146 -#: actions/apitimelinefriends.php:156 actions/apitimelinegroup.php:150 -#: actions/apitimelinehome.php:156 actions/apitimelinementions.php:151 -#: actions/apitimelinepublic.php:131 actions/apitimelineretweetedbyme.php:122 -#: actions/apitimelineretweetedtome.php:121 -#: actions/apitimelineretweetsofme.php:122 actions/apitimelinetag.php:141 -#: actions/apitimelineuser.php:165 actions/apiusershow.php:101 -msgid "API method not found!" -msgstr "Метод API не найден!" - #: actions/apidirectmessagenew.php:126 msgid "No message text!" msgstr "ОтÑутÑтвует текÑÑ‚ ÑообщениÑ!" @@ -271,16 +266,16 @@ msgid "No status found with that ID." msgstr "Ðет ÑтатуÑа Ñ Ñ‚Ð°ÐºÐ¸Ð¼ ID." #: actions/apifavoritecreate.php:119 -msgid "This status is already a favorite!" -msgstr "Ðтот ÑÑ‚Ð°Ñ‚ÑƒÑ ÑƒÐ¶Ðµ входит в чиÑло любимых!" +msgid "This status is already a favorite." +msgstr "Ðтот ÑÑ‚Ð°Ñ‚ÑƒÑ ÑƒÐ¶Ðµ входит в чиÑло любимых." #: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:176 msgid "Could not create favorite." msgstr "Ðе удаётÑÑ Ñоздать любимую запиÑÑŒ." #: actions/apifavoritedestroy.php:122 -msgid "That status is not a favorite!" -msgstr "Ðтот ÑÑ‚Ð°Ñ‚ÑƒÑ Ð½Ðµ входит в чиÑло ваших любимых ÑтатуÑов!" +msgid "That status is not a favorite." +msgstr "Ðтот ÑÑ‚Ð°Ñ‚ÑƒÑ Ð½Ðµ входит в чиÑло ваших любимых." #: actions/apifavoritedestroy.php:134 actions/disfavor.php:87 msgid "Could not delete favorite." @@ -304,8 +299,8 @@ msgstr "" "ÑущеÑтвует." #: actions/apifriendshipsdestroy.php:120 -msgid "You cannot unfollow yourself!" -msgstr "Ð’Ñ‹ не можете переÑтать Ñледовать за Ñобой!" +msgid "You cannot unfollow yourself." +msgstr "Ð’Ñ‹ не можете переÑтать Ñледовать за Ñобой." #: actions/apifriendshipsexists.php:94 msgid "Two user ids or screen_names must be supplied." @@ -390,7 +385,7 @@ msgstr "ÐÐ»Ð¸Ð°Ñ Ð½Ðµ может Ñовпадать Ñ Ð¸Ð¼ÐµÐ½ÐµÐ¼." msgid "Group not found!" msgstr "Группа не найдена!" -#: actions/apigroupjoin.php:110 +#: actions/apigroupjoin.php:110 actions/joingroup.php:90 lib/command.php:217 msgid "You are already a member of that group." msgstr "Ð’Ñ‹ уже ÑвлÑетеÑÑŒ членом Ñтой группы." @@ -398,30 +393,25 @@ msgstr "Ð’Ñ‹ уже ÑвлÑетеÑÑŒ членом Ñтой группы." msgid "You have been blocked from that group by the admin." msgstr "Ð’Ñ‹ заблокированы из Ñтой группы админиÑтратором." -#: actions/apigroupjoin.php:138 +#: actions/apigroupjoin.php:138 actions/joingroup.php:128 lib/command.php:234 #, php-format -msgid "Could not join user %s to group %s." -msgstr "Ðе удаётÑÑ Ð¿Ñ€Ð¸Ñоединить Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ %s к группе %s." +msgid "Could not join user %1$s to group %2$s." +msgstr "Ðе удаётÑÑ Ð¿Ñ€Ð¸Ñоединить Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ %1$s к группе %2$s." #: actions/apigroupleave.php:114 msgid "You are not a member of this group." msgstr "Ð’Ñ‹ не ÑвлÑетеÑÑŒ членом Ñтой группы." -#: actions/apigroupleave.php:124 +#: actions/apigroupleave.php:124 actions/leavegroup.php:127 #, php-format -msgid "Could not remove user %s to group %s." -msgstr "Ðе удаётÑÑ ÑƒÐ´Ð°Ð»Ð¸Ñ‚ÑŒ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ %s из группы %s." +msgid "Could not remove user %1$s from group %2$s." +msgstr "Ðе удаётÑÑ ÑƒÐ´Ð°Ð»Ð¸Ñ‚ÑŒ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ %1$s из группы %2$s." #: actions/apigrouplist.php:95 #, php-format msgid "%s's groups" msgstr "Группы %s" -#: actions/apigrouplist.php:103 -#, php-format -msgid "Groups %s is a member of on %s." -msgstr "Группы, в которых ÑоÑтоит %s на %s." - #: actions/apigrouplistall.php:90 actions/usergroups.php:62 #, php-format msgid "%s groups" @@ -445,11 +435,11 @@ msgstr "Ð’Ñ‹ не можете удалÑÑ‚ÑŒ ÑÑ‚Ð°Ñ‚ÑƒÑ Ð´Ñ€ÑƒÐ³Ð¸Ñ… поль msgid "No such notice." msgstr "Ðет такой запиÑи." -#: actions/apistatusesretweet.php:83 +#: actions/apistatusesretweet.php:83 lib/command.php:422 msgid "Cannot repeat your own notice." msgstr "Ðевозможно повторить ÑобÑтвенную запиÑÑŒ." -#: actions/apistatusesretweet.php:91 +#: actions/apistatusesretweet.php:91 lib/command.php:427 msgid "Already repeated that notice." msgstr "ЗапиÑÑŒ уже повторена." @@ -462,7 +452,7 @@ msgid "No status with that ID found." msgstr "Ðе найдено ÑтатуÑа Ñ Ñ‚Ð°ÐºÐ¸Ð¼ ID." #: actions/apistatusesupdate.php:157 actions/newnotice.php:155 -#: scripts/maildaemon.php:71 +#: lib/mailhandler.php:60 #, php-format msgid "That's too long. Max notice size is %d chars." msgstr "Слишком Ð´Ð»Ð¸Ð½Ð½Ð°Ñ Ð·Ð°Ð¿Ð¸ÑÑŒ. МакÑÐ¸Ð¼Ð°Ð»ÑŒÐ½Ð°Ñ Ð´Ð»Ð¸Ð½Ð° — %d знаков." @@ -482,13 +472,13 @@ msgstr "Ðеподдерживаемый формат." #: actions/apitimelinefavorites.php:108 #, php-format -msgid "%s / Favorites from %s" -msgstr "%s / Любимое от %s" +msgid "%1$s / Favorites from %2$s" +msgstr "%1$s / Любимое от %2$s" #: actions/apitimelinefavorites.php:120 #, php-format -msgid "%s updates favorited by %s / %s." -msgstr "%s обновлённые любимые запиÑи от %s / %s." +msgid "%1$s updates favorited by %2$s / %2$s." +msgstr "ÐžÐ±Ð½Ð¾Ð²Ð»ÐµÐ½Ð¸Ñ %1$s, отмеченные как любимые %2$s / %2$s." #: actions/apitimelinegroup.php:109 actions/apitimelineuser.php:118 #: actions/grouprss.php:131 actions/userrss.php:90 @@ -555,8 +545,11 @@ msgstr "Ðе найдено." msgid "No such attachment." msgstr "Ðет такого вложениÑ." -#: actions/avatarbynickname.php:59 actions/grouprss.php:91 -#: actions/leavegroup.php:76 +#: actions/avatarbynickname.php:59 actions/blockedfromgroup.php:73 +#: actions/editgroup.php:84 actions/groupdesignsettings.php:84 +#: actions/grouplogo.php:86 actions/groupmembers.php:76 +#: actions/grouprss.php:91 actions/joingroup.php:76 actions/leavegroup.php:76 +#: actions/showgroup.php:121 msgid "No nickname." msgstr "Ðет имени." @@ -580,8 +573,8 @@ msgstr "" "Ð’Ñ‹ можете загрузить Ñвою аватару. МакÑимальный размер файла ÑоÑтавлÑет %s." #: actions/avatarsettings.php:106 actions/avatarsettings.php:185 -#: actions/grouplogo.php:178 actions/remotesubscribe.php:191 -#: actions/userauthorization.php:72 actions/userrss.php:103 +#: actions/remotesubscribe.php:191 actions/userauthorization.php:72 +#: actions/userrss.php:103 msgid "User without matching profile" msgstr "Пользователь без ÑоответÑтвующего профилÑ" @@ -613,9 +606,9 @@ msgstr "Загрузить" msgid "Crop" msgstr "Обрезать" -#: actions/avatarsettings.php:268 actions/disfavor.php:74 -#: actions/emailsettings.php:238 actions/favor.php:75 actions/geocode.php:50 -#: actions/groupblock.php:66 actions/grouplogo.php:309 +#: actions/avatarsettings.php:268 actions/deletenotice.php:157 +#: actions/disfavor.php:74 actions/emailsettings.php:238 actions/favor.php:75 +#: actions/geocode.php:50 actions/groupblock.php:66 actions/grouplogo.php:309 #: actions/groupunblock.php:66 actions/imsettings.php:206 #: actions/invite.php:56 actions/login.php:135 actions/makeadmin.php:66 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80 @@ -697,19 +690,15 @@ msgstr "Заблокировать пользователÑ." msgid "Failed to save block information." msgstr "Ðе удаётÑÑ Ñохранить информацию о блокировании." -#: actions/blockedfromgroup.php:73 actions/editgroup.php:84 -#: actions/groupdesignsettings.php:84 actions/grouplogo.php:86 -#: actions/groupmembers.php:76 actions/joingroup.php:76 -#: actions/showgroup.php:121 -msgid "No nickname" -msgstr "Ðет Ð½Ð°Ð·Ð²Ð°Ð½Ð¸Ñ Ð³Ñ€ÑƒÐ¿Ð¿Ñ‹" - #: actions/blockedfromgroup.php:80 actions/editgroup.php:96 +#: actions/foafgroup.php:44 actions/foafgroup.php:62 actions/groupblock.php:86 #: actions/groupbyid.php:83 actions/groupdesignsettings.php:97 #: actions/grouplogo.php:99 actions/groupmembers.php:83 -#: actions/joingroup.php:83 actions/showgroup.php:137 -msgid "No such group" -msgstr "Ðет такой группы" +#: actions/grouprss.php:98 actions/groupunblock.php:86 +#: actions/joingroup.php:83 actions/leavegroup.php:83 actions/makeadmin.php:86 +#: actions/showgroup.php:137 lib/command.php:212 lib/command.php:263 +msgid "No such group." +msgstr "Ðет такой группы." #: actions/blockedfromgroup.php:90 #, php-format @@ -718,8 +707,8 @@ msgstr "Заблокированные профили %s" #: actions/blockedfromgroup.php:93 #, php-format -msgid "%s blocked profiles, page %d" -msgstr "Заблокированные профили %s, Ñтраница %d" +msgid "%1$s blocked profiles, page %2$d" +msgstr "Заблокированные профили %1$s, Ñтраница %2$d" #: actions/blockedfromgroup.php:108 msgid "A list of the users blocked from joining this group." @@ -831,10 +820,6 @@ msgstr "Ðе удалÑÑ‚ÑŒ Ñту запиÑÑŒ" msgid "Delete this notice" msgstr "Удалить Ñту запиÑÑŒ" -#: actions/deletenotice.php:157 -msgid "There was a problem with your session token. Try again, please." -msgstr "Проблема Ñ Ð²Ð°ÑˆÐ¸Ð¼ ключом ÑеÑÑии. ПожалуйÑта, попробуйте ещё раз." - #: actions/deleteuser.php:67 msgid "You cannot delete users." msgstr "Ð’Ñ‹ не можете удалÑÑ‚ÑŒ пользователей." @@ -860,7 +845,7 @@ msgid "Delete this user" msgstr "Удалить Ñтого пользователÑ" #: actions/designadminpanel.php:62 lib/accountsettingsaction.php:124 -#: lib/adminpanelaction.php:302 lib/groupnav.php:119 +#: lib/adminpanelaction.php:316 lib/groupnav.php:119 msgid "Design" msgstr "Оформление" @@ -1000,8 +985,8 @@ msgstr "Ð’Ñ‹ должны авторизоватьÑÑ, чтобы ÑÐ¾Ð·Ð´Ð°Ñ‚Ñ #: actions/editgroup.php:103 actions/editgroup.php:168 #: actions/groupdesignsettings.php:104 actions/grouplogo.php:106 -msgid "You must be an admin to edit the group" -msgstr "Ð’Ñ‹ должны быть админиÑтратором, чтобы изменÑÑ‚ÑŒ информацию о группе" +msgid "You must be an admin to edit the group." +msgstr "Ð’Ñ‹ должны быть админиÑтратором, чтобы изменÑÑ‚ÑŒ информацию о группе." #: actions/editgroup.php:154 msgid "Use this form to edit the group." @@ -1025,7 +1010,7 @@ msgid "Options saved." msgstr "ÐаÑтройки Ñохранены." #: actions/emailsettings.php:60 -msgid "Email Settings" +msgid "Email settings" msgstr "ÐаÑтройка почты" #: actions/emailsettings.php:71 @@ -1062,8 +1047,8 @@ msgid "Cancel" msgstr "Отменить" #: actions/emailsettings.php:121 -msgid "Email Address" -msgstr "Ðлектронный адреÑ" +msgid "Email address" +msgstr "ÐÐ´Ñ€ÐµÑ Ñл. почты" #: actions/emailsettings.php:123 msgid "Email address, like \"UserName@example.org\"" @@ -1146,9 +1131,10 @@ msgstr "Ðет Ñлектронного адреÑа." msgid "Cannot normalize that email address" msgstr "Ðе удаётÑÑ Ñтандартизировать Ñтот Ñлектронный адреÑ" -#: actions/emailsettings.php:331 actions/siteadminpanel.php:157 -msgid "Not a valid email address" -msgstr "Ðеверный Ñлектронный адреÑ" +#: actions/emailsettings.php:331 actions/register.php:201 +#: actions/siteadminpanel.php:157 +msgid "Not a valid email address." +msgstr "Ðеверный Ñлектронный адреÑ." #: actions/emailsettings.php:334 msgid "That is already your email address." @@ -1331,18 +1317,11 @@ msgstr "Удалённый ÑÐµÑ€Ð²Ð¸Ñ Ð¸Ñпользует неизвеÑÑ‚Ð½Ñ msgid "Error updating remote profile" msgstr "Ошибка Ð¾Ð±Ð½Ð¾Ð²Ð»ÐµÐ½Ð¸Ñ ÑƒÐ´Ð°Ð»Ñ‘Ð½Ð½Ð¾Ð³Ð¾ профилÑ" -#: actions/foafgroup.php:44 actions/foafgroup.php:62 actions/groupblock.php:86 -#: actions/grouprss.php:98 actions/groupunblock.php:86 -#: actions/leavegroup.php:83 actions/makeadmin.php:86 lib/command.php:212 -#: lib/command.php:263 -msgid "No such group." -msgstr "Ðет такой группы." - -#: actions/getfile.php:75 +#: actions/getfile.php:79 msgid "No such file." msgstr "Ðет такого файла." -#: actions/getfile.php:79 +#: actions/getfile.php:83 msgid "Cannot read file." msgstr "Ðе удалоÑÑŒ прочеÑÑ‚ÑŒ файл." @@ -1354,7 +1333,7 @@ msgstr "Профиль не определен." #: actions/groupblock.php:76 actions/groupunblock.php:76 #: actions/makeadmin.php:76 actions/subedit.php:53 actions/tagother.php:46 -#: lib/profileformaction.php:77 +#: actions/unsubscribe.php:84 lib/profileformaction.php:77 msgid "No profile with that ID." msgstr "Ðет Ð¿Ñ€Ð¾Ñ„Ð¸Ð»Ñ Ñ Ñ‚Ð°ÐºÐ¸Ð¼ ID." @@ -1382,11 +1361,11 @@ msgstr "Заблокировать Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ Ð¸Ð· группы." #: actions/groupblock.php:162 #, php-format msgid "" -"Are you sure you want to block user \"%s\" from the group \"%s\"? They will " -"be removed from the group, unable to post, and unable to subscribe to the " -"group in the future." +"Are you sure you want to block user \"%1$s\" from the group \"%2$s\"? They " +"will be removed from the group, unable to post, and unable to subscribe to " +"the group in the future." msgstr "" -"Ð’Ñ‹ дейÑтвительно хотите заблокировать Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ Â«%s» из группы «%s»? " +"Ð’Ñ‹ дейÑтвительно хотите заблокировать Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ Â«%1$s» из группы «%2$s»? " "Пользователь будет удалён из группы без возможноÑти отправлÑÑ‚ÑŒ и " "подпиÑыватьÑÑ Ð½Ð° группу в будущем." @@ -1402,9 +1381,9 @@ msgstr "Заблокировать Ñтого Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ Ð¸Ð· ÑÑ‚ msgid "Database error blocking user from group." msgstr "Ошибка базы данных при блокировании Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ Ð¸Ð· группы." -#: actions/groupbyid.php:74 -msgid "No ID" -msgstr "Ðет ID" +#: actions/groupbyid.php:74 actions/userbyid.php:70 +msgid "No ID." +msgstr "Ðет ID." #: actions/groupdesignsettings.php:68 msgid "You must be logged in to edit a group." @@ -1427,12 +1406,6 @@ msgstr "" msgid "Couldn't update your design." msgstr "Ðе удаётÑÑ Ð¾Ð±Ð½Ð¾Ð²Ð¸Ñ‚ÑŒ ваше оформление." -#: actions/groupdesignsettings.php:287 actions/groupdesignsettings.php:297 -#: actions/userdesignsettings.php:210 actions/userdesignsettings.php:220 -#: actions/userdesignsettings.php:263 actions/userdesignsettings.php:273 -msgid "Unable to save your design settings!" -msgstr "Ðе удаётÑÑ Ñохранить ваши наÑтройки оформлениÑ!" - #: actions/groupdesignsettings.php:308 actions/userdesignsettings.php:231 msgid "Design preferences saved." msgstr "ÐаÑтройки Ð¾Ñ„Ð¾Ñ€Ð¼Ð»ÐµÐ½Ð¸Ñ Ñохранены." @@ -1449,6 +1422,10 @@ msgstr "" "ЗдеÑÑŒ вы можете загрузить логотип Ð´Ð»Ñ Ð³Ñ€ÑƒÐ¿Ð¿Ñ‹. МакÑимальный размер файла " "ÑоÑтавлÑет %s." +#: actions/grouplogo.php:178 +msgid "User without matching profile." +msgstr "Пользователь без ÑоответÑтвующего профилÑ." + #: actions/grouplogo.php:362 msgid "Pick a square area of the image to be the logo." msgstr "Подберите нужный квадратный учаÑток Ð´Ð»Ñ Ð²Ð°ÑˆÐµÐ³Ð¾ логотипа." @@ -1468,14 +1445,14 @@ msgstr "УчаÑтники группы %s" #: actions/groupmembers.php:96 #, php-format -msgid "%s group members, page %d" -msgstr "УчаÑтники группы %s, Ñтраница %d" +msgid "%1$s group members, page %2$d" +msgstr "УчаÑтники группы %1$s, Ñтраница %2$d" #: actions/groupmembers.php:111 msgid "A list of the users in this group." msgstr "СпиÑок пользователей, ÑвлÑющихÑÑ Ñ‡Ð»ÐµÐ½Ð°Ð¼Ð¸ Ñтой группы." -#: actions/groupmembers.php:175 lib/action.php:441 lib/groupnav.php:107 +#: actions/groupmembers.php:175 lib/action.php:442 lib/groupnav.php:107 msgid "Admin" msgstr "ÐаÑтройки" @@ -1578,7 +1555,7 @@ msgid "Error removing the block." msgstr "Ошибка при удалении данного блока." #: actions/imsettings.php:59 -msgid "IM Settings" +msgid "IM settings" msgstr "IM-уÑтановки" #: actions/imsettings.php:70 @@ -1609,7 +1586,7 @@ msgstr "" "контактов?)" #: actions/imsettings.php:124 -msgid "IM Address" +msgid "IM address" msgstr "IM-адреÑ" #: actions/imsettings.php:126 @@ -1672,11 +1649,6 @@ msgstr "" msgid "That is not your Jabber ID." msgstr "Ðто не Ваш Jabber ID." -#: actions/inbox.php:59 -#, php-format -msgid "Inbox for %s - page %d" -msgstr "ВходÑщие Ð´Ð»Ñ %s - Ñтраница %d" - #: actions/inbox.php:62 #, php-format msgid "Inbox for %s" @@ -1715,10 +1687,10 @@ msgstr "ПриглаÑить новых пользователей" msgid "You are already subscribed to these users:" msgstr "Ð’Ñ‹ уже подпиÑаны на пользователÑ:" -#: actions/invite.php:131 actions/invite.php:139 +#: actions/invite.php:131 actions/invite.php:139 lib/command.php:315 #, php-format -msgid "%s (%s)" -msgstr "%s (%s)" +msgid "%1$s (%2$s)" +msgstr "%1$s (%2$s)" #: actions/invite.php:136 msgid "" @@ -1760,7 +1732,7 @@ msgstr "Личное Ñообщение" msgid "Optionally add a personal message to the invitation." msgstr "Можно добавить к приглашению личное Ñообщение." -#: actions/invite.php:197 lib/messageform.php:178 lib/noticeform.php:232 +#: actions/invite.php:197 lib/messageform.php:178 lib/noticeform.php:234 msgid "Send" msgstr "ОК" @@ -1830,19 +1802,10 @@ msgstr "" msgid "You must be logged in to join a group." msgstr "Ð’Ñ‹ должны авторизоватьÑÑ Ð´Ð»Ñ Ð²ÑÑ‚ÑƒÐ¿Ð»ÐµÐ½Ð¸Ñ Ð² группу." -#: actions/joingroup.php:90 lib/command.php:217 -msgid "You are already a member of that group" -msgstr "Ð’Ñ‹ уже ÑвлÑетеÑÑŒ членом Ñтой группы" - -#: actions/joingroup.php:128 lib/command.php:234 -#, php-format -msgid "Could not join user %s to group %s" -msgstr "Ðе удаётÑÑ Ð¿Ñ€Ð¸Ñоединить Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ %s к группе %s" - #: actions/joingroup.php:135 lib/command.php:239 #, php-format -msgid "%s joined group %s" -msgstr "%s вÑтупил в группу %s" +msgid "%1$s joined group %2$s" +msgstr "%1$s вÑтупил в группу %2$s" #: actions/leavegroup.php:60 msgid "You must be logged in to leave a group." @@ -1856,15 +1819,10 @@ msgstr "Ð’Ñ‹ не ÑвлÑетеÑÑŒ членом Ñтой группы." msgid "Could not find membership record." msgstr "Ðе удаётÑÑ Ð½Ð°Ð¹Ñ‚Ð¸ учетную запиÑÑŒ." -#: actions/leavegroup.php:127 lib/command.php:284 -#, php-format -msgid "Could not remove user %s to group %s" -msgstr "Ðе удаётÑÑ ÑƒÐ´Ð°Ð»Ð¸Ñ‚ÑŒ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ %s из группы %s" - #: actions/leavegroup.php:134 lib/command.php:289 #, php-format -msgid "%s left group %s" -msgstr "%s покинул группу %s" +msgid "%1$s left group %2$s" +msgstr "%1$s покинул группу %2$s" #: actions/login.php:83 actions/register.php:137 msgid "Already logged in." @@ -1882,7 +1840,7 @@ msgstr "Ðекорректное Ð¸Ð¼Ñ Ð¸Ð»Ð¸ пароль." msgid "Error setting user. You are probably not authorized." msgstr "Ошибка уÑтановки пользователÑ. Ð’Ñ‹, вероÑтно, не авторизованы." -#: actions/login.php:208 actions/login.php:261 lib/action.php:459 +#: actions/login.php:208 actions/login.php:261 lib/action.php:460 #: lib/logingroupnav.php:79 msgid "Login" msgstr "Вход" @@ -1938,18 +1896,18 @@ msgstr "" #: actions/makeadmin.php:95 #, php-format -msgid "%s is already an admin for group \"%s\"." -msgstr "%s уже ÑвлÑетÑÑ Ð°Ð´Ð¼Ð¸Ð½Ð¸Ñтратором группы «%s»." +msgid "%1$s is already an admin for group \"%2$s\"." +msgstr "%1$s уже ÑвлÑетÑÑ Ð°Ð´Ð¼Ð¸Ð½Ð¸Ñтратором группы «%2$s»." #: actions/makeadmin.php:132 #, php-format -msgid "Can't get membership record for %s in group %s" -msgstr "Ðе удаётÑÑ Ð¿Ð¾Ð»ÑƒÑ‡Ð¸Ñ‚ÑŒ запиÑÑŒ принадлежноÑти Ð´Ð»Ñ %s к группе %s" +msgid "Can't get membership record for %1$s in group %2$s." +msgstr "Ðе удаётÑÑ Ð¿Ð¾Ð»ÑƒÑ‡Ð¸Ñ‚ÑŒ запиÑÑŒ принадлежноÑти Ð´Ð»Ñ %1$s к группе %2$s." #: actions/makeadmin.php:145 #, php-format -msgid "Can't make %s an admin for group %s" -msgstr "Ðевозможно Ñделать %s админиÑтратором группы %s" +msgid "Can't make %1$s an admin for group %2$s." +msgstr "Ðевозможно Ñделать %1$s админиÑтратором группы %2$s." #: actions/microsummary.php:69 msgid "No current status" @@ -1991,8 +1949,8 @@ msgstr "Сообщение отправлено" #: actions/newmessage.php:185 lib/command.php:376 #, php-format -msgid "Direct message to %s sent" -msgstr "ПрÑмое Ñообщение Ð´Ð»Ñ %s поÑлано" +msgid "Direct message to %s sent." +msgstr "ПрÑмое Ñообщение Ð´Ð»Ñ %s поÑлано." #: actions/newmessage.php:210 actions/newnotice.php:245 lib/channel.php:170 msgid "Ajax Error" @@ -2021,8 +1979,8 @@ msgstr "ПоиÑк текÑта" #: actions/noticesearch.php:91 #, php-format -msgid "Search results for \"%s\" on %s" -msgstr "Результаты поиÑка Ð´Ð»Ñ Â«%s» на %s" +msgid "Search results for \"%1$s\" on %2$s" +msgstr "Результаты поиÑка Ð´Ð»Ñ Â«%1$s» на %2$s" #: actions/noticesearch.php:121 #, php-format @@ -2129,11 +2087,6 @@ msgstr "Показать или Ñкрыть Ð¾Ñ„Ð¾Ñ€Ð¼Ð»ÐµÐ½Ð¸Ñ Ð¿Ñ€Ð¾Ñ„Ð¸Ð»Ñ msgid "URL shortening service is too long (max 50 chars)." msgstr "Ð¡ÐµÑ€Ð²Ð¸Ñ ÑÐ¾ÐºÑ€Ð°Ñ‰ÐµÐ½Ð¸Ñ URL Ñлишком длинный (макÑимум 50 Ñимволов)." -#: actions/outbox.php:58 -#, php-format -msgid "Outbox for %s - page %d" -msgstr "ИÑходÑщие Ð´Ð»Ñ %s - Ñтраница %d" - #: actions/outbox.php:61 #, php-format msgid "Outbox for %s" @@ -2206,7 +2159,7 @@ msgstr "Ðе удаётÑÑ Ñохранить новый пароль." msgid "Password saved." msgstr "Пароль Ñохранён." -#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:308 +#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:326 msgid "Paths" msgstr "Пути" @@ -2239,7 +2192,7 @@ msgid "Invalid SSL server. The maximum length is 255 characters." msgstr "Ðеверный SSL-Ñервер. МакÑÐ¸Ð¼Ð°Ð»ÑŒÐ½Ð°Ñ Ð´Ð»Ð¸Ð½Ð° ÑоÑтавлÑет 255 Ñимволов." #: actions/pathsadminpanel.php:217 actions/siteadminpanel.php:58 -#: lib/adminpanelaction.php:299 +#: lib/adminpanelaction.php:311 msgid "Site" msgstr "Сайт" @@ -2332,7 +2285,7 @@ msgid "When to use SSL" msgstr "Когда иÑпользовать SSL" #: actions/pathsadminpanel.php:308 -msgid "SSL Server" +msgid "SSL server" msgstr "SSL-Ñервер" #: actions/pathsadminpanel.php:309 @@ -2363,8 +2316,8 @@ msgstr "Ðеверный тег человека: %s" #: actions/peopletag.php:144 #, php-format -msgid "Users self-tagged with %s - page %d" -msgstr "ПользовательÑкие авто-теги от %s - Ñтраница %d" +msgid "Users self-tagged with %1$s - page %2$d" +msgstr "Пользователи, уÑтановившие Ñебе тег %1$s — Ñтраница %2$d" #: actions/postnotice.php:84 msgid "Invalid notice content" @@ -2372,8 +2325,8 @@ msgstr "Ðеверный контент запиÑи" #: actions/postnotice.php:90 #, php-format -msgid "Notice license ‘%s’ is not compatible with site license ‘%s’." -msgstr "Ð›Ð¸Ñ†ÐµÐ½Ð·Ð¸Ñ Ð·Ð°Ð¿Ð¸Ñи «%s» не ÑовмеÑтима Ñ Ð»Ð¸Ñ†ÐµÐ½Ð·Ð¸ÐµÐ¹ Ñайта «%s»." +msgid "Notice license ‘%1$s’ is not compatible with site license ‘%2$s’." +msgstr "Ð›Ð¸Ñ†ÐµÐ½Ð·Ð¸Ñ Ð·Ð°Ð¿Ð¸Ñи «%1$s» не ÑовмеÑтима Ñ Ð»Ð¸Ñ†ÐµÐ½Ð·Ð¸ÐµÐ¹ Ñайта «%2$s»." #: actions/profilesettings.php:60 msgid "Profile settings" @@ -2435,7 +2388,7 @@ msgstr "Где вы находитеÑÑŒ, например «Город, облР#: actions/profilesettings.php:138 msgid "Share my current location when posting notices" -msgstr "" +msgstr "ДелитьÑÑ Ñвоим текущим меÑтоположением при отправке запиÑей" #: actions/profilesettings.php:145 actions/tagother.php:149 #: actions/tagother.php:209 lib/subscriptionlist.php:106 @@ -2493,20 +2446,19 @@ msgstr "Ðеверный тег: «%s»" msgid "Couldn't update user for autosubscribe." msgstr "Ðе удаётÑÑ Ð¾Ð±Ð½Ð¾Ð²Ð¸Ñ‚ÑŒ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ Ð´Ð»Ñ Ð°Ð²Ñ‚Ð¾Ð¿Ð¾Ð´Ð¿Ð¸Ñки." -#: actions/profilesettings.php:354 -#, fuzzy +#: actions/profilesettings.php:359 msgid "Couldn't save location prefs." -msgstr "Ðе удаётÑÑ Ñохранить теги." +msgstr "Ðе удаётÑÑ Ñохранить наÑтройки меÑтоположениÑ." -#: actions/profilesettings.php:366 +#: actions/profilesettings.php:371 msgid "Couldn't save profile." msgstr "Ðе удаётÑÑ Ñохранить профиль." -#: actions/profilesettings.php:374 +#: actions/profilesettings.php:379 msgid "Couldn't save tags." msgstr "Ðе удаётÑÑ Ñохранить теги." -#: actions/profilesettings.php:382 lib/adminpanelaction.php:126 +#: actions/profilesettings.php:387 lib/adminpanelaction.php:137 msgid "Settings saved." msgstr "ÐаÑтройки Ñохранены." @@ -2611,7 +2563,7 @@ msgstr "" "Почему бы не [зарегиÑтрироватьÑÑ](%%action.register%%), чтобы отправить " "первым?" -#: actions/publictagcloud.php:135 +#: actions/publictagcloud.php:131 msgid "Tag cloud" msgstr "Облако тегов" @@ -2751,7 +2703,7 @@ msgstr "Извините, неверный приглаÑительный код msgid "Registration successful" msgstr "РегиÑÑ‚Ñ€Ð°Ñ†Ð¸Ñ ÑƒÑпешна!" -#: actions/register.php:114 actions/register.php:502 lib/action.php:456 +#: actions/register.php:114 actions/register.php:502 lib/action.php:457 #: lib/logingroupnav.php:85 msgid "Register" msgstr "РегиÑтрациÑ" @@ -2766,10 +2718,6 @@ msgstr "" "Ð’Ñ‹ не можете зарегиÑтрироватьÑÑ, еÑли Ð’Ñ‹ не подтверждаете лицензионного " "ÑоглашениÑ." -#: actions/register.php:201 -msgid "Not a valid email address." -msgstr "Ðеверный Ñлектронный адреÑ." - #: actions/register.php:212 msgid "Email address already exists." msgstr "Такой Ñлектронный Ð°Ð´Ñ€ÐµÑ ÑƒÐ¶Ðµ задейÑтвован." @@ -2833,10 +2781,10 @@ msgstr "" #: actions/register.php:537 #, php-format msgid "" -"Congratulations, %s! And welcome to %%%%site.name%%%%. From here, you may " +"Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may " "want to...\n" "\n" -"* Go to [your profile](%s) and post your first message.\n" +"* Go to [your profile](%2$s) and post your first message.\n" "* Add a [Jabber/GTalk address](%%%%action.imsettings%%%%) so you can send " "notices through instant messages.\n" "* [Search for people](%%%%action.peoplesearch%%%%) that you may know or that " @@ -2848,10 +2796,10 @@ msgid "" "\n" "Thanks for signing up and we hope you enjoy using this service." msgstr "" -"Ðаши поздравлениÑ, %s! И добро пожаловать на %%%%site.name%%%%. ЗдеÑÑŒ вы " +"Ðаши поздравлениÑ, %1$s! И добро пожаловать на %%%%site.name%%%%. ЗдеÑÑŒ вы " "можете…\n" "\n" -"* Перейти на [ваш микроблог](%s) и опубликовать вашу первую запиÑÑŒ.\n" +"* Перейти в [ваш микроблог](%2$s) и опубликовать вашу первую запиÑÑŒ.\n" "* Добавить ваш [Ð°Ð´Ñ€ÐµÑ Jabber/GTalk](%%%%action.imsettings%%%%), Ð´Ð»Ñ " "возможноÑти отправлÑÑ‚ÑŒ запиÑи через мгновенные ÑообщениÑ.\n" "* [Ðайти людей](%%%%action.peoplesearch%%%%), которых вы, возможно, знаете, " @@ -2859,7 +2807,7 @@ msgstr "" "* Обновить ваши [наÑтройки профилÑ](%%%%action.profilesettings%%%%), чтобы " "больше раÑÑказать другим о Ñебе.\n" "* Прочитать [документацию](%%%%doc.help%%%%), чтобы узнать о возможноÑÑ‚ÑÑ…, о " -"которые вы можете не знать.\n" +"которых вы можете не знать.\n" "\n" "СпаÑибо за то, что приÑоединилиÑÑŒ к нам, надеемÑÑ, что вы получите " "удовольÑтвие от иÑÐ¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ð½Ð¸Ñ Ð´Ð°Ð½Ð½Ð¾Ð³Ð¾ ÑервиÑа!" @@ -2957,11 +2905,6 @@ msgstr "Повторено!" msgid "Replies to %s" msgstr "Ответы Ð´Ð»Ñ %s" -#: actions/replies.php:127 -#, php-format -msgid "Replies to %s, page %d" -msgstr "Ответы Ð´Ð»Ñ %s, Ñтраница %d" - #: actions/replies.php:144 #, php-format msgid "Replies feed for %s (RSS 1.0)" @@ -2980,9 +2923,10 @@ msgstr "Лента запиÑей Ð´Ð»Ñ %s (Atom)" #: actions/replies.php:198 #, php-format msgid "" -"This is the timeline showing replies to %s but %s hasn't received a notice " -"to his attention yet." -msgstr "Ðта лента Ñодержит ответы на запиÑи %s, однако %s пока не получал их." +"This is the timeline showing replies to %1$s but %2$s hasn't received a " +"notice to his attention yet." +msgstr "" +"Ðта лента Ñодержит ответы на запиÑи %1$s, однако %2$s пока не получал их." #: actions/replies.php:203 #, php-format @@ -2996,12 +2940,12 @@ msgstr "" #: actions/replies.php:205 #, php-format msgid "" -"You can try to [nudge %s](../%s) or [post something to his or her attention]" -"(%%%%action.newnotice%%%%?status_textarea=%s)." +"You can try to [nudge %1$s](../%2$s) or [post something to his or her " +"attention](%%%%action.newnotice%%%%?status_textarea=%3$s)." msgstr "" -"Ð’Ñ‹ можете попробовать [«подтолкнуть» %s](../%s) или [напиÑать что-нибудь Ð´Ð»Ñ " -"Ð¿Ñ€Ð¸Ð²Ð»ÐµÑ‡ÐµÐ½Ð¸Ñ ÐµÐ³Ð¾ или её вниманиÑ](%%%%action.newnotice%%%%?status_textarea=%" -"s)." +"Ð’Ñ‹ можете попробовать [«подтолкнуть» %1$s](../%2$s) или [напиÑать что-нибудь " +"Ð´Ð»Ñ Ð¿Ñ€Ð¸Ð²Ð»ÐµÑ‡ÐµÐ½Ð¸Ñ ÐµÐ³Ð¾ или её вниманиÑ](%%%%action.newnotice%%%%?" +"status_textarea=%3$s)." #: actions/repliesrss.php:72 #, php-format @@ -3017,11 +2961,6 @@ msgstr "" msgid "User is already sandboxed." msgstr "Пользователь уже в режиме пеÑочницы." -#: actions/showfavorites.php:79 -#, php-format -msgid "%s's favorite notices, page %d" -msgstr "Любимые запиÑи %s, Ñтраница %d" - #: actions/showfavorites.php:132 msgid "Could not retrieve favorite notices." msgstr "Ðе удаётÑÑ Ð²Ð¾ÑÑтановить любимые запиÑи." @@ -3078,11 +3017,6 @@ msgstr "Ðто ÑпоÑоб разделить то, что вам Ð½Ñ€Ð°Ð²Ð¸Ñ‚Ñ msgid "%s group" msgstr "Группа %s" -#: actions/showgroup.php:84 -#, php-format -msgid "%s group, page %d" -msgstr "Группа %s, Ñтраница %d" - #: actions/showgroup.php:218 msgid "Group profile" msgstr "Профиль группы" @@ -3131,7 +3065,7 @@ msgstr "УчаÑтники" #: actions/showgroup.php:386 lib/profileaction.php:117 #: lib/profileaction.php:148 lib/profileaction.php:236 lib/section.php:95 -#: lib/tagcloudsection.php:71 +#: lib/subscriptionlist.php:126 lib/tagcloudsection.php:71 msgid "(None)" msgstr "(пока ничего нет)" @@ -3207,15 +3141,10 @@ msgstr "ЗапиÑÑŒ удалена." msgid " tagged %s" msgstr " Ñ Ñ‚ÐµÐ³Ð¾Ð¼ %s" -#: actions/showstream.php:79 -#, php-format -msgid "%s, page %d" -msgstr "%s, Ñтраница %d" - #: actions/showstream.php:122 #, php-format -msgid "Notice feed for %s tagged %s (RSS 1.0)" -msgstr "Лента запиÑей %s Ñ Ñ‚ÐµÐ³Ð¾Ð¼ %s (RSS 1.0)" +msgid "Notice feed for %1$s tagged %2$s (RSS 1.0)" +msgstr "Лента запиÑей %1$s Ñ Ñ‚ÐµÐ³Ð¾Ð¼ %2$s (RSS 1.0)" #: actions/showstream.php:129 #, php-format @@ -3239,8 +3168,8 @@ msgstr "FOAF Ð´Ð»Ñ %s" #: actions/showstream.php:191 #, php-format -msgid "This is the timeline for %s but %s hasn't posted anything yet." -msgstr "Ðто лента %s, однако %s пока ничего не отправил." +msgid "This is the timeline for %1$s but %2$s hasn't posted anything yet." +msgstr "Ðто лента %1$s, однако %2$s пока ничего не отправил." #: actions/showstream.php:196 msgid "" @@ -3253,12 +3182,12 @@ msgstr "" #: actions/showstream.php:198 #, php-format msgid "" -"You can try to nudge %s or [post something to his or her attention](%%%%" -"action.newnotice%%%%?status_textarea=%s)." +"You can try to nudge %1$s or [post something to his or her attention](%%%%" +"action.newnotice%%%%?status_textarea=%2$s)." msgstr "" -"Ð’Ñ‹ можете попробовать «подтолкнуть» %s или [напиÑать что-нибудь Ð´Ð»Ñ " -"Ð¿Ñ€Ð¸Ð²Ð»ÐµÑ‡ÐµÐ½Ð¸Ñ ÐµÐ³Ð¾ или её вниманиÑ](%%%%action.newnotice%%%%?status_textarea=%" -"s)." +"Ð’Ñ‹ можете попробовать «подтолкнуть» %1$s или [напиÑать что-нибудь Ð´Ð»Ñ " +"Ð¿Ñ€Ð¸Ð²Ð»ÐµÑ‡ÐµÐ½Ð¸Ñ ÐµÐ³Ð¾ или её вниманиÑ](%%%%action.newnotice%%%%?status_textarea=%2" +"$s)." #: actions/showstream.php:234 #, php-format @@ -3309,13 +3238,13 @@ msgid "Site name must have non-zero length." msgstr "Ð˜Ð¼Ñ Ñайта должно быть ненулевой длины." #: actions/siteadminpanel.php:154 -msgid "You must have a valid contact email address" -msgstr "У Ð²Ð°Ñ Ð´Ð¾Ð»Ð¶ÐµÐ½ быть дейÑтвительный контактный email-адреÑ" +msgid "You must have a valid contact email address." +msgstr "У Ð²Ð°Ñ Ð´Ð¾Ð»Ð¶ÐµÐ½ быть дейÑтвительный контактный email-адреÑ." #: actions/siteadminpanel.php:172 #, php-format -msgid "Unknown language \"%s\"" -msgstr "ÐеизвеÑтный Ñзык «%s»" +msgid "Unknown language \"%s\"." +msgstr "ÐеизвеÑтный Ñзык «%s»." #: actions/siteadminpanel.php:179 msgid "Invalid snapshot report URL." @@ -3498,7 +3427,7 @@ msgid "Save site settings" msgstr "Сохранить наÑтройки Ñайта" #: actions/smssettings.php:58 -msgid "SMS Settings" +msgid "SMS settings" msgstr "УÑтановки СМС" #: actions/smssettings.php:69 @@ -3529,7 +3458,7 @@ msgid "Enter the code you received on your phone." msgstr "Введите код, который вы получили по телефону." #: actions/smssettings.php:138 -msgid "SMS Phone number" +msgid "SMS phone number" msgstr "Ðомер телефона Ð´Ð»Ñ Ð¡ÐœÐ¡" #: actions/smssettings.php:140 @@ -3621,8 +3550,8 @@ msgstr "ПодпиÑчики %s" #: actions/subscribers.php:52 #, php-format -msgid "%s subscribers, page %d" -msgstr "%s подпиÑчики, Ñтраница %d" +msgid "%1$s subscribers, page %2$d" +msgstr "ПодпиÑчики %1$s, Ñтраница %2$d" #: actions/subscribers.php:63 msgid "These are the people who listen to your notices." @@ -3662,8 +3591,8 @@ msgstr "ПодпиÑки %s" #: actions/subscriptions.php:54 #, php-format -msgid "%s subscriptions, page %d" -msgstr "ПодпиÑки %s, Ñтраница %d" +msgid "%1$s subscriptions, page %2$d" +msgstr "ПодпиÑки %1$s, Ñтраница %2$d" #: actions/subscriptions.php:65 msgid "These are the people whose notices you listen to." @@ -3703,11 +3632,6 @@ msgstr "Jabber" msgid "SMS" msgstr "СМС" -#: actions/tag.php:68 -#, php-format -msgid "Notices tagged with %s, page %d" -msgstr "ЗапиÑи Ñ Ñ‚ÐµÐ³Ð¾Ð¼ %s, Ñтраница %d" - #: actions/tag.php:86 #, php-format msgid "Notice feed for tag %s (RSS 1.0)" @@ -3792,21 +3716,18 @@ msgstr "Пользователь не заглушён." msgid "No profile id in request." msgstr "Ðет ID Ð¿Ñ€Ð¾Ñ„Ð¸Ð»Ñ Ð² запроÑе." -#: actions/unsubscribe.php:84 -msgid "No profile with that id." -msgstr "Ðет Ð¿Ñ€Ð¾Ñ„Ð¸Ð»Ñ Ñ Ñ‚Ð°ÐºÐ¸Ð¼ ID." - #: actions/unsubscribe.php:98 msgid "Unsubscribed" msgstr "ОтпиÑано" #: actions/updateprofile.php:62 actions/userauthorization.php:330 #, php-format -msgid "Listenee stream license ‘%s’ is not compatible with site license ‘%s’." +msgid "" +"Listenee stream license ‘%1$s’ is not compatible with site license ‘%2$s’." msgstr "" -"Ð›Ð¸Ñ†ÐµÐ½Ð·Ð¸Ñ Ð¿Ñ€Ð¾Ñматриваемого потока «%s» неÑовмеÑтима Ñ Ð»Ð¸Ñ†ÐµÐ½Ð·Ð¸ÐµÐ¹ Ñайта «%s»." +"Ð›Ð¸Ñ†ÐµÐ½Ð·Ð¸Ñ Ð¿Ñ€Ð¾Ñматриваемого потока «%1$s» неÑовмеÑтима Ñ Ð»Ð¸Ñ†ÐµÐ½Ð·Ð¸ÐµÐ¹ Ñайта «%2$s»." -#: actions/useradminpanel.php:58 lib/adminpanelaction.php:305 +#: actions/useradminpanel.php:58 lib/adminpanelaction.php:321 #: lib/personalgroupnav.php:115 msgid "User" msgstr "Пользователь" @@ -3908,7 +3829,7 @@ msgstr "" "подпиÑатьÑÑ Ð½Ð° запиÑи Ñтого пользователÑ. ЕÑли Ð’Ñ‹ Ñтого не хотите делать, " "нажмите «Отказ»." -#: actions/userauthorization.php:188 +#: actions/userauthorization.php:188 actions/version.php:165 msgid "License" msgstr "ЛицензиÑ" @@ -3961,8 +3882,8 @@ msgstr "" #: actions/userauthorization.php:296 #, php-format -msgid "Listener URI ‘%s’ not found here" -msgstr "СмотрÑщий URI «%s» здеÑÑŒ не найден" +msgid "Listener URI ‘%s’ not found here." +msgstr "СмотрÑщий URI «%s» здеÑÑŒ не найден." #: actions/userauthorization.php:301 #, php-format @@ -3994,10 +3915,6 @@ msgstr "Ðе удаётÑÑ Ð¿Ñ€Ð¾Ñ‡Ð¸Ñ‚Ð°Ñ‚ÑŒ URL аватары «%s»" msgid "Wrong image type for avatar URL ‘%s’." msgstr "Ðеверный тип Ð¸Ð·Ð¾Ð±Ñ€Ð°Ð¶ÐµÐ½Ð¸Ñ Ð´Ð»Ñ URL аватары «%s»." -#: actions/userbyid.php:70 -msgid "No ID." -msgstr "Ðет ID." - #: actions/userdesignsettings.php:76 lib/designsettings.php:65 msgid "Profile design" msgstr "Оформление профилÑ" @@ -4014,11 +3931,6 @@ msgstr "" msgid "Enjoy your hotdog!" msgstr "ПриÑтного аппетита!" -#: actions/usergroups.php:64 -#, php-format -msgid "%s groups, page %d" -msgstr "Группы %s, Ñтраница %d" - #: actions/usergroups.php:130 msgid "Search for more groups" msgstr "ИÑкать другие группы" @@ -4034,6 +3946,81 @@ msgid "Try [searching for groups](%%action.groupsearch%%) and joining them." msgstr "" "Попробуйте [найти группы](%%action.groupsearch%%) и приÑоединитьÑÑ Ðº ним." +#: actions/version.php:73 +#, php-format +msgid "StatusNet %s" +msgstr "StatusNet %s" + +#: actions/version.php:153 +#, php-format +msgid "" +"This site is powered by %1$s version %2$s, Copyright 2008-2010 StatusNet, " +"Inc. and contributors." +msgstr "" +"Ðтот Ñайт Ñоздан на оÑнове %1$s верÑии %2$s, Copyright 2008-2010 StatusNet, " +"Inc. и учаÑтники." + +#: actions/version.php:157 +msgid "StatusNet" +msgstr "StatusNet" + +#: actions/version.php:161 +msgid "Contributors" +msgstr "Разработчики" + +#: actions/version.php:168 +msgid "" +"StatusNet is free software: you can redistribute it and/or modify it under " +"the terms of the GNU Affero General Public License as published by the Free " +"Software Foundation, either version 3 of the License, or (at your option) " +"any later version. " +msgstr "" +"StatusNet — Ñвободное программное обеÑпечение: вы можете раÑпроÑтранÑÑ‚ÑŒ его " +"и/или модифицировать в ÑоответÑтвии Ñ ÑƒÑловиÑми GNU Affero General Public " +"License, опубликованной Free Software Foundation, либо под верÑией 3, либо " +"(на выбор) под любой более поздней верÑией. " + +#: actions/version.php:174 +msgid "" +"This program is distributed in the hope that it will be useful, but WITHOUT " +"ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or " +"FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License " +"for more details. " +msgstr "" +"Ð”Ð°Ð½Ð½Ð°Ñ Ð¿Ñ€Ð¾Ð³Ñ€Ð°Ð¼Ð¼Ð° раÑпроÑтранÑетÑÑ Ð² надежде, что она будет полезной, но БЕЗ " +"ВСЯКОЙ ГÐÐ ÐÐТИИ; в том чиÑле без вытекающей гарантии ТОВÐÐ ÐОЙ ПРИГОДÐОСТИ " +"или ПРИГОДÐОСТИ ДЛЯ ЧÐСТÐОГО ИСПОЛЬЗОВÐÐИЯ. См. GNU Affero General Public " +"License Ð´Ð»Ñ Ð±Ð¾Ð»ÐµÐµ подробной информации. " + +#: actions/version.php:180 +#, php-format +msgid "" +"You should have received a copy of the GNU Affero General Public License " +"along with this program. If not, see %s." +msgstr "" +"Ð’Ñ‹ должны были получить копию GNU Affero General Public License вмеÑте Ñ " +"Ñтой программой. ЕÑли нет, Ñм. %s." + +#: actions/version.php:189 +msgid "Plugins" +msgstr "Плагины" + +#: actions/version.php:195 +msgid "Name" +msgstr "ИмÑ" + +#: actions/version.php:196 lib/action.php:741 +msgid "Version" +msgstr "ВерÑиÑ" + +#: actions/version.php:197 +msgid "Author(s)" +msgstr "Ðвтор(Ñ‹)" + +#: actions/version.php:198 lib/groupeditform.php:172 +msgid "Description" +msgstr "ОпиÑание" + #: classes/File.php:137 #, php-format msgid "" @@ -4106,7 +4093,7 @@ msgstr "Проблемы Ñ Ñохранением запиÑи." msgid "DB error inserting reply: %s" msgstr "Ошибка баз данных при вÑтавке ответа Ð´Ð»Ñ %s" -#: classes/Notice.php:1361 +#: classes/Notice.php:1359 #, php-format msgid "RT @%1$s %2$s" msgstr "RT @%1$s %2$s" @@ -4152,137 +4139,132 @@ msgstr "Другое" msgid "Other options" msgstr "Другие опции" -#: lib/action.php:144 -#, php-format -msgid "%s - %s" -msgstr "%s (%s)" - #: lib/action.php:159 msgid "Untitled page" msgstr "Страница без названиÑ" -#: lib/action.php:426 +#: lib/action.php:427 msgid "Primary site navigation" msgstr "Ð“Ð»Ð°Ð²Ð½Ð°Ñ Ð½Ð°Ð²Ð¸Ð³Ð°Ñ†Ð¸Ñ" -#: lib/action.php:432 +#: lib/action.php:433 msgid "Home" msgstr "Моё" -#: lib/action.php:432 +#: lib/action.php:433 msgid "Personal profile and friends timeline" msgstr "Личный профиль и лента друзей" -#: lib/action.php:434 +#: lib/action.php:435 msgid "Account" msgstr "ÐаÑтройки" -#: lib/action.php:434 +#: lib/action.php:435 msgid "Change your email, avatar, password, profile" msgstr "Изменить ваш email, аватару, пароль, профиль" -#: lib/action.php:437 +#: lib/action.php:438 msgid "Connect" msgstr "Соединить" -#: lib/action.php:437 +#: lib/action.php:438 msgid "Connect to services" msgstr "Соединить Ñ ÑервиÑами" -#: lib/action.php:441 +#: lib/action.php:442 msgid "Change site configuration" msgstr "Изменить конфигурацию Ñайта" -#: lib/action.php:445 lib/subgroupnav.php:105 +#: lib/action.php:446 lib/subgroupnav.php:105 msgid "Invite" msgstr "ПриглаÑить" -#: lib/action.php:446 lib/subgroupnav.php:106 +#: lib/action.php:447 lib/subgroupnav.php:106 #, php-format msgid "Invite friends and colleagues to join you on %s" msgstr "ПриглаÑи друзей и коллег Ñтать такими же как Ñ‚Ñ‹ учаÑтниками %s" -#: lib/action.php:451 +#: lib/action.php:452 msgid "Logout" msgstr "Выход" -#: lib/action.php:451 +#: lib/action.php:452 msgid "Logout from the site" msgstr "Выйти" -#: lib/action.php:456 +#: lib/action.php:457 msgid "Create an account" msgstr "Создать новый аккаунт" -#: lib/action.php:459 +#: lib/action.php:460 msgid "Login to the site" msgstr "Войти" -#: lib/action.php:462 lib/action.php:725 +#: lib/action.php:463 lib/action.php:726 msgid "Help" msgstr "Помощь" -#: lib/action.php:462 +#: lib/action.php:463 msgid "Help me!" msgstr "Помощь" -#: lib/action.php:465 lib/searchaction.php:127 +#: lib/action.php:466 lib/searchaction.php:127 msgid "Search" msgstr "ПоиÑк" -#: lib/action.php:465 +#: lib/action.php:466 msgid "Search for people or text" msgstr "ИÑкать людей или текÑÑ‚" -#: lib/action.php:486 +#: lib/action.php:487 msgid "Site notice" msgstr "ÐÐ¾Ð²Ð°Ñ Ð·Ð°Ð¿Ð¸ÑÑŒ" -#: lib/action.php:552 +#: lib/action.php:553 msgid "Local views" msgstr "Локальные виды" -#: lib/action.php:618 +#: lib/action.php:619 msgid "Page notice" msgstr "ÐÐ¾Ð²Ð°Ñ Ð·Ð°Ð¿Ð¸ÑÑŒ" -#: lib/action.php:720 +#: lib/action.php:721 msgid "Secondary site navigation" msgstr "ÐÐ°Ð²Ð¸Ð³Ð°Ñ†Ð¸Ñ Ð¿Ð¾ подпиÑкам" -#: lib/action.php:727 +#: lib/action.php:728 msgid "About" msgstr "О проекте" -#: lib/action.php:729 +#: lib/action.php:730 msgid "FAQ" msgstr "ЧаВо" -#: lib/action.php:733 +#: lib/action.php:734 msgid "TOS" msgstr "TOS" -#: lib/action.php:736 +#: lib/action.php:737 msgid "Privacy" msgstr "ПользовательÑкое Ñоглашение" -#: lib/action.php:738 +#: lib/action.php:739 msgid "Source" msgstr "ИÑходный код" -#: lib/action.php:740 +#: lib/action.php:743 msgid "Contact" msgstr "ÐšÐ¾Ð½Ñ‚Ð°ÐºÑ‚Ð½Ð°Ñ Ð¸Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ" -#: lib/action.php:742 +#: lib/action.php:745 msgid "Badge" msgstr "Бедж" -#: lib/action.php:770 +#: lib/action.php:773 msgid "StatusNet software license" msgstr "StatusNet лицензиÑ" -#: lib/action.php:773 +#: lib/action.php:776 #, php-format msgid "" "**%%site.name%%** is a microblogging service brought to you by [%%site." @@ -4291,12 +4273,12 @@ msgstr "" "**%%site.name%%** — Ñто ÑÐµÑ€Ð²Ð¸Ñ Ð¼Ð¸ÐºÑ€Ð¾Ð±Ð»Ð¾Ð³Ð¸Ð½Ð³Ð°, Ñозданный Ð´Ð»Ñ Ð²Ð°Ñ Ð¿Ñ€Ð¸ помощи [%" "%site.broughtby%%](%%site.broughtbyurl%%). " -#: lib/action.php:775 +#: lib/action.php:778 #, php-format msgid "**%%site.name%%** is a microblogging service. " msgstr "**%%site.name%%** — ÑÐµÑ€Ð²Ð¸Ñ Ð¼Ð¸ÐºÑ€Ð¾Ð±Ð»Ð¾Ð³Ð¸Ð½Ð³Ð°. " -#: lib/action.php:777 +#: lib/action.php:780 #, php-format msgid "" "It runs the [StatusNet](http://status.net/) microblogging software, version %" @@ -4308,31 +4290,31 @@ msgstr "" "лицензией [GNU Affero General Public License](http://www.fsf.org/licensing/" "licenses/agpl-3.0.html)." -#: lib/action.php:791 +#: lib/action.php:794 msgid "Site content license" msgstr "Ð›Ð¸Ñ†ÐµÐ½Ð·Ð¸Ñ Ñодержимого Ñайта" -#: lib/action.php:800 +#: lib/action.php:803 msgid "All " msgstr "All " -#: lib/action.php:805 +#: lib/action.php:808 msgid "license." msgstr "license." -#: lib/action.php:1099 +#: lib/action.php:1102 msgid "Pagination" msgstr "Разбиение на Ñтраницы" -#: lib/action.php:1108 +#: lib/action.php:1111 msgid "After" msgstr "Сюда" -#: lib/action.php:1116 +#: lib/action.php:1119 msgid "Before" msgstr "Туда" -#: lib/action.php:1164 +#: lib/action.php:1167 msgid "There was a problem with your session token." msgstr "Проблема Ñ Ð’Ð°ÑˆÐµÐ¹ ÑеÑÑией. Попробуйте ещё раз, пожалуйÑта." @@ -4340,27 +4322,31 @@ msgstr "Проблема Ñ Ð’Ð°ÑˆÐµÐ¹ ÑеÑÑией. Попробуйте ещ msgid "You cannot make changes to this site." msgstr "Ð’Ñ‹ не можете изменÑÑ‚ÑŒ Ñтот Ñайт." -#: lib/adminpanelaction.php:195 +#: lib/adminpanelaction.php:107 +msgid "Changes to that panel are not allowed." +msgstr "Ð˜Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ Ð´Ð»Ñ Ñтой панели недопуÑтимы." + +#: lib/adminpanelaction.php:206 msgid "showForm() not implemented." msgstr "showForm() не реализована." -#: lib/adminpanelaction.php:224 +#: lib/adminpanelaction.php:235 msgid "saveSettings() not implemented." msgstr "saveSettings() не реализована." -#: lib/adminpanelaction.php:247 +#: lib/adminpanelaction.php:258 msgid "Unable to delete design setting." msgstr "Ðе удаётÑÑ ÑƒÐ´Ð°Ð»Ð¸Ñ‚ÑŒ наÑтройки оформлениÑ." -#: lib/adminpanelaction.php:300 +#: lib/adminpanelaction.php:312 msgid "Basic site configuration" msgstr "ОÑÐ½Ð¾Ð²Ð½Ð°Ñ ÐºÐ¾Ð½Ñ„Ð¸Ð³ÑƒÑ€Ð°Ñ†Ð¸Ñ Ñайта" -#: lib/adminpanelaction.php:303 +#: lib/adminpanelaction.php:317 msgid "Design configuration" msgstr "ÐšÐ¾Ð½Ñ„Ð¸Ð³ÑƒÑ€Ð°Ñ†Ð¸Ñ Ð¾Ñ„Ð¾Ñ€Ð¼Ð»ÐµÐ½Ð¸Ñ" -#: lib/adminpanelaction.php:306 lib/adminpanelaction.php:309 +#: lib/adminpanelaction.php:322 lib/adminpanelaction.php:327 msgid "Paths configuration" msgstr "ÐšÐ¾Ð½Ñ„Ð¸Ð³ÑƒÑ€Ð°Ñ†Ð¸Ñ Ð¿ÑƒÑ‚ÐµÐ¹" @@ -4384,11 +4370,19 @@ msgstr "Сообщает, где поÑвлÑетÑÑ Ñто вложение" msgid "Tags for this attachment" msgstr "Теги Ð´Ð»Ñ Ñтого вложениÑ" +#: lib/authenticationplugin.php:182 lib/authenticationplugin.php:187 +msgid "Password changing failed" +msgstr "Изменение Ð¿Ð°Ñ€Ð¾Ð»Ñ Ð½Ðµ удалоÑÑŒ" + +#: lib/authenticationplugin.php:197 +msgid "Password changing is not allowed" +msgstr "Смена Ð¿Ð°Ñ€Ð¾Ð»Ñ Ð½Ðµ разрешена" + #: lib/channel.php:138 lib/channel.php:158 msgid "Command results" msgstr "Команда иÑполнена" -#: lib/channel.php:210 +#: lib/channel.php:210 lib/mailhandler.php:142 msgid "Command complete" msgstr "Команда завершена" @@ -4402,8 +4396,8 @@ msgstr "ПроÑтите, Ñта команда ещё не выполнена." #: lib/command.php:88 #, php-format -msgid "Could not find a user with nickname %s" -msgstr "Ðе удаётÑÑ Ð½Ð°Ð¹Ñ‚Ð¸ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ Ñ Ð¸Ð¼ÐµÐ½ÐµÐ¼ %s" +msgid "Could not find a user with nickname %s." +msgstr "Ðе удаётÑÑ Ð½Ð°Ð¹Ñ‚Ð¸ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ Ñ Ð¸Ð¼ÐµÐ½ÐµÐ¼ %s." #: lib/command.php:92 msgid "It does not make a lot of sense to nudge yourself!" @@ -4411,8 +4405,8 @@ msgstr "Ðет ÑмыÑла «подталкивать» Ñамого ÑебÑ!" #: lib/command.php:99 #, php-format -msgid "Nudge sent to %s" -msgstr "«Подталкивание» поÑлано %s" +msgid "Nudge sent to %s." +msgstr "«Подталкивание» поÑлано %s." #: lib/command.php:126 #, php-format @@ -4426,34 +4420,34 @@ msgstr "" "ЗапиÑей: %3$s" #: lib/command.php:152 lib/command.php:399 lib/command.php:460 -msgid "Notice with that id does not exist" -msgstr "ЗапиÑи Ñ Ñ‚Ð°ÐºÐ¸Ð¼ id не ÑущеÑтвует" +msgid "Notice with that id does not exist." +msgstr "ЗапиÑи Ñ Ñ‚Ð°ÐºÐ¸Ð¼ id не ÑущеÑтвует." #: lib/command.php:168 lib/command.php:415 lib/command.php:476 #: lib/command.php:532 -msgid "User has no last notice" -msgstr "У Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ Ð½ÐµÑ‚ запиÑей" +msgid "User has no last notice." +msgstr "У Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ Ð½ÐµÑ‚ поÑледней запиÑи." #: lib/command.php:190 msgid "Notice marked as fave." msgstr "ЗапиÑÑŒ помечена как любимаÑ." -#: lib/command.php:315 +#: lib/command.php:284 #, php-format -msgid "%1$s (%2$s)" -msgstr "%1$s (%2$s)" +msgid "Could not remove user %1$s to group %2$s." +msgstr "Ðе удаётÑÑ ÑƒÐ´Ð°Ð»Ð¸Ñ‚ÑŒ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ %1$s из группы %2$s." #: lib/command.php:318 #, php-format -msgid "Fullname: %s" +msgid "Full name: %s" msgstr "Полное имÑ: %s" -#: lib/command.php:321 +#: lib/command.php:321 lib/mail.php:254 #, php-format msgid "Location: %s" msgstr "МеÑтораÑположение: %s" -#: lib/command.php:324 +#: lib/command.php:324 lib/mail.php:256 #, php-format msgid "Homepage: %s" msgstr "ДомашнÑÑ Ñтраница: %s" @@ -4465,25 +4459,18 @@ msgstr "О пользователе: %s" #: lib/command.php:358 scripts/xmppdaemon.php:301 #, php-format -msgid "Message too long - maximum is %d characters, you sent %d" -msgstr "Сообщение Ñлишком длинное — не больше %d Ñимволов, вы поÑылаете %d" +msgid "Message too long - maximum is %1$d characters, you sent %2$d." +msgstr "" +"Сообщение Ñлишком длинное — не больше %1$d Ñимволов, вы отправили %2$d." #: lib/command.php:378 msgid "Error sending direct message." msgstr "Ошибка при отправке прÑмого ÑообщениÑ." -#: lib/command.php:422 -msgid "Cannot repeat your own notice" -msgstr "Ðевозможно повторить ÑобÑтвенную запиÑÑŒ." - -#: lib/command.php:427 -msgid "Already repeated that notice" -msgstr "Ðта запиÑÑŒ уже повторена" - #: lib/command.php:435 #, php-format -msgid "Notice from %s repeated" -msgstr "ЗапиÑÑŒ %s повторена" +msgid "Notice from %s repeated." +msgstr "ЗапиÑÑŒ %s повторена." #: lib/command.php:437 msgid "Error repeating notice." @@ -4491,21 +4478,21 @@ msgstr "Ошибка при повторении запиÑи." #: lib/command.php:491 #, php-format -msgid "Notice too long - maximum is %d characters, you sent %d" -msgstr "ЗапиÑÑŒ Ñлишком Ð´Ð»Ð¸Ð½Ð½Ð°Ñ â€” не больше %d Ñимволов, вы поÑылаете %d" +msgid "Notice too long - maximum is %1$d characters, you sent %2$d." +msgstr "ЗапиÑÑŒ Ñлишком Ð´Ð»Ð¸Ð½Ð½Ð°Ñ â€” не больше %1$d Ñимволов, вы отправили %2$d." #: lib/command.php:500 #, php-format -msgid "Reply to %s sent" -msgstr "Ответ %s отправлен" +msgid "Reply to %s sent." +msgstr "Ответ %s отправлен." #: lib/command.php:502 msgid "Error saving notice." msgstr "Проблемы Ñ Ñохранением запиÑи." #: lib/command.php:556 -msgid "Specify the name of the user to subscribe to" -msgstr "Определите Ð¸Ð¼Ñ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ Ð¿Ñ€Ð¸ подпиÑке на" +msgid "Specify the name of the user to subscribe to." +msgstr "Укажите Ð¸Ð¼Ñ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ Ð´Ð»Ñ Ð¿Ð¾Ð´Ð¿Ð¸Ñки." #: lib/command.php:563 #, php-format @@ -4513,8 +4500,8 @@ msgid "Subscribed to %s" msgstr "ПодпиÑано на %s" #: lib/command.php:584 -msgid "Specify the name of the user to unsubscribe from" -msgstr "Определите Ð¸Ð¼Ñ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ Ð´Ð»Ñ Ð¾Ñ‚Ð¿Ð¸Ñки от" +msgid "Specify the name of the user to unsubscribe from." +msgstr "Укажите Ð¸Ð¼Ñ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ Ð´Ð»Ñ Ð¾Ñ‚Ð¼ÐµÐ½Ñ‹ подпиÑки." #: lib/command.php:591 #, php-format @@ -4542,18 +4529,18 @@ msgid "Can't turn on notification." msgstr "ЕÑÑ‚ÑŒ оповещение." #: lib/command.php:650 -msgid "Login command is disabled" -msgstr "Команда входа отключена" +msgid "Login command is disabled." +msgstr "Команда входа отключена." #: lib/command.php:664 #, php-format -msgid "Could not create login token for %s" -msgstr "Ðе удаётÑÑ Ñоздать токен входа Ð´Ð»Ñ %s" +msgid "Could not create login token for %s." +msgstr "Ðе удаётÑÑ Ñоздать токен входа Ð´Ð»Ñ %s." #: lib/command.php:669 #, php-format -msgid "This link is useable only once, and is good for only 2 minutes: %s" -msgstr "Ðта ÑÑылка дейÑтвительна только один раз в течение 2 минут: %s" +msgid "This link is useable only once, and is good for only 2 minutes: %s." +msgstr "Ðта ÑÑылка дейÑтвительна только один раз в течение 2 минут: %s." #: lib/command.php:685 msgid "You are not subscribed to anyone." @@ -4782,10 +4769,6 @@ msgstr "Опишите группу или тему" msgid "Describe the group or topic in %d characters" msgstr "Опишите группу или тему при помощи %d Ñимволов" -#: lib/groupeditform.php:172 -msgid "Description" -msgstr "ОпиÑание" - #: lib/groupeditform.php:179 msgid "" "Location for the group, if any, like \"City, State (or Region), Country\"" @@ -4969,24 +4952,10 @@ msgstr "" "----\n" "Измените email-Ð°Ð´Ñ€ÐµÑ Ð¸ наÑтройки уведомлений на %8$s\n" -#: lib/mail.php:254 -#, php-format -msgid "Location: %s\n" -msgstr "МеÑтораÑположение: %s\n" - -#: lib/mail.php:256 -#, php-format -msgid "Homepage: %s\n" -msgstr "ДомашнÑÑ Ñтраница: %s\n" - #: lib/mail.php:258 #, php-format -msgid "" -"Bio: %s\n" -"\n" -msgstr "" -"БиографиÑ: %s\n" -"\n" +msgid "Bio: %s" +msgstr "БиографиÑ: %s" #: lib/mail.php:286 #, php-format @@ -5183,6 +5152,27 @@ msgstr "" msgid "from" msgstr "от " +#: lib/mailhandler.php:37 +msgid "Could not parse message." +msgstr "Сообщение не удаётÑÑ Ñ€Ð°Ð·Ð¾Ð±Ñ€Ð°Ñ‚ÑŒ." + +#: lib/mailhandler.php:42 +msgid "Not a registered user." +msgstr "ÐезарегиÑтрированный пользователь." + +#: lib/mailhandler.php:46 +msgid "Sorry, that is not your incoming email address." +msgstr "ПроÑтите, Ñто не Ваш входÑщий Ñлектронный адреÑ." + +#: lib/mailhandler.php:50 +msgid "Sorry, no incoming email allowed." +msgstr "ПроÑтите, входÑщих пиÑем нет." + +#: lib/mailhandler.php:228 +#, php-format +msgid "Unsupported message type: %s" +msgstr "Ðеподдерживаемый формат файла изображениÑ: %s" + #: lib/mediafile.php:98 lib/mediafile.php:123 msgid "There was a database error while saving your file. Please try again." msgstr "" @@ -5217,16 +5207,16 @@ msgid "File upload stopped by extension." msgstr "Загрузка файла оÑтановлена по раÑширению." #: lib/mediafile.php:179 lib/mediafile.php:216 -msgid "File exceeds user's quota!" -msgstr "Файл превышает пользовательÑкую квоту!" +msgid "File exceeds user's quota." +msgstr "Файл превышает пользовательÑкую квоту." #: lib/mediafile.php:196 lib/mediafile.php:233 msgid "File could not be moved to destination directory." msgstr "Файл не может быть перемещён в целевую директорию." #: lib/mediafile.php:201 lib/mediafile.php:237 -msgid "Could not determine file's mime-type!" -msgstr "Ðе удаётÑÑ Ð¾Ð¿Ñ€ÐµÐ´ÐµÐ»Ð¸Ñ‚ÑŒ mime-тип файла!" +msgid "Could not determine file's MIME type." +msgstr "Ðе удаётÑÑ Ð¾Ð¿Ñ€ÐµÐ´ÐµÐ»Ð¸Ñ‚ÑŒ mime-тип файла." #: lib/mediafile.php:270 #, php-format @@ -5235,7 +5225,7 @@ msgstr " Попробуйте иÑпользовать другой формат #: lib/mediafile.php:275 #, php-format -msgid "%s is not a supported filetype on this server." +msgid "%s is not a supported file type on this server." msgstr "Тип файла %s не поддерживаетÑÑ Ð½Ðµ Ñтом Ñервере." #: lib/messageform.php:120 @@ -5268,8 +5258,16 @@ msgid "Attach a file" msgstr "Прикрепить файл" #: lib/noticeform.php:212 -msgid "Share your location" -msgstr "" +msgid "Share my location." +msgstr "ПоделитьÑÑ Ñвоим меÑтоположением." + +#: lib/noticeform.php:214 +msgid "Do not share my location." +msgstr "Ðе публиковать Ñвоё меÑтоположение." + +#: lib/noticeform.php:215 +msgid "Hide this info" +msgstr "Скрыть Ñту информацию" #: lib/noticelist.php:428 #, php-format @@ -5385,6 +5383,10 @@ msgstr "Ваши иÑходÑщие ÑообщениÑ" msgid "Tags in %s's notices" msgstr "Теги запиÑей Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ %s" +#: lib/plugin.php:114 +msgid "Unknown" +msgstr "ÐеизвеÑтно" + #: lib/profileaction.php:109 lib/profileaction.php:192 lib/subgroupnav.php:82 msgid "Subscriptions" msgstr "ПодпиÑки" @@ -5554,10 +5556,6 @@ msgstr "Облако ÑобÑтвенных тегов людей" msgid "People Tagcloud as tagged" msgstr "Облако тегов людей" -#: lib/subscriptionlist.php:126 -msgid "(none)" -msgstr "(пока ничего нет)" - #: lib/tagcloudsection.php:56 msgid "None" msgstr "Ðет тегов" @@ -5673,19 +5671,3 @@ msgid "%s is not a valid color! Use 3 or 6 hex chars." msgstr "" "%s не ÑвлÑетÑÑ Ð´Ð¾Ð¿ÑƒÑтимым цветом! ИÑпользуйте 3 или 6 шеÑтнадцатеричных " "Ñимволов." - -#: scripts/maildaemon.php:48 -msgid "Could not parse message." -msgstr "Сообщение не удаётÑÑ Ñ€Ð°Ð·Ð¾Ð±Ñ€Ð°Ñ‚ÑŒ." - -#: scripts/maildaemon.php:53 -msgid "Not a registered user." -msgstr "ÐезарегиÑтрированный пользователь." - -#: scripts/maildaemon.php:57 -msgid "Sorry, that is not your incoming email address." -msgstr "ПроÑтите, Ñто не Ваш входÑщий Ñлектронный адреÑ." - -#: scripts/maildaemon.php:61 -msgid "Sorry, no incoming email allowed." -msgstr "ПроÑтите, входÑщих пиÑем нет." diff --git a/locale/statusnet.po b/locale/statusnet.po index 38db608dc..91c6f9ba7 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-01-03 10:37+0000\n" +"POT-Creation-Date: 2010-01-11 00:19+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -48,11 +48,6 @@ msgstr "" msgid "No such user." msgstr "" -#: actions/all.php:84 -#, php-format -msgid "%s and friends, page %d" -msgstr "" - #: actions/all.php:86 actions/all.php:167 actions/allrss.php:115 #: actions/apitimelinefriends.php:115 actions/apitimelinehome.php:115 #: lib/personalgroupnav.php:100 @@ -91,8 +86,8 @@ msgstr "" #: actions/all.php:134 #, php-format msgid "" -"You can try to [nudge %s](../%s) from his profile or [post something to his " -"or her attention](%%%%action.newnotice%%%%?status_textarea=%s)." +"You can try to [nudge %1$s](../%2$s) from his profile or [post something to " +"his or her attention](%%%%action.newnotice%%%%?status_textarea=%3$s)." msgstr "" #: actions/all.php:137 actions/replies.php:209 actions/showstream.php:202 @@ -117,6 +112,23 @@ msgstr "" #: actions/apiaccountupdateprofile.php:97 #: actions/apiaccountupdateprofilebackgroundimage.php:94 #: actions/apiaccountupdateprofilecolors.php:118 +#: actions/apidirectmessage.php:156 actions/apifavoritecreate.php:99 +#: actions/apifavoritedestroy.php:100 actions/apifriendshipscreate.php:100 +#: actions/apifriendshipsdestroy.php:100 actions/apifriendshipsshow.php:129 +#: actions/apigroupcreate.php:136 actions/apigroupismember.php:114 +#: actions/apigroupjoin.php:155 actions/apigroupleave.php:141 +#: actions/apigrouplist.php:132 actions/apigrouplistall.php:120 +#: actions/apigroupmembership.php:106 actions/apigroupshow.php:105 +#: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102 +#: actions/apistatusesretweets.php:112 actions/apistatusesshow.php:108 +#: actions/apistatusnetconfig.php:133 actions/apistatusnetversion.php:93 +#: actions/apisubscriptions.php:111 actions/apitimelinefavorites.php:146 +#: actions/apitimelinefriends.php:156 actions/apitimelinegroup.php:150 +#: actions/apitimelinehome.php:156 actions/apitimelinementions.php:151 +#: actions/apitimelinepublic.php:131 actions/apitimelineretweetedbyme.php:122 +#: actions/apitimelineretweetedtome.php:121 +#: actions/apitimelineretweetsofme.php:122 actions/apitimelinetag.php:141 +#: actions/apitimelineuser.php:165 actions/apiusershow.php:101 msgid "API method not found." msgstr "" @@ -172,6 +184,9 @@ msgstr "" #: actions/apiaccountupdateprofilebackgroundimage.php:146 #: actions/apiaccountupdateprofilecolors.php:164 #: actions/apiaccountupdateprofilecolors.php:174 +#: actions/groupdesignsettings.php:287 actions/groupdesignsettings.php:297 +#: actions/userdesignsettings.php:210 actions/userdesignsettings.php:220 +#: actions/userdesignsettings.php:263 actions/userdesignsettings.php:273 msgid "Unable to save your design settings." msgstr "" @@ -212,26 +227,6 @@ msgstr "" msgid "All the direct messages sent to %s" msgstr "" -#: actions/apidirectmessage.php:156 actions/apifavoritecreate.php:99 -#: actions/apifavoritedestroy.php:100 actions/apifriendshipscreate.php:100 -#: actions/apifriendshipsdestroy.php:100 actions/apifriendshipsshow.php:129 -#: actions/apigroupcreate.php:136 actions/apigroupismember.php:114 -#: actions/apigroupjoin.php:155 actions/apigroupleave.php:141 -#: actions/apigrouplist.php:132 actions/apigrouplistall.php:120 -#: actions/apigroupmembership.php:106 actions/apigroupshow.php:105 -#: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102 -#: actions/apistatusesretweets.php:112 actions/apistatusesshow.php:108 -#: actions/apistatusnetconfig.php:133 actions/apistatusnetversion.php:93 -#: actions/apisubscriptions.php:111 actions/apitimelinefavorites.php:146 -#: actions/apitimelinefriends.php:156 actions/apitimelinegroup.php:150 -#: actions/apitimelinehome.php:156 actions/apitimelinementions.php:151 -#: actions/apitimelinepublic.php:131 actions/apitimelineretweetedbyme.php:122 -#: actions/apitimelineretweetedtome.php:121 -#: actions/apitimelineretweetsofme.php:122 actions/apitimelinetag.php:141 -#: actions/apitimelineuser.php:165 actions/apiusershow.php:101 -msgid "API method not found!" -msgstr "" - #: actions/apidirectmessagenew.php:126 msgid "No message text!" msgstr "" @@ -255,7 +250,7 @@ msgid "No status found with that ID." msgstr "" #: actions/apifavoritecreate.php:119 -msgid "This status is already a favorite!" +msgid "This status is already a favorite." msgstr "" #: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:176 @@ -263,7 +258,7 @@ msgid "Could not create favorite." msgstr "" #: actions/apifavoritedestroy.php:122 -msgid "That status is not a favorite!" +msgid "That status is not a favorite." msgstr "" #: actions/apifavoritedestroy.php:134 actions/disfavor.php:87 @@ -284,7 +279,7 @@ msgid "Could not unfollow user: User not found." msgstr "" #: actions/apifriendshipsdestroy.php:120 -msgid "You cannot unfollow yourself!" +msgid "You cannot unfollow yourself." msgstr "" #: actions/apifriendshipsexists.php:94 @@ -369,7 +364,7 @@ msgstr "" msgid "Group not found!" msgstr "" -#: actions/apigroupjoin.php:110 +#: actions/apigroupjoin.php:110 actions/joingroup.php:90 lib/command.php:217 msgid "You are already a member of that group." msgstr "" @@ -377,18 +372,18 @@ msgstr "" msgid "You have been blocked from that group by the admin." msgstr "" -#: actions/apigroupjoin.php:138 +#: actions/apigroupjoin.php:138 actions/joingroup.php:128 lib/command.php:234 #, php-format -msgid "Could not join user %s to group %s." +msgid "Could not join user %1$s to group %2$s." msgstr "" #: actions/apigroupleave.php:114 msgid "You are not a member of this group." msgstr "" -#: actions/apigroupleave.php:124 +#: actions/apigroupleave.php:124 actions/leavegroup.php:127 #, php-format -msgid "Could not remove user %s to group %s." +msgid "Could not remove user %1$s from group %2$s." msgstr "" #: actions/apigrouplist.php:95 @@ -396,11 +391,6 @@ msgstr "" msgid "%s's groups" msgstr "" -#: actions/apigrouplist.php:103 -#, php-format -msgid "Groups %s is a member of on %s." -msgstr "" - #: actions/apigrouplistall.php:90 actions/usergroups.php:62 #, php-format msgid "%s groups" @@ -424,11 +414,11 @@ msgstr "" msgid "No such notice." msgstr "" -#: actions/apistatusesretweet.php:83 +#: actions/apistatusesretweet.php:83 lib/command.php:422 msgid "Cannot repeat your own notice." msgstr "" -#: actions/apistatusesretweet.php:91 +#: actions/apistatusesretweet.php:91 lib/command.php:427 msgid "Already repeated that notice." msgstr "" @@ -441,7 +431,7 @@ msgid "No status with that ID found." msgstr "" #: actions/apistatusesupdate.php:157 actions/newnotice.php:155 -#: scripts/maildaemon.php:71 +#: lib/mailhandler.php:60 #, php-format msgid "That's too long. Max notice size is %d chars." msgstr "" @@ -461,12 +451,12 @@ msgstr "" #: actions/apitimelinefavorites.php:108 #, php-format -msgid "%s / Favorites from %s" +msgid "%1$s / Favorites from %2$s" msgstr "" #: actions/apitimelinefavorites.php:120 #, php-format -msgid "%s updates favorited by %s / %s." +msgid "%1$s updates favorited by %2$s / %2$s." msgstr "" #: actions/apitimelinegroup.php:109 actions/apitimelineuser.php:118 @@ -534,8 +524,11 @@ msgstr "" msgid "No such attachment." msgstr "" -#: actions/avatarbynickname.php:59 actions/grouprss.php:91 -#: actions/leavegroup.php:76 +#: actions/avatarbynickname.php:59 actions/blockedfromgroup.php:73 +#: actions/editgroup.php:84 actions/groupdesignsettings.php:84 +#: actions/grouplogo.php:86 actions/groupmembers.php:76 +#: actions/grouprss.php:91 actions/joingroup.php:76 actions/leavegroup.php:76 +#: actions/showgroup.php:121 msgid "No nickname." msgstr "" @@ -558,8 +551,8 @@ msgid "You can upload your personal avatar. The maximum file size is %s." msgstr "" #: actions/avatarsettings.php:106 actions/avatarsettings.php:185 -#: actions/grouplogo.php:178 actions/remotesubscribe.php:191 -#: actions/userauthorization.php:72 actions/userrss.php:103 +#: actions/remotesubscribe.php:191 actions/userauthorization.php:72 +#: actions/userrss.php:103 msgid "User without matching profile" msgstr "" @@ -591,9 +584,9 @@ msgstr "" msgid "Crop" msgstr "" -#: actions/avatarsettings.php:268 actions/disfavor.php:74 -#: actions/emailsettings.php:238 actions/favor.php:75 actions/geocode.php:50 -#: actions/groupblock.php:66 actions/grouplogo.php:309 +#: actions/avatarsettings.php:268 actions/deletenotice.php:157 +#: actions/disfavor.php:74 actions/emailsettings.php:238 actions/favor.php:75 +#: actions/geocode.php:50 actions/groupblock.php:66 actions/grouplogo.php:309 #: actions/groupunblock.php:66 actions/imsettings.php:206 #: actions/invite.php:56 actions/login.php:135 actions/makeadmin.php:66 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80 @@ -672,18 +665,14 @@ msgstr "" msgid "Failed to save block information." msgstr "" -#: actions/blockedfromgroup.php:73 actions/editgroup.php:84 -#: actions/groupdesignsettings.php:84 actions/grouplogo.php:86 -#: actions/groupmembers.php:76 actions/joingroup.php:76 -#: actions/showgroup.php:121 -msgid "No nickname" -msgstr "" - #: actions/blockedfromgroup.php:80 actions/editgroup.php:96 +#: actions/foafgroup.php:44 actions/foafgroup.php:62 actions/groupblock.php:86 #: actions/groupbyid.php:83 actions/groupdesignsettings.php:97 #: actions/grouplogo.php:99 actions/groupmembers.php:83 -#: actions/joingroup.php:83 actions/showgroup.php:137 -msgid "No such group" +#: actions/grouprss.php:98 actions/groupunblock.php:86 +#: actions/joingroup.php:83 actions/leavegroup.php:83 actions/makeadmin.php:86 +#: actions/showgroup.php:137 lib/command.php:212 lib/command.php:263 +msgid "No such group." msgstr "" #: actions/blockedfromgroup.php:90 @@ -693,7 +682,7 @@ msgstr "" #: actions/blockedfromgroup.php:93 #, php-format -msgid "%s blocked profiles, page %d" +msgid "%1$s blocked profiles, page %2$d" msgstr "" #: actions/blockedfromgroup.php:108 @@ -804,10 +793,6 @@ msgstr "" msgid "Delete this notice" msgstr "" -#: actions/deletenotice.php:157 -msgid "There was a problem with your session token. Try again, please." -msgstr "" - #: actions/deleteuser.php:67 msgid "You cannot delete users." msgstr "" @@ -831,7 +816,7 @@ msgid "Delete this user" msgstr "" #: actions/designadminpanel.php:62 lib/accountsettingsaction.php:124 -#: lib/adminpanelaction.php:302 lib/groupnav.php:119 +#: lib/adminpanelaction.php:316 lib/groupnav.php:119 msgid "Design" msgstr "" @@ -969,7 +954,7 @@ msgstr "" #: actions/editgroup.php:103 actions/editgroup.php:168 #: actions/groupdesignsettings.php:104 actions/grouplogo.php:106 -msgid "You must be an admin to edit the group" +msgid "You must be an admin to edit the group." msgstr "" #: actions/editgroup.php:154 @@ -994,7 +979,7 @@ msgid "Options saved." msgstr "" #: actions/emailsettings.php:60 -msgid "Email Settings" +msgid "Email settings" msgstr "" #: actions/emailsettings.php:71 @@ -1029,7 +1014,7 @@ msgid "Cancel" msgstr "" #: actions/emailsettings.php:121 -msgid "Email Address" +msgid "Email address" msgstr "" #: actions/emailsettings.php:123 @@ -1103,8 +1088,9 @@ msgstr "" msgid "Cannot normalize that email address" msgstr "" -#: actions/emailsettings.php:331 actions/siteadminpanel.php:157 -msgid "Not a valid email address" +#: actions/emailsettings.php:331 actions/register.php:201 +#: actions/siteadminpanel.php:157 +msgid "Not a valid email address." msgstr "" #: actions/emailsettings.php:334 @@ -1279,18 +1265,11 @@ msgstr "" msgid "Error updating remote profile" msgstr "" -#: actions/foafgroup.php:44 actions/foafgroup.php:62 actions/groupblock.php:86 -#: actions/grouprss.php:98 actions/groupunblock.php:86 -#: actions/leavegroup.php:83 actions/makeadmin.php:86 lib/command.php:212 -#: lib/command.php:263 -msgid "No such group." -msgstr "" - -#: actions/getfile.php:75 +#: actions/getfile.php:79 msgid "No such file." msgstr "" -#: actions/getfile.php:79 +#: actions/getfile.php:83 msgid "Cannot read file." msgstr "" @@ -1302,7 +1281,7 @@ msgstr "" #: actions/groupblock.php:76 actions/groupunblock.php:76 #: actions/makeadmin.php:76 actions/subedit.php:53 actions/tagother.php:46 -#: lib/profileformaction.php:77 +#: actions/unsubscribe.php:84 lib/profileformaction.php:77 msgid "No profile with that ID." msgstr "" @@ -1330,9 +1309,9 @@ msgstr "" #: actions/groupblock.php:162 #, php-format msgid "" -"Are you sure you want to block user \"%s\" from the group \"%s\"? They will " -"be removed from the group, unable to post, and unable to subscribe to the " -"group in the future." +"Are you sure you want to block user \"%1$s\" from the group \"%2$s\"? They " +"will be removed from the group, unable to post, and unable to subscribe to " +"the group in the future." msgstr "" #: actions/groupblock.php:178 @@ -1347,8 +1326,8 @@ msgstr "" msgid "Database error blocking user from group." msgstr "" -#: actions/groupbyid.php:74 -msgid "No ID" +#: actions/groupbyid.php:74 actions/userbyid.php:70 +msgid "No ID." msgstr "" #: actions/groupdesignsettings.php:68 @@ -1370,12 +1349,6 @@ msgstr "" msgid "Couldn't update your design." msgstr "" -#: actions/groupdesignsettings.php:287 actions/groupdesignsettings.php:297 -#: actions/userdesignsettings.php:210 actions/userdesignsettings.php:220 -#: actions/userdesignsettings.php:263 actions/userdesignsettings.php:273 -msgid "Unable to save your design settings!" -msgstr "" - #: actions/groupdesignsettings.php:308 actions/userdesignsettings.php:231 msgid "Design preferences saved." msgstr "" @@ -1390,6 +1363,10 @@ msgid "" "You can upload a logo image for your group. The maximum file size is %s." msgstr "" +#: actions/grouplogo.php:178 +msgid "User without matching profile." +msgstr "" + #: actions/grouplogo.php:362 msgid "Pick a square area of the image to be the logo." msgstr "" @@ -1409,14 +1386,14 @@ msgstr "" #: actions/groupmembers.php:96 #, php-format -msgid "%s group members, page %d" +msgid "%1$s group members, page %2$d" msgstr "" #: actions/groupmembers.php:111 msgid "A list of the users in this group." msgstr "" -#: actions/groupmembers.php:175 lib/action.php:441 lib/groupnav.php:107 +#: actions/groupmembers.php:175 lib/action.php:442 lib/groupnav.php:107 msgid "Admin" msgstr "" @@ -1508,7 +1485,7 @@ msgid "Error removing the block." msgstr "" #: actions/imsettings.php:59 -msgid "IM Settings" +msgid "IM settings" msgstr "" #: actions/imsettings.php:70 @@ -1534,7 +1511,7 @@ msgid "" msgstr "" #: actions/imsettings.php:124 -msgid "IM Address" +msgid "IM address" msgstr "" #: actions/imsettings.php:126 @@ -1591,11 +1568,6 @@ msgstr "" msgid "That is not your Jabber ID." msgstr "" -#: actions/inbox.php:59 -#, php-format -msgid "Inbox for %s - page %d" -msgstr "" - #: actions/inbox.php:62 #, php-format msgid "Inbox for %s" @@ -1631,9 +1603,9 @@ msgstr "" msgid "You are already subscribed to these users:" msgstr "" -#: actions/invite.php:131 actions/invite.php:139 +#: actions/invite.php:131 actions/invite.php:139 lib/command.php:315 #, php-format -msgid "%s (%s)" +msgid "%1$s (%2$s)" msgstr "" #: actions/invite.php:136 @@ -1672,7 +1644,7 @@ msgstr "" msgid "Optionally add a personal message to the invitation." msgstr "" -#: actions/invite.php:197 lib/messageform.php:178 lib/noticeform.php:232 +#: actions/invite.php:197 lib/messageform.php:178 lib/noticeform.php:234 msgid "Send" msgstr "" @@ -1716,18 +1688,9 @@ msgstr "" msgid "You must be logged in to join a group." msgstr "" -#: actions/joingroup.php:90 lib/command.php:217 -msgid "You are already a member of that group" -msgstr "" - -#: actions/joingroup.php:128 lib/command.php:234 -#, php-format -msgid "Could not join user %s to group %s" -msgstr "" - #: actions/joingroup.php:135 lib/command.php:239 #, php-format -msgid "%s joined group %s" +msgid "%1$s joined group %2$s" msgstr "" #: actions/leavegroup.php:60 @@ -1742,14 +1705,9 @@ msgstr "" msgid "Could not find membership record." msgstr "" -#: actions/leavegroup.php:127 lib/command.php:284 -#, php-format -msgid "Could not remove user %s to group %s" -msgstr "" - #: actions/leavegroup.php:134 lib/command.php:289 #, php-format -msgid "%s left group %s" +msgid "%1$s left group %2$s" msgstr "" #: actions/login.php:83 actions/register.php:137 @@ -1768,7 +1726,7 @@ msgstr "" msgid "Error setting user. You are probably not authorized." msgstr "" -#: actions/login.php:208 actions/login.php:261 lib/action.php:459 +#: actions/login.php:208 actions/login.php:261 lib/action.php:460 #: lib/logingroupnav.php:79 msgid "Login" msgstr "" @@ -1819,17 +1777,17 @@ msgstr "" #: actions/makeadmin.php:95 #, php-format -msgid "%s is already an admin for group \"%s\"." +msgid "%1$s is already an admin for group \"%2$s\"." msgstr "" #: actions/makeadmin.php:132 #, php-format -msgid "Can't get membership record for %s in group %s" +msgid "Can't get membership record for %1$s in group %2$s." msgstr "" #: actions/makeadmin.php:145 #, php-format -msgid "Can't make %s an admin for group %s" +msgid "Can't make %1$s an admin for group %2$s." msgstr "" #: actions/microsummary.php:69 @@ -1872,7 +1830,7 @@ msgstr "" #: actions/newmessage.php:185 lib/command.php:376 #, php-format -msgid "Direct message to %s sent" +msgid "Direct message to %s sent." msgstr "" #: actions/newmessage.php:210 actions/newnotice.php:245 lib/channel.php:170 @@ -1900,7 +1858,7 @@ msgstr "" #: actions/noticesearch.php:91 #, php-format -msgid "Search results for \"%s\" on %s" +msgid "Search results for \"%1$s\" on %2$s" msgstr "" #: actions/noticesearch.php:121 @@ -2002,11 +1960,6 @@ msgstr "" msgid "URL shortening service is too long (max 50 chars)." msgstr "" -#: actions/outbox.php:58 -#, php-format -msgid "Outbox for %s - page %d" -msgstr "" - #: actions/outbox.php:61 #, php-format msgid "Outbox for %s" @@ -2077,7 +2030,7 @@ msgstr "" msgid "Password saved." msgstr "" -#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:308 +#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:326 msgid "Paths" msgstr "" @@ -2110,7 +2063,7 @@ msgid "Invalid SSL server. The maximum length is 255 characters." msgstr "" #: actions/pathsadminpanel.php:217 actions/siteadminpanel.php:58 -#: lib/adminpanelaction.php:299 +#: lib/adminpanelaction.php:311 msgid "Site" msgstr "" @@ -2203,7 +2156,7 @@ msgid "When to use SSL" msgstr "" #: actions/pathsadminpanel.php:308 -msgid "SSL Server" +msgid "SSL server" msgstr "" #: actions/pathsadminpanel.php:309 @@ -2232,7 +2185,7 @@ msgstr "" #: actions/peopletag.php:144 #, php-format -msgid "Users self-tagged with %s - page %d" +msgid "Users self-tagged with %1$s - page %2$d" msgstr "" #: actions/postnotice.php:84 @@ -2241,7 +2194,7 @@ msgstr "" #: actions/postnotice.php:90 #, php-format -msgid "Notice license ‘%s’ is not compatible with site license ‘%s’." +msgid "Notice license ‘%1$s’ is not compatible with site license ‘%2$s’." msgstr "" #: actions/profilesettings.php:60 @@ -2358,19 +2311,19 @@ msgstr "" msgid "Couldn't update user for autosubscribe." msgstr "" -#: actions/profilesettings.php:354 +#: actions/profilesettings.php:359 msgid "Couldn't save location prefs." msgstr "" -#: actions/profilesettings.php:366 +#: actions/profilesettings.php:371 msgid "Couldn't save profile." msgstr "" -#: actions/profilesettings.php:374 +#: actions/profilesettings.php:379 msgid "Couldn't save tags." msgstr "" -#: actions/profilesettings.php:382 lib/adminpanelaction.php:126 +#: actions/profilesettings.php:387 lib/adminpanelaction.php:137 msgid "Settings saved." msgstr "" @@ -2463,7 +2416,7 @@ msgid "" "one!" msgstr "" -#: actions/publictagcloud.php:135 +#: actions/publictagcloud.php:131 msgid "Tag cloud" msgstr "" @@ -2599,7 +2552,7 @@ msgstr "" msgid "Registration successful" msgstr "" -#: actions/register.php:114 actions/register.php:502 lib/action.php:456 +#: actions/register.php:114 actions/register.php:502 lib/action.php:457 #: lib/logingroupnav.php:85 msgid "Register" msgstr "" @@ -2612,10 +2565,6 @@ msgstr "" msgid "You can't register if you don't agree to the license." msgstr "" -#: actions/register.php:201 -msgid "Not a valid email address." -msgstr "" - #: actions/register.php:212 msgid "Email address already exists." msgstr "" @@ -2672,10 +2621,10 @@ msgstr "" #: actions/register.php:537 #, php-format msgid "" -"Congratulations, %s! And welcome to %%%%site.name%%%%. From here, you may " +"Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may " "want to...\n" "\n" -"* Go to [your profile](%s) and post your first message.\n" +"* Go to [your profile](%2$s) and post your first message.\n" "* Add a [Jabber/GTalk address](%%%%action.imsettings%%%%) so you can send " "notices through instant messages.\n" "* [Search for people](%%%%action.peoplesearch%%%%) that you may know or that " @@ -2777,11 +2726,6 @@ msgstr "" msgid "Replies to %s" msgstr "" -#: actions/replies.php:127 -#, php-format -msgid "Replies to %s, page %d" -msgstr "" - #: actions/replies.php:144 #, php-format msgid "Replies feed for %s (RSS 1.0)" @@ -2800,8 +2744,8 @@ msgstr "" #: actions/replies.php:198 #, php-format msgid "" -"This is the timeline showing replies to %s but %s hasn't received a notice " -"to his attention yet." +"This is the timeline showing replies to %1$s but %2$s hasn't received a " +"notice to his attention yet." msgstr "" #: actions/replies.php:203 @@ -2814,8 +2758,8 @@ msgstr "" #: actions/replies.php:205 #, php-format msgid "" -"You can try to [nudge %s](../%s) or [post something to his or her attention]" -"(%%%%action.newnotice%%%%?status_textarea=%s)." +"You can try to [nudge %1$s](../%2$s) or [post something to his or her " +"attention](%%%%action.newnotice%%%%?status_textarea=%3$s)." msgstr "" #: actions/repliesrss.php:72 @@ -2831,11 +2775,6 @@ msgstr "" msgid "User is already sandboxed." msgstr "" -#: actions/showfavorites.php:79 -#, php-format -msgid "%s's favorite notices, page %d" -msgstr "" - #: actions/showfavorites.php:132 msgid "Could not retrieve favorite notices." msgstr "" @@ -2885,11 +2824,6 @@ msgstr "" msgid "%s group" msgstr "" -#: actions/showgroup.php:84 -#, php-format -msgid "%s group, page %d" -msgstr "" - #: actions/showgroup.php:218 msgid "Group profile" msgstr "" @@ -2938,7 +2872,7 @@ msgstr "" #: actions/showgroup.php:386 lib/profileaction.php:117 #: lib/profileaction.php:148 lib/profileaction.php:236 lib/section.php:95 -#: lib/tagcloudsection.php:71 +#: lib/subscriptionlist.php:126 lib/tagcloudsection.php:71 msgid "(None)" msgstr "" @@ -3004,14 +2938,9 @@ msgstr "" msgid " tagged %s" msgstr "" -#: actions/showstream.php:79 -#, php-format -msgid "%s, page %d" -msgstr "" - #: actions/showstream.php:122 #, php-format -msgid "Notice feed for %s tagged %s (RSS 1.0)" +msgid "Notice feed for %1$s tagged %2$s (RSS 1.0)" msgstr "" #: actions/showstream.php:129 @@ -3036,7 +2965,7 @@ msgstr "" #: actions/showstream.php:191 #, php-format -msgid "This is the timeline for %s but %s hasn't posted anything yet." +msgid "This is the timeline for %1$s but %2$s hasn't posted anything yet." msgstr "" #: actions/showstream.php:196 @@ -3048,8 +2977,8 @@ msgstr "" #: actions/showstream.php:198 #, php-format msgid "" -"You can try to nudge %s or [post something to his or her attention](%%%%" -"action.newnotice%%%%?status_textarea=%s)." +"You can try to nudge %1$s or [post something to his or her attention](%%%%" +"action.newnotice%%%%?status_textarea=%2$s)." msgstr "" #: actions/showstream.php:234 @@ -3091,12 +3020,12 @@ msgid "Site name must have non-zero length." msgstr "" #: actions/siteadminpanel.php:154 -msgid "You must have a valid contact email address" +msgid "You must have a valid contact email address." msgstr "" #: actions/siteadminpanel.php:172 #, php-format -msgid "Unknown language \"%s\"" +msgid "Unknown language \"%s\"." msgstr "" #: actions/siteadminpanel.php:179 @@ -3276,7 +3205,7 @@ msgid "Save site settings" msgstr "" #: actions/smssettings.php:58 -msgid "SMS Settings" +msgid "SMS settings" msgstr "" #: actions/smssettings.php:69 @@ -3305,7 +3234,7 @@ msgid "Enter the code you received on your phone." msgstr "" #: actions/smssettings.php:138 -msgid "SMS Phone number" +msgid "SMS phone number" msgstr "" #: actions/smssettings.php:140 @@ -3390,7 +3319,7 @@ msgstr "" #: actions/subscribers.php:52 #, php-format -msgid "%s subscribers, page %d" +msgid "%1$s subscribers, page %2$d" msgstr "" #: actions/subscribers.php:63 @@ -3427,7 +3356,7 @@ msgstr "" #: actions/subscriptions.php:54 #, php-format -msgid "%s subscriptions, page %d" +msgid "%1$s subscriptions, page %2$d" msgstr "" #: actions/subscriptions.php:65 @@ -3462,11 +3391,6 @@ msgstr "" msgid "SMS" msgstr "" -#: actions/tag.php:68 -#, php-format -msgid "Notices tagged with %s, page %d" -msgstr "" - #: actions/tag.php:86 #, php-format msgid "Notice feed for tag %s (RSS 1.0)" @@ -3546,20 +3470,17 @@ msgstr "" msgid "No profile id in request." msgstr "" -#: actions/unsubscribe.php:84 -msgid "No profile with that id." -msgstr "" - #: actions/unsubscribe.php:98 msgid "Unsubscribed" msgstr "" #: actions/updateprofile.php:62 actions/userauthorization.php:330 #, php-format -msgid "Listenee stream license ‘%s’ is not compatible with site license ‘%s’." +msgid "" +"Listenee stream license ‘%1$s’ is not compatible with site license ‘%2$s’." msgstr "" -#: actions/useradminpanel.php:58 lib/adminpanelaction.php:305 +#: actions/useradminpanel.php:58 lib/adminpanelaction.php:321 #: lib/personalgroupnav.php:115 msgid "User" msgstr "" @@ -3657,7 +3578,7 @@ msgid "" "click “Rejectâ€." msgstr "" -#: actions/userauthorization.php:188 +#: actions/userauthorization.php:188 actions/version.php:165 msgid "License" msgstr "" @@ -3706,7 +3627,7 @@ msgstr "" #: actions/userauthorization.php:296 #, php-format -msgid "Listener URI ‘%s’ not found here" +msgid "Listener URI ‘%s’ not found here." msgstr "" #: actions/userauthorization.php:301 @@ -3739,10 +3660,6 @@ msgstr "" msgid "Wrong image type for avatar URL ‘%s’." msgstr "" -#: actions/userbyid.php:70 -msgid "No ID." -msgstr "" - #: actions/userdesignsettings.php:76 lib/designsettings.php:65 msgid "Profile design" msgstr "" @@ -3757,11 +3674,6 @@ msgstr "" msgid "Enjoy your hotdog!" msgstr "" -#: actions/usergroups.php:64 -#, php-format -msgid "%s groups, page %d" -msgstr "" - #: actions/usergroups.php:130 msgid "Search for more groups" msgstr "" @@ -3776,6 +3688,69 @@ msgstr "" msgid "Try [searching for groups](%%action.groupsearch%%) and joining them." msgstr "" +#: actions/version.php:73 +#, php-format +msgid "StatusNet %s" +msgstr "" + +#: actions/version.php:153 +#, php-format +msgid "" +"This site is powered by %1$s version %2$s, Copyright 2008-2010 StatusNet, " +"Inc. and contributors." +msgstr "" + +#: actions/version.php:157 +msgid "StatusNet" +msgstr "" + +#: actions/version.php:161 +msgid "Contributors" +msgstr "" + +#: actions/version.php:168 +msgid "" +"StatusNet is free software: you can redistribute it and/or modify it under " +"the terms of the GNU Affero General Public License as published by the Free " +"Software Foundation, either version 3 of the License, or (at your option) " +"any later version. " +msgstr "" + +#: actions/version.php:174 +msgid "" +"This program is distributed in the hope that it will be useful, but WITHOUT " +"ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or " +"FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License " +"for more details. " +msgstr "" + +#: actions/version.php:180 +#, php-format +msgid "" +"You should have received a copy of the GNU Affero General Public License " +"along with this program. If not, see %s." +msgstr "" + +#: actions/version.php:189 +msgid "Plugins" +msgstr "" + +#: actions/version.php:195 +msgid "Name" +msgstr "" + +#: actions/version.php:196 lib/action.php:741 +msgid "Version" +msgstr "" + +#: actions/version.php:197 +msgid "Author(s)" +msgstr "" + +#: actions/version.php:198 lib/groupeditform.php:172 +msgid "Description" +msgstr "" + #: classes/File.php:137 #, php-format msgid "" @@ -3842,7 +3817,7 @@ msgstr "" msgid "DB error inserting reply: %s" msgstr "" -#: classes/Notice.php:1361 +#: classes/Notice.php:1359 #, php-format msgid "RT @%1$s %2$s" msgstr "" @@ -3888,149 +3863,144 @@ msgstr "" msgid "Other options" msgstr "" -#: lib/action.php:144 -#, php-format -msgid "%s - %s" -msgstr "" - #: lib/action.php:159 msgid "Untitled page" msgstr "" -#: lib/action.php:426 +#: lib/action.php:427 msgid "Primary site navigation" msgstr "" -#: lib/action.php:432 +#: lib/action.php:433 msgid "Home" msgstr "" -#: lib/action.php:432 +#: lib/action.php:433 msgid "Personal profile and friends timeline" msgstr "" -#: lib/action.php:434 +#: lib/action.php:435 msgid "Account" msgstr "" -#: lib/action.php:434 +#: lib/action.php:435 msgid "Change your email, avatar, password, profile" msgstr "" -#: lib/action.php:437 +#: lib/action.php:438 msgid "Connect" msgstr "" -#: lib/action.php:437 +#: lib/action.php:438 msgid "Connect to services" msgstr "" -#: lib/action.php:441 +#: lib/action.php:442 msgid "Change site configuration" msgstr "" -#: lib/action.php:445 lib/subgroupnav.php:105 +#: lib/action.php:446 lib/subgroupnav.php:105 msgid "Invite" msgstr "" -#: lib/action.php:446 lib/subgroupnav.php:106 +#: lib/action.php:447 lib/subgroupnav.php:106 #, php-format msgid "Invite friends and colleagues to join you on %s" msgstr "" -#: lib/action.php:451 +#: lib/action.php:452 msgid "Logout" msgstr "" -#: lib/action.php:451 +#: lib/action.php:452 msgid "Logout from the site" msgstr "" -#: lib/action.php:456 +#: lib/action.php:457 msgid "Create an account" msgstr "" -#: lib/action.php:459 +#: lib/action.php:460 msgid "Login to the site" msgstr "" -#: lib/action.php:462 lib/action.php:725 +#: lib/action.php:463 lib/action.php:726 msgid "Help" msgstr "" -#: lib/action.php:462 +#: lib/action.php:463 msgid "Help me!" msgstr "" -#: lib/action.php:465 lib/searchaction.php:127 +#: lib/action.php:466 lib/searchaction.php:127 msgid "Search" msgstr "" -#: lib/action.php:465 +#: lib/action.php:466 msgid "Search for people or text" msgstr "" -#: lib/action.php:486 +#: lib/action.php:487 msgid "Site notice" msgstr "" -#: lib/action.php:552 +#: lib/action.php:553 msgid "Local views" msgstr "" -#: lib/action.php:618 +#: lib/action.php:619 msgid "Page notice" msgstr "" -#: lib/action.php:720 +#: lib/action.php:721 msgid "Secondary site navigation" msgstr "" -#: lib/action.php:727 +#: lib/action.php:728 msgid "About" msgstr "" -#: lib/action.php:729 +#: lib/action.php:730 msgid "FAQ" msgstr "" -#: lib/action.php:733 +#: lib/action.php:734 msgid "TOS" msgstr "" -#: lib/action.php:736 +#: lib/action.php:737 msgid "Privacy" msgstr "" -#: lib/action.php:738 +#: lib/action.php:739 msgid "Source" msgstr "" -#: lib/action.php:740 +#: lib/action.php:743 msgid "Contact" msgstr "" -#: lib/action.php:742 +#: lib/action.php:745 msgid "Badge" msgstr "" -#: lib/action.php:770 +#: lib/action.php:773 msgid "StatusNet software license" msgstr "" -#: lib/action.php:773 +#: lib/action.php:776 #, php-format msgid "" "**%%site.name%%** is a microblogging service brought to you by [%%site." "broughtby%%](%%site.broughtbyurl%%). " msgstr "" -#: lib/action.php:775 +#: lib/action.php:778 #, php-format msgid "**%%site.name%%** is a microblogging service. " msgstr "" -#: lib/action.php:777 +#: lib/action.php:780 #, php-format msgid "" "It runs the [StatusNet](http://status.net/) microblogging software, version %" @@ -4038,31 +4008,31 @@ msgid "" "org/licensing/licenses/agpl-3.0.html)." msgstr "" -#: lib/action.php:791 +#: lib/action.php:794 msgid "Site content license" msgstr "" -#: lib/action.php:800 +#: lib/action.php:803 msgid "All " msgstr "" -#: lib/action.php:805 +#: lib/action.php:808 msgid "license." msgstr "" -#: lib/action.php:1099 +#: lib/action.php:1102 msgid "Pagination" msgstr "" -#: lib/action.php:1108 +#: lib/action.php:1111 msgid "After" msgstr "" -#: lib/action.php:1116 +#: lib/action.php:1119 msgid "Before" msgstr "" -#: lib/action.php:1164 +#: lib/action.php:1167 msgid "There was a problem with your session token." msgstr "" @@ -4070,27 +4040,31 @@ msgstr "" msgid "You cannot make changes to this site." msgstr "" -#: lib/adminpanelaction.php:195 +#: lib/adminpanelaction.php:107 +msgid "Changes to that panel are not allowed." +msgstr "" + +#: lib/adminpanelaction.php:206 msgid "showForm() not implemented." msgstr "" -#: lib/adminpanelaction.php:224 +#: lib/adminpanelaction.php:235 msgid "saveSettings() not implemented." msgstr "" -#: lib/adminpanelaction.php:247 +#: lib/adminpanelaction.php:258 msgid "Unable to delete design setting." msgstr "" -#: lib/adminpanelaction.php:300 +#: lib/adminpanelaction.php:312 msgid "Basic site configuration" msgstr "" -#: lib/adminpanelaction.php:303 +#: lib/adminpanelaction.php:317 msgid "Design configuration" msgstr "" -#: lib/adminpanelaction.php:306 lib/adminpanelaction.php:309 +#: lib/adminpanelaction.php:322 lib/adminpanelaction.php:327 msgid "Paths configuration" msgstr "" @@ -4114,11 +4088,19 @@ msgstr "" msgid "Tags for this attachment" msgstr "" +#: lib/authenticationplugin.php:182 lib/authenticationplugin.php:187 +msgid "Password changing failed" +msgstr "" + +#: lib/authenticationplugin.php:197 +msgid "Password changing is not allowed" +msgstr "" + #: lib/channel.php:138 lib/channel.php:158 msgid "Command results" msgstr "" -#: lib/channel.php:210 +#: lib/channel.php:210 lib/mailhandler.php:142 msgid "Command complete" msgstr "" @@ -4132,7 +4114,7 @@ msgstr "" #: lib/command.php:88 #, php-format -msgid "Could not find a user with nickname %s" +msgid "Could not find a user with nickname %s." msgstr "" #: lib/command.php:92 @@ -4141,7 +4123,7 @@ msgstr "" #: lib/command.php:99 #, php-format -msgid "Nudge sent to %s" +msgid "Nudge sent to %s." msgstr "" #: lib/command.php:126 @@ -4153,34 +4135,34 @@ msgid "" msgstr "" #: lib/command.php:152 lib/command.php:399 lib/command.php:460 -msgid "Notice with that id does not exist" +msgid "Notice with that id does not exist." msgstr "" #: lib/command.php:168 lib/command.php:415 lib/command.php:476 #: lib/command.php:532 -msgid "User has no last notice" +msgid "User has no last notice." msgstr "" #: lib/command.php:190 msgid "Notice marked as fave." msgstr "" -#: lib/command.php:315 +#: lib/command.php:284 #, php-format -msgid "%1$s (%2$s)" +msgid "Could not remove user %1$s to group %2$s." msgstr "" #: lib/command.php:318 #, php-format -msgid "Fullname: %s" +msgid "Full name: %s" msgstr "" -#: lib/command.php:321 +#: lib/command.php:321 lib/mail.php:254 #, php-format msgid "Location: %s" msgstr "" -#: lib/command.php:324 +#: lib/command.php:324 lib/mail.php:256 #, php-format msgid "Homepage: %s" msgstr "" @@ -4192,24 +4174,16 @@ msgstr "" #: lib/command.php:358 scripts/xmppdaemon.php:301 #, php-format -msgid "Message too long - maximum is %d characters, you sent %d" +msgid "Message too long - maximum is %1$d characters, you sent %2$d." msgstr "" #: lib/command.php:378 msgid "Error sending direct message." msgstr "" -#: lib/command.php:422 -msgid "Cannot repeat your own notice" -msgstr "" - -#: lib/command.php:427 -msgid "Already repeated that notice" -msgstr "" - #: lib/command.php:435 #, php-format -msgid "Notice from %s repeated" +msgid "Notice from %s repeated." msgstr "" #: lib/command.php:437 @@ -4218,12 +4192,12 @@ msgstr "" #: lib/command.php:491 #, php-format -msgid "Notice too long - maximum is %d characters, you sent %d" +msgid "Notice too long - maximum is %1$d characters, you sent %2$d." msgstr "" #: lib/command.php:500 #, php-format -msgid "Reply to %s sent" +msgid "Reply to %s sent." msgstr "" #: lib/command.php:502 @@ -4231,7 +4205,7 @@ msgid "Error saving notice." msgstr "" #: lib/command.php:556 -msgid "Specify the name of the user to subscribe to" +msgid "Specify the name of the user to subscribe to." msgstr "" #: lib/command.php:563 @@ -4240,7 +4214,7 @@ msgid "Subscribed to %s" msgstr "" #: lib/command.php:584 -msgid "Specify the name of the user to unsubscribe from" +msgid "Specify the name of the user to unsubscribe from." msgstr "" #: lib/command.php:591 @@ -4269,17 +4243,17 @@ msgid "Can't turn on notification." msgstr "" #: lib/command.php:650 -msgid "Login command is disabled" +msgid "Login command is disabled." msgstr "" #: lib/command.php:664 #, php-format -msgid "Could not create login token for %s" +msgid "Could not create login token for %s." msgstr "" #: lib/command.php:669 #, php-format -msgid "This link is useable only once, and is good for only 2 minutes: %s" +msgid "This link is useable only once, and is good for only 2 minutes: %s." msgstr "" #: lib/command.php:685 @@ -4467,10 +4441,6 @@ msgstr "" msgid "Describe the group or topic in %d characters" msgstr "" -#: lib/groupeditform.php:172 -msgid "Description" -msgstr "" - #: lib/groupeditform.php:179 msgid "" "Location for the group, if any, like \"City, State (or Region), Country\"" @@ -4629,21 +4599,9 @@ msgid "" "Change your email address or notification options at %8$s\n" msgstr "" -#: lib/mail.php:254 -#, php-format -msgid "Location: %s\n" -msgstr "" - -#: lib/mail.php:256 -#, php-format -msgid "Homepage: %s\n" -msgstr "" - #: lib/mail.php:258 #, php-format -msgid "" -"Bio: %s\n" -"\n" +msgid "Bio: %s" msgstr "" #: lib/mail.php:286 @@ -4778,6 +4736,27 @@ msgstr "" msgid "from" msgstr "" +#: lib/mailhandler.php:37 +msgid "Could not parse message." +msgstr "" + +#: lib/mailhandler.php:42 +msgid "Not a registered user." +msgstr "" + +#: lib/mailhandler.php:46 +msgid "Sorry, that is not your incoming email address." +msgstr "" + +#: lib/mailhandler.php:50 +msgid "Sorry, no incoming email allowed." +msgstr "" + +#: lib/mailhandler.php:228 +#, php-format +msgid "Unsupported message type: %s" +msgstr "" + #: lib/mediafile.php:98 lib/mediafile.php:123 msgid "There was a database error while saving your file. Please try again." msgstr "" @@ -4809,7 +4788,7 @@ msgid "File upload stopped by extension." msgstr "" #: lib/mediafile.php:179 lib/mediafile.php:216 -msgid "File exceeds user's quota!" +msgid "File exceeds user's quota." msgstr "" #: lib/mediafile.php:196 lib/mediafile.php:233 @@ -4817,7 +4796,7 @@ msgid "File could not be moved to destination directory." msgstr "" #: lib/mediafile.php:201 lib/mediafile.php:237 -msgid "Could not determine file's mime-type!" +msgid "Could not determine file's MIME type." msgstr "" #: lib/mediafile.php:270 @@ -4827,7 +4806,7 @@ msgstr "" #: lib/mediafile.php:275 #, php-format -msgid "%s is not a supported filetype on this server." +msgid "%s is not a supported file type on this server." msgstr "" #: lib/messageform.php:120 @@ -4860,7 +4839,15 @@ msgid "Attach a file" msgstr "" #: lib/noticeform.php:212 -msgid "Share your location" +msgid "Share my location." +msgstr "" + +#: lib/noticeform.php:214 +msgid "Do not share my location." +msgstr "" + +#: lib/noticeform.php:215 +msgid "Hide this info" msgstr "" #: lib/noticelist.php:428 @@ -4977,6 +4964,10 @@ msgstr "" msgid "Tags in %s's notices" msgstr "" +#: lib/plugin.php:114 +msgid "Unknown" +msgstr "" + #: lib/profileaction.php:109 lib/profileaction.php:192 lib/subgroupnav.php:82 msgid "Subscriptions" msgstr "" @@ -5146,10 +5137,6 @@ msgstr "" msgid "People Tagcloud as tagged" msgstr "" -#: lib/subscriptionlist.php:126 -msgid "(none)" -msgstr "" - #: lib/tagcloudsection.php:56 msgid "None" msgstr "" @@ -5263,19 +5250,3 @@ msgstr "" #, php-format msgid "%s is not a valid color! Use 3 or 6 hex chars." msgstr "" - -#: scripts/maildaemon.php:48 -msgid "Could not parse message." -msgstr "" - -#: scripts/maildaemon.php:53 -msgid "Not a registered user." -msgstr "" - -#: scripts/maildaemon.php:57 -msgid "Sorry, that is not your incoming email address." -msgstr "" - -#: scripts/maildaemon.php:61 -msgid "Sorry, no incoming email allowed." -msgstr "" diff --git a/locale/sv/LC_MESSAGES/statusnet.po b/locale/sv/LC_MESSAGES/statusnet.po index 64253a52e..11889caca 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-01-03 10:37+0000\n" -"PO-Revision-Date: 2010-01-03 10:38:48+0000\n" +"POT-Creation-Date: 2010-01-10 11:27+0000\n" +"PO-Revision-Date: 2010-01-10 11:29:04+0000\n" "Language-Team: Swedish\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha (r60575); Translate extension (2009-12-06)\n" +"X-Generator: MediaWiki 1.16alpha (r60888); Translate extension (2010-01-04)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: sv\n" "X-Message-Group: out-statusnet\n" @@ -51,11 +51,6 @@ msgstr "Ingen sÃ¥dan sida" msgid "No such user." msgstr "Ingen sÃ¥dan användare." -#: actions/all.php:84 -#, php-format -msgid "%s and friends, page %d" -msgstr "%s och vänner, sida %d" - #: actions/all.php:86 actions/all.php:167 actions/allrss.php:115 #: actions/apitimelinefriends.php:115 actions/apitimelinehome.php:115 #: lib/personalgroupnav.php:100 @@ -94,10 +89,10 @@ msgstr "" "%) eller posta nÃ¥got själv." #: actions/all.php:134 -#, php-format +#, fuzzy, php-format msgid "" -"You can try to [nudge %s](../%s) from his profile or [post something to his " -"or her attention](%%%%action.newnotice%%%%?status_textarea=%s)." +"You can try to [nudge %1$s](../%2$s) from his profile or [post something to " +"his or her attention](%%%%action.newnotice%%%%?status_textarea=%3$s)." msgstr "" "Du kan prova att [knuffa %s](../%s) frÃ¥n dennes profil eller [posta " "nÃ¥gonting för hans eller hennes uppmärksamhet](%%%%action.newnotice%%%%?" @@ -127,6 +122,23 @@ msgstr "Uppdateringar frÃ¥n %1$s och vänner pÃ¥ %2$s!" #: actions/apiaccountupdateprofile.php:97 #: actions/apiaccountupdateprofilebackgroundimage.php:94 #: actions/apiaccountupdateprofilecolors.php:118 +#: actions/apidirectmessage.php:156 actions/apifavoritecreate.php:99 +#: actions/apifavoritedestroy.php:100 actions/apifriendshipscreate.php:100 +#: actions/apifriendshipsdestroy.php:100 actions/apifriendshipsshow.php:129 +#: actions/apigroupcreate.php:136 actions/apigroupismember.php:114 +#: actions/apigroupjoin.php:155 actions/apigroupleave.php:141 +#: actions/apigrouplist.php:132 actions/apigrouplistall.php:120 +#: actions/apigroupmembership.php:106 actions/apigroupshow.php:105 +#: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102 +#: actions/apistatusesretweets.php:112 actions/apistatusesshow.php:108 +#: actions/apistatusnetconfig.php:133 actions/apistatusnetversion.php:93 +#: actions/apisubscriptions.php:111 actions/apitimelinefavorites.php:146 +#: actions/apitimelinefriends.php:156 actions/apitimelinegroup.php:150 +#: actions/apitimelinehome.php:156 actions/apitimelinementions.php:151 +#: actions/apitimelinepublic.php:131 actions/apitimelineretweetedbyme.php:122 +#: actions/apitimelineretweetedtome.php:121 +#: actions/apitimelineretweetsofme.php:122 actions/apitimelinetag.php:141 +#: actions/apitimelineuser.php:165 actions/apiusershow.php:101 msgid "API method not found." msgstr "API-metoden hittades inte" @@ -184,6 +196,9 @@ msgstr "" #: actions/apiaccountupdateprofilebackgroundimage.php:146 #: actions/apiaccountupdateprofilecolors.php:164 #: actions/apiaccountupdateprofilecolors.php:174 +#: actions/groupdesignsettings.php:287 actions/groupdesignsettings.php:297 +#: actions/userdesignsettings.php:210 actions/userdesignsettings.php:220 +#: actions/userdesignsettings.php:263 actions/userdesignsettings.php:273 msgid "Unable to save your design settings." msgstr "Kunde inte spara dina utseendeinställningar." @@ -224,26 +239,6 @@ msgstr "Direktmeddelande till %s" msgid "All the direct messages sent to %s" msgstr "Alla direktmeddelanden skickade till %s" -#: actions/apidirectmessage.php:156 actions/apifavoritecreate.php:99 -#: actions/apifavoritedestroy.php:100 actions/apifriendshipscreate.php:100 -#: actions/apifriendshipsdestroy.php:100 actions/apifriendshipsshow.php:129 -#: actions/apigroupcreate.php:136 actions/apigroupismember.php:114 -#: actions/apigroupjoin.php:155 actions/apigroupleave.php:141 -#: actions/apigrouplist.php:132 actions/apigrouplistall.php:120 -#: actions/apigroupmembership.php:106 actions/apigroupshow.php:105 -#: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102 -#: actions/apistatusesretweets.php:112 actions/apistatusesshow.php:108 -#: actions/apistatusnetconfig.php:133 actions/apistatusnetversion.php:93 -#: actions/apisubscriptions.php:111 actions/apitimelinefavorites.php:146 -#: actions/apitimelinefriends.php:156 actions/apitimelinegroup.php:150 -#: actions/apitimelinehome.php:156 actions/apitimelinementions.php:151 -#: actions/apitimelinepublic.php:131 actions/apitimelineretweetedbyme.php:122 -#: actions/apitimelineretweetedtome.php:121 -#: actions/apitimelineretweetsofme.php:122 actions/apitimelinetag.php:141 -#: actions/apitimelineuser.php:165 actions/apiusershow.php:101 -msgid "API method not found!" -msgstr "API-metoden hittades inte!" - #: actions/apidirectmessagenew.php:126 msgid "No message text!" msgstr "Ingen meddelandetext!" @@ -267,7 +262,8 @@ msgid "No status found with that ID." msgstr "Ingen status hittad med det ID:t." #: actions/apifavoritecreate.php:119 -msgid "This status is already a favorite!" +#, fuzzy +msgid "This status is already a favorite." msgstr "Denna status är redan en favorit!" #: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:176 @@ -275,7 +271,8 @@ msgid "Could not create favorite." msgstr "Kunde inte skapa favorit." #: actions/apifavoritedestroy.php:122 -msgid "That status is not a favorite!" +#, fuzzy +msgid "That status is not a favorite." msgstr "Denna status är inte en favorit!" #: actions/apifavoritedestroy.php:134 actions/disfavor.php:87 @@ -296,7 +293,8 @@ msgid "Could not unfollow user: User not found." msgstr "Kunde inte sluta följa användaren: användaren hittades inte." #: actions/apifriendshipsdestroy.php:120 -msgid "You cannot unfollow yourself!" +#, fuzzy +msgid "You cannot unfollow yourself." msgstr "Du kan inte sluta följa dig själv!" #: actions/apifriendshipsexists.php:94 @@ -382,7 +380,7 @@ msgstr "Alias kan inte vara samma som smeknamn." msgid "Group not found!" msgstr "Grupp hittades inte!" -#: actions/apigroupjoin.php:110 +#: actions/apigroupjoin.php:110 actions/joingroup.php:90 lib/command.php:217 msgid "You are already a member of that group." msgstr "Du är redan en medlem i denna grupp." @@ -390,18 +388,18 @@ msgstr "Du är redan en medlem i denna grupp." msgid "You have been blocked from that group by the admin." msgstr "Du har blivit blockerad frÃ¥n denna grupp av administratören." -#: actions/apigroupjoin.php:138 -#, php-format -msgid "Could not join user %s to group %s." +#: actions/apigroupjoin.php:138 actions/joingroup.php:128 lib/command.php:234 +#, fuzzy, php-format +msgid "Could not join user %1$s to group %2$s." msgstr "Kunde inte ansluta användare % till grupp %s." #: actions/apigroupleave.php:114 msgid "You are not a member of this group." msgstr "Du är inte en medlem i denna grupp." -#: actions/apigroupleave.php:124 -#, php-format -msgid "Could not remove user %s to group %s." +#: actions/apigroupleave.php:124 actions/leavegroup.php:127 +#, fuzzy, php-format +msgid "Could not remove user %1$s from group %2$s." msgstr "Kunde inte ta bort användare %s frÃ¥n grupp %s." #: actions/apigrouplist.php:95 @@ -409,11 +407,6 @@ msgstr "Kunde inte ta bort användare %s frÃ¥n grupp %s." msgid "%s's groups" msgstr "%ss grupper" -#: actions/apigrouplist.php:103 -#, php-format -msgid "Groups %s is a member of on %s." -msgstr "Grupper %s är en medlem i pÃ¥ %s." - #: actions/apigrouplistall.php:90 actions/usergroups.php:62 #, php-format msgid "%s groups" @@ -437,11 +430,11 @@ msgstr "Du kan inte ta bort en annan användares status." msgid "No such notice." msgstr "Ingen sÃ¥dan notis." -#: actions/apistatusesretweet.php:83 +#: actions/apistatusesretweet.php:83 lib/command.php:422 msgid "Cannot repeat your own notice." msgstr "Kan inte upprepa din egen notis." -#: actions/apistatusesretweet.php:91 +#: actions/apistatusesretweet.php:91 lib/command.php:427 msgid "Already repeated that notice." msgstr "Redan upprepat denna notis." @@ -454,7 +447,7 @@ msgid "No status with that ID found." msgstr "Ingen status med det ID:t hittades." #: actions/apistatusesupdate.php:157 actions/newnotice.php:155 -#: scripts/maildaemon.php:71 +#: lib/mailhandler.php:60 #, php-format msgid "That's too long. Max notice size is %d chars." msgstr "Det är för lÃ¥ngt. Maximal notisstorlek är %d tecken." @@ -473,13 +466,13 @@ msgid "Unsupported format." msgstr "Format som inte stödjs." #: actions/apitimelinefavorites.php:108 -#, php-format -msgid "%s / Favorites from %s" +#, fuzzy, php-format +msgid "%1$s / Favorites from %2$s" msgstr "%s / Favoriter frÃ¥n %s" #: actions/apitimelinefavorites.php:120 -#, php-format -msgid "%s updates favorited by %s / %s." +#, fuzzy, php-format +msgid "%1$s updates favorited by %2$s / %2$s." msgstr "%s uppdateringar markerade som favorit av %s / %s." #: actions/apitimelinegroup.php:109 actions/apitimelineuser.php:118 @@ -547,8 +540,11 @@ msgstr "Hittades inte." msgid "No such attachment." msgstr "Ingen sÃ¥dan bilaga." -#: actions/avatarbynickname.php:59 actions/grouprss.php:91 -#: actions/leavegroup.php:76 +#: actions/avatarbynickname.php:59 actions/blockedfromgroup.php:73 +#: actions/editgroup.php:84 actions/groupdesignsettings.php:84 +#: actions/grouplogo.php:86 actions/groupmembers.php:76 +#: actions/grouprss.php:91 actions/joingroup.php:76 actions/leavegroup.php:76 +#: actions/showgroup.php:121 msgid "No nickname." msgstr "Inget smeknamn." @@ -572,8 +568,8 @@ msgstr "" "Du kan ladda upp din personliga avatar. Den maximala filstorleken är %s." #: actions/avatarsettings.php:106 actions/avatarsettings.php:185 -#: actions/grouplogo.php:178 actions/remotesubscribe.php:191 -#: actions/userauthorization.php:72 actions/userrss.php:103 +#: actions/remotesubscribe.php:191 actions/userauthorization.php:72 +#: actions/userrss.php:103 msgid "User without matching profile" msgstr "Användare utan matchande profil" @@ -605,9 +601,9 @@ msgstr "Ladda upp" msgid "Crop" msgstr "Beskär" -#: actions/avatarsettings.php:268 actions/disfavor.php:74 -#: actions/emailsettings.php:238 actions/favor.php:75 actions/geocode.php:50 -#: actions/groupblock.php:66 actions/grouplogo.php:309 +#: actions/avatarsettings.php:268 actions/deletenotice.php:157 +#: actions/disfavor.php:74 actions/emailsettings.php:238 actions/favor.php:75 +#: actions/geocode.php:50 actions/groupblock.php:66 actions/grouplogo.php:309 #: actions/groupunblock.php:66 actions/imsettings.php:206 #: actions/invite.php:56 actions/login.php:135 actions/makeadmin.php:66 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80 @@ -689,19 +685,15 @@ msgstr "Blockera denna användare" msgid "Failed to save block information." msgstr "Misslyckades att spara blockeringsinformation." -#: actions/blockedfromgroup.php:73 actions/editgroup.php:84 -#: actions/groupdesignsettings.php:84 actions/grouplogo.php:86 -#: actions/groupmembers.php:76 actions/joingroup.php:76 -#: actions/showgroup.php:121 -msgid "No nickname" -msgstr "Inget smeknamn" - #: actions/blockedfromgroup.php:80 actions/editgroup.php:96 +#: actions/foafgroup.php:44 actions/foafgroup.php:62 actions/groupblock.php:86 #: actions/groupbyid.php:83 actions/groupdesignsettings.php:97 #: actions/grouplogo.php:99 actions/groupmembers.php:83 -#: actions/joingroup.php:83 actions/showgroup.php:137 -msgid "No such group" -msgstr "Ingen sÃ¥dan grupp" +#: actions/grouprss.php:98 actions/groupunblock.php:86 +#: actions/joingroup.php:83 actions/leavegroup.php:83 actions/makeadmin.php:86 +#: actions/showgroup.php:137 lib/command.php:212 lib/command.php:263 +msgid "No such group." +msgstr "Ingen sÃ¥dan grupp." #: actions/blockedfromgroup.php:90 #, php-format @@ -709,8 +701,8 @@ msgid "%s blocked profiles" msgstr "%s blockerade profiler" #: actions/blockedfromgroup.php:93 -#, php-format -msgid "%s blocked profiles, page %d" +#, fuzzy, php-format +msgid "%1$s blocked profiles, page %2$d" msgstr "%s blockerade profiler, sida %d" #: actions/blockedfromgroup.php:108 @@ -824,10 +816,6 @@ msgstr "Ta inte bort denna notis" msgid "Delete this notice" msgstr "Ta bort denna notis" -#: actions/deletenotice.php:157 -msgid "There was a problem with your session token. Try again, please." -msgstr "Det var nÃ¥got problem med din sessions-token. Var vänlig försök igen." - #: actions/deleteuser.php:67 msgid "You cannot delete users." msgstr "Du kan inte ta bort användare." @@ -853,7 +841,7 @@ msgid "Delete this user" msgstr "Ta bort denna användare" #: actions/designadminpanel.php:62 lib/accountsettingsaction.php:124 -#: lib/adminpanelaction.php:302 lib/groupnav.php:119 +#: lib/adminpanelaction.php:316 lib/groupnav.php:119 msgid "Design" msgstr "Utseende" @@ -993,7 +981,8 @@ msgstr "Du mÃ¥ste vara inloggad för att skapa en grupp." #: actions/editgroup.php:103 actions/editgroup.php:168 #: actions/groupdesignsettings.php:104 actions/grouplogo.php:106 -msgid "You must be an admin to edit the group" +#, fuzzy +msgid "You must be an admin to edit the group." msgstr "Du mÃ¥ste vara inloggad för att redigera gruppen" #: actions/editgroup.php:154 @@ -1018,7 +1007,8 @@ msgid "Options saved." msgstr "Alternativ sparade." #: actions/emailsettings.php:60 -msgid "Email Settings" +#, fuzzy +msgid "Email settings" msgstr "E-postinställningar" #: actions/emailsettings.php:71 @@ -1055,8 +1045,9 @@ msgid "Cancel" msgstr "Avbryt" #: actions/emailsettings.php:121 -msgid "Email Address" -msgstr "E-postadress" +#, fuzzy +msgid "Email address" +msgstr "E-postadresser" #: actions/emailsettings.php:123 msgid "Email address, like \"UserName@example.org\"" @@ -1095,7 +1086,7 @@ msgstr "Skicka notiser om nya prenumerationer till mig genom e-post." #: actions/emailsettings.php:163 msgid "Send me email when someone adds my notice as a favorite." -msgstr "Skicka mig ett email när nÃ¥gon lägger till mitt inlägg som favorit." +msgstr "Skicka mig e-post när nÃ¥gon lägger till min notis som en favorit." #: actions/emailsettings.php:169 msgid "Send me email when someone sends me a private message." @@ -1130,9 +1121,10 @@ msgstr "Ingen e-postadress." msgid "Cannot normalize that email address" msgstr "Kan inte normalisera den e-postadressen" -#: actions/emailsettings.php:331 actions/siteadminpanel.php:157 -msgid "Not a valid email address" -msgstr "Inte en giltig e-postadress" +#: actions/emailsettings.php:331 actions/register.php:201 +#: actions/siteadminpanel.php:157 +msgid "Not a valid email address." +msgstr "Inte en giltig e-postadress." #: actions/emailsettings.php:334 msgid "That is already your email address." @@ -1229,6 +1221,8 @@ msgid "" "Be the first to add a notice to your favorites by clicking the fave button " "next to any notice you like." msgstr "" +"Bli först att lägga en notis till dina favoriter genom att klicka pÃ¥ favorit-" +"knappen bredvid nÃ¥gon notis du gillar." #: actions/favorited.php:156 #, php-format @@ -1261,9 +1255,9 @@ msgid "Featured users, page %d" msgstr "Profilerade användare, sida %d" #: actions/featured.php:99 -#, fuzzy, php-format +#, php-format msgid "A selection of some great users on %s" -msgstr "Ett urval av nÃ¥gra av de stora användarna pÃ¥% s" +msgstr "Ett urval av nÃ¥gra av de stora användarna pÃ¥ %s" #: actions/file.php:34 msgid "No notice ID." @@ -1313,18 +1307,11 @@ msgstr "Fjärrtjänsten använder en okänd version av OMB-protokollet." msgid "Error updating remote profile" msgstr "Fel vid uppdatering av fjärrprofil" -#: actions/foafgroup.php:44 actions/foafgroup.php:62 actions/groupblock.php:86 -#: actions/grouprss.php:98 actions/groupunblock.php:86 -#: actions/leavegroup.php:83 actions/makeadmin.php:86 lib/command.php:212 -#: lib/command.php:263 -msgid "No such group." -msgstr "Ingen sÃ¥dan grupp." - -#: actions/getfile.php:75 +#: actions/getfile.php:79 msgid "No such file." msgstr "Ingen sÃ¥dan fil." -#: actions/getfile.php:79 +#: actions/getfile.php:83 msgid "Cannot read file." msgstr "Kan inte läsa fil." @@ -1336,7 +1323,7 @@ msgstr "Ingen profil angiven." #: actions/groupblock.php:76 actions/groupunblock.php:76 #: actions/makeadmin.php:76 actions/subedit.php:53 actions/tagother.php:46 -#: lib/profileformaction.php:77 +#: actions/unsubscribe.php:84 lib/profileformaction.php:77 msgid "No profile with that ID." msgstr "Ingen profil med det ID:t." @@ -1362,11 +1349,11 @@ msgid "Block user from group" msgstr "Blockera användare frÃ¥n grupp" #: actions/groupblock.php:162 -#, php-format +#, fuzzy, php-format msgid "" -"Are you sure you want to block user \"%s\" from the group \"%s\"? They will " -"be removed from the group, unable to post, and unable to subscribe to the " -"group in the future." +"Are you sure you want to block user \"%1$s\" from the group \"%2$s\"? They " +"will be removed from the group, unable to post, and unable to subscribe to " +"the group in the future." msgstr "" "Är du säker pÃ¥ att du vill blockera användare \"%s\" frÃ¥n gruppen \"%s\"? De " "kommer bli borttagna frÃ¥n gruppen, inte kunna posta och inte kunna " @@ -1384,9 +1371,9 @@ msgstr "Blockera denna användare frÃ¥n denna grupp" msgid "Database error blocking user from group." msgstr "Databasfel vid blockering av användare frÃ¥n grupp." -#: actions/groupbyid.php:74 -msgid "No ID" -msgstr "Ingen ID" +#: actions/groupbyid.php:74 actions/userbyid.php:70 +msgid "No ID." +msgstr "Ingen ID." #: actions/groupdesignsettings.php:68 msgid "You must be logged in to edit a group." @@ -1408,12 +1395,6 @@ msgstr "" msgid "Couldn't update your design." msgstr "Kunde inte uppdatera dina utseendeinställningar." -#: actions/groupdesignsettings.php:287 actions/groupdesignsettings.php:297 -#: actions/userdesignsettings.php:210 actions/userdesignsettings.php:220 -#: actions/userdesignsettings.php:263 actions/userdesignsettings.php:273 -msgid "Unable to save your design settings!" -msgstr "Kunde inte spara dina utseendeinställningar!" - #: actions/groupdesignsettings.php:308 actions/userdesignsettings.php:231 msgid "Design preferences saved." msgstr "Utseendeinställningar sparade." @@ -1430,6 +1411,11 @@ msgstr "" "Du kan ladda upp en logotypbild för din grupp. Den maximala filstorleken är %" "s." +#: actions/grouplogo.php:178 +#, fuzzy +msgid "User without matching profile." +msgstr "Användare utan matchande profil" + #: actions/grouplogo.php:362 msgid "Pick a square area of the image to be the logo." msgstr "Välj ett kvadratiskt omrÃ¥de i bilden som logotyp" @@ -1448,15 +1434,15 @@ msgid "%s group members" msgstr "%s gruppmedlemmar" #: actions/groupmembers.php:96 -#, php-format -msgid "%s group members, page %d" +#, fuzzy, php-format +msgid "%1$s group members, page %2$d" msgstr "%s gruppmedlemmar, sida %d" #: actions/groupmembers.php:111 msgid "A list of the users in this group." msgstr "En lista av användarna i denna grupp." -#: actions/groupmembers.php:175 lib/action.php:441 lib/groupnav.php:107 +#: actions/groupmembers.php:175 lib/action.php:442 lib/groupnav.php:107 msgid "Admin" msgstr "Administratör" @@ -1560,7 +1546,8 @@ msgid "Error removing the block." msgstr "Fel vid hävning av blockering." #: actions/imsettings.php:59 -msgid "IM Settings" +#, fuzzy +msgid "IM settings" msgstr "IM-inställningar" #: actions/imsettings.php:70 @@ -1590,7 +1577,8 @@ msgstr "" "vidare instruktioner. (La du till %s i din kompislista?)" #: actions/imsettings.php:124 -msgid "IM Address" +#, fuzzy +msgid "IM address" msgstr "IM-adress" #: actions/imsettings.php:126 @@ -1653,11 +1641,6 @@ msgstr "" msgid "That is not your Jabber ID." msgstr "Detta är inte ditt Jabber-ID." -#: actions/inbox.php:59 -#, php-format -msgid "Inbox for %s - page %d" -msgstr "Inkorg för %s - sida %d" - #: actions/inbox.php:62 #, php-format msgid "Inbox for %s" @@ -1694,10 +1677,10 @@ msgstr "Bjud in nya användare" msgid "You are already subscribed to these users:" msgstr "Du prenumererar redan pÃ¥ dessa användare:" -#: actions/invite.php:131 actions/invite.php:139 +#: actions/invite.php:131 actions/invite.php:139 lib/command.php:315 #, php-format -msgid "%s (%s)" -msgstr "%s (%s)" +msgid "%1$s (%2$s)" +msgstr "%1$s (%2$s)" #: actions/invite.php:136 msgid "" @@ -1741,7 +1724,7 @@ msgstr "Personligt meddelande" msgid "Optionally add a personal message to the invitation." msgstr "Om du vill, skriv ett personligt meddelande till inbjudan." -#: actions/invite.php:197 lib/messageform.php:178 lib/noticeform.php:232 +#: actions/invite.php:197 lib/messageform.php:178 lib/noticeform.php:234 msgid "Send" msgstr "Skicka" @@ -1785,18 +1768,9 @@ msgstr "" msgid "You must be logged in to join a group." msgstr "Du mÃ¥ste vara inloggad för att kunna gÃ¥ med i en grupp." -#: actions/joingroup.php:90 lib/command.php:217 -msgid "You are already a member of that group" -msgstr "Du är redan en medlem i denna grupp" - -#: actions/joingroup.php:128 lib/command.php:234 -#, php-format -msgid "Could not join user %s to group %s" -msgstr "Kunde inte ansluta användare %s till groupp %s" - #: actions/joingroup.php:135 lib/command.php:239 -#, php-format -msgid "%s joined group %s" +#, fuzzy, php-format +msgid "%1$s joined group %2$s" msgstr "%s gick med i grupp %s" #: actions/leavegroup.php:60 @@ -1811,14 +1785,9 @@ msgstr "Du är inte en medlem i den gruppen." msgid "Could not find membership record." msgstr "Kunde inte hitta uppgift om medlemskap." -#: actions/leavegroup.php:127 lib/command.php:284 -#, php-format -msgid "Could not remove user %s to group %s" -msgstr "Kunde inte ta bort användare %s frÃ¥n grupp %s" - #: actions/leavegroup.php:134 lib/command.php:289 -#, php-format -msgid "%s left group %s" +#, fuzzy, php-format +msgid "%1$s left group %2$s" msgstr "%s lämnade grupp %s" #: actions/login.php:83 actions/register.php:137 @@ -1837,7 +1806,7 @@ msgstr "Felaktigt användarnamn eller lösenord." msgid "Error setting user. You are probably not authorized." msgstr "Fel vid inställning av användare. Du har sannolikt inte tillstÃ¥nd." -#: actions/login.php:208 actions/login.php:261 lib/action.php:459 +#: actions/login.php:208 actions/login.php:261 lib/action.php:460 #: lib/logingroupnav.php:79 msgid "Login" msgstr "Logga in" @@ -1891,18 +1860,18 @@ msgid "Only an admin can make another user an admin." msgstr "Bara en administratör kan göra en annan användare till administratör." #: actions/makeadmin.php:95 -#, php-format -msgid "%s is already an admin for group \"%s\"." +#, fuzzy, php-format +msgid "%1$s is already an admin for group \"%2$s\"." msgstr "%s är redan en administratör för grupp \"%s\"." #: actions/makeadmin.php:132 -#, php-format -msgid "Can't get membership record for %s in group %s" +#, fuzzy, php-format +msgid "Can't get membership record for %1$s in group %2$s." msgstr "Kan inte hämta uppgift om medlemskap för %s i grupp %s" #: actions/makeadmin.php:145 -#, php-format -msgid "Can't make %s an admin for group %s" +#, fuzzy, php-format +msgid "Can't make %1$s an admin for group %2$s." msgstr "Kan inte göra %s till en administratör för grupp %s" #: actions/microsummary.php:69 @@ -1946,8 +1915,8 @@ msgid "Message sent" msgstr "Meddelande skickat" #: actions/newmessage.php:185 lib/command.php:376 -#, php-format -msgid "Direct message to %s sent" +#, fuzzy, php-format +msgid "Direct message to %s sent." msgstr "Direktmeddelande till %s skickat" #: actions/newmessage.php:210 actions/newnotice.php:245 lib/channel.php:170 @@ -1976,8 +1945,8 @@ msgid "Text search" msgstr "Textsökning" #: actions/noticesearch.php:91 -#, php-format -msgid "Search results for \"%s\" on %s" +#, fuzzy, php-format +msgid "Search results for \"%1$s\" on %2$s" msgstr "Sökresultat för \"%s\" pÃ¥ %s" #: actions/noticesearch.php:121 @@ -2085,11 +2054,6 @@ msgstr "Visa eller göm profilutseenden." msgid "URL shortening service is too long (max 50 chars)." msgstr "Namnet pÃ¥ URL-förkortningstjänsen är för lÃ¥ngt (max 50 tecken)." -#: actions/outbox.php:58 -#, php-format -msgid "Outbox for %s - page %d" -msgstr "Utkorg för %s - sida %d" - #: actions/outbox.php:61 #, php-format msgid "Outbox for %s" @@ -2160,7 +2124,7 @@ msgstr "Kan inte spara nytt lösenord." msgid "Password saved." msgstr "Lösenord sparat." -#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:308 +#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:326 msgid "Paths" msgstr "Sökvägar" @@ -2193,7 +2157,7 @@ msgid "Invalid SSL server. The maximum length is 255 characters." msgstr "Ogiltigt SSL-servernamn. Den maximala längden är 255 tecken." #: actions/pathsadminpanel.php:217 actions/siteadminpanel.php:58 -#: lib/adminpanelaction.php:299 +#: lib/adminpanelaction.php:311 msgid "Site" msgstr "Webbplats" @@ -2286,7 +2250,8 @@ msgid "When to use SSL" msgstr "När SSL skall användas" #: actions/pathsadminpanel.php:308 -msgid "SSL Server" +#, fuzzy +msgid "SSL server" msgstr "SSL-server" #: actions/pathsadminpanel.php:309 @@ -2316,8 +2281,8 @@ msgid "Not a valid people tag: %s" msgstr "Inte en giltig persontagg: %s" #: actions/peopletag.php:144 -#, php-format -msgid "Users self-tagged with %s - page %d" +#, fuzzy, php-format +msgid "Users self-tagged with %1$s - page %2$d" msgstr "Användare som taggat sig själv med %s - sida %d" #: actions/postnotice.php:84 @@ -2325,8 +2290,8 @@ msgid "Invalid notice content" msgstr "Ogiltigt notisinnehÃ¥ll" #: actions/postnotice.php:90 -#, php-format -msgid "Notice license ‘%s’ is not compatible with site license ‘%s’." +#, fuzzy, php-format +msgid "Notice license ‘%1$s’ is not compatible with site license ‘%2$s’." msgstr "Licensen för notiser ‘%s’ är inte förenlig webbplatslicensen ‘%s’." #: actions/profilesettings.php:60 @@ -2389,7 +2354,7 @@ msgstr "Var du hÃ¥ller till, sÃ¥som \"Stad, Län, Land\"" #: actions/profilesettings.php:138 msgid "Share my current location when posting notices" -msgstr "" +msgstr "Dela min nuvarande plats när jag skickar notiser" #: actions/profilesettings.php:145 actions/tagother.php:149 #: actions/tagother.php:209 lib/subscriptionlist.php:106 @@ -2448,20 +2413,19 @@ msgstr "Ogiltig tagg: \"%s\"" msgid "Couldn't update user for autosubscribe." msgstr "Kunde inte uppdatera användaren för automatisk prenumeration." -#: actions/profilesettings.php:354 -#, fuzzy +#: actions/profilesettings.php:359 msgid "Couldn't save location prefs." -msgstr "Kunde inte spara taggar." +msgstr "Kunde inte spara platsinställningar." -#: actions/profilesettings.php:366 +#: actions/profilesettings.php:371 msgid "Couldn't save profile." msgstr "Kunde inte spara profil." -#: actions/profilesettings.php:374 +#: actions/profilesettings.php:379 msgid "Couldn't save tags." msgstr "Kunde inte spara taggar." -#: actions/profilesettings.php:382 lib/adminpanelaction.php:126 +#: actions/profilesettings.php:387 lib/adminpanelaction.php:137 msgid "Settings saved." msgstr "Inställningar sparade." @@ -2567,7 +2531,7 @@ msgstr "" "Varför inte [registrera ett konto](%%action.register%%) och bli först att " "posta en!" -#: actions/publictagcloud.php:135 +#: actions/publictagcloud.php:131 msgid "Tag cloud" msgstr "Taggmoln" @@ -2708,7 +2672,7 @@ msgstr "Ledsen, ogiltig inbjudningskod." msgid "Registration successful" msgstr "Registreringen genomförd" -#: actions/register.php:114 actions/register.php:502 lib/action.php:456 +#: actions/register.php:114 actions/register.php:502 lib/action.php:457 #: lib/logingroupnav.php:85 msgid "Register" msgstr "Registrera" @@ -2721,10 +2685,6 @@ msgstr "Registrering inte tillÃ¥ten." msgid "You can't register if you don't agree to the license." msgstr "Du kan inte registrera dig om du inte godkänner licensen." -#: actions/register.php:201 -msgid "Not a valid email address." -msgstr "Inte en giltig e-postadress." - #: actions/register.php:212 msgid "Email address already exists." msgstr "E-postadressen finns redan." @@ -2789,10 +2749,10 @@ msgstr "" #: actions/register.php:537 #, php-format msgid "" -"Congratulations, %s! And welcome to %%%%site.name%%%%. From here, you may " +"Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may " "want to...\n" "\n" -"* Go to [your profile](%s) and post your first message.\n" +"* Go to [your profile](%2$s) and post your first message.\n" "* Add a [Jabber/GTalk address](%%%%action.imsettings%%%%) so you can send " "notices through instant messages.\n" "* [Search for people](%%%%action.peoplesearch%%%%) that you may know or that " @@ -2902,11 +2862,6 @@ msgstr "Upprepad!" msgid "Replies to %s" msgstr "Svarat till %s" -#: actions/replies.php:127 -#, php-format -msgid "Replies to %s, page %d" -msgstr "Svar till %s, sida %d" - #: actions/replies.php:144 #, php-format msgid "Replies feed for %s (RSS 1.0)" @@ -2923,10 +2878,10 @@ msgid "Replies feed for %s (Atom)" msgstr "Flöde med svar för %s (Atom)" #: actions/replies.php:198 -#, php-format +#, fuzzy, php-format msgid "" -"This is the timeline showing replies to %s but %s hasn't received a notice " -"to his attention yet." +"This is the timeline showing replies to %1$s but %2$s hasn't received a " +"notice to his attention yet." msgstr "" "Detta är tidslinjen som visar svar till %s men %s har inte tagit emot en " "notis för dennes uppmärksamhet än." @@ -2941,10 +2896,10 @@ msgstr "" "personer eller [gÃ¥ med i grupper](%%action.groups%%)." #: actions/replies.php:205 -#, php-format +#, fuzzy, php-format msgid "" -"You can try to [nudge %s](../%s) or [post something to his or her attention]" -"(%%%%action.newnotice%%%%?status_textarea=%s)." +"You can try to [nudge %1$s](../%2$s) or [post something to his or her " +"attention](%%%%action.newnotice%%%%?status_textarea=%3$s)." msgstr "" "Du kan prova att [knuffa %s](../%s) eller [posta nÃ¥gonting för hans eller " "hennes uppmärksamhet](%%%%action.newnotice%%%%?status_textarea=%s)." @@ -2955,19 +2910,12 @@ msgid "Replies to %1$s on %2$s!" msgstr "Svar till %1$s pÃ¥ %2$s" #: actions/sandbox.php:65 actions/unsandbox.php:65 -#, fuzzy msgid "You cannot sandbox users on this site." -msgstr "Du kan inte flytta användare till sandlÃ¥da pÃ¥ denna webbplats." +msgstr "Du kan inte flytta användare till sandlÃ¥dan pÃ¥ denna webbplats." #: actions/sandbox.php:72 -#, fuzzy msgid "User is already sandboxed." -msgstr "Användare är redan flyttad till sandlÃ¥da." - -#: actions/showfavorites.php:79 -#, php-format -msgid "%s's favorite notices, page %d" -msgstr "%ss favoritnotiser, sida %d" +msgstr "Användare är redan flyttad till sandlÃ¥dan." #: actions/showfavorites.php:132 msgid "Could not retrieve favorite notices." @@ -3018,11 +2966,6 @@ msgstr "Detta är ett sätt att dela vad du gillar." msgid "%s group" msgstr "%s grupp" -#: actions/showgroup.php:84 -#, php-format -msgid "%s group, page %d" -msgstr "%s grupp, sida %d" - #: actions/showgroup.php:218 msgid "Group profile" msgstr "Grupprofil" @@ -3071,7 +3014,7 @@ msgstr "Medlemmar" #: actions/showgroup.php:386 lib/profileaction.php:117 #: lib/profileaction.php:148 lib/profileaction.php:236 lib/section.php:95 -#: lib/tagcloudsection.php:71 +#: lib/subscriptionlist.php:126 lib/tagcloudsection.php:71 msgid "(None)" msgstr "(Ingen)" @@ -3146,14 +3089,9 @@ msgstr "Notis borttagen." msgid " tagged %s" msgstr "taggade %s" -#: actions/showstream.php:79 -#, php-format -msgid "%s, page %d" -msgstr "%s, sida %d" - #: actions/showstream.php:122 -#, php-format -msgid "Notice feed for %s tagged %s (RSS 1.0)" +#, fuzzy, php-format +msgid "Notice feed for %1$s tagged %2$s (RSS 1.0)" msgstr "Flöde av notiser för %s taggade %s (RSS 1.0)" #: actions/showstream.php:129 @@ -3177,8 +3115,8 @@ msgid "FOAF for %s" msgstr "FOAF för %s" #: actions/showstream.php:191 -#, php-format -msgid "This is the timeline for %s but %s hasn't posted anything yet." +#, fuzzy, php-format +msgid "This is the timeline for %1$s but %2$s hasn't posted anything yet." msgstr "Detta är tidslinjen för %s men %s har inte postat nÃ¥got än." #: actions/showstream.php:196 @@ -3190,10 +3128,10 @@ msgstr "" "inte börja nu?" #: actions/showstream.php:198 -#, php-format +#, fuzzy, php-format msgid "" -"You can try to nudge %s or [post something to his or her attention](%%%%" -"action.newnotice%%%%?status_textarea=%s)." +"You can try to nudge %1$s or [post something to his or her attention](%%%%" +"action.newnotice%%%%?status_textarea=%2$s)." msgstr "" "Du kan prova att knuffa %s eller [posta nÃ¥got för hans eller hennes " "uppmärksamhet](%%%%action.newnotice%%%%?status_textarea=%s)." @@ -3244,12 +3182,13 @@ msgid "Site name must have non-zero length." msgstr "Webbplatsnamnet mÃ¥ste vara minst ett tecken lÃ¥ngt." #: actions/siteadminpanel.php:154 -msgid "You must have a valid contact email address" +#, fuzzy +msgid "You must have a valid contact email address." msgstr "Du mÃ¥ste ha en giltig kontakte-postadress" #: actions/siteadminpanel.php:172 -#, php-format -msgid "Unknown language \"%s\"" +#, fuzzy, php-format +msgid "Unknown language \"%s\"." msgstr "Okänt sprÃ¥k \"%s\"" #: actions/siteadminpanel.php:179 @@ -3376,7 +3315,7 @@ msgstr "Ögonblicksbild" #: actions/siteadminpanel.php:344 msgid "Randomly during Web hit" -msgstr "" +msgstr "Slumpmässigt vid webbförfrÃ¥gningar" #: actions/siteadminpanel.php:345 msgid "In a scheduled job" @@ -3432,7 +3371,8 @@ msgid "Save site settings" msgstr "Spara webbplatsinställningar" #: actions/smssettings.php:58 -msgid "SMS Settings" +#, fuzzy +msgid "SMS settings" msgstr "SMS-inställningar" #: actions/smssettings.php:69 @@ -3461,7 +3401,8 @@ msgid "Enter the code you received on your phone." msgstr "Fyll i koden du mottog i din telefon." #: actions/smssettings.php:138 -msgid "SMS Phone number" +#, fuzzy +msgid "SMS phone number" msgstr "Telefonnummer för SMS" #: actions/smssettings.php:140 @@ -3552,8 +3493,8 @@ msgid "%s subscribers" msgstr "%s prenumeranter" #: actions/subscribers.php:52 -#, php-format -msgid "%s subscribers, page %d" +#, fuzzy, php-format +msgid "%1$s subscribers, page %2$d" msgstr "%s prenumeranter, sida %d" #: actions/subscribers.php:63 @@ -3593,8 +3534,8 @@ msgid "%s subscriptions" msgstr "%s prenumerationer" #: actions/subscriptions.php:54 -#, php-format -msgid "%s subscriptions, page %d" +#, fuzzy, php-format +msgid "%1$s subscriptions, page %2$d" msgstr "%s prenumerationer, sida %d" #: actions/subscriptions.php:65 @@ -3629,11 +3570,6 @@ msgstr "Jabber" msgid "SMS" msgstr "SMS" -#: actions/tag.php:68 -#, php-format -msgid "Notices tagged with %s, page %d" -msgstr "Notiser taggade med %s, sida %d" - #: actions/tag.php:86 #, php-format msgid "Notice feed for tag %s (RSS 1.0)" @@ -3707,9 +3643,8 @@ msgid "You haven't blocked that user." msgstr "Du har inte blockerat denna användared." #: actions/unsandbox.php:72 -#, fuzzy msgid "User is not sandboxed." -msgstr "Användare är inte flyttad till sandlÃ¥da." +msgstr "Användare är inte flyttad till sandlÃ¥dan." #: actions/unsilence.php:72 msgid "User is not silenced." @@ -3719,22 +3654,19 @@ msgstr "Användare är inte nedtystad." msgid "No profile id in request." msgstr "Ingen profil-ID i begäran." -#: actions/unsubscribe.php:84 -msgid "No profile with that id." -msgstr "Ingen profil med det ID:t." - #: actions/unsubscribe.php:98 msgid "Unsubscribed" msgstr "Prenumeration avslutad" #: actions/updateprofile.php:62 actions/userauthorization.php:330 -#, php-format -msgid "Listenee stream license ‘%s’ is not compatible with site license ‘%s’." +#, fuzzy, php-format +msgid "" +"Listenee stream license ‘%1$s’ is not compatible with site license ‘%2$s’." msgstr "" "Licensen för lyssnarströmmen '%s' är inte förenlig med webbplatslicensen '%" "s'." -#: actions/useradminpanel.php:58 lib/adminpanelaction.php:305 +#: actions/useradminpanel.php:58 lib/adminpanelaction.php:321 #: lib/personalgroupnav.php:115 msgid "User" msgstr "Användare" @@ -3837,7 +3769,7 @@ msgstr "" "prenumerera pÃ¥ den här användarens notiser. Om du inte bett att prenumerera " "pÃ¥ nÃ¥gons meddelanden, klicka pÃ¥ \"Avvisa\"." -#: actions/userauthorization.php:188 +#: actions/userauthorization.php:188 actions/version.php:165 msgid "License" msgstr "Licens" @@ -3891,8 +3823,8 @@ msgstr "" "prenumerationen." #: actions/userauthorization.php:296 -#, php-format -msgid "Listener URI ‘%s’ not found here" +#, fuzzy, php-format +msgid "Listener URI ‘%s’ not found here." msgstr "Lyssnar-URI '%s' hittades inte här" #: actions/userauthorization.php:301 @@ -3925,10 +3857,6 @@ msgstr "Kan inte läsa avatar-URL '%s'." msgid "Wrong image type for avatar URL ‘%s’." msgstr "Fel bildtyp för avatar-URL '%s'." -#: actions/userbyid.php:70 -msgid "No ID." -msgstr "Ingen ID." - #: actions/userdesignsettings.php:76 lib/designsettings.php:65 msgid "Profile design" msgstr "Profilutseende" @@ -3942,12 +3870,7 @@ msgstr "" #: actions/userdesignsettings.php:282 msgid "Enjoy your hotdog!" -msgstr "" - -#: actions/usergroups.php:64 -#, php-format -msgid "%s groups, page %d" -msgstr "%s grupper, sida %d" +msgstr "Smaklig mÃ¥ltid!" #: actions/usergroups.php:130 msgid "Search for more groups" @@ -3964,6 +3887,73 @@ msgid "Try [searching for groups](%%action.groupsearch%%) and joining them." msgstr "" "Prova att [söka efter grupper](%%action.groupsearch%%) och gÃ¥ med i dem." +#: actions/version.php:73 +#, fuzzy, php-format +msgid "StatusNet %s" +msgstr "Statistik" + +#: actions/version.php:153 +#, php-format +msgid "" +"This site is powered by %1$s version %2$s, Copyright 2008-2010 StatusNet, " +"Inc. and contributors." +msgstr "" + +#: actions/version.php:157 +#, fuzzy +msgid "StatusNet" +msgstr "Status borttagen." + +#: actions/version.php:161 +msgid "Contributors" +msgstr "" + +#: actions/version.php:168 +msgid "" +"StatusNet is free software: you can redistribute it and/or modify it under " +"the terms of the GNU Affero General Public License as published by the Free " +"Software Foundation, either version 3 of the License, or (at your option) " +"any later version. " +msgstr "" + +#: actions/version.php:174 +msgid "" +"This program is distributed in the hope that it will be useful, but WITHOUT " +"ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or " +"FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License " +"for more details. " +msgstr "" + +#: actions/version.php:180 +#, php-format +msgid "" +"You should have received a copy of the GNU Affero General Public License " +"along with this program. If not, see %s." +msgstr "" + +#: actions/version.php:189 +msgid "Plugins" +msgstr "" + +#: actions/version.php:195 +#, fuzzy +msgid "Name" +msgstr "Smeknamn" + +#: actions/version.php:196 lib/action.php:741 +#, fuzzy +msgid "Version" +msgstr "Sessioner" + +#: actions/version.php:197 +#, fuzzy +msgid "Author(s)" +msgstr "Författare" + +#: actions/version.php:198 lib/groupeditform.php:172 +msgid "Description" +msgstr "Beskrivning" + #: classes/File.php:137 #, php-format msgid "" @@ -4036,7 +4026,7 @@ msgstr "Problem med att spara notis." msgid "DB error inserting reply: %s" msgstr "Databasfel vid infogning av svar: %s" -#: classes/Notice.php:1361 +#: classes/Notice.php:1359 #, php-format msgid "RT @%1$s %2$s" msgstr "RT @%1$s %2$s" @@ -4082,137 +4072,132 @@ msgstr "Övrigt" msgid "Other options" msgstr "Övriga alternativ" -#: lib/action.php:144 -#, php-format -msgid "%s - %s" -msgstr "%s - %s" - #: lib/action.php:159 msgid "Untitled page" msgstr "Namnlös sida" -#: lib/action.php:426 +#: lib/action.php:427 msgid "Primary site navigation" msgstr "Primär webbplatsnavigation" -#: lib/action.php:432 +#: lib/action.php:433 msgid "Home" msgstr "Hem" -#: lib/action.php:432 +#: lib/action.php:433 msgid "Personal profile and friends timeline" msgstr "Personlig profil och vänners tidslinje" -#: lib/action.php:434 +#: lib/action.php:435 msgid "Account" msgstr "Konto" -#: lib/action.php:434 +#: lib/action.php:435 msgid "Change your email, avatar, password, profile" msgstr "Ändra din e-post, avatar, lösenord, profil" -#: lib/action.php:437 +#: lib/action.php:438 msgid "Connect" msgstr "Anslut" -#: lib/action.php:437 +#: lib/action.php:438 msgid "Connect to services" msgstr "Anslut till tjänster" -#: lib/action.php:441 +#: lib/action.php:442 msgid "Change site configuration" msgstr "Ändra webbplatskonfiguration" -#: lib/action.php:445 lib/subgroupnav.php:105 +#: lib/action.php:446 lib/subgroupnav.php:105 msgid "Invite" msgstr "Bjud in" -#: lib/action.php:446 lib/subgroupnav.php:106 +#: lib/action.php:447 lib/subgroupnav.php:106 #, php-format msgid "Invite friends and colleagues to join you on %s" msgstr "Bjud in vänner och kollegor att gÃ¥ med dig pÃ¥ %s" -#: lib/action.php:451 +#: lib/action.php:452 msgid "Logout" msgstr "Logga ut" -#: lib/action.php:451 +#: lib/action.php:452 msgid "Logout from the site" msgstr "Logga ut frÃ¥n webbplatsen" -#: lib/action.php:456 +#: lib/action.php:457 msgid "Create an account" msgstr "Skapa ett konto" -#: lib/action.php:459 +#: lib/action.php:460 msgid "Login to the site" msgstr "Logga in pÃ¥ webbplatsen" -#: lib/action.php:462 lib/action.php:725 +#: lib/action.php:463 lib/action.php:726 msgid "Help" msgstr "Hjälp" -#: lib/action.php:462 +#: lib/action.php:463 msgid "Help me!" msgstr "Hjälp mig!" -#: lib/action.php:465 lib/searchaction.php:127 +#: lib/action.php:466 lib/searchaction.php:127 msgid "Search" msgstr "Sök" -#: lib/action.php:465 +#: lib/action.php:466 msgid "Search for people or text" msgstr "Sök efter personer eller text" -#: lib/action.php:486 +#: lib/action.php:487 msgid "Site notice" msgstr "Webbplatsnotis" -#: lib/action.php:552 +#: lib/action.php:553 msgid "Local views" msgstr "Lokala vyer" -#: lib/action.php:618 +#: lib/action.php:619 msgid "Page notice" msgstr "Sidnotis" -#: lib/action.php:720 +#: lib/action.php:721 msgid "Secondary site navigation" msgstr "Sekundär webbplatsnavigation" -#: lib/action.php:727 +#: lib/action.php:728 msgid "About" msgstr "Om" -#: lib/action.php:729 +#: lib/action.php:730 msgid "FAQ" msgstr "FrÃ¥gor & svar" -#: lib/action.php:733 +#: lib/action.php:734 msgid "TOS" msgstr "Användarvillkor" -#: lib/action.php:736 +#: lib/action.php:737 msgid "Privacy" msgstr "Sekretess" -#: lib/action.php:738 +#: lib/action.php:739 msgid "Source" msgstr "Källa" -#: lib/action.php:740 +#: lib/action.php:743 msgid "Contact" msgstr "Kontakt" -#: lib/action.php:742 +#: lib/action.php:745 msgid "Badge" msgstr "Emblem" -#: lib/action.php:770 +#: lib/action.php:773 msgid "StatusNet software license" msgstr "Programvarulicens för StatusNet" -#: lib/action.php:773 +#: lib/action.php:776 #, php-format msgid "" "**%%site.name%%** is a microblogging service brought to you by [%%site." @@ -4221,12 +4206,12 @@ msgstr "" "**%%site.name%%** är en mikrobloggtjänst tillhandahÃ¥llen av [%%site.broughtby" "%%](%%site.broughtbyurl%%)" -#: lib/action.php:775 +#: lib/action.php:778 #, php-format msgid "**%%site.name%%** is a microblogging service. " msgstr "**%%site.name%%** är en mikrobloggtjänst." -#: lib/action.php:777 +#: lib/action.php:780 #, php-format msgid "" "It runs the [StatusNet](http://status.net/) microblogging software, version %" @@ -4237,31 +4222,31 @@ msgstr "" "version %s, tillgänglig under [GNU Affero General Public License](http://www." "fsf.org/licensing/licenses/agpl-3.0.html)." -#: lib/action.php:791 +#: lib/action.php:794 msgid "Site content license" msgstr "Licens för webbplatsinnehÃ¥ll" -#: lib/action.php:800 +#: lib/action.php:803 msgid "All " msgstr "Alla " -#: lib/action.php:805 +#: lib/action.php:808 msgid "license." msgstr "licens." -#: lib/action.php:1099 +#: lib/action.php:1102 msgid "Pagination" msgstr "Numrering av sidor" -#: lib/action.php:1108 +#: lib/action.php:1111 msgid "After" msgstr "Senare" -#: lib/action.php:1116 +#: lib/action.php:1119 msgid "Before" msgstr "Tidigare" -#: lib/action.php:1164 +#: lib/action.php:1167 msgid "There was a problem with your session token." msgstr "Det var ett problem med din sessions-token." @@ -4269,27 +4254,32 @@ msgstr "Det var ett problem med din sessions-token." msgid "You cannot make changes to this site." msgstr "Du kan inte göra förändringar av denna webbplats." -#: lib/adminpanelaction.php:195 +#: lib/adminpanelaction.php:107 +#, fuzzy +msgid "Changes to that panel are not allowed." +msgstr "Registrering inte tillÃ¥ten." + +#: lib/adminpanelaction.php:206 msgid "showForm() not implemented." msgstr "showForm() är inte implementerat." -#: lib/adminpanelaction.php:224 +#: lib/adminpanelaction.php:235 msgid "saveSettings() not implemented." msgstr "saveSetting() är inte implementerat." -#: lib/adminpanelaction.php:247 +#: lib/adminpanelaction.php:258 msgid "Unable to delete design setting." msgstr "Kunde inte ta bort utseendeinställning." -#: lib/adminpanelaction.php:300 +#: lib/adminpanelaction.php:312 msgid "Basic site configuration" msgstr "Grundläggande webbplatskonfiguration" -#: lib/adminpanelaction.php:303 +#: lib/adminpanelaction.php:317 msgid "Design configuration" msgstr "Konfiguration av utseende" -#: lib/adminpanelaction.php:306 lib/adminpanelaction.php:309 +#: lib/adminpanelaction.php:322 lib/adminpanelaction.php:327 msgid "Paths configuration" msgstr "Konfiguration av sökvägar" @@ -4313,11 +4303,19 @@ msgstr "Notiser där denna bilaga förekommer" msgid "Tags for this attachment" msgstr "Taggar för denna billaga" +#: lib/authenticationplugin.php:182 lib/authenticationplugin.php:187 +msgid "Password changing failed" +msgstr "Byte av lösenord misslyckades" + +#: lib/authenticationplugin.php:197 +msgid "Password changing is not allowed" +msgstr "Byte av lösenord är inte tillÃ¥tet" + #: lib/channel.php:138 lib/channel.php:158 msgid "Command results" msgstr "Resultat av kommando" -#: lib/channel.php:210 +#: lib/channel.php:210 lib/mailhandler.php:142 msgid "Command complete" msgstr "Kommando komplett" @@ -4330,8 +4328,8 @@ msgid "Sorry, this command is not yet implemented." msgstr "Ledsen, detta kommando är inte implementerat än." #: lib/command.php:88 -#, php-format -msgid "Could not find a user with nickname %s" +#, fuzzy, php-format +msgid "Could not find a user with nickname %s." msgstr "Kunde inte hitta en användare med smeknamnet %s" #: lib/command.php:92 @@ -4339,8 +4337,8 @@ msgid "It does not make a lot of sense to nudge yourself!" msgstr "Det verkar inte vara särskilt meningsfullt att knuffa dig själv!" #: lib/command.php:99 -#, php-format -msgid "Nudge sent to %s" +#, fuzzy, php-format +msgid "Nudge sent to %s." msgstr "Knuff skickad till %s" #: lib/command.php:126 @@ -4355,34 +4353,36 @@ msgstr "" "Notiser: %3$s" #: lib/command.php:152 lib/command.php:399 lib/command.php:460 -msgid "Notice with that id does not exist" +#, fuzzy +msgid "Notice with that id does not exist." msgstr "Notis med den ID:n finns inte" #: lib/command.php:168 lib/command.php:415 lib/command.php:476 #: lib/command.php:532 -msgid "User has no last notice" +#, fuzzy +msgid "User has no last notice." msgstr "Användare har ingen sista notis" #: lib/command.php:190 msgid "Notice marked as fave." msgstr "Notis markerad som favorit." -#: lib/command.php:315 -#, php-format -msgid "%1$s (%2$s)" -msgstr "%1$s (%2$s)" +#: lib/command.php:284 +#, fuzzy, php-format +msgid "Could not remove user %1$s to group %2$s." +msgstr "Kunde inte ta bort användare %s frÃ¥n grupp %s" #: lib/command.php:318 -#, php-format -msgid "Fullname: %s" +#, fuzzy, php-format +msgid "Full name: %s" msgstr "Fullständigt namn: %s" -#: lib/command.php:321 +#: lib/command.php:321 lib/mail.php:254 #, php-format msgid "Location: %s" msgstr "Plats: %s" -#: lib/command.php:324 +#: lib/command.php:324 lib/mail.php:256 #, php-format msgid "Homepage: %s" msgstr "Hemsida: %s" @@ -4393,25 +4393,17 @@ msgid "About: %s" msgstr "Om: %s" #: lib/command.php:358 scripts/xmppdaemon.php:301 -#, php-format -msgid "Message too long - maximum is %d characters, you sent %d" +#, fuzzy, php-format +msgid "Message too long - maximum is %1$d characters, you sent %2$d." msgstr "Meddelande för lÃ¥ngt - maximum är %d tecken, du skickade %d" #: lib/command.php:378 msgid "Error sending direct message." msgstr "Fel vid sändning av direktmeddelande." -#: lib/command.php:422 -msgid "Cannot repeat your own notice" -msgstr "Kan inte upprepa din egen notis" - -#: lib/command.php:427 -msgid "Already repeated that notice" -msgstr "Redan upprepat denna notis" - #: lib/command.php:435 -#, php-format -msgid "Notice from %s repeated" +#, fuzzy, php-format +msgid "Notice from %s repeated." msgstr "Notis fron %s upprepad" #: lib/command.php:437 @@ -4419,13 +4411,13 @@ msgid "Error repeating notice." msgstr "Fel vid upprepning av notis." #: lib/command.php:491 -#, php-format -msgid "Notice too long - maximum is %d characters, you sent %d" +#, fuzzy, php-format +msgid "Notice too long - maximum is %1$d characters, you sent %2$d." msgstr "Notis för lÃ¥ngt - maximum är %d tecken, du skickade %d" #: lib/command.php:500 -#, php-format -msgid "Reply to %s sent" +#, fuzzy, php-format +msgid "Reply to %s sent." msgstr "Svar pÃ¥ %s skickat" #: lib/command.php:502 @@ -4433,7 +4425,8 @@ msgid "Error saving notice." msgstr "Fel vid sparande av notis." #: lib/command.php:556 -msgid "Specify the name of the user to subscribe to" +#, fuzzy +msgid "Specify the name of the user to subscribe to." msgstr "Ange namnet pÃ¥ användaren att prenumerara pÃ¥" #: lib/command.php:563 @@ -4442,7 +4435,8 @@ msgid "Subscribed to %s" msgstr "Prenumerar pÃ¥ %s" #: lib/command.php:584 -msgid "Specify the name of the user to unsubscribe from" +#, fuzzy +msgid "Specify the name of the user to unsubscribe from." msgstr "Ange namnet pÃ¥ användaren att avsluta prenumeration pÃ¥" #: lib/command.php:591 @@ -4471,17 +4465,18 @@ msgid "Can't turn on notification." msgstr "Kan inte stänga av notifikation." #: lib/command.php:650 -msgid "Login command is disabled" +#, fuzzy +msgid "Login command is disabled." msgstr "Inloggningskommando är inaktiverat" #: lib/command.php:664 -#, php-format -msgid "Could not create login token for %s" +#, fuzzy, php-format +msgid "Could not create login token for %s." msgstr "Kunde inte skapa inloggnings-token för %s" #: lib/command.php:669 -#, php-format -msgid "This link is useable only once, and is good for only 2 minutes: %s" +#, fuzzy, php-format +msgid "This link is useable only once, and is good for only 2 minutes: %s." msgstr "" "Denna länk är endast användbar en gÃ¥ng, och gäller bara i 2 minuter: %s" @@ -4672,10 +4667,6 @@ msgstr "Beskriv gruppen eller ämnet" msgid "Describe the group or topic in %d characters" msgstr "Beskriv gruppen eller ämnet med högst %d tecken" -#: lib/groupeditform.php:172 -msgid "Description" -msgstr "Beskrivning" - #: lib/groupeditform.php:179 msgid "" "Location for the group, if any, like \"City, State (or Region), Country\"" @@ -4834,21 +4825,9 @@ msgid "" "Change your email address or notification options at %8$s\n" msgstr "" -#: lib/mail.php:254 -#, php-format -msgid "Location: %s\n" -msgstr "Plats: %s\n" - -#: lib/mail.php:256 -#, php-format -msgid "Homepage: %s\n" -msgstr "Hemsida: %s\n" - #: lib/mail.php:258 -#, php-format -msgid "" -"Bio: %s\n" -"\n" +#, fuzzy, php-format +msgid "Bio: %s" msgstr "" "Biografi: %s\n" "\n" @@ -4996,6 +4975,27 @@ msgstr "" msgid "from" msgstr "frÃ¥n" +#: lib/mailhandler.php:37 +msgid "Could not parse message." +msgstr "Kunde inte tolka meddelande." + +#: lib/mailhandler.php:42 +msgid "Not a registered user." +msgstr "Inte en registrerad användare." + +#: lib/mailhandler.php:46 +msgid "Sorry, that is not your incoming email address." +msgstr "Ledsen, det är inte din inkommande e-postadress." + +#: lib/mailhandler.php:50 +msgid "Sorry, no incoming email allowed." +msgstr "Ledsen, ingen inkommande e-post tillÃ¥ts." + +#: lib/mailhandler.php:228 +#, fuzzy, php-format +msgid "Unsupported message type: %s" +msgstr "Bildfilens format stödjs inte." + #: lib/mediafile.php:98 lib/mediafile.php:123 msgid "There was a database error while saving your file. Please try again." msgstr "" @@ -5031,7 +5031,8 @@ msgid "File upload stopped by extension." msgstr "Filuppladdningen stoppad pga filändelse" #: lib/mediafile.php:179 lib/mediafile.php:216 -msgid "File exceeds user's quota!" +#, fuzzy +msgid "File exceeds user's quota." msgstr "Fil överstiger användaren kvot!" #: lib/mediafile.php:196 lib/mediafile.php:233 @@ -5039,7 +5040,8 @@ msgid "File could not be moved to destination directory." msgstr "Fil kunde inte flyttas till destinationskatalog." #: lib/mediafile.php:201 lib/mediafile.php:237 -msgid "Could not determine file's mime-type!" +#, fuzzy +msgid "Could not determine file's MIME type." msgstr "Kunde inte fastställa filens MIME-typ!" #: lib/mediafile.php:270 @@ -5048,8 +5050,8 @@ msgid " Try using another %s format." msgstr "Försök använda ett annat %s-format." #: lib/mediafile.php:275 -#, php-format -msgid "%s is not a supported filetype on this server." +#, fuzzy, php-format +msgid "%s is not a supported file type on this server." msgstr "%s är en filtyp som saknar stöd pÃ¥ denna server." #: lib/messageform.php:120 @@ -5082,7 +5084,17 @@ msgid "Attach a file" msgstr "Bifoga en fil" #: lib/noticeform.php:212 -msgid "Share your location" +#, fuzzy +msgid "Share my location." +msgstr "Dela din plats" + +#: lib/noticeform.php:214 +#, fuzzy +msgid "Do not share my location." +msgstr "Dela din plats" + +#: lib/noticeform.php:215 +msgid "Hide this info" msgstr "" #: lib/noticelist.php:428 @@ -5199,6 +5211,11 @@ msgstr "Dina skickade meddelanden" msgid "Tags in %s's notices" msgstr "Taggar i %ss notiser" +#: lib/plugin.php:114 +#, fuzzy +msgid "Unknown" +msgstr "Okänd funktion" + #: lib/profileaction.php:109 lib/profileaction.php:192 lib/subgroupnav.php:82 msgid "Subscriptions" msgstr "Prenumerationer" @@ -5256,23 +5273,20 @@ msgid "Popular" msgstr "Populärt" #: lib/repeatform.php:107 -#, fuzzy msgid "Repeat this notice?" -msgstr "Upprepa detta inlägg" +msgstr "Upprepa denna notis?" #: lib/repeatform.php:132 msgid "Repeat this notice" msgstr "Upprepa detta inlägg" #: lib/sandboxform.php:67 -#, fuzzy msgid "Sandbox" -msgstr "Flytta till sandlÃ¥da" +msgstr "Flytta till sandlÃ¥dan" #: lib/sandboxform.php:78 -#, fuzzy msgid "Sandbox this user" -msgstr "Flytta denna användare till sandlÃ¥da" +msgstr "Flytta denna användare till sandlÃ¥dan" #: lib/searchaction.php:120 msgid "Search site" @@ -5371,10 +5385,6 @@ msgstr "" msgid "People Tagcloud as tagged" msgstr "" -#: lib/subscriptionlist.php:126 -msgid "(none)" -msgstr "(ingen)" - #: lib/tagcloudsection.php:56 msgid "None" msgstr "Ingen" @@ -5384,14 +5394,12 @@ msgid "Top posters" msgstr "Toppostare" #: lib/unsandboxform.php:69 -#, fuzzy msgid "Unsandbox" -msgstr "Flytta frÃ¥n sandlÃ¥da" +msgstr "Flytta frÃ¥n sandlÃ¥dan" #: lib/unsandboxform.php:80 -#, fuzzy msgid "Unsandbox this user" -msgstr "Flytta denna användare frÃ¥n sandlÃ¥da" +msgstr "Flytta denna användare frÃ¥n sandlÃ¥dan" #: lib/unsilenceform.php:67 msgid "Unsilence" @@ -5490,19 +5498,3 @@ msgstr "%s är inte en giltig färg!" #, php-format msgid "%s is not a valid color! Use 3 or 6 hex chars." msgstr "%s är inte en giltig färg! Använd 3 eller 6 hexadecimala tecken." - -#: scripts/maildaemon.php:48 -msgid "Could not parse message." -msgstr "Kunde inte tolka meddelande." - -#: scripts/maildaemon.php:53 -msgid "Not a registered user." -msgstr "Inte en registrerad användare." - -#: scripts/maildaemon.php:57 -msgid "Sorry, that is not your incoming email address." -msgstr "Ledsen, det är inte din inkommande e-postadress." - -#: scripts/maildaemon.php:61 -msgid "Sorry, no incoming email allowed." -msgstr "Ledsen, ingen inkommande e-post tillÃ¥ts." diff --git a/locale/te/LC_MESSAGES/statusnet.po b/locale/te/LC_MESSAGES/statusnet.po index ffbf5a990..ac356e7da 100644 --- a/locale/te/LC_MESSAGES/statusnet.po +++ b/locale/te/LC_MESSAGES/statusnet.po @@ -8,12 +8,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-01-03 10:37+0000\n" -"PO-Revision-Date: 2010-01-03 10:38:51+0000\n" +"POT-Creation-Date: 2010-01-10 11:27+0000\n" +"PO-Revision-Date: 2010-01-10 11:29:07+0000\n" "Language-Team: Telugu\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha (r60575); Translate extension (2009-12-06)\n" +"X-Generator: MediaWiki 1.16alpha (r60888); Translate extension (2010-01-04)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: te\n" "X-Message-Group: out-statusnet\n" @@ -50,11 +50,6 @@ msgstr "à°…à°Ÿà±à°µà°‚à°Ÿà°¿ పేజీ లేదà±" msgid "No such user." msgstr "à°…à°Ÿà±à°µà°‚à°Ÿà°¿ వాడà±à°•à°°à°¿ లేరà±." -#: actions/all.php:84 -#, php-format -msgid "%s and friends, page %d" -msgstr "%s మరియౠమితà±à°°à±à°²à±, పేజీ %d" - #: actions/all.php:86 actions/all.php:167 actions/allrss.php:115 #: actions/apitimelinefriends.php:115 actions/apitimelinehome.php:115 #: lib/personalgroupnav.php:100 @@ -93,8 +88,8 @@ msgstr "ఇతరà±à°²à°•à°¿ చందా చేరండి, [à°à°¦à±ˆà°¨à°¾ #: actions/all.php:134 #, php-format msgid "" -"You can try to [nudge %s](../%s) from his profile or [post something to his " -"or her attention](%%%%action.newnotice%%%%?status_textarea=%s)." +"You can try to [nudge %1$s](../%2$s) from his profile or [post something to " +"his or her attention](%%%%action.newnotice%%%%?status_textarea=%3$s)." msgstr "" #: actions/all.php:137 actions/replies.php:209 actions/showstream.php:202 @@ -119,6 +114,23 @@ msgstr "" #: actions/apiaccountupdateprofile.php:97 #: actions/apiaccountupdateprofilebackgroundimage.php:94 #: actions/apiaccountupdateprofilecolors.php:118 +#: actions/apidirectmessage.php:156 actions/apifavoritecreate.php:99 +#: actions/apifavoritedestroy.php:100 actions/apifriendshipscreate.php:100 +#: actions/apifriendshipsdestroy.php:100 actions/apifriendshipsshow.php:129 +#: actions/apigroupcreate.php:136 actions/apigroupismember.php:114 +#: actions/apigroupjoin.php:155 actions/apigroupleave.php:141 +#: actions/apigrouplist.php:132 actions/apigrouplistall.php:120 +#: actions/apigroupmembership.php:106 actions/apigroupshow.php:105 +#: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102 +#: actions/apistatusesretweets.php:112 actions/apistatusesshow.php:108 +#: actions/apistatusnetconfig.php:133 actions/apistatusnetversion.php:93 +#: actions/apisubscriptions.php:111 actions/apitimelinefavorites.php:146 +#: actions/apitimelinefriends.php:156 actions/apitimelinegroup.php:150 +#: actions/apitimelinehome.php:156 actions/apitimelinementions.php:151 +#: actions/apitimelinepublic.php:131 actions/apitimelineretweetedbyme.php:122 +#: actions/apitimelineretweetedtome.php:121 +#: actions/apitimelineretweetsofme.php:122 actions/apitimelinetag.php:141 +#: actions/apitimelineuser.php:165 actions/apiusershow.php:101 #, fuzzy msgid "API method not found." msgstr "నిరà±à°§à°¾à°°à°£ సంకేతం కనబడలేదà±." @@ -177,6 +189,9 @@ msgstr "" #: actions/apiaccountupdateprofilebackgroundimage.php:146 #: actions/apiaccountupdateprofilecolors.php:164 #: actions/apiaccountupdateprofilecolors.php:174 +#: actions/groupdesignsettings.php:287 actions/groupdesignsettings.php:297 +#: actions/userdesignsettings.php:210 actions/userdesignsettings.php:220 +#: actions/userdesignsettings.php:263 actions/userdesignsettings.php:273 msgid "Unable to save your design settings." msgstr "" @@ -218,26 +233,6 @@ msgstr "%s à°•à°¿ నేరౠసందేశాలà±" msgid "All the direct messages sent to %s" msgstr "" -#: actions/apidirectmessage.php:156 actions/apifavoritecreate.php:99 -#: actions/apifavoritedestroy.php:100 actions/apifriendshipscreate.php:100 -#: actions/apifriendshipsdestroy.php:100 actions/apifriendshipsshow.php:129 -#: actions/apigroupcreate.php:136 actions/apigroupismember.php:114 -#: actions/apigroupjoin.php:155 actions/apigroupleave.php:141 -#: actions/apigrouplist.php:132 actions/apigrouplistall.php:120 -#: actions/apigroupmembership.php:106 actions/apigroupshow.php:105 -#: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102 -#: actions/apistatusesretweets.php:112 actions/apistatusesshow.php:108 -#: actions/apistatusnetconfig.php:133 actions/apistatusnetversion.php:93 -#: actions/apisubscriptions.php:111 actions/apitimelinefavorites.php:146 -#: actions/apitimelinefriends.php:156 actions/apitimelinegroup.php:150 -#: actions/apitimelinehome.php:156 actions/apitimelinementions.php:151 -#: actions/apitimelinepublic.php:131 actions/apitimelineretweetedbyme.php:122 -#: actions/apitimelineretweetedtome.php:121 -#: actions/apitimelineretweetsofme.php:122 actions/apitimelinetag.php:141 -#: actions/apitimelineuser.php:165 actions/apiusershow.php:101 -msgid "API method not found!" -msgstr "" - #: actions/apidirectmessagenew.php:126 msgid "No message text!" msgstr "సందేశపౠపాఠà±à°¯à°‚ లేదà±!" @@ -261,7 +256,8 @@ msgid "No status found with that ID." msgstr "" #: actions/apifavoritecreate.php:119 -msgid "This status is already a favorite!" +#, fuzzy +msgid "This status is already a favorite." msgstr "à°ˆ నోటీసౠఇపà±à°ªà°Ÿà°¿à°•à±‡ మీ ఇషà±à°Ÿà°¾à°‚శం!" #: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:176 @@ -269,7 +265,8 @@ msgid "Could not create favorite." msgstr "ఇషà±à°Ÿà°¾à°‚శానà±à°¨à°¿ సృషà±à°Ÿà°¿à°‚చలేకపోయాం." #: actions/apifavoritedestroy.php:122 -msgid "That status is not a favorite!" +#, fuzzy +msgid "That status is not a favorite." msgstr "à°† నోటీసౠఇషà±à°Ÿà°¾à°‚శం కాదà±!" #: actions/apifavoritedestroy.php:134 actions/disfavor.php:87 @@ -291,8 +288,9 @@ msgid "Could not unfollow user: User not found." msgstr "ఓపెనà±à°à°¡à±€ ఫారమà±à°¨à± సృషà±à°Ÿà°¿à°‚చలేకపోయాం: %s" #: actions/apifriendshipsdestroy.php:120 -msgid "You cannot unfollow yourself!" -msgstr "" +#, fuzzy +msgid "You cannot unfollow yourself." +msgstr "మిమà±à°®à°²à±à°¨à°¿ మీరే నిరోధించà±à°•à±‹à°²à±‡à°°à±!" #: actions/apifriendshipsexists.php:94 msgid "Two user ids or screen_names must be supplied." @@ -377,7 +375,7 @@ msgstr "మారà±à°ªà±‡à°°à± పేరà±à°¤à±‹ సమానంగా ఉం msgid "Group not found!" msgstr "à°—à±à°‚పౠదొరకలేదà±!" -#: actions/apigroupjoin.php:110 +#: actions/apigroupjoin.php:110 actions/joingroup.php:90 lib/command.php:217 msgid "You are already a member of that group." msgstr "మీరౠఇపà±à°ªà°Ÿà°¿à°•à±‡ à°† à°—à±à°‚à°ªà±à°²à±‹ à°¸à°à±à°¯à±à°²à±." @@ -385,18 +383,18 @@ msgstr "మీరౠఇపà±à°ªà°Ÿà°¿à°•à±‡ à°† à°—à±à°‚à°ªà±à°²à±‹ à°¸à°à± msgid "You have been blocked from that group by the admin." msgstr "నిరà±à°µà°¾à°¹à°•à±à°²à± à°† à°—à±à°‚పౠనà±à°‚à°¡à°¿ మిమà±à°®à°²à±à°¨à°¿ నిరోధించారà±." -#: actions/apigroupjoin.php:138 +#: actions/apigroupjoin.php:138 actions/joingroup.php:128 lib/command.php:234 #, fuzzy, php-format -msgid "Could not join user %s to group %s." +msgid "Could not join user %1$s to group %2$s." msgstr "ఓపెనà±à°à°¡à±€ ఫారమà±à°¨à± సృషà±à°Ÿà°¿à°‚చలేకపోయాం: %s" #: actions/apigroupleave.php:114 msgid "You are not a member of this group." msgstr "మీరౠఈ à°—à±à°‚à°ªà±à°²à±‹ à°¸à°à±à°¯à±à°²à± కాదà±." -#: actions/apigroupleave.php:124 -#, php-format -msgid "Could not remove user %s to group %s." +#: actions/apigroupleave.php:124 actions/leavegroup.php:127 +#, fuzzy, php-format +msgid "Could not remove user %1$s from group %2$s." msgstr "వాడà±à°•à°°à°¿ %sని %s à°—à±à°‚పౠనà±à°‚à°¡à°¿ తొలగించలేకపోయాం." #: actions/apigrouplist.php:95 @@ -404,11 +402,6 @@ msgstr "వాడà±à°•à°°à°¿ %sని %s à°—à±à°‚పౠనà±à°‚à°¡à°¿ తొ msgid "%s's groups" msgstr "%s యొకà±à°• à°—à±à°‚à°ªà±à°²à±" -#: actions/apigrouplist.php:103 -#, fuzzy, php-format -msgid "Groups %s is a member of on %s." -msgstr "మీరౠఇపà±à°ªà°Ÿà°¿à°•à±‡ లోనికి à°ªà±à°°à°µà±‡à°¶à°¿à°‚చారà±!" - #: actions/apigrouplistall.php:90 actions/usergroups.php:62 #, php-format msgid "%s groups" @@ -432,12 +425,12 @@ msgstr "ఇతర వాడà±à°•à°°à±à°² à°¸à±à°¥à°¿à°¤à°¿à°¨à°¿ మీరౠmsgid "No such notice." msgstr "à°…à°Ÿà±à°µà°‚à°Ÿà°¿ సందేశమేమీ లేదà±." -#: actions/apistatusesretweet.php:83 +#: actions/apistatusesretweet.php:83 lib/command.php:422 #, fuzzy msgid "Cannot repeat your own notice." msgstr "à°ˆ లైసెనà±à°¸à±à°•à°¿ అంగీకరించకపోతే మీరౠనమోదà±à°šà±‡à°¸à±à°•à±‹à°²à±‡à°°à±." -#: actions/apistatusesretweet.php:91 +#: actions/apistatusesretweet.php:91 lib/command.php:427 #, fuzzy msgid "Already repeated that notice." msgstr "à°ˆ నోటీసà±à°¨à°¿ తొలగించà±" @@ -451,7 +444,7 @@ msgid "No status with that ID found." msgstr "" #: actions/apistatusesupdate.php:157 actions/newnotice.php:155 -#: scripts/maildaemon.php:71 +#: lib/mailhandler.php:60 #, php-format msgid "That's too long. Max notice size is %d chars." msgstr "అది చాలా పొడవà±à°‚ది. à°—à°°à°¿à°·à±à° నోటీసౠపరిమాణం %d à°…à°•à±à°·à°°à°¾à°²à±." @@ -471,13 +464,13 @@ msgstr "" #: actions/apitimelinefavorites.php:108 #, php-format -msgid "%s / Favorites from %s" +msgid "%1$s / Favorites from %2$s" msgstr "" #: actions/apitimelinefavorites.php:120 -#, php-format -msgid "%s updates favorited by %s / %s." -msgstr "" +#, fuzzy, php-format +msgid "%1$s updates favorited by %2$s / %2$s." +msgstr "%s యొకà±à°• మైకà±à°°à±‹à°¬à±à°²à°¾à°—à±" #: actions/apitimelinegroup.php:109 actions/apitimelineuser.php:118 #: actions/grouprss.php:131 actions/userrss.php:90 @@ -544,8 +537,11 @@ msgstr "కనబడలేదà±." msgid "No such attachment." msgstr "à°…à°Ÿà±à°µà°‚à°Ÿà°¿ జోడింపౠలేదà±." -#: actions/avatarbynickname.php:59 actions/grouprss.php:91 -#: actions/leavegroup.php:76 +#: actions/avatarbynickname.php:59 actions/blockedfromgroup.php:73 +#: actions/editgroup.php:84 actions/groupdesignsettings.php:84 +#: actions/grouplogo.php:86 actions/groupmembers.php:76 +#: actions/grouprss.php:91 actions/joingroup.php:76 actions/leavegroup.php:76 +#: actions/showgroup.php:121 #, fuzzy msgid "No nickname." msgstr "పేరౠలేదà±." @@ -569,8 +565,8 @@ msgid "You can upload your personal avatar. The maximum file size is %s." msgstr "మీ à°µà±à°¯à°•à±à°¤à°¿à°—à°¤ అవతారానà±à°¨à°¿ మీరౠఎకà±à°•à°¿à°‚చవచà±à°šà±. à°—à°°à°¿à°·à±à° ఫైలౠపరిమాణం %s." #: actions/avatarsettings.php:106 actions/avatarsettings.php:185 -#: actions/grouplogo.php:178 actions/remotesubscribe.php:191 -#: actions/userauthorization.php:72 actions/userrss.php:103 +#: actions/remotesubscribe.php:191 actions/userauthorization.php:72 +#: actions/userrss.php:103 msgid "User without matching profile" msgstr "" @@ -602,9 +598,9 @@ msgstr "à°Žà°—à±à°®à°¤à°¿à°‚à°šà±" msgid "Crop" msgstr "à°•à°¤à±à°¤à°¿à°°à°¿à°‚à°šà±" -#: actions/avatarsettings.php:268 actions/disfavor.php:74 -#: actions/emailsettings.php:238 actions/favor.php:75 actions/geocode.php:50 -#: actions/groupblock.php:66 actions/grouplogo.php:309 +#: actions/avatarsettings.php:268 actions/deletenotice.php:157 +#: actions/disfavor.php:74 actions/emailsettings.php:238 actions/favor.php:75 +#: actions/geocode.php:50 actions/groupblock.php:66 actions/grouplogo.php:309 #: actions/groupunblock.php:66 actions/imsettings.php:206 #: actions/invite.php:56 actions/login.php:135 actions/makeadmin.php:66 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80 @@ -683,20 +679,15 @@ msgstr "à°ˆ వాడà±à°•à°°à°¿à°¨à°¿ నిరోధించà±" msgid "Failed to save block information." msgstr "నిరోధపౠసమాచారానà±à°¨à°¿ à°à°¦à±à°°à°ªà°°à°šà°¡à°‚లో విఫలమయà±à°¯à°¾à°‚." -#: actions/blockedfromgroup.php:73 actions/editgroup.php:84 -#: actions/groupdesignsettings.php:84 actions/grouplogo.php:86 -#: actions/groupmembers.php:76 actions/joingroup.php:76 -#: actions/showgroup.php:121 -#, fuzzy -msgid "No nickname" -msgstr "పేరౠలేదà±." - #: actions/blockedfromgroup.php:80 actions/editgroup.php:96 +#: actions/foafgroup.php:44 actions/foafgroup.php:62 actions/groupblock.php:86 #: actions/groupbyid.php:83 actions/groupdesignsettings.php:97 #: actions/grouplogo.php:99 actions/groupmembers.php:83 -#: actions/joingroup.php:83 actions/showgroup.php:137 -msgid "No such group" -msgstr "à°…à°Ÿà±à°µà°‚à°Ÿà°¿ à°—à±à°‚పౠలేదà±" +#: actions/grouprss.php:98 actions/groupunblock.php:86 +#: actions/joingroup.php:83 actions/leavegroup.php:83 actions/makeadmin.php:86 +#: actions/showgroup.php:137 lib/command.php:212 lib/command.php:263 +msgid "No such group." +msgstr "à°…à°Ÿà±à°µà°‚à°Ÿà°¿ à°—à±à°‚పౠలేదà±." #: actions/blockedfromgroup.php:90 #, fuzzy, php-format @@ -705,7 +696,7 @@ msgstr "వాడà±à°•à°°à°¿à°•à°¿ à°ªà±à°°à±Šà°«à±ˆà°²à± లేదà±." #: actions/blockedfromgroup.php:93 #, fuzzy, php-format -msgid "%s blocked profiles, page %d" +msgid "%1$s blocked profiles, page %2$d" msgstr "%s మరియౠమితà±à°°à±à°²à±" #: actions/blockedfromgroup.php:108 @@ -818,10 +809,6 @@ msgstr "à°ˆ నోటీసà±à°¨à°¿ తొలగించకà±" msgid "Delete this notice" msgstr "à°ˆ నోటీసà±à°¨à°¿ తొలగించà±" -#: actions/deletenotice.php:157 -msgid "There was a problem with your session token. Try again, please." -msgstr "" - #: actions/deleteuser.php:67 msgid "You cannot delete users." msgstr "మీరౠవాడà±à°•à°°à±à°²à°¨à°¿ తొలగించలేరà±." @@ -847,7 +834,7 @@ msgid "Delete this user" msgstr "à°ˆ వాడà±à°•à°°à°¿à°¨à°¿ తొలగించà±" #: actions/designadminpanel.php:62 lib/accountsettingsaction.php:124 -#: lib/adminpanelaction.php:302 lib/groupnav.php:119 +#: lib/adminpanelaction.php:316 lib/groupnav.php:119 msgid "Design" msgstr "రూపà±à°°à±‡à°–à°²à±" @@ -985,7 +972,8 @@ msgstr "à°—à±à°‚à°ªà±à°¨à°¿ సృషà±à°Ÿà°¿à°‚చడానికి మీà #: actions/editgroup.php:103 actions/editgroup.php:168 #: actions/groupdesignsettings.php:104 actions/grouplogo.php:106 -msgid "You must be an admin to edit the group" +#, fuzzy +msgid "You must be an admin to edit the group." msgstr "à°—à±à°‚à°ªà±à°¨à°¿ మారà±à°šà°¡à°¾à°¨à°¿à°•à°¿ మీరౠనిరà±à°µà°¾à°¹à°•à±à°²à°¯à°¿ ఉండాలి." #: actions/editgroup.php:154 @@ -1010,7 +998,8 @@ msgid "Options saved." msgstr "ఎంపికలౠà°à°¦à±à°°à°®à°¯à±à°¯à°¾à°¯à°¿." #: actions/emailsettings.php:60 -msgid "Email Settings" +#, fuzzy +msgid "Email settings" msgstr "ఈమెయిలౠఅమరికలà±" #: actions/emailsettings.php:71 @@ -1045,8 +1034,9 @@ msgid "Cancel" msgstr "à°°à°¦à±à°¦à±à°šà±‡à°¯à°¿" #: actions/emailsettings.php:121 -msgid "Email Address" -msgstr "ఈమెయిలౠచిరà±à°¨à°¾à°®à°¾" +#, fuzzy +msgid "Email address" +msgstr "ఈమెయిలౠచిరà±à°¨à°¾à°®à°¾à°²à±" #: actions/emailsettings.php:123 msgid "Email address, like \"UserName@example.org\"" @@ -1119,9 +1109,10 @@ msgstr "ఈమెయిలౠచిరà±à°¨à°¾à°®à°¾ లేదà±." msgid "Cannot normalize that email address" msgstr "" -#: actions/emailsettings.php:331 actions/siteadminpanel.php:157 -msgid "Not a valid email address" -msgstr "సరైన ఈమెయిలౠచిరà±à°¨à°¾à°®à°¾ కాదà±" +#: actions/emailsettings.php:331 actions/register.php:201 +#: actions/siteadminpanel.php:157 +msgid "Not a valid email address." +msgstr "సరైన ఈమెయిలౠచిరà±à°¨à°¾à°®à°¾ కాదà±:" #: actions/emailsettings.php:334 msgid "That is already your email address." @@ -1296,18 +1287,11 @@ msgstr "" msgid "Error updating remote profile" msgstr "దూరపౠపà±à°°à±Šà°ªà±ˆà°²à±à°¨à°¿ తాజాకరించటంలో పొరపాటà±" -#: actions/foafgroup.php:44 actions/foafgroup.php:62 actions/groupblock.php:86 -#: actions/grouprss.php:98 actions/groupunblock.php:86 -#: actions/leavegroup.php:83 actions/makeadmin.php:86 lib/command.php:212 -#: lib/command.php:263 -msgid "No such group." -msgstr "à°…à°Ÿà±à°µà°‚à°Ÿà°¿ à°—à±à°‚పౠలేదà±." - -#: actions/getfile.php:75 +#: actions/getfile.php:79 msgid "No such file." msgstr "à°…à°Ÿà±à°µà°‚à°Ÿà°¿ ఫైలౠలేదà±." -#: actions/getfile.php:79 +#: actions/getfile.php:83 msgid "Cannot read file." msgstr "ఫైలà±à°¨à°¿ చదవలేకపోతà±à°¨à±à°¨à°¾à°‚." @@ -1319,7 +1303,7 @@ msgstr "" #: actions/groupblock.php:76 actions/groupunblock.php:76 #: actions/makeadmin.php:76 actions/subedit.php:53 actions/tagother.php:46 -#: lib/profileformaction.php:77 +#: actions/unsubscribe.php:84 lib/profileformaction.php:77 msgid "No profile with that ID." msgstr "" @@ -1347,9 +1331,9 @@ msgstr "వాడà±à°•à°°à°¿à°¨à°¿ à°—à±à°‚పౠనà±à°‚à°¡à°¿ నిరో #: actions/groupblock.php:162 #, php-format msgid "" -"Are you sure you want to block user \"%s\" from the group \"%s\"? They will " -"be removed from the group, unable to post, and unable to subscribe to the " -"group in the future." +"Are you sure you want to block user \"%1$s\" from the group \"%2$s\"? They " +"will be removed from the group, unable to post, and unable to subscribe to " +"the group in the future." msgstr "" #: actions/groupblock.php:178 @@ -1364,9 +1348,10 @@ msgstr "à°ˆ à°—à±à°‚à°ªà±à°¨à±à°‚à°¡à°¿ à°ˆ వాడà±à°•à°°à°¿à°¨à°¿ నఠmsgid "Database error blocking user from group." msgstr "" -#: actions/groupbyid.php:74 -msgid "No ID" -msgstr "" +#: actions/groupbyid.php:74 actions/userbyid.php:70 +#, fuzzy +msgid "No ID." +msgstr "à°à°¡à±€ లేదà±." #: actions/groupdesignsettings.php:68 msgid "You must be logged in to edit a group." @@ -1387,12 +1372,6 @@ msgstr "" msgid "Couldn't update your design." msgstr "మీ రూపà±à°°à±‡à°–లని తాజాకరించలేకపోయాం." -#: actions/groupdesignsettings.php:287 actions/groupdesignsettings.php:297 -#: actions/userdesignsettings.php:210 actions/userdesignsettings.php:220 -#: actions/userdesignsettings.php:263 actions/userdesignsettings.php:273 -msgid "Unable to save your design settings!" -msgstr "" - #: actions/groupdesignsettings.php:308 actions/userdesignsettings.php:231 #, fuzzy msgid "Design preferences saved." @@ -1408,6 +1387,11 @@ msgid "" "You can upload a logo image for your group. The maximum file size is %s." msgstr "మీ à°—à±à°‚à°ªà±à°•à°¿ మీరౠఒక à°šà°¿à°¹à±à°¨à°¾à°¨à±à°¨à°¿ à°Žà°•à±à°•à°¿à°‚చవచà±à°šà±. à°† ఫైలౠయొకà±à°• à°—à°°à°¿à°·à±à° పరిమాణం %s." +#: actions/grouplogo.php:178 +#, fuzzy +msgid "User without matching profile." +msgstr "వాడà±à°•à°°à°¿à°•à°¿ à°ªà±à°°à±Šà°«à±ˆà°²à± లేదà±." + #: actions/grouplogo.php:362 msgid "Pick a square area of the image to be the logo." msgstr "à°šà°¿à°¹à±à°¨à°‚à°—à°¾ ఉండాలà±à°¸à°¿à°¨ à°šà°¤à±à°°à°¸à±à°¤à±à°° à°ªà±à°°à°¦à±‡à°¶à°¾à°¨à±à°¨à°¿ బొమà±à°® à°¨à±à°‚à°¡à°¿ à°Žà°‚à°šà±à°•à±‹à°‚à°¡à°¿." @@ -1426,15 +1410,15 @@ msgid "%s group members" msgstr "%s à°—à±à°‚పౠసà°à±à°¯à±à°²à±" #: actions/groupmembers.php:96 -#, php-format -msgid "%s group members, page %d" +#, fuzzy, php-format +msgid "%1$s group members, page %2$d" msgstr "%s à°—à±à°‚పౠసà°à±à°¯à±à°²à±, పేజీ %d" #: actions/groupmembers.php:111 msgid "A list of the users in this group." msgstr "à°ˆ à°—à±à°‚à°ªà±à°²à±‹ వాడà±à°•à°°à±à°²à± జాబితా." -#: actions/groupmembers.php:175 lib/action.php:441 lib/groupnav.php:107 +#: actions/groupmembers.php:175 lib/action.php:442 lib/groupnav.php:107 msgid "Admin" msgstr "" @@ -1529,7 +1513,8 @@ msgid "Error removing the block." msgstr "నిరోధానà±à°¨à°¿ తొలగించడంలో పొరపాటà±." #: actions/imsettings.php:59 -msgid "IM Settings" +#, fuzzy +msgid "IM settings" msgstr "IM అమరికలà±" #: actions/imsettings.php:70 @@ -1555,7 +1540,8 @@ msgid "" msgstr "" #: actions/imsettings.php:124 -msgid "IM Address" +#, fuzzy +msgid "IM address" msgstr "IM à°šà°¿à°°à±à°¨à°¾à°®à°¾" #: actions/imsettings.php:126 @@ -1612,11 +1598,6 @@ msgstr "" msgid "That is not your Jabber ID." msgstr "ఇది మీ Jabber ID కాదà±" -#: actions/inbox.php:59 -#, php-format -msgid "Inbox for %s - page %d" -msgstr "%sà°•à°¿ వచà±à°šà°¿à°¨à°µà°¿ - పేజీ %d" - #: actions/inbox.php:62 #, php-format msgid "Inbox for %s" @@ -1652,10 +1633,10 @@ msgstr "కొతà±à°¤ వాడà±à°•à°°à±à°²à°¨à°¿ ఆహà±à°µà°¾à°¨à°¿à°‚à msgid "You are already subscribed to these users:" msgstr "మీరౠఇపà±à°ªà°Ÿà°¿à°•à±‡ à°ˆ వాడà±à°•à°°à±à°²à°•à± చందాచేరి ఉనà±à°¨à°¾à°°à±:" -#: actions/invite.php:131 actions/invite.php:139 +#: actions/invite.php:131 actions/invite.php:139 lib/command.php:315 #, php-format -msgid "%s (%s)" -msgstr "%s (%s)" +msgid "%1$s (%2$s)" +msgstr "%1$s (%2$s)" #: actions/invite.php:136 msgid "" @@ -1693,7 +1674,7 @@ msgstr "à°µà±à°¯à°•à±à°¤à°¿à°—à°¤ సందేశం" msgid "Optionally add a personal message to the invitation." msgstr "à°à°šà±à°›à°¿à°•à°‚à°—à°¾ ఆహà±à°µà°¾à°¨à°¾à°¨à°¿à°•à°¿ à°µà±à°¯à°•à±à°¤à°¿à°—à°¤ సందేశం చేరà±à°šà°‚à°¡à°¿." -#: actions/invite.php:197 lib/messageform.php:178 lib/noticeform.php:232 +#: actions/invite.php:197 lib/messageform.php:178 lib/noticeform.php:234 msgid "Send" msgstr "పంపించà±" @@ -1737,18 +1718,9 @@ msgstr "" msgid "You must be logged in to join a group." msgstr "à°—à±à°‚à°ªà±à°²à±à°²à±‹ చేరడానికి మీరౠపà±à°°à°µà±‡à°¶à°¿à°‚à°šà°¿ ఉండాలి." -#: actions/joingroup.php:90 lib/command.php:217 -msgid "You are already a member of that group" -msgstr "మీరౠఇపà±à°ªà°Ÿà°¿à°•à±‡ à°† à°—à±à°‚à°ªà±à°²à±‹ à°¸à°à±à°¯à±à°²à±" - -#: actions/joingroup.php:128 lib/command.php:234 -#, php-format -msgid "Could not join user %s to group %s" -msgstr "వాడà±à°•à°°à°¿ %sని %s à°—à±à°‚à°ªà±à°²à±‹ చేరà±à°šà°²à±‡à°•à°ªà±‹à°¯à°¾à°‚" - #: actions/joingroup.php:135 lib/command.php:239 -#, php-format -msgid "%s joined group %s" +#, fuzzy, php-format +msgid "%1$s joined group %2$s" msgstr "%s %s à°—à±à°‚à°ªà±à°²à±‹ చేరారà±" #: actions/leavegroup.php:60 @@ -1763,14 +1735,9 @@ msgstr "మీరౠఆ à°—à±à°‚à°ªà±à°²à±‹ à°¸à°à±à°¯à±à°²à± కాదౠmsgid "Could not find membership record." msgstr "" -#: actions/leavegroup.php:127 lib/command.php:284 -#, php-format -msgid "Could not remove user %s to group %s" -msgstr "వాడà±à°•à°°à°¿ %sని %s à°—à±à°‚పౠనà±à°‚à°¡à°¿ తొలగించలేకపోయాం" - #: actions/leavegroup.php:134 lib/command.php:289 -#, php-format -msgid "%s left group %s" +#, fuzzy, php-format +msgid "%1$s left group %2$s" msgstr "%2$s à°—à±à°‚పౠనà±à°‚à°¡à°¿ %1$s వైదొలిగారà±" #: actions/login.php:83 actions/register.php:137 @@ -1790,7 +1757,7 @@ msgstr "వాడà±à°•à°°à°¿à°ªà±‡à°°à± లేదా సంకేతపదం msgid "Error setting user. You are probably not authorized." msgstr "" -#: actions/login.php:208 actions/login.php:261 lib/action.php:459 +#: actions/login.php:208 actions/login.php:261 lib/action.php:460 #: lib/logingroupnav.php:79 msgid "Login" msgstr "à°ªà±à°°à°µà±‡à°¶à°¿à°‚à°šà°‚à°¡à°¿" @@ -1843,19 +1810,19 @@ msgid "Only an admin can make another user an admin." msgstr "నిరà±à°µà°¾à°¹à°•à±à°²à± మాతà±à°°à°®à±‡ మరొక వాడà±à°•à°°à°¿à°¨à°¿ నిరà±à°µà°¾à°¹à°•à±à°¨à°¿à°—à°¾ చేయగలరà±." #: actions/makeadmin.php:95 -#, php-format -msgid "%s is already an admin for group \"%s\"." +#, fuzzy, php-format +msgid "%1$s is already an admin for group \"%2$s\"." msgstr "%s ఇపà±à°ªà°Ÿà°¿à°•à±‡ \"%s\" à°—à±à°‚పౠయొకà±à°• à°’à°• నిరà±à°µà°¾à°•à±à°²à±." #: actions/makeadmin.php:132 -#, php-format -msgid "Can't get membership record for %s in group %s" -msgstr "" +#, fuzzy, php-format +msgid "Can't get membership record for %1$s in group %2$s." +msgstr "వాడà±à°•à°°à°¿ %sని %s à°—à±à°‚పౠనà±à°‚à°¡à°¿ తొలగించలేకపోయాం" #: actions/makeadmin.php:145 -#, php-format -msgid "Can't make %s an admin for group %s" -msgstr "" +#, fuzzy, php-format +msgid "Can't make %1$s an admin for group %2$s." +msgstr "%s ఇపà±à°ªà°Ÿà°¿à°•à±‡ \"%s\" à°—à±à°‚పౠయొకà±à°• à°’à°• నిరà±à°µà°¾à°•à±à°²à±." #: actions/microsummary.php:69 msgid "No current status" @@ -1896,8 +1863,8 @@ msgid "Message sent" msgstr "సందేశానà±à°¨à°¿ పంపించాం" #: actions/newmessage.php:185 lib/command.php:376 -#, php-format -msgid "Direct message to %s sent" +#, fuzzy, php-format +msgid "Direct message to %s sent." msgstr "%sà°•à°¿ నేరౠసందేశానà±à°¨à°¿ పంపించాం" #: actions/newmessage.php:210 actions/newnotice.php:245 lib/channel.php:170 @@ -1927,8 +1894,8 @@ msgid "Text search" msgstr "పాఠà±à°¯ à°…à°¨à±à°µà±‡à°·à°£" #: actions/noticesearch.php:91 -#, php-format -msgid "Search results for \"%s\" on %s" +#, fuzzy, php-format +msgid "Search results for \"%1$s\" on %2$s" msgstr "%2$sలో \"%1$s\"కై à°…à°¨à±à°µà±‡à°·à°£ ఫలితాలà±" #: actions/noticesearch.php:121 @@ -2031,11 +1998,6 @@ msgstr "" msgid "URL shortening service is too long (max 50 chars)." msgstr "URL à°•à±à°¦à°¿à°‚పౠసేవ మరీ పెదà±à°¦à°—à°¾ ఉంది (50 à°…à°•à±à°·à°°à°¾à°²à± à°—à°°à°¿à°·à±à° à°‚)." -#: actions/outbox.php:58 -#, php-format -msgid "Outbox for %s - page %d" -msgstr "" - #: actions/outbox.php:61 #, php-format msgid "Outbox for %s" @@ -2106,7 +2068,7 @@ msgstr "కొతà±à°¤ సంకేతపదానà±à°¨à°¿ à°à°¦à±à°°à°ªà°°à msgid "Password saved." msgstr "సంకేతపదం à°à°¦à±à°°à°®à°¯à±à°¯à°¿à°‚ది." -#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:308 +#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:326 msgid "Paths" msgstr "" @@ -2139,7 +2101,7 @@ msgid "Invalid SSL server. The maximum length is 255 characters." msgstr "" #: actions/pathsadminpanel.php:217 actions/siteadminpanel.php:58 -#: lib/adminpanelaction.php:299 +#: lib/adminpanelaction.php:311 msgid "Site" msgstr "సైటà±" @@ -2174,7 +2136,7 @@ msgstr "" #: actions/pathsadminpanel.php:245 msgid "Theme directory" -msgstr "" +msgstr "అలంకార సంచయం" #: actions/pathsadminpanel.php:252 msgid "Avatars" @@ -2191,9 +2153,8 @@ msgid "Avatar path" msgstr "అవతారానà±à°¨à°¿ తాజాకరించాం." #: actions/pathsadminpanel.php:265 -#, fuzzy msgid "Avatar directory" -msgstr "అవతారానà±à°¨à°¿ తొలగించాం." +msgstr "అవతారాల సంచయం" #: actions/pathsadminpanel.php:274 msgid "Backgrounds" @@ -2239,8 +2200,9 @@ msgid "When to use SSL" msgstr "" #: actions/pathsadminpanel.php:308 -msgid "SSL Server" -msgstr "" +#, fuzzy +msgid "SSL server" +msgstr "వైదొలగà±" #: actions/pathsadminpanel.php:309 msgid "Server to direct SSL requests to" @@ -2270,9 +2232,9 @@ msgid "Not a valid people tag: %s" msgstr "సరైన ఈమెయిలౠచిరà±à°¨à°¾à°®à°¾ కాదà±:" #: actions/peopletag.php:144 -#, php-format -msgid "Users self-tagged with %s - page %d" -msgstr "" +#, fuzzy, php-format +msgid "Users self-tagged with %1$s - page %2$d" +msgstr "%s యొకà±à°• మైకà±à°°à±‹à°¬à±à°²à°¾à°—à±" #: actions/postnotice.php:84 msgid "Invalid notice content" @@ -2280,7 +2242,7 @@ msgstr "సందేశపౠవిషయం సరైనది కాదà±" #: actions/postnotice.php:90 #, php-format -msgid "Notice license ‘%s’ is not compatible with site license ‘%s’." +msgid "Notice license ‘%1$s’ is not compatible with site license ‘%2$s’." msgstr "" #: actions/profilesettings.php:60 @@ -2399,20 +2361,20 @@ msgstr "'%s' అనే హోమౠపేజీ సరైనదికాదà±" msgid "Couldn't update user for autosubscribe." msgstr "" -#: actions/profilesettings.php:354 +#: actions/profilesettings.php:359 #, fuzzy msgid "Couldn't save location prefs." msgstr "à°Ÿà±à°¯à°¾à°—à±à°²à°¨à°¿ à°à°¦à±à°°à°ªà°°à°šà°²à±‡à°•à±à°¨à±à°¨à°¾à°‚." -#: actions/profilesettings.php:366 +#: actions/profilesettings.php:371 msgid "Couldn't save profile." msgstr "à°ªà±à°°à±Šà°«à±ˆà°²à±à°¨à°¿ à°à°¦à±à°°à°ªà°°à°šà°²à±‡à°•à±à°¨à±à°¨à°¾à°‚." -#: actions/profilesettings.php:374 +#: actions/profilesettings.php:379 msgid "Couldn't save tags." msgstr "à°Ÿà±à°¯à°¾à°—à±à°²à°¨à°¿ à°à°¦à±à°°à°ªà°°à°šà°²à±‡à°•à±à°¨à±à°¨à°¾à°‚." -#: actions/profilesettings.php:382 lib/adminpanelaction.php:126 +#: actions/profilesettings.php:387 lib/adminpanelaction.php:137 msgid "Settings saved." msgstr "అమరికలౠà°à°¦à±à°°à°®à°¯à±à°¯à°¾à°¯à°¿." @@ -2509,7 +2471,7 @@ msgid "" "one!" msgstr "" -#: actions/publictagcloud.php:135 +#: actions/publictagcloud.php:131 msgid "Tag cloud" msgstr "à°Ÿà±à°¯à°¾à°—ౠమేఘం" @@ -2646,7 +2608,7 @@ msgstr "à°•à±à°·à°®à°¿à°‚à°šà°‚à°¡à°¿, తపà±à°ªà± ఆహà±à°µà°¾à°¨ సఠmsgid "Registration successful" msgstr "నమోదౠవిజయవంతం" -#: actions/register.php:114 actions/register.php:502 lib/action.php:456 +#: actions/register.php:114 actions/register.php:502 lib/action.php:457 #: lib/logingroupnav.php:85 msgid "Register" msgstr "నమోదà±" @@ -2659,10 +2621,6 @@ msgstr "" msgid "You can't register if you don't agree to the license." msgstr "à°ˆ లైసెనà±à°¸à±à°•à°¿ అంగీకరించకపోతే మీరౠనమోదà±à°šà±‡à°¸à±à°•à±‹à°²à±‡à°°à±." -#: actions/register.php:201 -msgid "Not a valid email address." -msgstr "సరైన ఈమెయిలౠచిరà±à°¨à°¾à°®à°¾ కాదà±:" - #: actions/register.php:212 msgid "Email address already exists." msgstr "ఈమెయిలౠచిరà±à°¨à°¾à°®à°¾ ఇపà±à°ªà°Ÿà°¿à°•à±‡ ఉంది." @@ -2719,10 +2677,10 @@ msgstr " à°ˆ అంతరంగిక à°à±‹à°—à°Ÿà±à°Ÿà°¾ తపà±à°ª: సం #: actions/register.php:537 #, php-format msgid "" -"Congratulations, %s! And welcome to %%%%site.name%%%%. From here, you may " +"Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may " "want to...\n" "\n" -"* Go to [your profile](%s) and post your first message.\n" +"* Go to [your profile](%2$s) and post your first message.\n" "* Add a [Jabber/GTalk address](%%%%action.imsettings%%%%) so you can send " "notices through instant messages.\n" "* [Search for people](%%%%action.peoplesearch%%%%) that you may know or that " @@ -2830,11 +2788,6 @@ msgstr "సృషà±à°Ÿà°¿à°¤à°‚" msgid "Replies to %s" msgstr "%sà°•à°¿ à°¸à±à°ªà°‚దనలà±" -#: actions/replies.php:127 -#, php-format -msgid "Replies to %s, page %d" -msgstr "%sà°•à°¿ à°¸à±à°ªà°‚దనలà±, పేజీ %d" - #: actions/replies.php:144 #, fuzzy, php-format msgid "Replies feed for %s (RSS 1.0)" @@ -2851,11 +2804,11 @@ msgid "Replies feed for %s (Atom)" msgstr "%s యొకà±à°• సందేశమà±à°² ఫీడà±" #: actions/replies.php:198 -#, php-format +#, fuzzy, php-format msgid "" -"This is the timeline showing replies to %s but %s hasn't received a notice " -"to his attention yet." -msgstr "" +"This is the timeline showing replies to %1$s but %2$s hasn't received a " +"notice to his attention yet." +msgstr "ఇది %s మరియౠమితà±à°°à±à°² కాలరేఖ కానీ ఇంకా ఎవరూ à°à°®à±€ రాయలేదà±." #: actions/replies.php:203 #, php-format @@ -2867,8 +2820,8 @@ msgstr "" #: actions/replies.php:205 #, php-format msgid "" -"You can try to [nudge %s](../%s) or [post something to his or her attention]" -"(%%%%action.newnotice%%%%?status_textarea=%s)." +"You can try to [nudge %1$s](../%2$s) or [post something to his or her " +"attention](%%%%action.newnotice%%%%?status_textarea=%3$s)." msgstr "" #: actions/repliesrss.php:72 @@ -2886,11 +2839,6 @@ msgstr "మీరౠఇపà±à°ªà°Ÿà°¿à°•à±‡ లోనికి à°ªà±à°°à°µà±‡ msgid "User is already sandboxed." msgstr "వాడà±à°•à°°à°¿à°¨à°¿ ఇపà±à°ªà°Ÿà°¿à°•à±‡ à°—à±à°‚à°ªà±à°¨à±à°‚à°¡à°¿ నిరోధించారà±." -#: actions/showfavorites.php:79 -#, php-format -msgid "%s's favorite notices, page %d" -msgstr "%sà°•à°¿ ఇషà±à°Ÿà°®à±ˆà°¨ నోటీసà±à°²à±, పేజీ %d" - #: actions/showfavorites.php:132 msgid "Could not retrieve favorite notices." msgstr "" @@ -2940,11 +2888,6 @@ msgstr "మీకౠనచà±à°šà°¿à°¨à°µà°¿ పంచà±à°•à±‹à°¡à°¾à°¨à°¿à°•à msgid "%s group" msgstr "%s à°—à±à°‚à°ªà±" -#: actions/showgroup.php:84 -#, php-format -msgid "%s group, page %d" -msgstr "%s à°—à±à°‚à°ªà±, పేజీ %d" - #: actions/showgroup.php:218 msgid "Group profile" msgstr "à°—à±à°‚పౠపà±à°°à±Šà°«à±ˆà°²à±" @@ -2993,7 +2936,7 @@ msgstr "à°¸à°à±à°¯à±à°²à±" #: actions/showgroup.php:386 lib/profileaction.php:117 #: lib/profileaction.php:148 lib/profileaction.php:236 lib/section.php:95 -#: lib/tagcloudsection.php:71 +#: lib/subscriptionlist.php:126 lib/tagcloudsection.php:71 msgid "(None)" msgstr "(à°à°®à±€à°²à±‡à°¦à±)" @@ -3059,14 +3002,9 @@ msgstr "నోటీసà±à°¨à°¿ తొలగించాం." msgid " tagged %s" msgstr "" -#: actions/showstream.php:79 -#, php-format -msgid "%s, page %d" -msgstr "%s, పేజీ %d" - #: actions/showstream.php:122 #, fuzzy, php-format -msgid "Notice feed for %s tagged %s (RSS 1.0)" +msgid "Notice feed for %1$s tagged %2$s (RSS 1.0)" msgstr "%s యొకà±à°• సందేశమà±à°² ఫీడà±" #: actions/showstream.php:129 @@ -3090,9 +3028,9 @@ msgid "FOAF for %s" msgstr "" #: actions/showstream.php:191 -#, php-format -msgid "This is the timeline for %s but %s hasn't posted anything yet." -msgstr "" +#, fuzzy, php-format +msgid "This is the timeline for %1$s but %2$s hasn't posted anything yet." +msgstr "ఇది %s మరియౠమితà±à°°à±à°² కాలరేఖ కానీ ఇంకా ఎవరూ à°à°®à±€ రాయలేదà±." #: actions/showstream.php:196 msgid "" @@ -3103,8 +3041,8 @@ msgstr "" #: actions/showstream.php:198 #, php-format msgid "" -"You can try to nudge %s or [post something to his or her attention](%%%%" -"action.newnotice%%%%?status_textarea=%s)." +"You can try to nudge %1$s or [post something to his or her attention](%%%%" +"action.newnotice%%%%?status_textarea=%2$s)." msgstr "" #: actions/showstream.php:234 @@ -3147,12 +3085,13 @@ msgid "Site name must have non-zero length." msgstr "" #: actions/siteadminpanel.php:154 -msgid "You must have a valid contact email address" +#, fuzzy +msgid "You must have a valid contact email address." msgstr "మీకౠసరైన సంపà±à°°à°¦à°¿à°‚పౠఈమెయిలౠచిరà±à°¨à°¾à°®à°¾ ఉండాలి" #: actions/siteadminpanel.php:172 -#, php-format -msgid "Unknown language \"%s\"" +#, fuzzy, php-format +msgid "Unknown language \"%s\"." msgstr "à°—à±à°°à±à°¤à± తెలియని à°à°¾à°· \"%s\"" #: actions/siteadminpanel.php:179 @@ -3185,7 +3124,7 @@ msgstr "సైటౠపేరà±" #: actions/siteadminpanel.php:257 msgid "The name of your site, like \"Yourcompany Microblog\"" -msgstr "" +msgstr "మీ సైటౠయొకà±à°• పేరà±, ఇలా \"మీకంపెనీ మైకà±à°°à±‹à°¬à±à°²à°¾à°—à±\"" #: actions/siteadminpanel.php:261 msgid "Brought by" @@ -3258,7 +3197,7 @@ msgstr "అంతరంగికం" #: actions/siteadminpanel.php:323 msgid "Prohibit anonymous users (not logged in) from viewing site?" -msgstr "" +msgstr "à°…à°œà±à°žà°¾à°¤ (à°ªà±à°°à°µà±‡à°¶à°¿à°‚చని) వాడà±à°•à°°à±à°²à°¨à°¿ సైటà±à°¨à°¿ చూడకà±à°‚à°¡à°¾ నిషేధించాలా?" #: actions/siteadminpanel.php:327 msgid "Invite only" @@ -3266,7 +3205,7 @@ msgstr "ఆహà±à°µà°¾à°¨à°¿à°¤à±à°²à°•à± మాతà±à°°à°®à±‡" #: actions/siteadminpanel.php:329 msgid "Make registration invitation only." -msgstr "" +msgstr "ఆహà±à°µà°¾à°¨à°¿à°¤à±à°²à± మాతà±à°°à°®à±‡ నమోదౠఅవà±à°µà°—లిగేలా చెయà±à°¯à°¿." #: actions/siteadminpanel.php:333 #, fuzzy @@ -3338,7 +3277,8 @@ msgid "Save site settings" msgstr "సైటౠఅమరికలనౠà°à°¦à±à°°à°ªà°°à°šà±" #: actions/smssettings.php:58 -msgid "SMS Settings" +#, fuzzy +msgid "SMS settings" msgstr "SMS అమరికలà±" #: actions/smssettings.php:69 @@ -3357,7 +3297,7 @@ msgstr "" #: actions/smssettings.php:123 msgid "Awaiting confirmation on this phone number." -msgstr "" +msgstr "à°ˆ ఫోనౠనంబరౠయొకà±à°• నిరà±à°§à°¾à°°à°£à°•à±ˆ వేచివà±à°‚ది." #: actions/smssettings.php:130 msgid "Confirmation code" @@ -3368,7 +3308,7 @@ msgid "Enter the code you received on your phone." msgstr "" #: actions/smssettings.php:138 -msgid "SMS Phone number" +msgid "SMS phone number" msgstr "" #: actions/smssettings.php:140 @@ -3455,8 +3395,8 @@ msgid "%s subscribers" msgstr "%s చందాదారà±à°²à±" #: actions/subscribers.php:52 -#, php-format -msgid "%s subscribers, page %d" +#, fuzzy, php-format +msgid "%1$s subscribers, page %2$d" msgstr "%s చందాదారà±à°²à±, పేజీ %d" #: actions/subscribers.php:63 @@ -3492,8 +3432,8 @@ msgid "%s subscriptions" msgstr "%s చందాలà±" #: actions/subscriptions.php:54 -#, php-format -msgid "%s subscriptions, page %d" +#, fuzzy, php-format +msgid "%1$s subscriptions, page %2$d" msgstr "%s చందాలà±, పేజీ %d" #: actions/subscriptions.php:65 @@ -3528,11 +3468,6 @@ msgstr "జాబరà±" msgid "SMS" msgstr "" -#: actions/tag.php:68 -#, fuzzy, php-format -msgid "Notices tagged with %s, page %d" -msgstr "%s యొకà±à°• మైకà±à°°à±‹à°¬à±à°²à°¾à°—à±" - #: actions/tag.php:86 #, fuzzy, php-format msgid "Notice feed for tag %s (RSS 1.0)" @@ -3615,10 +3550,6 @@ msgstr "వాడà±à°•à°°à°¿à°•à°¿ à°ªà±à°°à±Šà°«à±ˆà°²à± లేదà±." msgid "No profile id in request." msgstr "" -#: actions/unsubscribe.php:84 -msgid "No profile with that id." -msgstr "" - #: actions/unsubscribe.php:98 #, fuzzy msgid "Unsubscribed" @@ -3626,10 +3557,11 @@ msgstr "చందాదారà±à°²à±" #: actions/updateprofile.php:62 actions/userauthorization.php:330 #, php-format -msgid "Listenee stream license ‘%s’ is not compatible with site license ‘%s’." +msgid "" +"Listenee stream license ‘%1$s’ is not compatible with site license ‘%2$s’." msgstr "" -#: actions/useradminpanel.php:58 lib/adminpanelaction.php:305 +#: actions/useradminpanel.php:58 lib/adminpanelaction.php:321 #: lib/personalgroupnav.php:115 msgid "User" msgstr "వాడà±à°•à°°à°¿" @@ -3730,7 +3662,7 @@ msgid "" "click “Rejectâ€." msgstr "" -#: actions/userauthorization.php:188 +#: actions/userauthorization.php:188 actions/version.php:165 msgid "License" msgstr "లైసెనà±à°¸à±" @@ -3779,7 +3711,7 @@ msgstr "" #: actions/userauthorization.php:296 #, php-format -msgid "Listener URI ‘%s’ not found here" +msgid "Listener URI ‘%s’ not found here." msgstr "" #: actions/userauthorization.php:301 @@ -3812,11 +3744,6 @@ msgstr "'%s' అనే అవతారపౠURL తపà±à°ªà±" msgid "Wrong image type for avatar URL ‘%s’." msgstr "'%s' కొరకౠతపà±à°ªà±à°¡à± బొమà±à°® à°°à°•à°‚" -#: actions/userbyid.php:70 -#, fuzzy -msgid "No ID." -msgstr "à°à°¡à±€ లేదà±." - #: actions/userdesignsettings.php:76 lib/designsettings.php:65 msgid "Profile design" msgstr "à°«à±à°°à±Šà°«à±ˆà°²à± రూపà±à°°à±‡à°–à°²à±" @@ -3831,11 +3758,6 @@ msgstr "" msgid "Enjoy your hotdog!" msgstr "" -#: actions/usergroups.php:64 -#, php-format -msgid "%s groups, page %d" -msgstr "%s à°—à±à°‚à°ªà±à°²à±, పేజీ %d" - #: actions/usergroups.php:130 msgid "Search for more groups" msgstr "మరినà±à°¨à°¿ à°—à±à°‚à°ªà±à°²à°•à±ˆ వెతà±à°•à±" @@ -3850,6 +3772,73 @@ msgstr "%s à° à°—à±à°‚పౠలోనూ à°¸à°à±à°¯à±à°²à± కాదà±." msgid "Try [searching for groups](%%action.groupsearch%%) and joining them." msgstr "[à°—à±à°‚à°ªà±à°²à°¨à°¿ వెతికి](%%action.groupsearch%%) వాటిలో చేరడానికి à°ªà±à°°à°¯à°¤à±à°¨à°¿à°‚à°šà°‚à°¡à°¿." +#: actions/version.php:73 +#, fuzzy, php-format +msgid "StatusNet %s" +msgstr "గణాంకాలà±" + +#: actions/version.php:153 +#, php-format +msgid "" +"This site is powered by %1$s version %2$s, Copyright 2008-2010 StatusNet, " +"Inc. and contributors." +msgstr "" + +#: actions/version.php:157 +#, fuzzy +msgid "StatusNet" +msgstr "à°¸à±à°¥à°¿à°¤à°¿à°¨à°¿ తొలగించాం." + +#: actions/version.php:161 +msgid "Contributors" +msgstr "" + +#: actions/version.php:168 +msgid "" +"StatusNet is free software: you can redistribute it and/or modify it under " +"the terms of the GNU Affero General Public License as published by the Free " +"Software Foundation, either version 3 of the License, or (at your option) " +"any later version. " +msgstr "" + +#: actions/version.php:174 +msgid "" +"This program is distributed in the hope that it will be useful, but WITHOUT " +"ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or " +"FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License " +"for more details. " +msgstr "" + +#: actions/version.php:180 +#, php-format +msgid "" +"You should have received a copy of the GNU Affero General Public License " +"along with this program. If not, see %s." +msgstr "" + +#: actions/version.php:189 +msgid "Plugins" +msgstr "" + +#: actions/version.php:195 +#, fuzzy +msgid "Name" +msgstr "పేరà±" + +#: actions/version.php:196 lib/action.php:741 +#, fuzzy +msgid "Version" +msgstr "à°µà±à°¯à°•à±à°¤à°¿à°—à°¤" + +#: actions/version.php:197 +#, fuzzy +msgid "Author(s)" +msgstr "రచయిత" + +#: actions/version.php:198 lib/groupeditform.php:172 +msgid "Description" +msgstr "వివరణ" + #: classes/File.php:137 #, php-format msgid "" @@ -3918,7 +3907,7 @@ msgstr "సందేశానà±à°¨à°¿ à°à°¦à±à°°à°ªà°°à°šà°¡à°‚లో పొà msgid "DB error inserting reply: %s" msgstr "" -#: classes/Notice.php:1361 +#: classes/Notice.php:1359 #, fuzzy, php-format msgid "RT @%1$s %2$s" msgstr "%1$s (%2$s)" @@ -3966,141 +3955,136 @@ msgstr "ఇతర" msgid "Other options" msgstr "ఇతర ఎంపికలà±" -#: lib/action.php:144 -#, php-format -msgid "%s - %s" -msgstr "%s - %s" - #: lib/action.php:159 msgid "Untitled page" msgstr "" -#: lib/action.php:426 +#: lib/action.php:427 msgid "Primary site navigation" msgstr "" -#: lib/action.php:432 +#: lib/action.php:433 msgid "Home" msgstr "à°®à±à°‚గిలి" -#: lib/action.php:432 +#: lib/action.php:433 msgid "Personal profile and friends timeline" msgstr "" -#: lib/action.php:434 +#: lib/action.php:435 msgid "Account" msgstr "ఖాతా" -#: lib/action.php:434 +#: lib/action.php:435 msgid "Change your email, avatar, password, profile" msgstr "మీ ఈమెయిలà±, అవతారం, సంకేతపదం మరియౠపà±à°°à±Œà°«à±ˆà°³à±à°³à°¨à± మారà±à°šà±à°•à±‹à°‚à°¡à°¿" -#: lib/action.php:437 +#: lib/action.php:438 msgid "Connect" msgstr "à°…à°¨à±à°¸à°‚ధానించà±" -#: lib/action.php:437 +#: lib/action.php:438 msgid "Connect to services" msgstr "" -#: lib/action.php:441 +#: lib/action.php:442 #, fuzzy msgid "Change site configuration" msgstr "చందాలà±" -#: lib/action.php:445 lib/subgroupnav.php:105 +#: lib/action.php:446 lib/subgroupnav.php:105 msgid "Invite" msgstr "ఆహà±à°µà°¾à°¨à°¿à°‚à°šà±" -#: lib/action.php:446 lib/subgroupnav.php:106 +#: lib/action.php:447 lib/subgroupnav.php:106 #, php-format msgid "Invite friends and colleagues to join you on %s" msgstr "" -#: lib/action.php:451 +#: lib/action.php:452 msgid "Logout" msgstr "నిషà±à°•à±à°°à°®à°¿à°‚à°šà±" -#: lib/action.php:451 +#: lib/action.php:452 msgid "Logout from the site" msgstr "సైటౠనà±à°‚à°¡à°¿ నిషà±à°•à±à°°à°®à°¿à°‚à°šà±" -#: lib/action.php:456 +#: lib/action.php:457 msgid "Create an account" msgstr "కొతà±à°¤ ఖాతా సృషà±à°Ÿà°¿à°‚à°šà±" -#: lib/action.php:459 +#: lib/action.php:460 msgid "Login to the site" msgstr "సైటà±à°²à±‹à°¨à°¿ à°ªà±à°°à°µà±‡à°¶à°¿à°‚à°šà±" -#: lib/action.php:462 lib/action.php:725 +#: lib/action.php:463 lib/action.php:726 msgid "Help" msgstr "సహాయం" -#: lib/action.php:462 +#: lib/action.php:463 msgid "Help me!" msgstr "సహాయం కావాలి!" -#: lib/action.php:465 lib/searchaction.php:127 +#: lib/action.php:466 lib/searchaction.php:127 msgid "Search" msgstr "వెతà±à°•à±" -#: lib/action.php:465 +#: lib/action.php:466 msgid "Search for people or text" msgstr "" -#: lib/action.php:486 +#: lib/action.php:487 #, fuzzy msgid "Site notice" msgstr "కొతà±à°¤ సందేశం" -#: lib/action.php:552 +#: lib/action.php:553 msgid "Local views" msgstr "à°¸à±à°¥à°¾à°¨à°¿à°• వీకà±à°·à°£à°²à±" -#: lib/action.php:618 +#: lib/action.php:619 #, fuzzy msgid "Page notice" msgstr "కొతà±à°¤ సందేశం" -#: lib/action.php:720 +#: lib/action.php:721 #, fuzzy msgid "Secondary site navigation" msgstr "చందాలà±" -#: lib/action.php:727 +#: lib/action.php:728 msgid "About" msgstr "à°—à±à°°à°¿à°‚à°šà°¿" -#: lib/action.php:729 +#: lib/action.php:730 msgid "FAQ" msgstr "à°ªà±à°°à°¶à±à°¨à°²à±" -#: lib/action.php:733 +#: lib/action.php:734 msgid "TOS" msgstr "సేవా నియమాలà±" -#: lib/action.php:736 +#: lib/action.php:737 msgid "Privacy" msgstr "అంతరంగికత" -#: lib/action.php:738 +#: lib/action.php:739 msgid "Source" msgstr "మూలమà±" -#: lib/action.php:740 +#: lib/action.php:743 msgid "Contact" msgstr "సంపà±à°°à°¦à°¿à°‚à°šà±" -#: lib/action.php:742 +#: lib/action.php:745 msgid "Badge" msgstr "బాడà±à°œà°¿" -#: lib/action.php:770 +#: lib/action.php:773 msgid "StatusNet software license" msgstr "" -#: lib/action.php:773 +#: lib/action.php:776 #, php-format msgid "" "**%%site.name%%** is a microblogging service brought to you by [%%site." @@ -4109,12 +4093,12 @@ msgstr "" "**%%site.name%%** అనేది [%%site.broughtby%%](%%site.broughtbyurl%%) వారౠ" "అందిసà±à°¤à±à°¨à±à°¨ మైకà±à°°à±‹ à°¬à±à°²à°¾à°—ింగౠసదà±à°ªà°¾à°¯à°‚. " -#: lib/action.php:775 +#: lib/action.php:778 #, php-format msgid "**%%site.name%%** is a microblogging service. " msgstr "**%%site.name%%** అనేది మైకà±à°°à±‹ à°¬à±à°²à°¾à°—ింగౠసదà±à°ªà°¾à°¯à°‚." -#: lib/action.php:777 +#: lib/action.php:780 #, php-format msgid "" "It runs the [StatusNet](http://status.net/) microblogging software, version %" @@ -4125,32 +4109,32 @@ msgstr "" "html) à°•à°¿à°‚à°¦ à°²à°à±à°¯à°®à°¯à±à°¯à±‡ [à°¸à±à°Ÿà±‡à°Ÿà°¸à±‌నెటà±](http://status.net/) మైకà±à°°à±‹à°¬à±à°²à°¾à°—ింగౠఉపకరణం సంచిక %s " "పై నడà±à°¸à±à°¤à±à°‚ది." -#: lib/action.php:791 +#: lib/action.php:794 #, fuzzy msgid "Site content license" msgstr "కొతà±à°¤ సందేశం" -#: lib/action.php:800 +#: lib/action.php:803 msgid "All " msgstr "à°…à°¨à±à°¨à±€ " -#: lib/action.php:805 +#: lib/action.php:808 msgid "license." msgstr "" -#: lib/action.php:1099 +#: lib/action.php:1102 msgid "Pagination" msgstr "పేజీకరణ" -#: lib/action.php:1108 +#: lib/action.php:1111 msgid "After" msgstr "తరà±à°µà°¾à°¤" -#: lib/action.php:1116 +#: lib/action.php:1119 msgid "Before" msgstr "ఇంతకà±à°°à°¿à°¤à°‚" -#: lib/action.php:1164 +#: lib/action.php:1167 msgid "There was a problem with your session token." msgstr "" @@ -4158,28 +4142,32 @@ msgstr "" msgid "You cannot make changes to this site." msgstr "à°ˆ సైటà±à°•à°¿ మీరౠమారà±à°ªà±à°²à± చేయలేరà±." -#: lib/adminpanelaction.php:195 +#: lib/adminpanelaction.php:107 +msgid "Changes to that panel are not allowed." +msgstr "" + +#: lib/adminpanelaction.php:206 msgid "showForm() not implemented." msgstr "" -#: lib/adminpanelaction.php:224 +#: lib/adminpanelaction.php:235 msgid "saveSettings() not implemented." msgstr "" -#: lib/adminpanelaction.php:247 +#: lib/adminpanelaction.php:258 msgid "Unable to delete design setting." msgstr "" -#: lib/adminpanelaction.php:300 +#: lib/adminpanelaction.php:312 msgid "Basic site configuration" msgstr "à°ªà±à°°à°¾à°¥à°®à°¿à°• సైటౠసà±à°µà°°à±‚పణం" -#: lib/adminpanelaction.php:303 +#: lib/adminpanelaction.php:317 #, fuzzy msgid "Design configuration" msgstr "SMS నిరà±à°§à°¾à°°à°£" -#: lib/adminpanelaction.php:306 lib/adminpanelaction.php:309 +#: lib/adminpanelaction.php:322 lib/adminpanelaction.php:327 #, fuzzy msgid "Paths configuration" msgstr "SMS నిరà±à°§à°¾à°°à°£" @@ -4205,11 +4193,21 @@ msgstr "" msgid "Tags for this attachment" msgstr "" +#: lib/authenticationplugin.php:182 lib/authenticationplugin.php:187 +#, fuzzy +msgid "Password changing failed" +msgstr "సంకేతపదం మారà±à°ªà±" + +#: lib/authenticationplugin.php:197 +#, fuzzy +msgid "Password changing is not allowed" +msgstr "సంకేతపదం మారà±à°ªà±" + #: lib/channel.php:138 lib/channel.php:158 msgid "Command results" msgstr "ఆదేశ ఫలితాలà±" -#: lib/channel.php:210 +#: lib/channel.php:210 lib/mailhandler.php:142 msgid "Command complete" msgstr "ఆదేశం పూరà±à°¤à°¯à±à°¯à°¿à°‚ది" @@ -4222,8 +4220,8 @@ msgid "Sorry, this command is not yet implemented." msgstr "" #: lib/command.php:88 -#, php-format -msgid "Could not find a user with nickname %s" +#, fuzzy, php-format +msgid "Could not find a user with nickname %s." msgstr "వాడà±à°•à°°à°¿à°¨à°¿ తాజాకరించలేకà±à°¨à±à°¨à°¾à°‚." #: lib/command.php:92 @@ -4232,7 +4230,7 @@ msgstr "" #: lib/command.php:99 #, php-format -msgid "Nudge sent to %s" +msgid "Nudge sent to %s." msgstr "" #: lib/command.php:126 @@ -4247,34 +4245,36 @@ msgstr "" "నోటీసà±à°²à±: %3$s" #: lib/command.php:152 lib/command.php:399 lib/command.php:460 -msgid "Notice with that id does not exist" -msgstr "" +#, fuzzy +msgid "Notice with that id does not exist." +msgstr "à°† ఈమెయిలౠచిరà±à°¨à°¾à°®à°¾ లేదా వాడà±à°•à°°à°¿à°ªà±‡à°°à±à°¤à±‹ వాడà±à°•à°°à±à°²à±†à°µà°°à±‚ లేరà±." #: lib/command.php:168 lib/command.php:415 lib/command.php:476 #: lib/command.php:532 -msgid "User has no last notice" -msgstr "" +#, fuzzy +msgid "User has no last notice." +msgstr "వాడà±à°•à°°à°¿à°•à°¿ à°ªà±à°°à±Šà°«à±ˆà°²à± లేదà±." #: lib/command.php:190 msgid "Notice marked as fave." msgstr "" -#: lib/command.php:315 -#, php-format -msgid "%1$s (%2$s)" -msgstr "%1$s (%2$s)" +#: lib/command.php:284 +#, fuzzy, php-format +msgid "Could not remove user %1$s to group %2$s." +msgstr "వాడà±à°•à°°à°¿ %sని %s à°—à±à°‚పౠనà±à°‚à°¡à°¿ తొలగించలేకపోయాం" #: lib/command.php:318 -#, php-format -msgid "Fullname: %s" +#, fuzzy, php-format +msgid "Full name: %s" msgstr "పూరà±à°¤à°¿à°ªà±‡à°°à±: %s" -#: lib/command.php:321 +#: lib/command.php:321 lib/mail.php:254 #, php-format msgid "Location: %s" msgstr "à°ªà±à°°à°¾à°‚తం: %s" -#: lib/command.php:324 +#: lib/command.php:324 lib/mail.php:256 #, php-format msgid "Homepage: %s" msgstr "" @@ -4285,26 +4285,17 @@ msgid "About: %s" msgstr "à°—à±à°°à°¿à°‚à°šà°¿: %s" #: lib/command.php:358 scripts/xmppdaemon.php:301 -#, php-format -msgid "Message too long - maximum is %d characters, you sent %d" -msgstr "" +#, fuzzy, php-format +msgid "Message too long - maximum is %1$d characters, you sent %2$d." +msgstr "నోటిసౠచాలా పొడవà±à°—à°¾ ఉంది - %d à°…à°•à±à°·à°°à°¾à°²à± à°—à°°à°¿à°·à±à° à°‚, మీరౠ%d పంపించారà±" #: lib/command.php:378 msgid "Error sending direct message." msgstr "" -#: lib/command.php:422 -msgid "Cannot repeat your own notice" -msgstr "" - -#: lib/command.php:427 -#, fuzzy -msgid "Already repeated that notice" -msgstr "à°ˆ నోటీసà±à°¨à°¿ తొలగించà±" - #: lib/command.php:435 #, fuzzy, php-format -msgid "Notice from %s repeated" +msgid "Notice from %s repeated." msgstr "సందేశాలà±" #: lib/command.php:437 @@ -4313,13 +4304,13 @@ msgid "Error repeating notice." msgstr "సందేశానà±à°¨à°¿ à°à°¦à±à°°à°ªà°°à°šà°¡à°‚లో పొరపాటà±." #: lib/command.php:491 -#, php-format -msgid "Notice too long - maximum is %d characters, you sent %d" +#, fuzzy, php-format +msgid "Notice too long - maximum is %1$d characters, you sent %2$d." msgstr "నోటిసౠచాలా పొడవà±à°—à°¾ ఉంది - %d à°…à°•à±à°·à°°à°¾à°²à± à°—à°°à°¿à°·à±à° à°‚, మీరౠ%d పంపించారà±" #: lib/command.php:500 #, fuzzy, php-format -msgid "Reply to %s sent" +msgid "Reply to %s sent." msgstr "%sà°•à°¿ à°¸à±à°ªà°‚దనలà±" #: lib/command.php:502 @@ -4328,16 +4319,16 @@ msgid "Error saving notice." msgstr "సందేశానà±à°¨à°¿ à°à°¦à±à°°à°ªà°°à°šà°¡à°‚లో పొరపాటà±." #: lib/command.php:556 -msgid "Specify the name of the user to subscribe to" +msgid "Specify the name of the user to subscribe to." msgstr "" #: lib/command.php:563 #, php-format msgid "Subscribed to %s" -msgstr "" +msgstr "%sà°•à°¿ చందా చేరారà±" #: lib/command.php:584 -msgid "Specify the name of the user to unsubscribe from" +msgid "Specify the name of the user to unsubscribe from." msgstr "" #: lib/command.php:591 @@ -4366,17 +4357,17 @@ msgid "Can't turn on notification." msgstr "" #: lib/command.php:650 -msgid "Login command is disabled" +msgid "Login command is disabled." msgstr "" #: lib/command.php:664 #, fuzzy, php-format -msgid "Could not create login token for %s" +msgid "Could not create login token for %s." msgstr "మారà±à°ªà±‡à°°à±à°²à°¨à°¿ సృషà±à°Ÿà°¿à°‚చలేకపోయాం." #: lib/command.php:669 -#, php-format -msgid "This link is useable only once, and is good for only 2 minutes: %s" +#, fuzzy, php-format +msgid "This link is useable only once, and is good for only 2 minutes: %s." msgstr "à°ˆ లంకెని ఒకే సారి ఉపయోగించగలరà±, మరియౠఅది పనిచేసేది 2 నిమిషాలౠమాతà±à°°à°®à±‡: %s" #: lib/command.php:685 @@ -4569,10 +4560,6 @@ msgstr "మీ à°—à±à°°à°¿à°‚à°šà°¿ మరియౠమీ ఆసకà±à°¤à±à° msgid "Describe the group or topic in %d characters" msgstr "మీ à°—à±à°°à°¿à°‚à°šà°¿ మరియౠమీ ఆసకà±à°¤à±à°² à°—à±à°°à°¿à°‚à°šà°¿ 140 à°…à°•à±à°·à°°à°¾à°²à±à°²à±‹ చెపà±à°ªà°‚à°¡à°¿" -#: lib/groupeditform.php:172 -msgid "Description" -msgstr "వివరణ" - #: lib/groupeditform.php:179 #, fuzzy msgid "" @@ -4735,21 +4722,9 @@ msgid "" "Change your email address or notification options at %8$s\n" msgstr "" -#: lib/mail.php:254 -#, php-format -msgid "Location: %s\n" -msgstr "à°ªà±à°°à°¾à°‚తం: %s\n" - -#: lib/mail.php:256 -#, php-format -msgid "Homepage: %s\n" -msgstr "హోమౠపేజీ: %s\n" - #: lib/mail.php:258 -#, php-format -msgid "" -"Bio: %s\n" -"\n" +#, fuzzy, php-format +msgid "Bio: %s" msgstr "" "à°¸à±à°µà°ªà°°à°¿à°šà°¯à°‚: %s\n" "\n" @@ -4886,6 +4861,27 @@ msgstr "" msgid "from" msgstr "à°¨à±à°‚à°¡à°¿" +#: lib/mailhandler.php:37 +msgid "Could not parse message." +msgstr "" + +#: lib/mailhandler.php:42 +msgid "Not a registered user." +msgstr "నమోదైన వాడà±à°•à°°à°¿ కాదà±." + +#: lib/mailhandler.php:46 +msgid "Sorry, that is not your incoming email address." +msgstr "à°•à±à°·à°®à°¿à°‚à°šà°‚à°¡à°¿, అది మీ లోనికివచà±à°šà± ఈమెయిలౠచిరà±à°¨à°¾à°®à°¾ కాదà±." + +#: lib/mailhandler.php:50 +msgid "Sorry, no incoming email allowed." +msgstr "" + +#: lib/mailhandler.php:228 +#, fuzzy, php-format +msgid "Unsupported message type: %s" +msgstr "%s à°•à°¿ నేరౠసందేశాలà±" + #: lib/mediafile.php:98 lib/mediafile.php:123 msgid "There was a database error while saving your file. Please try again." msgstr "" @@ -4917,7 +4913,7 @@ msgid "File upload stopped by extension." msgstr "" #: lib/mediafile.php:179 lib/mediafile.php:216 -msgid "File exceeds user's quota!" +msgid "File exceeds user's quota." msgstr "" #: lib/mediafile.php:196 lib/mediafile.php:233 @@ -4926,7 +4922,7 @@ msgstr "" #: lib/mediafile.php:201 lib/mediafile.php:237 #, fuzzy -msgid "Could not determine file's mime-type!" +msgid "Could not determine file's MIME type." msgstr "వాడà±à°•à°°à°¿à°¨à°¿ తాజాకరించలేకà±à°¨à±à°¨à°¾à°‚." #: lib/mediafile.php:270 @@ -4936,7 +4932,7 @@ msgstr "" #: lib/mediafile.php:275 #, php-format -msgid "%s is not a supported filetype on this server." +msgid "%s is not a supported file type on this server." msgstr "" #: lib/messageform.php:120 @@ -4970,7 +4966,17 @@ msgid "Attach a file" msgstr "à°’à°• ఫైలà±à°¨à°¿ జోడించà±" #: lib/noticeform.php:212 -msgid "Share your location" +#, fuzzy +msgid "Share my location." +msgstr "à°Ÿà±à°¯à°¾à°—à±à°²à°¨à°¿ à°à°¦à±à°°à°ªà°°à°šà°²à±‡à°•à±à°¨à±à°¨à°¾à°‚." + +#: lib/noticeform.php:214 +#, fuzzy +msgid "Do not share my location." +msgstr "à°Ÿà±à°¯à°¾à°—à±à°²à°¨à°¿ à°à°¦à±à°°à°ªà°°à°šà°²à±‡à°•à±à°¨à±à°¨à°¾à°‚." + +#: lib/noticeform.php:215 +msgid "Hide this info" msgstr "" #: lib/noticelist.php:428 @@ -5091,6 +5097,10 @@ msgstr "మీరౠపంపిన సందేశాలà±" msgid "Tags in %s's notices" msgstr "" +#: lib/plugin.php:114 +msgid "Unknown" +msgstr "" + #: lib/profileaction.php:109 lib/profileaction.php:192 lib/subgroupnav.php:82 msgid "Subscriptions" msgstr "చందాలà±" @@ -5268,10 +5278,6 @@ msgstr "" msgid "People Tagcloud as tagged" msgstr "" -#: lib/subscriptionlist.php:126 -msgid "(none)" -msgstr "(à°à°®à±€à°²à±‡à°µà±)" - #: lib/tagcloudsection.php:56 msgid "None" msgstr "à°à°®à±€à°²à±‡à°¦à±" @@ -5388,19 +5394,3 @@ msgstr "%s అనేది సరైన రంగౠకాదà±!" #, php-format msgid "%s is not a valid color! Use 3 or 6 hex chars." msgstr "%s అనేది సరైన రంగౠకాదà±! 3 లేదా 6 హెకà±à°¸à± à°…à°•à±à°·à°°à°¾à°²à°¨à± వాడండి." - -#: scripts/maildaemon.php:48 -msgid "Could not parse message." -msgstr "" - -#: scripts/maildaemon.php:53 -msgid "Not a registered user." -msgstr "నమోదైన వాడà±à°•à°°à°¿ కాదà±." - -#: scripts/maildaemon.php:57 -msgid "Sorry, that is not your incoming email address." -msgstr "à°•à±à°·à°®à°¿à°‚à°šà°‚à°¡à°¿, అది మీ లోనికివచà±à°šà± ఈమెయిలౠచిరà±à°¨à°¾à°®à°¾ కాదà±." - -#: scripts/maildaemon.php:61 -msgid "Sorry, no incoming email allowed." -msgstr "" diff --git a/locale/tr/LC_MESSAGES/statusnet.po b/locale/tr/LC_MESSAGES/statusnet.po index 238252591..2e6adfe66 100644 --- a/locale/tr/LC_MESSAGES/statusnet.po +++ b/locale/tr/LC_MESSAGES/statusnet.po @@ -8,12 +8,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-01-03 10:37+0000\n" -"PO-Revision-Date: 2010-01-03 10:38:54+0000\n" +"POT-Creation-Date: 2010-01-10 11:27+0000\n" +"PO-Revision-Date: 2010-01-10 11:29:11+0000\n" "Language-Team: Turkish\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha (r60575); Translate extension (2009-12-06)\n" +"X-Generator: MediaWiki 1.16alpha (r60888); Translate extension (2010-01-04)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: tr\n" "X-Message-Group: out-statusnet\n" @@ -51,11 +51,6 @@ msgstr "Böyle bir durum mesajı yok." msgid "No such user." msgstr "Böyle bir kullanıcı yok." -#: actions/all.php:84 -#, fuzzy, php-format -msgid "%s and friends, page %d" -msgstr "%s ve arkadaÅŸları" - #: actions/all.php:86 actions/all.php:167 actions/allrss.php:115 #: actions/apitimelinefriends.php:115 actions/apitimelinehome.php:115 #: lib/personalgroupnav.php:100 @@ -94,8 +89,8 @@ msgstr "" #: actions/all.php:134 #, php-format msgid "" -"You can try to [nudge %s](../%s) from his profile or [post something to his " -"or her attention](%%%%action.newnotice%%%%?status_textarea=%s)." +"You can try to [nudge %1$s](../%2$s) from his profile or [post something to " +"his or her attention](%%%%action.newnotice%%%%?status_textarea=%3$s)." msgstr "" #: actions/all.php:137 actions/replies.php:209 actions/showstream.php:202 @@ -121,6 +116,23 @@ msgstr "" #: actions/apiaccountupdateprofile.php:97 #: actions/apiaccountupdateprofilebackgroundimage.php:94 #: actions/apiaccountupdateprofilecolors.php:118 +#: actions/apidirectmessage.php:156 actions/apifavoritecreate.php:99 +#: actions/apifavoritedestroy.php:100 actions/apifriendshipscreate.php:100 +#: actions/apifriendshipsdestroy.php:100 actions/apifriendshipsshow.php:129 +#: actions/apigroupcreate.php:136 actions/apigroupismember.php:114 +#: actions/apigroupjoin.php:155 actions/apigroupleave.php:141 +#: actions/apigrouplist.php:132 actions/apigrouplistall.php:120 +#: actions/apigroupmembership.php:106 actions/apigroupshow.php:105 +#: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102 +#: actions/apistatusesretweets.php:112 actions/apistatusesshow.php:108 +#: actions/apistatusnetconfig.php:133 actions/apistatusnetversion.php:93 +#: actions/apisubscriptions.php:111 actions/apitimelinefavorites.php:146 +#: actions/apitimelinefriends.php:156 actions/apitimelinegroup.php:150 +#: actions/apitimelinehome.php:156 actions/apitimelinementions.php:151 +#: actions/apitimelinepublic.php:131 actions/apitimelineretweetedbyme.php:122 +#: actions/apitimelineretweetedtome.php:121 +#: actions/apitimelineretweetsofme.php:122 actions/apitimelinetag.php:141 +#: actions/apitimelineuser.php:165 actions/apiusershow.php:101 #, fuzzy msgid "API method not found." msgstr "Onay kodu bulunamadı." @@ -179,6 +191,9 @@ msgstr "" #: actions/apiaccountupdateprofilebackgroundimage.php:146 #: actions/apiaccountupdateprofilecolors.php:164 #: actions/apiaccountupdateprofilecolors.php:174 +#: actions/groupdesignsettings.php:287 actions/groupdesignsettings.php:297 +#: actions/userdesignsettings.php:210 actions/userdesignsettings.php:220 +#: actions/userdesignsettings.php:263 actions/userdesignsettings.php:273 msgid "Unable to save your design settings." msgstr "" @@ -221,26 +236,6 @@ msgstr "" msgid "All the direct messages sent to %s" msgstr "" -#: actions/apidirectmessage.php:156 actions/apifavoritecreate.php:99 -#: actions/apifavoritedestroy.php:100 actions/apifriendshipscreate.php:100 -#: actions/apifriendshipsdestroy.php:100 actions/apifriendshipsshow.php:129 -#: actions/apigroupcreate.php:136 actions/apigroupismember.php:114 -#: actions/apigroupjoin.php:155 actions/apigroupleave.php:141 -#: actions/apigrouplist.php:132 actions/apigrouplistall.php:120 -#: actions/apigroupmembership.php:106 actions/apigroupshow.php:105 -#: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102 -#: actions/apistatusesretweets.php:112 actions/apistatusesshow.php:108 -#: actions/apistatusnetconfig.php:133 actions/apistatusnetversion.php:93 -#: actions/apisubscriptions.php:111 actions/apitimelinefavorites.php:146 -#: actions/apitimelinefriends.php:156 actions/apitimelinegroup.php:150 -#: actions/apitimelinehome.php:156 actions/apitimelinementions.php:151 -#: actions/apitimelinepublic.php:131 actions/apitimelineretweetedbyme.php:122 -#: actions/apitimelineretweetedtome.php:121 -#: actions/apitimelineretweetsofme.php:122 actions/apitimelinetag.php:141 -#: actions/apitimelineuser.php:165 actions/apiusershow.php:101 -msgid "API method not found!" -msgstr "" - #: actions/apidirectmessagenew.php:126 msgid "No message text!" msgstr "" @@ -265,15 +260,16 @@ msgid "No status found with that ID." msgstr "" #: actions/apifavoritecreate.php:119 -msgid "This status is already a favorite!" -msgstr "" +#, fuzzy +msgid "This status is already a favorite." +msgstr "Bu zaten sizin Jabber ID'niz." #: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:176 msgid "Could not create favorite." msgstr "" #: actions/apifavoritedestroy.php:122 -msgid "That status is not a favorite!" +msgid "That status is not a favorite." msgstr "" #: actions/apifavoritedestroy.php:134 actions/disfavor.php:87 @@ -295,8 +291,9 @@ msgid "Could not unfollow user: User not found." msgstr "Sunucuya yönlendirme yapılamadı: %s" #: actions/apifriendshipsdestroy.php:120 -msgid "You cannot unfollow yourself!" -msgstr "" +#, fuzzy +msgid "You cannot unfollow yourself." +msgstr "Kullanıcı güncellenemedi." #: actions/apifriendshipsexists.php:94 msgid "Two user ids or screen_names must be supplied." @@ -385,7 +382,7 @@ msgstr "" msgid "Group not found!" msgstr "Ä°stek bulunamadı!" -#: actions/apigroupjoin.php:110 +#: actions/apigroupjoin.php:110 actions/joingroup.php:90 lib/command.php:217 #, fuzzy msgid "You are already a member of that group." msgstr "Zaten giriÅŸ yapmış durumdasıznız!" @@ -394,9 +391,9 @@ msgstr "Zaten giriÅŸ yapmış durumdasıznız!" msgid "You have been blocked from that group by the admin." msgstr "" -#: actions/apigroupjoin.php:138 +#: actions/apigroupjoin.php:138 actions/joingroup.php:128 lib/command.php:234 #, fuzzy, php-format -msgid "Could not join user %s to group %s." +msgid "Could not join user %1$s to group %2$s." msgstr "Sunucuya yönlendirme yapılamadı: %s" #: actions/apigroupleave.php:114 @@ -404,9 +401,9 @@ msgstr "Sunucuya yönlendirme yapılamadı: %s" msgid "You are not a member of this group." msgstr "Bize o profili yollamadınız" -#: actions/apigroupleave.php:124 +#: actions/apigroupleave.php:124 actions/leavegroup.php:127 #, fuzzy, php-format -msgid "Could not remove user %s to group %s." +msgid "Could not remove user %1$s from group %2$s." msgstr "OpenID formu yaratılamadı: %s" #: actions/apigrouplist.php:95 @@ -414,11 +411,6 @@ msgstr "OpenID formu yaratılamadı: %s" msgid "%s's groups" msgstr "Profil" -#: actions/apigrouplist.php:103 -#, fuzzy, php-format -msgid "Groups %s is a member of on %s." -msgstr "Bize o profili yollamadınız" - #: actions/apigrouplistall.php:90 actions/usergroups.php:62 #, php-format msgid "%s groups" @@ -442,12 +434,12 @@ msgstr "" msgid "No such notice." msgstr "Böyle bir durum mesajı yok." -#: actions/apistatusesretweet.php:83 +#: actions/apistatusesretweet.php:83 lib/command.php:422 #, fuzzy msgid "Cannot repeat your own notice." msgstr "EÄŸer lisansı kabul etmezseniz kayıt olamazsınız." -#: actions/apistatusesretweet.php:91 +#: actions/apistatusesretweet.php:91 lib/command.php:427 #, fuzzy msgid "Already repeated that notice." msgstr "Zaten giriÅŸ yapmış durumdasıznız!" @@ -462,7 +454,7 @@ msgid "No status with that ID found." msgstr "" #: actions/apistatusesupdate.php:157 actions/newnotice.php:155 -#: scripts/maildaemon.php:71 +#: lib/mailhandler.php:60 #, fuzzy, php-format msgid "That's too long. Max notice size is %d chars." msgstr "" @@ -483,14 +475,14 @@ msgid "Unsupported format." msgstr "Desteklenmeyen görüntü dosyası biçemi." #: actions/apitimelinefavorites.php:108 -#, php-format -msgid "%s / Favorites from %s" -msgstr "" +#, fuzzy, php-format +msgid "%1$s / Favorites from %2$s" +msgstr "%1$s'in %2$s'deki durum mesajları " #: actions/apitimelinefavorites.php:120 -#, php-format -msgid "%s updates favorited by %s / %s." -msgstr "" +#, fuzzy, php-format +msgid "%1$s updates favorited by %2$s / %2$s." +msgstr "%s adli kullanicinin durum mesajlari" #: actions/apitimelinegroup.php:109 actions/apitimelineuser.php:118 #: actions/grouprss.php:131 actions/userrss.php:90 @@ -559,8 +551,11 @@ msgstr "Ä°stek bulunamadı!" msgid "No such attachment." msgstr "Böyle bir belge yok." -#: actions/avatarbynickname.php:59 actions/grouprss.php:91 -#: actions/leavegroup.php:76 +#: actions/avatarbynickname.php:59 actions/blockedfromgroup.php:73 +#: actions/editgroup.php:84 actions/groupdesignsettings.php:84 +#: actions/grouplogo.php:86 actions/groupmembers.php:76 +#: actions/grouprss.php:91 actions/joingroup.php:76 actions/leavegroup.php:76 +#: actions/showgroup.php:121 msgid "No nickname." msgstr "Takma ad yok" @@ -583,8 +578,8 @@ msgid "You can upload your personal avatar. The maximum file size is %s." msgstr "" #: actions/avatarsettings.php:106 actions/avatarsettings.php:185 -#: actions/grouplogo.php:178 actions/remotesubscribe.php:191 -#: actions/userauthorization.php:72 actions/userrss.php:103 +#: actions/remotesubscribe.php:191 actions/userauthorization.php:72 +#: actions/userrss.php:103 msgid "User without matching profile" msgstr "" @@ -617,9 +612,9 @@ msgstr "Yükle" msgid "Crop" msgstr "" -#: actions/avatarsettings.php:268 actions/disfavor.php:74 -#: actions/emailsettings.php:238 actions/favor.php:75 actions/geocode.php:50 -#: actions/groupblock.php:66 actions/grouplogo.php:309 +#: actions/avatarsettings.php:268 actions/deletenotice.php:157 +#: actions/disfavor.php:74 actions/emailsettings.php:238 actions/favor.php:75 +#: actions/geocode.php:50 actions/groupblock.php:66 actions/grouplogo.php:309 #: actions/groupunblock.php:66 actions/imsettings.php:206 #: actions/invite.php:56 actions/login.php:135 actions/makeadmin.php:66 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80 @@ -703,20 +698,15 @@ msgstr "Böyle bir kullanıcı yok." msgid "Failed to save block information." msgstr "" -#: actions/blockedfromgroup.php:73 actions/editgroup.php:84 -#: actions/groupdesignsettings.php:84 actions/grouplogo.php:86 -#: actions/groupmembers.php:76 actions/joingroup.php:76 -#: actions/showgroup.php:121 -#, fuzzy -msgid "No nickname" -msgstr "Takma ad yok" - #: actions/blockedfromgroup.php:80 actions/editgroup.php:96 +#: actions/foafgroup.php:44 actions/foafgroup.php:62 actions/groupblock.php:86 #: actions/groupbyid.php:83 actions/groupdesignsettings.php:97 #: actions/grouplogo.php:99 actions/groupmembers.php:83 -#: actions/joingroup.php:83 actions/showgroup.php:137 +#: actions/grouprss.php:98 actions/groupunblock.php:86 +#: actions/joingroup.php:83 actions/leavegroup.php:83 actions/makeadmin.php:86 +#: actions/showgroup.php:137 lib/command.php:212 lib/command.php:263 #, fuzzy -msgid "No such group" +msgid "No such group." msgstr "Böyle bir durum mesajı yok." #: actions/blockedfromgroup.php:90 @@ -726,7 +716,7 @@ msgstr "Kullanıcının profili yok." #: actions/blockedfromgroup.php:93 #, fuzzy, php-format -msgid "%s blocked profiles, page %d" +msgid "%1$s blocked profiles, page %2$d" msgstr "%s ve arkadaÅŸları" #: actions/blockedfromgroup.php:108 @@ -841,10 +831,6 @@ msgstr "Böyle bir durum mesajı yok." msgid "Delete this notice" msgstr "" -#: actions/deletenotice.php:157 -msgid "There was a problem with your session token. Try again, please." -msgstr "" - #: actions/deleteuser.php:67 #, fuzzy msgid "You cannot delete users." @@ -871,7 +857,7 @@ msgid "Delete this user" msgstr "Böyle bir kullanıcı yok." #: actions/designadminpanel.php:62 lib/accountsettingsaction.php:124 -#: lib/adminpanelaction.php:302 lib/groupnav.php:119 +#: lib/adminpanelaction.php:316 lib/groupnav.php:119 msgid "Design" msgstr "" @@ -1019,7 +1005,7 @@ msgstr "" #: actions/editgroup.php:103 actions/editgroup.php:168 #: actions/groupdesignsettings.php:104 actions/grouplogo.php:106 -msgid "You must be an admin to edit the group" +msgid "You must be an admin to edit the group." msgstr "" #: actions/editgroup.php:154 @@ -1047,8 +1033,9 @@ msgid "Options saved." msgstr "Ayarlar kaydedildi." #: actions/emailsettings.php:60 -msgid "Email Settings" -msgstr "" +#, fuzzy +msgid "Email settings" +msgstr "Profil ayarları" #: actions/emailsettings.php:71 #, php-format @@ -1082,8 +1069,9 @@ msgid "Cancel" msgstr "Ä°ptal et" #: actions/emailsettings.php:121 -msgid "Email Address" -msgstr "" +#, fuzzy +msgid "Email address" +msgstr "Eposta adresi onayı" #: actions/emailsettings.php:123 msgid "Email address, like \"UserName@example.org\"" @@ -1156,9 +1144,10 @@ msgstr "" msgid "Cannot normalize that email address" msgstr "" -#: actions/emailsettings.php:331 actions/siteadminpanel.php:157 -msgid "Not a valid email address" -msgstr "" +#: actions/emailsettings.php:331 actions/register.php:201 +#: actions/siteadminpanel.php:157 +msgid "Not a valid email address." +msgstr "Geçersiz bir eposta adresi." #: actions/emailsettings.php:334 msgid "That is already your email address." @@ -1339,20 +1328,12 @@ msgstr "OMB protokolünün bilinmeÄŸen sürümü." msgid "Error updating remote profile" msgstr "Uzaktaki profili güncellemede hata oluÅŸtu" -#: actions/foafgroup.php:44 actions/foafgroup.php:62 actions/groupblock.php:86 -#: actions/grouprss.php:98 actions/groupunblock.php:86 -#: actions/leavegroup.php:83 actions/makeadmin.php:86 lib/command.php:212 -#: lib/command.php:263 -#, fuzzy -msgid "No such group." -msgstr "Böyle bir durum mesajı yok." - -#: actions/getfile.php:75 +#: actions/getfile.php:79 #, fuzzy msgid "No such file." msgstr "Böyle bir durum mesajı yok." -#: actions/getfile.php:79 +#: actions/getfile.php:83 #, fuzzy msgid "Cannot read file." msgstr "Böyle bir durum mesajı yok." @@ -1365,7 +1346,7 @@ msgstr "" #: actions/groupblock.php:76 actions/groupunblock.php:76 #: actions/makeadmin.php:76 actions/subedit.php:53 actions/tagother.php:46 -#: lib/profileformaction.php:77 +#: actions/unsubscribe.php:84 lib/profileformaction.php:77 msgid "No profile with that ID." msgstr "" @@ -1396,9 +1377,9 @@ msgstr "Böyle bir kullanıcı yok." #: actions/groupblock.php:162 #, php-format msgid "" -"Are you sure you want to block user \"%s\" from the group \"%s\"? They will " -"be removed from the group, unable to post, and unable to subscribe to the " -"group in the future." +"Are you sure you want to block user \"%1$s\" from the group \"%2$s\"? They " +"will be removed from the group, unable to post, and unable to subscribe to " +"the group in the future." msgstr "" #: actions/groupblock.php:178 @@ -1415,9 +1396,10 @@ msgstr "Böyle bir kullanıcı yok." msgid "Database error blocking user from group." msgstr "" -#: actions/groupbyid.php:74 -msgid "No ID" -msgstr "" +#: actions/groupbyid.php:74 actions/userbyid.php:70 +#, fuzzy +msgid "No ID." +msgstr "Kullanıcı numarası yok" #: actions/groupdesignsettings.php:68 msgid "You must be logged in to edit a group." @@ -1439,12 +1421,6 @@ msgstr "" msgid "Couldn't update your design." msgstr "Kullanıcı güncellenemedi." -#: actions/groupdesignsettings.php:287 actions/groupdesignsettings.php:297 -#: actions/userdesignsettings.php:210 actions/userdesignsettings.php:220 -#: actions/userdesignsettings.php:263 actions/userdesignsettings.php:273 -msgid "Unable to save your design settings!" -msgstr "" - #: actions/groupdesignsettings.php:308 actions/userdesignsettings.php:231 #, fuzzy msgid "Design preferences saved." @@ -1460,6 +1436,11 @@ msgid "" "You can upload a logo image for your group. The maximum file size is %s." msgstr "" +#: actions/grouplogo.php:178 +#, fuzzy +msgid "User without matching profile." +msgstr "Kullanıcının profili yok." + #: actions/grouplogo.php:362 msgid "Pick a square area of the image to be the logo." msgstr "" @@ -1481,14 +1462,14 @@ msgstr "" #: actions/groupmembers.php:96 #, php-format -msgid "%s group members, page %d" +msgid "%1$s group members, page %2$d" msgstr "" #: actions/groupmembers.php:111 msgid "A list of the users in this group." msgstr "" -#: actions/groupmembers.php:175 lib/action.php:441 lib/groupnav.php:107 +#: actions/groupmembers.php:175 lib/action.php:442 lib/groupnav.php:107 msgid "Admin" msgstr "" @@ -1588,7 +1569,8 @@ msgid "Error removing the block." msgstr "Kullanıcıyı kaydetmede hata oluÅŸtu." #: actions/imsettings.php:59 -msgid "IM Settings" +#, fuzzy +msgid "IM settings" msgstr "IM Ayarları" #: actions/imsettings.php:70 @@ -1619,7 +1601,8 @@ msgstr "" "içeren mesajı almak için kontrol edin. (%s'u arkadaÅŸ listenize eklediniz mi?)" #: actions/imsettings.php:124 -msgid "IM Address" +#, fuzzy +msgid "IM address" msgstr "IM adresi" #: actions/imsettings.php:126 @@ -1681,11 +1664,6 @@ msgstr "" msgid "That is not your Jabber ID." msgstr "Bu sizin Jabber ID'niz deÄŸil." -#: actions/inbox.php:59 -#, php-format -msgid "Inbox for %s - page %d" -msgstr "" - #: actions/inbox.php:62 #, php-format msgid "Inbox for %s" @@ -1721,9 +1699,9 @@ msgstr "" msgid "You are already subscribed to these users:" msgstr "" -#: actions/invite.php:131 actions/invite.php:139 +#: actions/invite.php:131 actions/invite.php:139 lib/command.php:315 #, php-format -msgid "%s (%s)" +msgid "%1$s (%2$s)" msgstr "" #: actions/invite.php:136 @@ -1762,7 +1740,7 @@ msgstr "" msgid "Optionally add a personal message to the invitation." msgstr "" -#: actions/invite.php:197 lib/messageform.php:178 lib/noticeform.php:232 +#: actions/invite.php:197 lib/messageform.php:178 lib/noticeform.php:234 msgid "Send" msgstr "Gönder" @@ -1806,19 +1784,9 @@ msgstr "" msgid "You must be logged in to join a group." msgstr "" -#: actions/joingroup.php:90 lib/command.php:217 -#, fuzzy -msgid "You are already a member of that group" -msgstr "Zaten giriÅŸ yapmış durumdasıznız!" - -#: actions/joingroup.php:128 lib/command.php:234 -#, fuzzy, php-format -msgid "Could not join user %s to group %s" -msgstr "Sunucuya yönlendirme yapılamadı: %s" - #: actions/joingroup.php:135 lib/command.php:239 #, php-format -msgid "%s joined group %s" +msgid "%1$s joined group %2$s" msgstr "" #: actions/leavegroup.php:60 @@ -1834,15 +1802,10 @@ msgstr "Bize o profili yollamadınız" msgid "Could not find membership record." msgstr "" -#: actions/leavegroup.php:127 lib/command.php:284 -#, fuzzy, php-format -msgid "Could not remove user %s to group %s" -msgstr "OpenID formu yaratılamadı: %s" - #: actions/leavegroup.php:134 lib/command.php:289 -#, php-format -msgid "%s left group %s" -msgstr "" +#, fuzzy, php-format +msgid "%1$s left group %2$s" +msgstr "%1$s'in %2$s'deki durum mesajları " #: actions/login.php:83 actions/register.php:137 msgid "Already logged in." @@ -1862,7 +1825,7 @@ msgstr "Yanlış kullanıcı adı veya parola." msgid "Error setting user. You are probably not authorized." msgstr "YetkilendirilmemiÅŸ." -#: actions/login.php:208 actions/login.php:261 lib/action.php:459 +#: actions/login.php:208 actions/login.php:261 lib/action.php:460 #: lib/logingroupnav.php:79 msgid "Login" msgstr "GiriÅŸ" @@ -1918,19 +1881,19 @@ msgid "Only an admin can make another user an admin." msgstr "" #: actions/makeadmin.php:95 -#, php-format -msgid "%s is already an admin for group \"%s\"." -msgstr "" +#, fuzzy, php-format +msgid "%1$s is already an admin for group \"%2$s\"." +msgstr "Kullanıcının profili yok." #: actions/makeadmin.php:132 -#, php-format -msgid "Can't get membership record for %s in group %s" -msgstr "" +#, fuzzy, php-format +msgid "Can't get membership record for %1$s in group %2$s." +msgstr "OpenID formu yaratılamadı: %s" #: actions/makeadmin.php:145 -#, php-format -msgid "Can't make %s an admin for group %s" -msgstr "" +#, fuzzy, php-format +msgid "Can't make %1$s an admin for group %2$s." +msgstr "Kullanıcının profili yok." #: actions/microsummary.php:69 msgid "No current status" @@ -1972,7 +1935,7 @@ msgstr "" #: actions/newmessage.php:185 lib/command.php:376 #, php-format -msgid "Direct message to %s sent" +msgid "Direct message to %s sent." msgstr "" #: actions/newmessage.php:210 actions/newnotice.php:245 lib/channel.php:170 @@ -2003,7 +1966,7 @@ msgstr "Metin arama" #: actions/noticesearch.php:91 #, fuzzy, php-format -msgid "Search results for \"%s\" on %s" +msgid "Search results for \"%1$s\" on %2$s" msgstr " \"%s\" için arama sonuçları" #: actions/noticesearch.php:121 @@ -2109,11 +2072,6 @@ msgstr "" msgid "URL shortening service is too long (max 50 chars)." msgstr "Yer bilgisi çok uzun (azm: 255 karakter)." -#: actions/outbox.php:58 -#, php-format -msgid "Outbox for %s - page %d" -msgstr "" - #: actions/outbox.php:61 #, php-format msgid "Outbox for %s" @@ -2186,7 +2144,7 @@ msgstr "Yeni parola kaydedilemedi." msgid "Password saved." msgstr "Parola kaydedildi." -#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:308 +#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:326 msgid "Paths" msgstr "" @@ -2219,7 +2177,7 @@ msgid "Invalid SSL server. The maximum length is 255 characters." msgstr "" #: actions/pathsadminpanel.php:217 actions/siteadminpanel.php:58 -#: lib/adminpanelaction.php:299 +#: lib/adminpanelaction.php:311 msgid "Site" msgstr "" @@ -2319,8 +2277,9 @@ msgid "When to use SSL" msgstr "" #: actions/pathsadminpanel.php:308 -msgid "SSL Server" -msgstr "" +#, fuzzy +msgid "SSL server" +msgstr "Geri al" #: actions/pathsadminpanel.php:309 msgid "Server to direct SSL requests to" @@ -2351,9 +2310,9 @@ msgid "Not a valid people tag: %s" msgstr "Geçersiz bir eposta adresi." #: actions/peopletag.php:144 -#, php-format -msgid "Users self-tagged with %s - page %d" -msgstr "" +#, fuzzy, php-format +msgid "Users self-tagged with %1$s - page %2$d" +msgstr "%s adli kullanicinin durum mesajlari" #: actions/postnotice.php:84 msgid "Invalid notice content" @@ -2361,7 +2320,7 @@ msgstr "Geçersiz durum mesajı" #: actions/postnotice.php:90 #, php-format -msgid "Notice license ‘%s’ is not compatible with site license ‘%s’." +msgid "Notice license ‘%1$s’ is not compatible with site license ‘%2$s’." msgstr "" #: actions/profilesettings.php:60 @@ -2485,21 +2444,21 @@ msgstr "%s Geçersiz baÅŸlangıç sayfası" msgid "Couldn't update user for autosubscribe." msgstr "" -#: actions/profilesettings.php:354 +#: actions/profilesettings.php:359 #, fuzzy msgid "Couldn't save location prefs." msgstr "Profil kaydedilemedi." -#: actions/profilesettings.php:366 +#: actions/profilesettings.php:371 msgid "Couldn't save profile." msgstr "Profil kaydedilemedi." -#: actions/profilesettings.php:374 +#: actions/profilesettings.php:379 #, fuzzy msgid "Couldn't save tags." msgstr "Profil kaydedilemedi." -#: actions/profilesettings.php:382 lib/adminpanelaction.php:126 +#: actions/profilesettings.php:387 lib/adminpanelaction.php:137 msgid "Settings saved." msgstr "Ayarlar kaydedildi." @@ -2596,7 +2555,7 @@ msgid "" "one!" msgstr "" -#: actions/publictagcloud.php:135 +#: actions/publictagcloud.php:131 msgid "Tag cloud" msgstr "" @@ -2735,7 +2694,7 @@ msgstr "Onay kodu hatası." msgid "Registration successful" msgstr "" -#: actions/register.php:114 actions/register.php:502 lib/action.php:456 +#: actions/register.php:114 actions/register.php:502 lib/action.php:457 #: lib/logingroupnav.php:85 msgid "Register" msgstr "Kayıt" @@ -2748,10 +2707,6 @@ msgstr "" msgid "You can't register if you don't agree to the license." msgstr "EÄŸer lisansı kabul etmezseniz kayıt olamazsınız." -#: actions/register.php:201 -msgid "Not a valid email address." -msgstr "Geçersiz bir eposta adresi." - #: actions/register.php:212 msgid "Email address already exists." msgstr "Eposta adresi zaten var." @@ -2812,10 +2767,10 @@ msgstr "" #: actions/register.php:537 #, php-format msgid "" -"Congratulations, %s! And welcome to %%%%site.name%%%%. From here, you may " +"Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may " "want to...\n" "\n" -"* Go to [your profile](%s) and post your first message.\n" +"* Go to [your profile](%2$s) and post your first message.\n" "* Add a [Jabber/GTalk address](%%%%action.imsettings%%%%) so you can send " "notices through instant messages.\n" "* [Search for people](%%%%action.peoplesearch%%%%) that you may know or that " @@ -2924,11 +2879,6 @@ msgstr "Yarat" msgid "Replies to %s" msgstr "%s için cevaplar" -#: actions/replies.php:127 -#, fuzzy, php-format -msgid "Replies to %s, page %d" -msgstr "%s için cevaplar" - #: actions/replies.php:144 #, fuzzy, php-format msgid "Replies feed for %s (RSS 1.0)" @@ -2947,8 +2897,8 @@ msgstr "%s için durum RSS beslemesi" #: actions/replies.php:198 #, php-format msgid "" -"This is the timeline showing replies to %s but %s hasn't received a notice " -"to his attention yet." +"This is the timeline showing replies to %1$s but %2$s hasn't received a " +"notice to his attention yet." msgstr "" #: actions/replies.php:203 @@ -2961,8 +2911,8 @@ msgstr "" #: actions/replies.php:205 #, php-format msgid "" -"You can try to [nudge %s](../%s) or [post something to his or her attention]" -"(%%%%action.newnotice%%%%?status_textarea=%s)." +"You can try to [nudge %1$s](../%2$s) or [post something to his or her " +"attention](%%%%action.newnotice%%%%?status_textarea=%3$s)." msgstr "" #: actions/repliesrss.php:72 @@ -2980,11 +2930,6 @@ msgstr "Bize o profili yollamadınız" msgid "User is already sandboxed." msgstr "Kullanıcının profili yok." -#: actions/showfavorites.php:79 -#, fuzzy, php-format -msgid "%s's favorite notices, page %d" -msgstr "Böyle bir durum mesajı yok." - #: actions/showfavorites.php:132 msgid "Could not retrieve favorite notices." msgstr "" @@ -3034,11 +2979,6 @@ msgstr "" msgid "%s group" msgstr "" -#: actions/showgroup.php:84 -#, php-format -msgid "%s group, page %d" -msgstr "" - #: actions/showgroup.php:218 #, fuzzy msgid "Group profile" @@ -3090,7 +3030,7 @@ msgstr "Ãœyelik baÅŸlangıcı" #: actions/showgroup.php:386 lib/profileaction.php:117 #: lib/profileaction.php:148 lib/profileaction.php:236 lib/section.php:95 -#: lib/tagcloudsection.php:71 +#: lib/subscriptionlist.php:126 lib/tagcloudsection.php:71 msgid "(None)" msgstr "" @@ -3158,14 +3098,9 @@ msgstr "Durum mesajları" msgid " tagged %s" msgstr "" -#: actions/showstream.php:79 -#, php-format -msgid "%s, page %d" -msgstr "" - #: actions/showstream.php:122 #, fuzzy, php-format -msgid "Notice feed for %s tagged %s (RSS 1.0)" +msgid "Notice feed for %1$s tagged %2$s (RSS 1.0)" msgstr "%s için durum RSS beslemesi" #: actions/showstream.php:129 @@ -3190,7 +3125,7 @@ msgstr "" #: actions/showstream.php:191 #, php-format -msgid "This is the timeline for %s but %s hasn't posted anything yet." +msgid "This is the timeline for %1$s but %2$s hasn't posted anything yet." msgstr "" #: actions/showstream.php:196 @@ -3202,8 +3137,8 @@ msgstr "" #: actions/showstream.php:198 #, php-format msgid "" -"You can try to nudge %s or [post something to his or her attention](%%%%" -"action.newnotice%%%%?status_textarea=%s)." +"You can try to nudge %1$s or [post something to his or her attention](%%%%" +"action.newnotice%%%%?status_textarea=%2$s)." msgstr "" #: actions/showstream.php:234 @@ -3247,12 +3182,12 @@ msgstr "" #: actions/siteadminpanel.php:154 #, fuzzy -msgid "You must have a valid contact email address" +msgid "You must have a valid contact email address." msgstr "Geçersiz bir eposta adresi." #: actions/siteadminpanel.php:172 #, php-format -msgid "Unknown language \"%s\"" +msgid "Unknown language \"%s\"." msgstr "" #: actions/siteadminpanel.php:179 @@ -3440,8 +3375,9 @@ msgid "Save site settings" msgstr "Ayarlar" #: actions/smssettings.php:58 -msgid "SMS Settings" -msgstr "" +#, fuzzy +msgid "SMS settings" +msgstr "IM Ayarları" #: actions/smssettings.php:69 #, php-format @@ -3470,7 +3406,7 @@ msgid "Enter the code you received on your phone." msgstr "" #: actions/smssettings.php:138 -msgid "SMS Phone number" +msgid "SMS phone number" msgstr "" #: actions/smssettings.php:140 @@ -3559,9 +3495,9 @@ msgid "%s subscribers" msgstr "Abone olanlar" #: actions/subscribers.php:52 -#, php-format -msgid "%s subscribers, page %d" -msgstr "" +#, fuzzy, php-format +msgid "%1$s subscribers, page %2$d" +msgstr "Bütün abonelikler" #: actions/subscribers.php:63 msgid "These are the people who listen to your notices." @@ -3597,7 +3533,7 @@ msgstr "Bütün abonelikler" #: actions/subscriptions.php:54 #, fuzzy, php-format -msgid "%s subscriptions, page %d" +msgid "%1$s subscriptions, page %2$d" msgstr "Bütün abonelikler" #: actions/subscriptions.php:65 @@ -3633,11 +3569,6 @@ msgstr "JabberID yok." msgid "SMS" msgstr "" -#: actions/tag.php:68 -#, fuzzy, php-format -msgid "Notices tagged with %s, page %d" -msgstr "%s adli kullanicinin durum mesajlari" - #: actions/tag.php:86 #, fuzzy, php-format msgid "Notice feed for tag %s (RSS 1.0)" @@ -3725,10 +3656,6 @@ msgstr "Kullanıcının profili yok." msgid "No profile id in request." msgstr "Yetkilendirme isteÄŸi yok!" -#: actions/unsubscribe.php:84 -msgid "No profile with that id." -msgstr "" - #: actions/unsubscribe.php:98 #, fuzzy msgid "Unsubscribed" @@ -3736,10 +3663,11 @@ msgstr "AboneliÄŸi sonlandır" #: actions/updateprofile.php:62 actions/userauthorization.php:330 #, php-format -msgid "Listenee stream license ‘%s’ is not compatible with site license ‘%s’." +msgid "" +"Listenee stream license ‘%1$s’ is not compatible with site license ‘%2$s’." msgstr "" -#: actions/useradminpanel.php:58 lib/adminpanelaction.php:305 +#: actions/useradminpanel.php:58 lib/adminpanelaction.php:321 #: lib/personalgroupnav.php:115 msgid "User" msgstr "" @@ -3844,7 +3772,7 @@ msgstr "" "detayları gözden geçirin. Kimsenin durumunu taki etme isteÄŸinde " "bulunmadıysanız \"Ä°ptal\" tuÅŸuna basın. " -#: actions/userauthorization.php:188 +#: actions/userauthorization.php:188 actions/version.php:165 msgid "License" msgstr "" @@ -3895,7 +3823,7 @@ msgstr "" #: actions/userauthorization.php:296 #, php-format -msgid "Listener URI ‘%s’ not found here" +msgid "Listener URI ‘%s’ not found here." msgstr "" #: actions/userauthorization.php:301 @@ -3928,11 +3856,6 @@ msgstr "Avatar URLi '%s' okunamıyor" msgid "Wrong image type for avatar URL ‘%s’." msgstr "%s için yanlış resim türü" -#: actions/userbyid.php:70 -#, fuzzy -msgid "No ID." -msgstr "Kullanıcı numarası yok" - #: actions/userdesignsettings.php:76 lib/designsettings.php:65 #, fuzzy msgid "Profile design" @@ -3948,11 +3871,6 @@ msgstr "" msgid "Enjoy your hotdog!" msgstr "" -#: actions/usergroups.php:64 -#, php-format -msgid "%s groups, page %d" -msgstr "" - #: actions/usergroups.php:130 msgid "Search for more groups" msgstr "" @@ -3967,6 +3885,73 @@ msgstr "Bize o profili yollamadınız" msgid "Try [searching for groups](%%action.groupsearch%%) and joining them." msgstr "" +#: actions/version.php:73 +#, fuzzy, php-format +msgid "StatusNet %s" +msgstr "Ä°statistikler" + +#: actions/version.php:153 +#, php-format +msgid "" +"This site is powered by %1$s version %2$s, Copyright 2008-2010 StatusNet, " +"Inc. and contributors." +msgstr "" + +#: actions/version.php:157 +#, fuzzy +msgid "StatusNet" +msgstr "Avatar güncellendi." + +#: actions/version.php:161 +msgid "Contributors" +msgstr "" + +#: actions/version.php:168 +msgid "" +"StatusNet is free software: you can redistribute it and/or modify it under " +"the terms of the GNU Affero General Public License as published by the Free " +"Software Foundation, either version 3 of the License, or (at your option) " +"any later version. " +msgstr "" + +#: actions/version.php:174 +msgid "" +"This program is distributed in the hope that it will be useful, but WITHOUT " +"ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or " +"FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License " +"for more details. " +msgstr "" + +#: actions/version.php:180 +#, php-format +msgid "" +"You should have received a copy of the GNU Affero General Public License " +"along with this program. If not, see %s." +msgstr "" + +#: actions/version.php:189 +msgid "Plugins" +msgstr "" + +#: actions/version.php:195 +#, fuzzy +msgid "Name" +msgstr "Takma ad" + +#: actions/version.php:196 lib/action.php:741 +#, fuzzy +msgid "Version" +msgstr "KiÅŸisel" + +#: actions/version.php:197 +msgid "Author(s)" +msgstr "" + +#: actions/version.php:198 lib/groupeditform.php:172 +#, fuzzy +msgid "Description" +msgstr "Abonelikler" + #: classes/File.php:137 #, php-format msgid "" @@ -4035,7 +4020,7 @@ msgstr "Durum mesajını kaydederken hata oluÅŸtu." msgid "DB error inserting reply: %s" msgstr "Cevap eklenirken veritabanı hatası: %s" -#: classes/Notice.php:1361 +#: classes/Notice.php:1359 #, php-format msgid "RT @%1$s %2$s" msgstr "" @@ -4085,145 +4070,140 @@ msgstr "" msgid "Other options" msgstr "" -#: lib/action.php:144 -#, php-format -msgid "%s - %s" -msgstr "" - #: lib/action.php:159 msgid "Untitled page" msgstr "" -#: lib/action.php:426 +#: lib/action.php:427 msgid "Primary site navigation" msgstr "" -#: lib/action.php:432 +#: lib/action.php:433 msgid "Home" msgstr "BaÅŸlangıç" -#: lib/action.php:432 +#: lib/action.php:433 msgid "Personal profile and friends timeline" msgstr "" -#: lib/action.php:434 +#: lib/action.php:435 #, fuzzy msgid "Account" msgstr "Hakkında" -#: lib/action.php:434 +#: lib/action.php:435 msgid "Change your email, avatar, password, profile" msgstr "" -#: lib/action.php:437 +#: lib/action.php:438 msgid "Connect" msgstr "BaÄŸlan" -#: lib/action.php:437 +#: lib/action.php:438 #, fuzzy msgid "Connect to services" msgstr "Sunucuya yönlendirme yapılamadı: %s" -#: lib/action.php:441 +#: lib/action.php:442 #, fuzzy msgid "Change site configuration" msgstr "Abonelikler" -#: lib/action.php:445 lib/subgroupnav.php:105 +#: lib/action.php:446 lib/subgroupnav.php:105 msgid "Invite" msgstr "" -#: lib/action.php:446 lib/subgroupnav.php:106 +#: lib/action.php:447 lib/subgroupnav.php:106 #, php-format msgid "Invite friends and colleagues to join you on %s" msgstr "" -#: lib/action.php:451 +#: lib/action.php:452 msgid "Logout" msgstr "Çıkış" -#: lib/action.php:451 +#: lib/action.php:452 msgid "Logout from the site" msgstr "" -#: lib/action.php:456 +#: lib/action.php:457 #, fuzzy msgid "Create an account" msgstr "Yeni hesap oluÅŸtur" -#: lib/action.php:459 +#: lib/action.php:460 msgid "Login to the site" msgstr "" -#: lib/action.php:462 lib/action.php:725 +#: lib/action.php:463 lib/action.php:726 msgid "Help" msgstr "Yardım" -#: lib/action.php:462 +#: lib/action.php:463 #, fuzzy msgid "Help me!" msgstr "Yardım" -#: lib/action.php:465 lib/searchaction.php:127 +#: lib/action.php:466 lib/searchaction.php:127 msgid "Search" msgstr "Ara" -#: lib/action.php:465 +#: lib/action.php:466 msgid "Search for people or text" msgstr "" -#: lib/action.php:486 +#: lib/action.php:487 #, fuzzy msgid "Site notice" msgstr "Yeni durum mesajı" -#: lib/action.php:552 +#: lib/action.php:553 msgid "Local views" msgstr "" -#: lib/action.php:618 +#: lib/action.php:619 #, fuzzy msgid "Page notice" msgstr "Yeni durum mesajı" -#: lib/action.php:720 +#: lib/action.php:721 #, fuzzy msgid "Secondary site navigation" msgstr "Abonelikler" -#: lib/action.php:727 +#: lib/action.php:728 msgid "About" msgstr "Hakkında" -#: lib/action.php:729 +#: lib/action.php:730 msgid "FAQ" msgstr "SSS" -#: lib/action.php:733 +#: lib/action.php:734 msgid "TOS" msgstr "" -#: lib/action.php:736 +#: lib/action.php:737 msgid "Privacy" msgstr "Gizlilik" -#: lib/action.php:738 +#: lib/action.php:739 msgid "Source" msgstr "Kaynak" -#: lib/action.php:740 +#: lib/action.php:743 msgid "Contact" msgstr "Ä°letiÅŸim" -#: lib/action.php:742 +#: lib/action.php:745 msgid "Badge" msgstr "" -#: lib/action.php:770 +#: lib/action.php:773 msgid "StatusNet software license" msgstr "" -#: lib/action.php:773 +#: lib/action.php:776 #, php-format msgid "" "**%%site.name%%** is a microblogging service brought to you by [%%site." @@ -4232,12 +4212,12 @@ msgstr "" "**%%site.name%%** [%%site.broughtby%%](%%site.broughtbyurl%%)\" tarafından " "hazırlanan anında mesajlaÅŸma ağıdır. " -#: lib/action.php:775 +#: lib/action.php:778 #, php-format msgid "**%%site.name%%** is a microblogging service. " msgstr "**%%site.name%%** bir aninda mesajlaÅŸma sosyal ağıdır." -#: lib/action.php:777 +#: lib/action.php:780 #, php-format msgid "" "It runs the [StatusNet](http://status.net/) microblogging software, version %" @@ -4248,34 +4228,34 @@ msgstr "" "licenses/agpl-3.0.html) lisansı ile korunan [StatusNet](http://status.net/) " "microbloglama yazılımının %s. versiyonunu kullanmaktadır." -#: lib/action.php:791 +#: lib/action.php:794 #, fuzzy msgid "Site content license" msgstr "Yeni durum mesajı" -#: lib/action.php:800 +#: lib/action.php:803 msgid "All " msgstr "" -#: lib/action.php:805 +#: lib/action.php:808 msgid "license." msgstr "" -#: lib/action.php:1099 +#: lib/action.php:1102 msgid "Pagination" msgstr "" -#: lib/action.php:1108 +#: lib/action.php:1111 #, fuzzy msgid "After" msgstr "« Sonra" -#: lib/action.php:1116 +#: lib/action.php:1119 #, fuzzy msgid "Before" msgstr "Önce »" -#: lib/action.php:1164 +#: lib/action.php:1167 msgid "There was a problem with your session token." msgstr "" @@ -4283,29 +4263,33 @@ msgstr "" msgid "You cannot make changes to this site." msgstr "" -#: lib/adminpanelaction.php:195 +#: lib/adminpanelaction.php:107 +msgid "Changes to that panel are not allowed." +msgstr "" + +#: lib/adminpanelaction.php:206 msgid "showForm() not implemented." msgstr "" -#: lib/adminpanelaction.php:224 +#: lib/adminpanelaction.php:235 msgid "saveSettings() not implemented." msgstr "" -#: lib/adminpanelaction.php:247 +#: lib/adminpanelaction.php:258 msgid "Unable to delete design setting." msgstr "" -#: lib/adminpanelaction.php:300 +#: lib/adminpanelaction.php:312 #, fuzzy msgid "Basic site configuration" msgstr "Eposta adresi onayı" -#: lib/adminpanelaction.php:303 +#: lib/adminpanelaction.php:317 #, fuzzy msgid "Design configuration" msgstr "Eposta adresi onayı" -#: lib/adminpanelaction.php:306 lib/adminpanelaction.php:309 +#: lib/adminpanelaction.php:322 lib/adminpanelaction.php:327 #, fuzzy msgid "Paths configuration" msgstr "Eposta adresi onayı" @@ -4331,11 +4315,21 @@ msgstr "" msgid "Tags for this attachment" msgstr "" +#: lib/authenticationplugin.php:182 lib/authenticationplugin.php:187 +#, fuzzy +msgid "Password changing failed" +msgstr "Parola kaydedildi." + +#: lib/authenticationplugin.php:197 +#, fuzzy +msgid "Password changing is not allowed" +msgstr "Parola kaydedildi." + #: lib/channel.php:138 lib/channel.php:158 msgid "Command results" msgstr "" -#: lib/channel.php:210 +#: lib/channel.php:210 lib/mailhandler.php:142 msgid "Command complete" msgstr "" @@ -4348,8 +4342,8 @@ msgid "Sorry, this command is not yet implemented." msgstr "" #: lib/command.php:88 -#, php-format -msgid "Could not find a user with nickname %s" +#, fuzzy, php-format +msgid "Could not find a user with nickname %s." msgstr "Kullanıcı güncellenemedi." #: lib/command.php:92 @@ -4358,7 +4352,7 @@ msgstr "" #: lib/command.php:99 #, php-format -msgid "Nudge sent to %s" +msgid "Nudge sent to %s." msgstr "" #: lib/command.php:126 @@ -4370,34 +4364,35 @@ msgid "" msgstr "" #: lib/command.php:152 lib/command.php:399 lib/command.php:460 -msgid "Notice with that id does not exist" +msgid "Notice with that id does not exist." msgstr "" #: lib/command.php:168 lib/command.php:415 lib/command.php:476 #: lib/command.php:532 -msgid "User has no last notice" -msgstr "" +#, fuzzy +msgid "User has no last notice." +msgstr "Kullanıcının profili yok." #: lib/command.php:190 msgid "Notice marked as fave." msgstr "" -#: lib/command.php:315 -#, php-format -msgid "%1$s (%2$s)" -msgstr "" +#: lib/command.php:284 +#, fuzzy, php-format +msgid "Could not remove user %1$s to group %2$s." +msgstr "OpenID formu yaratılamadı: %s" #: lib/command.php:318 -#, php-format -msgid "Fullname: %s" -msgstr "" +#, fuzzy, php-format +msgid "Full name: %s" +msgstr "Tam Ä°sim" -#: lib/command.php:321 +#: lib/command.php:321 lib/mail.php:254 #, php-format msgid "Location: %s" msgstr "" -#: lib/command.php:324 +#: lib/command.php:324 lib/mail.php:256 #, php-format msgid "Homepage: %s" msgstr "" @@ -4409,24 +4404,16 @@ msgstr "" #: lib/command.php:358 scripts/xmppdaemon.php:301 #, php-format -msgid "Message too long - maximum is %d characters, you sent %d" +msgid "Message too long - maximum is %1$d characters, you sent %2$d." msgstr "" #: lib/command.php:378 msgid "Error sending direct message." msgstr "" -#: lib/command.php:422 -msgid "Cannot repeat your own notice" -msgstr "" - -#: lib/command.php:427 -msgid "Already repeated that notice" -msgstr "" - #: lib/command.php:435 #, fuzzy, php-format -msgid "Notice from %s repeated" +msgid "Notice from %s repeated." msgstr "Durum mesajları" #: lib/command.php:437 @@ -4436,12 +4423,12 @@ msgstr "Durum mesajını kaydederken hata oluÅŸtu." #: lib/command.php:491 #, php-format -msgid "Notice too long - maximum is %d characters, you sent %d" +msgid "Notice too long - maximum is %1$d characters, you sent %2$d." msgstr "" #: lib/command.php:500 #, fuzzy, php-format -msgid "Reply to %s sent" +msgid "Reply to %s sent." msgstr "%s için cevaplar" #: lib/command.php:502 @@ -4450,7 +4437,7 @@ msgid "Error saving notice." msgstr "Durum mesajını kaydederken hata oluÅŸtu." #: lib/command.php:556 -msgid "Specify the name of the user to subscribe to" +msgid "Specify the name of the user to subscribe to." msgstr "" #: lib/command.php:563 @@ -4459,7 +4446,7 @@ msgid "Subscribed to %s" msgstr "" #: lib/command.php:584 -msgid "Specify the name of the user to unsubscribe from" +msgid "Specify the name of the user to unsubscribe from." msgstr "" #: lib/command.php:591 @@ -4488,17 +4475,17 @@ msgid "Can't turn on notification." msgstr "" #: lib/command.php:650 -msgid "Login command is disabled" +msgid "Login command is disabled." msgstr "" #: lib/command.php:664 #, fuzzy, php-format -msgid "Could not create login token for %s" +msgid "Could not create login token for %s." msgstr "Avatar bilgisi kaydedilemedi" #: lib/command.php:669 #, php-format -msgid "This link is useable only once, and is good for only 2 minutes: %s" +msgid "This link is useable only once, and is good for only 2 minutes: %s." msgstr "" #: lib/command.php:685 @@ -4694,11 +4681,6 @@ msgstr "Kendinizi ve ilgi alanlarınızı 140 karakter ile anlatın" msgid "Describe the group or topic in %d characters" msgstr "Kendinizi ve ilgi alanlarınızı 140 karakter ile anlatın" -#: lib/groupeditform.php:172 -#, fuzzy -msgid "Description" -msgstr "Abonelikler" - #: lib/groupeditform.php:179 #, fuzzy msgid "" @@ -4872,22 +4854,10 @@ msgstr "" "Kendisini durumsuz bırakmayın!,\n" "%4$s.\n" -#: lib/mail.php:254 -#, php-format -msgid "Location: %s\n" -msgstr "" - -#: lib/mail.php:256 -#, php-format -msgid "Homepage: %s\n" -msgstr "" - #: lib/mail.php:258 -#, php-format -msgid "" -"Bio: %s\n" -"\n" -msgstr "" +#, fuzzy, php-format +msgid "Bio: %s" +msgstr "Hakkında" #: lib/mail.php:286 #, php-format @@ -5021,6 +4991,27 @@ msgstr "" msgid "from" msgstr "" +#: lib/mailhandler.php:37 +msgid "Could not parse message." +msgstr "" + +#: lib/mailhandler.php:42 +msgid "Not a registered user." +msgstr "" + +#: lib/mailhandler.php:46 +msgid "Sorry, that is not your incoming email address." +msgstr "" + +#: lib/mailhandler.php:50 +msgid "Sorry, no incoming email allowed." +msgstr "" + +#: lib/mailhandler.php:228 +#, fuzzy, php-format +msgid "Unsupported message type: %s" +msgstr "Desteklenmeyen görüntü dosyası biçemi." + #: lib/mediafile.php:98 lib/mediafile.php:123 msgid "There was a database error while saving your file. Please try again." msgstr "" @@ -5052,7 +5043,7 @@ msgid "File upload stopped by extension." msgstr "" #: lib/mediafile.php:179 lib/mediafile.php:216 -msgid "File exceeds user's quota!" +msgid "File exceeds user's quota." msgstr "" #: lib/mediafile.php:196 lib/mediafile.php:233 @@ -5061,7 +5052,7 @@ msgstr "" #: lib/mediafile.php:201 lib/mediafile.php:237 #, fuzzy -msgid "Could not determine file's mime-type!" +msgid "Could not determine file's MIME type." msgstr "Kullanıcı güncellenemedi." #: lib/mediafile.php:270 @@ -5071,7 +5062,7 @@ msgstr "" #: lib/mediafile.php:275 #, php-format -msgid "%s is not a supported filetype on this server." +msgid "%s is not a supported file type on this server." msgstr "" #: lib/messageform.php:120 @@ -5106,7 +5097,17 @@ msgid "Attach a file" msgstr "" #: lib/noticeform.php:212 -msgid "Share your location" +#, fuzzy +msgid "Share my location." +msgstr "Profil kaydedilemedi." + +#: lib/noticeform.php:214 +#, fuzzy +msgid "Do not share my location." +msgstr "Profil kaydedilemedi." + +#: lib/noticeform.php:215 +msgid "Hide this info" msgstr "" #: lib/noticelist.php:428 @@ -5228,6 +5229,10 @@ msgstr "" msgid "Tags in %s's notices" msgstr "" +#: lib/plugin.php:114 +msgid "Unknown" +msgstr "" + #: lib/profileaction.php:109 lib/profileaction.php:192 lib/subgroupnav.php:82 msgid "Subscriptions" msgstr "Abonelikler" @@ -5410,10 +5415,6 @@ msgstr "" msgid "People Tagcloud as tagged" msgstr "" -#: lib/subscriptionlist.php:126 -msgid "(none)" -msgstr "" - #: lib/tagcloudsection.php:56 msgid "None" msgstr "" @@ -5531,19 +5532,3 @@ msgstr "BaÅŸlangıç sayfası adresi geçerli bir URL deÄŸil." #, php-format msgid "%s is not a valid color! Use 3 or 6 hex chars." msgstr "" - -#: scripts/maildaemon.php:48 -msgid "Could not parse message." -msgstr "" - -#: scripts/maildaemon.php:53 -msgid "Not a registered user." -msgstr "" - -#: scripts/maildaemon.php:57 -msgid "Sorry, that is not your incoming email address." -msgstr "" - -#: scripts/maildaemon.php:61 -msgid "Sorry, no incoming email allowed." -msgstr "" diff --git a/locale/uk/LC_MESSAGES/statusnet.po b/locale/uk/LC_MESSAGES/statusnet.po index df464a5e4..e52e525b1 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-01-03 10:37+0000\n" -"PO-Revision-Date: 2010-01-03 10:38:57+0000\n" +"POT-Creation-Date: 2010-01-10 11:27+0000\n" +"PO-Revision-Date: 2010-01-10 11:29:15+0000\n" "Language-Team: Ukrainian\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha (r60575); Translate extension (2009-12-06)\n" +"X-Generator: MediaWiki 1.16alpha (r60888); Translate extension (2010-01-04)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: uk\n" "X-Message-Group: out-statusnet\n" @@ -53,11 +53,6 @@ msgstr "Ðемає такої Ñторінки" msgid "No such user." msgstr "Такого кориÑтувача немає." -#: actions/all.php:84 -#, php-format -msgid "%s and friends, page %d" -msgstr "%s з друзÑми, Ñторінка %d" - #: actions/all.php:86 actions/all.php:167 actions/allrss.php:115 #: actions/apitimelinefriends.php:115 actions/apitimelinehome.php:115 #: lib/personalgroupnav.php:100 @@ -96,10 +91,10 @@ msgstr "" "або напишіть щоÑÑŒ Ñамі." #: actions/all.php:134 -#, php-format +#, fuzzy, php-format msgid "" -"You can try to [nudge %s](../%s) from his profile or [post something to his " -"or her attention](%%%%action.newnotice%%%%?status_textarea=%s)." +"You can try to [nudge %1$s](../%2$s) from his profile or [post something to " +"his or her attention](%%%%action.newnotice%%%%?status_textarea=%3$s)." msgstr "" "Ви можете [«розштовхати» %s](../%s) зі Ñторінки його профілю або [щоÑÑŒ йому " "напиÑати](%%%%action.newnotice%%%%?status_textarea=%s)." @@ -128,6 +123,23 @@ msgstr "ÐžÐ½Ð¾Ð²Ð»ÐµÐ½Ð½Ñ Ð²Ñ–Ð´ %1$s та друзів на %2$s!" #: actions/apiaccountupdateprofile.php:97 #: actions/apiaccountupdateprofilebackgroundimage.php:94 #: actions/apiaccountupdateprofilecolors.php:118 +#: actions/apidirectmessage.php:156 actions/apifavoritecreate.php:99 +#: actions/apifavoritedestroy.php:100 actions/apifriendshipscreate.php:100 +#: actions/apifriendshipsdestroy.php:100 actions/apifriendshipsshow.php:129 +#: actions/apigroupcreate.php:136 actions/apigroupismember.php:114 +#: actions/apigroupjoin.php:155 actions/apigroupleave.php:141 +#: actions/apigrouplist.php:132 actions/apigrouplistall.php:120 +#: actions/apigroupmembership.php:106 actions/apigroupshow.php:105 +#: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102 +#: actions/apistatusesretweets.php:112 actions/apistatusesshow.php:108 +#: actions/apistatusnetconfig.php:133 actions/apistatusnetversion.php:93 +#: actions/apisubscriptions.php:111 actions/apitimelinefavorites.php:146 +#: actions/apitimelinefriends.php:156 actions/apitimelinegroup.php:150 +#: actions/apitimelinehome.php:156 actions/apitimelinementions.php:151 +#: actions/apitimelinepublic.php:131 actions/apitimelineretweetedbyme.php:122 +#: actions/apitimelineretweetedtome.php:121 +#: actions/apitimelineretweetsofme.php:122 actions/apitimelinetag.php:141 +#: actions/apitimelineuser.php:165 actions/apiusershow.php:101 msgid "API method not found." msgstr "API метод не знайдено." @@ -186,6 +198,9 @@ msgstr "" #: actions/apiaccountupdateprofilebackgroundimage.php:146 #: actions/apiaccountupdateprofilecolors.php:164 #: actions/apiaccountupdateprofilecolors.php:174 +#: actions/groupdesignsettings.php:287 actions/groupdesignsettings.php:297 +#: actions/userdesignsettings.php:210 actions/userdesignsettings.php:220 +#: actions/userdesignsettings.php:263 actions/userdesignsettings.php:273 msgid "Unable to save your design settings." msgstr "Ðе маю можливоÑÑ‚Ñ– зберегти Ð½Ð°Ð»Ð°ÑˆÑ‚ÑƒÐ²Ð°Ð½Ð½Ñ Ð´Ð¸Ð·Ð°Ð¹Ð½Ñƒ." @@ -226,26 +241,6 @@ msgstr "ПрÑме Ð¿Ð¾Ð²Ñ–Ð´Ð¾Ð¼Ð»ÐµÐ½Ð½Ñ Ð´Ð¾ %s" msgid "All the direct messages sent to %s" msgstr "Ð’ÑÑ– прÑмі Ð¿Ð¾Ð²Ñ–Ð´Ð¾Ð¼Ð»ÐµÐ½Ð½Ñ Ð½Ð°Ð´Ñ–Ñлані до %s" -#: actions/apidirectmessage.php:156 actions/apifavoritecreate.php:99 -#: actions/apifavoritedestroy.php:100 actions/apifriendshipscreate.php:100 -#: actions/apifriendshipsdestroy.php:100 actions/apifriendshipsshow.php:129 -#: actions/apigroupcreate.php:136 actions/apigroupismember.php:114 -#: actions/apigroupjoin.php:155 actions/apigroupleave.php:141 -#: actions/apigrouplist.php:132 actions/apigrouplistall.php:120 -#: actions/apigroupmembership.php:106 actions/apigroupshow.php:105 -#: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102 -#: actions/apistatusesretweets.php:112 actions/apistatusesshow.php:108 -#: actions/apistatusnetconfig.php:133 actions/apistatusnetversion.php:93 -#: actions/apisubscriptions.php:111 actions/apitimelinefavorites.php:146 -#: actions/apitimelinefriends.php:156 actions/apitimelinegroup.php:150 -#: actions/apitimelinehome.php:156 actions/apitimelinementions.php:151 -#: actions/apitimelinepublic.php:131 actions/apitimelineretweetedbyme.php:122 -#: actions/apitimelineretweetedtome.php:121 -#: actions/apitimelineretweetsofme.php:122 actions/apitimelinetag.php:141 -#: actions/apitimelineuser.php:165 actions/apiusershow.php:101 -msgid "API method not found!" -msgstr "API метод не знайдено!" - #: actions/apidirectmessagenew.php:126 msgid "No message text!" msgstr "ÐŸÐ¾Ð²Ñ–Ð´Ð¾Ð¼Ð»ÐµÐ½Ð½Ñ Ð±ÐµÐ· текÑту!" @@ -270,7 +265,8 @@ msgid "No status found with that ID." msgstr "Жодних ÑтатуÑів з таким ID." #: actions/apifavoritecreate.php:119 -msgid "This status is already a favorite!" +#, fuzzy +msgid "This status is already a favorite." msgstr "Цей Ð´Ð¾Ð¿Ð¸Ñ Ð²Ð¶Ðµ Ñ” обраним!" #: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:176 @@ -278,7 +274,8 @@ msgid "Could not create favorite." msgstr "Ðе можна позначити Ñк обране." #: actions/apifavoritedestroy.php:122 -msgid "That status is not a favorite!" +#, fuzzy +msgid "That status is not a favorite." msgstr "Цей Ð´Ð¾Ð¿Ð¸Ñ Ð½Ðµ Ñ” обраним!" #: actions/apifavoritedestroy.php:134 actions/disfavor.php:87 @@ -299,7 +296,8 @@ msgid "Could not unfollow user: User not found." msgstr "Ðе вдалоÑÑ Ð²Ñ–Ð´Ð¼Ñ–Ð½Ð¸Ñ‚Ð¸ підпиÑку: кориÑтувача не знайдено." #: actions/apifriendshipsdestroy.php:120 -msgid "You cannot unfollow yourself!" +#, fuzzy +msgid "You cannot unfollow yourself." msgstr "Ðе можна відпиÑатиÑÑŒ від Ñамого Ñебе!" #: actions/apifriendshipsexists.php:94 @@ -386,7 +384,7 @@ msgstr "Додаткове Ñ–Ð¼â€™Ñ Ð½Ðµ може бути таким ÑамиРmsgid "Group not found!" msgstr "Групу не знайдено!" -#: actions/apigroupjoin.php:110 +#: actions/apigroupjoin.php:110 actions/joingroup.php:90 lib/command.php:217 msgid "You are already a member of that group." msgstr "Ви вже Ñ” учаÑником цієї групи." @@ -394,18 +392,18 @@ msgstr "Ви вже Ñ” учаÑником цієї групи." msgid "You have been blocked from that group by the admin." msgstr "Ðдмін цієї групи заблокував Вашу приÑутніÑÑ‚ÑŒ в ній." -#: actions/apigroupjoin.php:138 -#, php-format -msgid "Could not join user %s to group %s." +#: actions/apigroupjoin.php:138 actions/joingroup.php:128 lib/command.php:234 +#, fuzzy, php-format +msgid "Could not join user %1$s to group %2$s." msgstr "Ðе вдалоÑÑŒ долучити кориÑтувача %s до групи %s." #: actions/apigroupleave.php:114 msgid "You are not a member of this group." msgstr "Ви не Ñ” учаÑником цієї групи." -#: actions/apigroupleave.php:124 -#, php-format -msgid "Could not remove user %s to group %s." +#: actions/apigroupleave.php:124 actions/leavegroup.php:127 +#, fuzzy, php-format +msgid "Could not remove user %1$s from group %2$s." msgstr "Ðе вдалоÑÑ Ð²Ð¸Ð´Ð°Ð»Ð¸Ñ‚Ð¸ кориÑтувача %s з групи %s." #: actions/apigrouplist.php:95 @@ -413,11 +411,6 @@ msgstr "Ðе вдалоÑÑ Ð²Ð¸Ð´Ð°Ð»Ð¸Ñ‚Ð¸ кориÑтувача %s з гру msgid "%s's groups" msgstr "%s групи" -#: actions/apigrouplist.php:103 -#, php-format -msgid "Groups %s is a member of on %s." -msgstr "Групи, в Ñких %s бере учаÑÑ‚ÑŒ на %s." - #: actions/apigrouplistall.php:90 actions/usergroups.php:62 #, php-format msgid "%s groups" @@ -441,11 +434,11 @@ msgstr "Ви не можете видалити ÑÑ‚Ð°Ñ‚ÑƒÑ Ñ–Ð½ÑˆÐ¾Ð³Ð¾ кор msgid "No such notice." msgstr "Такого допиÑу немає." -#: actions/apistatusesretweet.php:83 +#: actions/apistatusesretweet.php:83 lib/command.php:422 msgid "Cannot repeat your own notice." msgstr "Ðе можу вторувати Вашому влаÑному допиÑу." -#: actions/apistatusesretweet.php:91 +#: actions/apistatusesretweet.php:91 lib/command.php:427 msgid "Already repeated that notice." msgstr "Цьому допиÑу вже вторували." @@ -458,7 +451,7 @@ msgid "No status with that ID found." msgstr "Ðе знайдено жодних ÑтатуÑів з таким ID." #: actions/apistatusesupdate.php:157 actions/newnotice.php:155 -#: scripts/maildaemon.php:71 +#: lib/mailhandler.php:60 #, php-format msgid "That's too long. Max notice size is %d chars." msgstr "Ðадто довго. МакÑимальний розмір допиÑу — %d знаків." @@ -479,13 +472,13 @@ msgid "Unsupported format." msgstr "Формат не підтримуєтьÑÑ." #: actions/apitimelinefavorites.php:108 -#, php-format -msgid "%s / Favorites from %s" +#, fuzzy, php-format +msgid "%1$s / Favorites from %2$s" msgstr "%s / Обрані від %s" #: actions/apitimelinefavorites.php:120 -#, php-format -msgid "%s updates favorited by %s / %s." +#, fuzzy, php-format +msgid "%1$s updates favorited by %2$s / %2$s." msgstr "%s Ð¾Ð½Ð¾Ð²Ð»ÐµÐ½Ð½Ñ Ð¾Ð±Ñ€Ð°Ð½Ð¸Ñ… від %s / %s." #: actions/apitimelinegroup.php:109 actions/apitimelineuser.php:118 @@ -553,8 +546,11 @@ msgstr "Ðе знайдено." msgid "No such attachment." msgstr "Такого Ð²ÐºÐ»Ð°Ð´ÐµÐ½Ð½Ñ Ð½ÐµÐ¼Ð°Ñ”." -#: actions/avatarbynickname.php:59 actions/grouprss.php:91 -#: actions/leavegroup.php:76 +#: actions/avatarbynickname.php:59 actions/blockedfromgroup.php:73 +#: actions/editgroup.php:84 actions/groupdesignsettings.php:84 +#: actions/grouplogo.php:86 actions/groupmembers.php:76 +#: actions/grouprss.php:91 actions/joingroup.php:76 actions/leavegroup.php:76 +#: actions/showgroup.php:121 msgid "No nickname." msgstr "Ðемає імені." @@ -577,8 +573,8 @@ msgid "You can upload your personal avatar. The maximum file size is %s." msgstr "Ви можете завантажити аватару. МакÑимальний розмір %s." #: actions/avatarsettings.php:106 actions/avatarsettings.php:185 -#: actions/grouplogo.php:178 actions/remotesubscribe.php:191 -#: actions/userauthorization.php:72 actions/userrss.php:103 +#: actions/remotesubscribe.php:191 actions/userauthorization.php:72 +#: actions/userrss.php:103 msgid "User without matching profile" msgstr "КориÑтувач з невідповідним профілем" @@ -610,9 +606,9 @@ msgstr "Завантажити" msgid "Crop" msgstr "Ð’Ñ‚Ñти" -#: actions/avatarsettings.php:268 actions/disfavor.php:74 -#: actions/emailsettings.php:238 actions/favor.php:75 actions/geocode.php:50 -#: actions/groupblock.php:66 actions/grouplogo.php:309 +#: actions/avatarsettings.php:268 actions/deletenotice.php:157 +#: actions/disfavor.php:74 actions/emailsettings.php:238 actions/favor.php:75 +#: actions/geocode.php:50 actions/groupblock.php:66 actions/grouplogo.php:309 #: actions/groupunblock.php:66 actions/imsettings.php:206 #: actions/invite.php:56 actions/login.php:135 actions/makeadmin.php:66 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80 @@ -695,19 +691,15 @@ msgstr "Блокувати кориÑтувача" msgid "Failed to save block information." msgstr "Ð—Ð±ÐµÑ€ÐµÐ¶ÐµÐ½Ð½Ñ Ñ–Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ñ–Ñ— про Ð±Ð»Ð¾ÐºÑƒÐ²Ð°Ð½Ð½Ñ Ð·Ð°Ð²ÐµÑ€ÑˆÐ¸Ð»Ð¾ÑÑŒ невдачею." -#: actions/blockedfromgroup.php:73 actions/editgroup.php:84 -#: actions/groupdesignsettings.php:84 actions/grouplogo.php:86 -#: actions/groupmembers.php:76 actions/joingroup.php:76 -#: actions/showgroup.php:121 -msgid "No nickname" -msgstr "Ðемає імені" - #: actions/blockedfromgroup.php:80 actions/editgroup.php:96 +#: actions/foafgroup.php:44 actions/foafgroup.php:62 actions/groupblock.php:86 #: actions/groupbyid.php:83 actions/groupdesignsettings.php:97 #: actions/grouplogo.php:99 actions/groupmembers.php:83 -#: actions/joingroup.php:83 actions/showgroup.php:137 -msgid "No such group" -msgstr "Такої групи немає" +#: actions/grouprss.php:98 actions/groupunblock.php:86 +#: actions/joingroup.php:83 actions/leavegroup.php:83 actions/makeadmin.php:86 +#: actions/showgroup.php:137 lib/command.php:212 lib/command.php:263 +msgid "No such group." +msgstr "Такої групи немає." #: actions/blockedfromgroup.php:90 #, php-format @@ -715,8 +707,8 @@ msgid "%s blocked profiles" msgstr "Заблоковані профілі %s" #: actions/blockedfromgroup.php:93 -#, php-format -msgid "%s blocked profiles, page %d" +#, fuzzy, php-format +msgid "%1$s blocked profiles, page %2$d" msgstr "Заблоковані профілі %s, Ñторінка %d" #: actions/blockedfromgroup.php:108 @@ -827,11 +819,6 @@ msgstr "Ðе видалÑти цей допиÑ" msgid "Delete this notice" msgstr "Видалити допиÑ" -#: actions/deletenotice.php:157 -msgid "There was a problem with your session token. Try again, please." -msgstr "" -"Виникли певні проблеми з токеном поточної ÑеÑÑ–Ñ—. Спробуйте знов, будь лаÑка." - #: actions/deleteuser.php:67 msgid "You cannot delete users." msgstr "Ви не можете видалÑти кориÑтувачів." @@ -857,7 +844,7 @@ msgid "Delete this user" msgstr "Видалити цього кориÑтувача" #: actions/designadminpanel.php:62 lib/accountsettingsaction.php:124 -#: lib/adminpanelaction.php:302 lib/groupnav.php:119 +#: lib/adminpanelaction.php:316 lib/groupnav.php:119 msgid "Design" msgstr "Дизайн" @@ -997,7 +984,8 @@ msgstr "Ви маєте Ñпочатку увійти, аби мати Ð·Ð¼Ð¾Ð³Ñ #: actions/editgroup.php:103 actions/editgroup.php:168 #: actions/groupdesignsettings.php:104 actions/grouplogo.php:106 -msgid "You must be an admin to edit the group" +#, fuzzy +msgid "You must be an admin to edit the group." msgstr "Ви маєте бути наділені правами адміниÑтратора, аби редагувати групу" #: actions/editgroup.php:154 @@ -1022,7 +1010,8 @@ msgid "Options saved." msgstr "Опції збережено." #: actions/emailsettings.php:60 -msgid "Email Settings" +#, fuzzy +msgid "Email settings" msgstr "ÐÐ°Ð»Ð°ÑˆÑ‚ÑƒÐ²Ð°Ð½Ð½Ñ Ð¿Ð¾ÑˆÑ‚Ð¸" #: actions/emailsettings.php:71 @@ -1059,8 +1048,9 @@ msgid "Cancel" msgstr "СкаÑувати" #: actions/emailsettings.php:121 -msgid "Email Address" -msgstr "Електронна адреÑа" +#, fuzzy +msgid "Email address" +msgstr "Електронні адреÑи" #: actions/emailsettings.php:123 msgid "Email address, like \"UserName@example.org\"" @@ -1133,9 +1123,10 @@ msgstr "Ðемає електронної адреÑи." msgid "Cannot normalize that email address" msgstr "Ðе можна полагодити цю поштову адреÑу" -#: actions/emailsettings.php:331 actions/siteadminpanel.php:157 -msgid "Not a valid email address" -msgstr "Це недійÑна електронна адреÑа" +#: actions/emailsettings.php:331 actions/register.php:201 +#: actions/siteadminpanel.php:157 +msgid "Not a valid email address." +msgstr "Це недійÑна електронна адреÑа." #: actions/emailsettings.php:334 msgid "That is already your email address." @@ -1316,18 +1307,11 @@ msgstr "Ðевідома верÑÑ–Ñ Ð¿Ñ€Ð¾Ñ‚Ð¾ÐºÐ¾Ð»Ñƒ OMB." msgid "Error updating remote profile" msgstr "Помилка при оновленні віддаленого профілю" -#: actions/foafgroup.php:44 actions/foafgroup.php:62 actions/groupblock.php:86 -#: actions/grouprss.php:98 actions/groupunblock.php:86 -#: actions/leavegroup.php:83 actions/makeadmin.php:86 lib/command.php:212 -#: lib/command.php:263 -msgid "No such group." -msgstr "Такої групи немає." - -#: actions/getfile.php:75 +#: actions/getfile.php:79 msgid "No such file." msgstr "Такого файлу немає." -#: actions/getfile.php:79 +#: actions/getfile.php:83 msgid "Cannot read file." msgstr "Ðе можу прочитати файл." @@ -1339,7 +1323,7 @@ msgstr "Ðе визначено жодного профілю." #: actions/groupblock.php:76 actions/groupunblock.php:76 #: actions/makeadmin.php:76 actions/subedit.php:53 actions/tagother.php:46 -#: lib/profileformaction.php:77 +#: actions/unsubscribe.php:84 lib/profileformaction.php:77 msgid "No profile with that ID." msgstr "Ðе визначено профілю з таким ID." @@ -1365,11 +1349,11 @@ msgid "Block user from group" msgstr "Блокувати кориÑтувача в групі" #: actions/groupblock.php:162 -#, php-format +#, fuzzy, php-format msgid "" -"Are you sure you want to block user \"%s\" from the group \"%s\"? They will " -"be removed from the group, unable to post, and unable to subscribe to the " -"group in the future." +"Are you sure you want to block user \"%1$s\" from the group \"%2$s\"? They " +"will be removed from the group, unable to post, and unable to subscribe to " +"the group in the future." msgstr "" "Впевнені, що бажаєте блокувати кориÑтувача \"%s\" у групі \"%s\"? Його буде " "позбавлено членÑтва у групі, він не зможе Ñюди пиÑати, а також не зможе " @@ -1387,9 +1371,9 @@ msgstr "Блокувати кориÑтувача цієї групи" msgid "Database error blocking user from group." msgstr "Виникла помилка при блокуванні кориÑтувача в цій групі." -#: actions/groupbyid.php:74 -msgid "No ID" -msgstr "Ðемає ID" +#: actions/groupbyid.php:74 actions/userbyid.php:70 +msgid "No ID." +msgstr "Ðемає ID." #: actions/groupdesignsettings.php:68 msgid "You must be logged in to edit a group." @@ -1412,12 +1396,6 @@ msgstr "" msgid "Couldn't update your design." msgstr "Ðе вдалоÑÑ Ð¾Ð½Ð¾Ð²Ð¸Ñ‚Ð¸ дизайн." -#: actions/groupdesignsettings.php:287 actions/groupdesignsettings.php:297 -#: actions/userdesignsettings.php:210 actions/userdesignsettings.php:220 -#: actions/userdesignsettings.php:263 actions/userdesignsettings.php:273 -msgid "Unable to save your design settings!" -msgstr "Ðе маю можливоÑÑ‚Ñ– зберегти Ваші Ð½Ð°Ð»Ð°ÑˆÑ‚ÑƒÐ²Ð°Ð½Ð½Ñ Ð´Ð¸Ð·Ð°Ð¹Ð½Ñƒ!" - #: actions/groupdesignsettings.php:308 actions/userdesignsettings.php:231 msgid "Design preferences saved." msgstr "Преференції дизайну збережно." @@ -1434,6 +1412,11 @@ msgstr "" "Ви маєте можливіÑÑ‚ÑŒ завантажити логотип Ð´Ð»Ñ Ð’Ð°ÑˆÐ¾Ñ— группи. МакÑимальний " "розмір файлу %s." +#: actions/grouplogo.php:178 +#, fuzzy +msgid "User without matching profile." +msgstr "КориÑтувач з невідповідним профілем" + #: actions/grouplogo.php:362 msgid "Pick a square area of the image to be the logo." msgstr "Оберіть квадратну ділÑнку зображеннÑ, Ñка й буде логотипом групи." @@ -1452,15 +1435,15 @@ msgid "%s group members" msgstr "УчаÑники групи %s" #: actions/groupmembers.php:96 -#, php-format -msgid "%s group members, page %d" +#, fuzzy, php-format +msgid "%1$s group members, page %2$d" msgstr "УчаÑники групи %s, Ñторінка %d" #: actions/groupmembers.php:111 msgid "A list of the users in this group." msgstr "СпиÑок учаÑників цієї групи." -#: actions/groupmembers.php:175 lib/action.php:441 lib/groupnav.php:107 +#: actions/groupmembers.php:175 lib/action.php:442 lib/groupnav.php:107 msgid "Admin" msgstr "Ðдмін" @@ -1564,7 +1547,8 @@ msgid "Error removing the block." msgstr "Помилка при розблокуванні." #: actions/imsettings.php:59 -msgid "IM Settings" +#, fuzzy +msgid "IM settings" msgstr "ÐÐ°Ð»Ð°ÑˆÑ‚ÑƒÐ²Ð°Ð½Ð½Ñ IM" #: actions/imsettings.php:70 @@ -1595,7 +1579,8 @@ msgstr "" "Вашого ÑпиÑку контактів?)" #: actions/imsettings.php:124 -msgid "IM Address" +#, fuzzy +msgid "IM address" msgstr "ÐдреÑа IM" #: actions/imsettings.php:126 @@ -1659,11 +1644,6 @@ msgstr "" msgid "That is not your Jabber ID." msgstr "Це не Ваш Jabber ID." -#: actions/inbox.php:59 -#, php-format -msgid "Inbox for %s - page %d" -msgstr "Вхідні Ð´Ð»Ñ %s — Ñторінка %d" - #: actions/inbox.php:62 #, php-format msgid "Inbox for %s" @@ -1700,10 +1680,10 @@ msgstr "ЗапроÑити нових кориÑтувачів" msgid "You are already subscribed to these users:" msgstr "Ви вже підпиÑані до цих кориÑтувачів:" -#: actions/invite.php:131 actions/invite.php:139 +#: actions/invite.php:131 actions/invite.php:139 lib/command.php:315 #, php-format -msgid "%s (%s)" -msgstr "%s (%s)" +msgid "%1$s (%2$s)" +msgstr "%1$s (%2$s)" #: actions/invite.php:136 msgid "" @@ -1746,7 +1726,7 @@ msgstr "ОÑобиÑÑ‚Ñ– повідомленнÑ" msgid "Optionally add a personal message to the invitation." msgstr "Можна додати перÑональне Ð¿Ð¾Ð²Ñ–Ð´Ð¾Ð¼Ð»ÐµÐ½Ð½Ñ Ð´Ð¾ Ð·Ð°Ð¿Ñ€Ð¾ÑˆÐµÐ½Ð½Ñ (опціонально)." -#: actions/invite.php:197 lib/messageform.php:178 lib/noticeform.php:232 +#: actions/invite.php:197 lib/messageform.php:178 lib/noticeform.php:234 msgid "Send" msgstr "Так!" @@ -1817,18 +1797,9 @@ msgstr "" msgid "You must be logged in to join a group." msgstr "Ви повинні Ñпочатку увійти на Ñайт, аби приєднатиÑÑ Ð´Ð¾ групи." -#: actions/joingroup.php:90 lib/command.php:217 -msgid "You are already a member of that group" -msgstr "Ви вже Ñ” учаÑником цієї групи" - -#: actions/joingroup.php:128 lib/command.php:234 -#, php-format -msgid "Could not join user %s to group %s" -msgstr "КориÑтувачеві %s не вдалоÑÑŒ приєднатиÑÑŒ до групи %s" - #: actions/joingroup.php:135 lib/command.php:239 -#, php-format -msgid "%s joined group %s" +#, fuzzy, php-format +msgid "%1$s joined group %2$s" msgstr "%s приєднавÑÑ Ð´Ð¾ групи %s" #: actions/leavegroup.php:60 @@ -1843,14 +1814,9 @@ msgstr "Ви не Ñ” учаÑником цієї групи." msgid "Could not find membership record." msgstr "Ðе вдалоÑÑ Ð·Ð½Ð°Ð¹Ñ‚Ð¸ Ð·Ð°Ð¿Ð¸Ñ Ñ‰Ð¾Ð´Ð¾ членÑтва." -#: actions/leavegroup.php:127 lib/command.php:284 -#, php-format -msgid "Could not remove user %s to group %s" -msgstr "Ðе вдалоÑÑ Ð²Ð¸Ð´Ð°Ð»Ð¸Ñ‚Ð¸ кориÑтувача %s з групи %s" - #: actions/leavegroup.php:134 lib/command.php:289 -#, php-format -msgid "%s left group %s" +#, fuzzy, php-format +msgid "%1$s left group %2$s" msgstr "%s залишив групу %s" #: actions/login.php:83 actions/register.php:137 @@ -1869,7 +1835,7 @@ msgstr "Ðеточне Ñ–Ð¼â€™Ñ Ð°Ð±Ð¾ пароль." msgid "Error setting user. You are probably not authorized." msgstr "Помилка. Можливо, Ви не авторизовані." -#: actions/login.php:208 actions/login.php:261 lib/action.php:459 +#: actions/login.php:208 actions/login.php:261 lib/action.php:460 #: lib/logingroupnav.php:79 msgid "Login" msgstr "Увійти" @@ -1926,18 +1892,18 @@ msgstr "" "Лише кориÑтувач з правами адмініÑтратора може призначити інших адмінів групи." #: actions/makeadmin.php:95 -#, php-format -msgid "%s is already an admin for group \"%s\"." +#, fuzzy, php-format +msgid "%1$s is already an admin for group \"%2$s\"." msgstr "%s вже Ñ” адміном у групі \"%s\"." #: actions/makeadmin.php:132 -#, php-format -msgid "Can't get membership record for %s in group %s" +#, fuzzy, php-format +msgid "Can't get membership record for %1$s in group %2$s." msgstr "Ðеможна отримати Ð·Ð°Ð¿Ð¸Ñ Ð´Ð»Ñ %s щодо членÑтва у групі %s" #: actions/makeadmin.php:145 -#, php-format -msgid "Can't make %s an admin for group %s" +#, fuzzy, php-format +msgid "Can't make %1$s an admin for group %2$s." msgstr "Ðеможна %s надати права адміна у групі %s" #: actions/microsummary.php:69 @@ -1980,8 +1946,8 @@ msgid "Message sent" msgstr "ÐŸÐ¾Ð²Ñ–Ð´Ð¾Ð¼Ð»ÐµÐ½Ð½Ñ Ð½Ð°Ð´Ñ–Ñлано" #: actions/newmessage.php:185 lib/command.php:376 -#, php-format -msgid "Direct message to %s sent" +#, fuzzy, php-format +msgid "Direct message to %s sent." msgstr "ПрÑме Ð¿Ð¾Ð²Ñ–Ð´Ð¾Ð¼Ð»ÐµÐ½Ð½Ñ Ð´Ð¾ %s надіÑлано" #: actions/newmessage.php:210 actions/newnotice.php:245 lib/channel.php:170 @@ -2010,8 +1976,8 @@ msgid "Text search" msgstr "Пошук текÑтів" #: actions/noticesearch.php:91 -#, php-format -msgid "Search results for \"%s\" on %s" +#, fuzzy, php-format +msgid "Search results for \"%1$s\" on %2$s" msgstr "Результати пошуку Ð´Ð»Ñ \"%s\" на %s" #: actions/noticesearch.php:121 @@ -2119,11 +2085,6 @@ msgstr "Показувати або приховувати дизайни Ñто msgid "URL shortening service is too long (max 50 chars)." msgstr "Ð¡ÐµÑ€Ð²Ñ–Ñ ÑÐºÐ¾Ñ€Ð¾Ñ‡ÐµÐ½Ð½Ñ URL-Ð°Ð´Ñ€ÐµÑ Ð½Ð°Ð´Ñ‚Ð¾ довгий (50 знаків макÑимум)." -#: actions/outbox.php:58 -#, php-format -msgid "Outbox for %s - page %d" -msgstr "Вихідні Ð´Ð»Ñ %s — Ñторінка %d" - #: actions/outbox.php:61 #, php-format msgid "Outbox for %s" @@ -2196,7 +2157,7 @@ msgstr "Ðеможна зберегти новий пароль." msgid "Password saved." msgstr "Пароль збережено." -#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:308 +#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:326 msgid "Paths" msgstr "ШлÑÑ…" @@ -2229,7 +2190,7 @@ msgid "Invalid SSL server. The maximum length is 255 characters." msgstr "Помилковий SSL-Ñервер. МакÑимальна довжина 255 знаків." #: actions/pathsadminpanel.php:217 actions/siteadminpanel.php:58 -#: lib/adminpanelaction.php:299 +#: lib/adminpanelaction.php:311 msgid "Site" msgstr "Сайт" @@ -2322,7 +2283,8 @@ msgid "When to use SSL" msgstr "Тоді викориÑтовувати SSL" #: actions/pathsadminpanel.php:308 -msgid "SSL Server" +#, fuzzy +msgid "SSL server" msgstr "SSL-Ñервер" #: actions/pathsadminpanel.php:309 @@ -2353,8 +2315,8 @@ msgid "Not a valid people tag: %s" msgstr "Це недійÑний оÑобиÑтий теґ: %s" #: actions/peopletag.php:144 -#, php-format -msgid "Users self-tagged with %s - page %d" +#, fuzzy, php-format +msgid "Users self-tagged with %1$s - page %2$d" msgstr "КориÑтувачі з оÑобиÑтим теґом %s — Ñторінка %d" #: actions/postnotice.php:84 @@ -2362,8 +2324,8 @@ msgid "Invalid notice content" msgstr "ÐедійÑний зміÑÑ‚ допиÑу" #: actions/postnotice.php:90 -#, php-format -msgid "Notice license ‘%s’ is not compatible with site license ‘%s’." +#, fuzzy, php-format +msgid "Notice license ‘%1$s’ is not compatible with site license ‘%2$s’." msgstr "Ð›Ñ–Ñ†ÐµÐ½Ð·Ñ–Ñ Ð´Ð¾Ð¿Ð¸Ñу ‘%s’ Ñ” неÑуміÑною з ліцензією Ñайту ‘%s’." #: actions/profilesettings.php:60 @@ -2485,19 +2447,19 @@ msgstr "ÐедійÑний теґ: \"%s\"" msgid "Couldn't update user for autosubscribe." msgstr "Ðе вдалоÑÑ Ð¾Ð½Ð¾Ð²Ð¸Ñ‚Ð¸ кориÑтувача Ð´Ð»Ñ Ð°Ð²Ñ‚Ð¾Ð¿Ñ–Ð´Ð¿Ð¸Ñки." -#: actions/profilesettings.php:354 +#: actions/profilesettings.php:359 msgid "Couldn't save location prefs." msgstr "Ðе вдалоÑÑ Ð·Ð±ÐµÑ€ÐµÐ³Ñ‚Ð¸ Ð½Ð°Ð»Ð°ÑˆÑ‚ÑƒÐ²Ð°Ð½Ð½Ñ Ñ€Ð¾Ð·Ñ‚Ð°ÑˆÑƒÐ²Ð°Ð½Ð½Ñ." -#: actions/profilesettings.php:366 +#: actions/profilesettings.php:371 msgid "Couldn't save profile." msgstr "Ðе вдалоÑÑ Ð·Ð±ÐµÑ€ÐµÐ³Ñ‚Ð¸ профіль." -#: actions/profilesettings.php:374 +#: actions/profilesettings.php:379 msgid "Couldn't save tags." msgstr "Ðе вдалоÑÑ Ð·Ð±ÐµÑ€ÐµÐ³Ñ‚Ð¸ теґи." -#: actions/profilesettings.php:382 lib/adminpanelaction.php:126 +#: actions/profilesettings.php:387 lib/adminpanelaction.php:137 msgid "Settings saved." msgstr "ÐÐ°Ð»Ð°ÑˆÑ‚ÑƒÐ²Ð°Ð½Ð½Ñ Ð·Ð±ÐµÑ€ÐµÐ¶ÐµÐ½Ð¾." @@ -2603,7 +2565,7 @@ msgstr "" "Чому б не [зареєÑтруватиÑÑŒ](%%%%action.register%%%%) Ñ– не напиÑати щоÑÑŒ " "цікаве!" -#: actions/publictagcloud.php:135 +#: actions/publictagcloud.php:131 msgid "Tag cloud" msgstr "Хмарка теґів" @@ -2745,7 +2707,7 @@ msgstr "Даруйте, помилка у коді запрошеннÑ." msgid "Registration successful" msgstr "РеєÑÑ‚Ñ€Ð°Ñ†Ñ–Ñ ÑƒÑпішна" -#: actions/register.php:114 actions/register.php:502 lib/action.php:456 +#: actions/register.php:114 actions/register.php:502 lib/action.php:457 #: lib/logingroupnav.php:85 msgid "Register" msgstr "РеєÑтраціÑ" @@ -2758,10 +2720,6 @@ msgstr "РеєÑтрацію не дозволено." msgid "You can't register if you don't agree to the license." msgstr "Ви не зможете зареєÑтруватиÑÑŒ, Ñкщо не погодитеÑÑŒ з умовами ліцензії." -#: actions/register.php:201 -msgid "Not a valid email address." -msgstr "Це недійÑна електронна адреÑа." - #: actions/register.php:212 msgid "Email address already exists." msgstr "Ð¦Ñ Ð°Ð´Ñ€ÐµÑа вже викориÑтовуєтьÑÑ." @@ -2822,12 +2780,12 @@ msgstr "" "номер." #: actions/register.php:537 -#, php-format +#, fuzzy, php-format msgid "" -"Congratulations, %s! And welcome to %%%%site.name%%%%. From here, you may " +"Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may " "want to...\n" "\n" -"* Go to [your profile](%s) and post your first message.\n" +"* Go to [your profile](%2$s) and post your first message.\n" "* Add a [Jabber/GTalk address](%%%%action.imsettings%%%%) so you can send " "notices through instant messages.\n" "* [Search for people](%%%%action.peoplesearch%%%%) that you may know or that " @@ -2950,11 +2908,6 @@ msgstr "Вторувати!" msgid "Replies to %s" msgstr "Відповіді до %s" -#: actions/replies.php:127 -#, php-format -msgid "Replies to %s, page %d" -msgstr "Відповіді %s, Ñторінка %d" - #: actions/replies.php:144 #, php-format msgid "Replies feed for %s (RSS 1.0)" @@ -2971,10 +2924,10 @@ msgid "Replies feed for %s (Atom)" msgstr "Стрічка відповідей до %s (Atom)" #: actions/replies.php:198 -#, php-format +#, fuzzy, php-format msgid "" -"This is the timeline showing replies to %s but %s hasn't received a notice " -"to his attention yet." +"This is the timeline showing replies to %1$s but %2$s hasn't received a " +"notice to his attention yet." msgstr "" "Ð¦Ñ Ñтрічка допиÑів міÑтить відповіді %s, але %s ще нічого не отримав у " "відповідь." @@ -2989,10 +2942,10 @@ msgstr "" "більшої кількоÑÑ‚Ñ– людей або [приєднавшиÑÑŒ до груп](%%action.groups%%)." #: actions/replies.php:205 -#, php-format +#, fuzzy, php-format msgid "" -"You can try to [nudge %s](../%s) or [post something to his or her attention]" -"(%%%%action.newnotice%%%%?status_textarea=%s)." +"You can try to [nudge %1$s](../%2$s) or [post something to his or her " +"attention](%%%%action.newnotice%%%%?status_textarea=%3$s)." msgstr "" "Ви можете [«розштовхати» %s](../%s) або [напиÑати дещо варте його уваги](%%%%" "action.newnotice%%%%?status_textarea=%s)." @@ -3010,11 +2963,6 @@ msgstr "Ви не можете нікого ізолювати на цьому Ñ msgid "User is already sandboxed." msgstr "КориÑтувача ізольовано доки наберетьÑÑ ÑƒÐ¼Ñƒ-розуму." -#: actions/showfavorites.php:79 -#, php-format -msgid "%s's favorite notices, page %d" -msgstr "Обрані допиÑи %s, Ñторінка %d" - #: actions/showfavorites.php:132 msgid "Could not retrieve favorite notices." msgstr "Ðе можна відновити обрані допиÑи." @@ -3072,11 +3020,6 @@ msgstr "Це ÑпоÑіб поділитиÑÑŒ з уÑіма тим, що вам msgid "%s group" msgstr "Група %s" -#: actions/showgroup.php:84 -#, php-format -msgid "%s group, page %d" -msgstr "Група %s, Ñторінка %d" - #: actions/showgroup.php:218 msgid "Group profile" msgstr "Профіль групи" @@ -3125,7 +3068,7 @@ msgstr "УчаÑники" #: actions/showgroup.php:386 lib/profileaction.php:117 #: lib/profileaction.php:148 lib/profileaction.php:236 lib/section.php:95 -#: lib/tagcloudsection.php:71 +#: lib/subscriptionlist.php:126 lib/tagcloudsection.php:71 msgid "(None)" msgstr "(ПуÑто)" @@ -3200,14 +3143,9 @@ msgstr "Ð”Ð¾Ð¿Ð¸Ñ Ð²Ð¸Ð´Ð°Ð»ÐµÐ½Ð¾." msgid " tagged %s" msgstr " позначено з %s" -#: actions/showstream.php:79 -#, php-format -msgid "%s, page %d" -msgstr "%s, Ñторінка %d" - #: actions/showstream.php:122 -#, php-format -msgid "Notice feed for %s tagged %s (RSS 1.0)" +#, fuzzy, php-format +msgid "Notice feed for %1$s tagged %2$s (RSS 1.0)" msgstr "Стрічка допиÑів Ð´Ð»Ñ %s з теґом %s (RSS 1.0)" #: actions/showstream.php:129 @@ -3231,8 +3169,8 @@ msgid "FOAF for %s" msgstr "FOAF Ð´Ð»Ñ %s" #: actions/showstream.php:191 -#, php-format -msgid "This is the timeline for %s but %s hasn't posted anything yet." +#, fuzzy, php-format +msgid "This is the timeline for %1$s but %2$s hasn't posted anything yet." msgstr "Це Ñтрічка допиÑів %s, але %s ще нічого не напиÑав." #: actions/showstream.php:196 @@ -3244,10 +3182,10 @@ msgstr "" "аби розпочати! :)" #: actions/showstream.php:198 -#, php-format +#, fuzzy, php-format msgid "" -"You can try to nudge %s or [post something to his or her attention](%%%%" -"action.newnotice%%%%?status_textarea=%s)." +"You can try to nudge %1$s or [post something to his or her attention](%%%%" +"action.newnotice%%%%?status_textarea=%2$s)." msgstr "" "Ви можете «розштовхати» %s або [щоÑÑŒ йому напиÑати](%%%%action.newnotice%%%%?" "status_textarea=%s)." @@ -3299,12 +3237,13 @@ msgid "Site name must have non-zero length." msgstr "Ð†Ð¼â€™Ñ Ñайту не може бути порожнім." #: actions/siteadminpanel.php:154 -msgid "You must have a valid contact email address" +#, fuzzy +msgid "You must have a valid contact email address." msgstr "Електронна адреÑа має бути дійÑною" #: actions/siteadminpanel.php:172 -#, php-format -msgid "Unknown language \"%s\"" +#, fuzzy, php-format +msgid "Unknown language \"%s\"." msgstr "Мову не визначено \"%s\"" #: actions/siteadminpanel.php:179 @@ -3490,7 +3429,8 @@ msgid "Save site settings" msgstr "Зберегти Ð½Ð°Ð»Ð°ÑˆÑ‚ÑƒÐ²Ð°Ð½Ð½Ñ Ñайту" #: actions/smssettings.php:58 -msgid "SMS Settings" +#, fuzzy +msgid "SMS settings" msgstr "ÐÐ°Ð»Ð°ÑˆÑ‚ÑƒÐ²Ð°Ð½Ð½Ñ Ð¡ÐœÐ¡" #: actions/smssettings.php:69 @@ -3519,7 +3459,8 @@ msgid "Enter the code you received on your phone." msgstr "Введіть код, Ñкий Ви отримали телефоном." #: actions/smssettings.php:138 -msgid "SMS Phone number" +#, fuzzy +msgid "SMS phone number" msgstr "Телефонний номер" #: actions/smssettings.php:140 @@ -3610,8 +3551,8 @@ msgid "%s subscribers" msgstr "ПідпиÑані до %s" #: actions/subscribers.php:52 -#, php-format -msgid "%s subscribers, page %d" +#, fuzzy, php-format +msgid "%1$s subscribers, page %2$d" msgstr "ПідпиÑані до %s, Ñторінка %d" #: actions/subscribers.php:63 @@ -3651,8 +3592,8 @@ msgid "%s subscriptions" msgstr "ПідпиÑки %s" #: actions/subscriptions.php:54 -#, php-format -msgid "%s subscriptions, page %d" +#, fuzzy, php-format +msgid "%1$s subscriptions, page %2$d" msgstr "ПідпиÑки %s, Ñторінка %d" #: actions/subscriptions.php:65 @@ -3693,11 +3634,6 @@ msgstr "Jabber" msgid "SMS" msgstr "СМС" -#: actions/tag.php:68 -#, php-format -msgid "Notices tagged with %s, page %d" -msgstr "ДопиÑи позначені %s, Ñторінка %d" - #: actions/tag.php:86 #, php-format msgid "Notice feed for tag %s (RSS 1.0)" @@ -3781,20 +3717,17 @@ msgstr "КориÑтувач поки що має право голоÑу." msgid "No profile id in request." msgstr "У запиті відÑутній ID профілю." -#: actions/unsubscribe.php:84 -msgid "No profile with that id." -msgstr "Ðемає профілю з таким ID." - #: actions/unsubscribe.php:98 msgid "Unsubscribed" msgstr "ВідпиÑано" #: actions/updateprofile.php:62 actions/userauthorization.php:330 -#, php-format -msgid "Listenee stream license ‘%s’ is not compatible with site license ‘%s’." +#, fuzzy, php-format +msgid "" +"Listenee stream license ‘%1$s’ is not compatible with site license ‘%2$s’." msgstr "Ð›Ñ–Ñ†ÐµÐ½Ð·Ñ–Ñ â€˜%s’ не відповідає ліцензії Ñайту ‘%s’." -#: actions/useradminpanel.php:58 lib/adminpanelaction.php:305 +#: actions/useradminpanel.php:58 lib/adminpanelaction.php:321 #: lib/personalgroupnav.php:115 msgid "User" msgstr "КориÑтувач" @@ -3896,7 +3829,7 @@ msgstr "" "підпиÑатиÑÑŒ на допиÑи цього кориÑтувача. Якщо Ви не збиралиÑÑŒ підпиÑуватиÑÑŒ " "ні на чиї допиÑи, проÑто натиÑніть «Відмінити»." -#: actions/userauthorization.php:188 +#: actions/userauthorization.php:188 actions/version.php:165 msgid "License" msgstr "ЛіцензіÑ" @@ -3950,8 +3883,8 @@ msgstr "" "підпиÑку." #: actions/userauthorization.php:296 -#, php-format -msgid "Listener URI ‘%s’ not found here" +#, fuzzy, php-format +msgid "Listener URI ‘%s’ not found here." msgstr "URI Ñлухача ‘%s’ тут не знайдено" #: actions/userauthorization.php:301 @@ -3984,10 +3917,6 @@ msgstr "Ðе можна прочитати URL аватари ‘%s’." msgid "Wrong image type for avatar URL ‘%s’." msgstr "Ðеправильний тип Ð·Ð¾Ð±Ñ€Ð°Ð¶ÐµÐ½Ð½Ñ Ð´Ð»Ñ URL-адреÑи аватари ‘%s’." -#: actions/userbyid.php:70 -msgid "No ID." -msgstr "Ðемає ID." - #: actions/userdesignsettings.php:76 lib/designsettings.php:65 msgid "Profile design" msgstr "Дизайн профілю" @@ -4004,11 +3933,6 @@ msgstr "" msgid "Enjoy your hotdog!" msgstr "ПолаÑуйте бутербродом!" -#: actions/usergroups.php:64 -#, php-format -msgid "%s groups, page %d" -msgstr "Групи %s, Ñторінка %d" - #: actions/usergroups.php:130 msgid "Search for more groups" msgstr "Шукати групи ще" @@ -4024,6 +3948,73 @@ msgid "Try [searching for groups](%%action.groupsearch%%) and joining them." msgstr "" "Спробуйте [знайти ÑкіÑÑŒ групи](%%action.groupsearch%%) Ñ– приєднайтеÑÑ Ð´Ð¾ них." +#: actions/version.php:73 +#, fuzzy, php-format +msgid "StatusNet %s" +msgstr "СтатиÑтика" + +#: actions/version.php:153 +#, php-format +msgid "" +"This site is powered by %1$s version %2$s, Copyright 2008-2010 StatusNet, " +"Inc. and contributors." +msgstr "" + +#: actions/version.php:157 +#, fuzzy +msgid "StatusNet" +msgstr "Ð¡Ñ‚Ð°Ñ‚ÑƒÑ Ð²Ð¸Ð´Ð°Ð»ÐµÐ½Ð¾." + +#: actions/version.php:161 +msgid "Contributors" +msgstr "" + +#: actions/version.php:168 +msgid "" +"StatusNet is free software: you can redistribute it and/or modify it under " +"the terms of the GNU Affero General Public License as published by the Free " +"Software Foundation, either version 3 of the License, or (at your option) " +"any later version. " +msgstr "" + +#: actions/version.php:174 +msgid "" +"This program is distributed in the hope that it will be useful, but WITHOUT " +"ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or " +"FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License " +"for more details. " +msgstr "" + +#: actions/version.php:180 +#, php-format +msgid "" +"You should have received a copy of the GNU Affero General Public License " +"along with this program. If not, see %s." +msgstr "" + +#: actions/version.php:189 +msgid "Plugins" +msgstr "" + +#: actions/version.php:195 +#, fuzzy +msgid "Name" +msgstr "Ð†Ð¼â€™Ñ ÐºÐ¾Ñ€Ð¸Ñтувача" + +#: actions/version.php:196 lib/action.php:741 +#, fuzzy +msgid "Version" +msgstr "СеÑÑ–Ñ—" + +#: actions/version.php:197 +#, fuzzy +msgid "Author(s)" +msgstr "Ðвтор" + +#: actions/version.php:198 lib/groupeditform.php:172 +msgid "Description" +msgstr "ОпиÑ" + #: classes/File.php:137 #, php-format msgid "" @@ -4096,7 +4087,7 @@ msgstr "Проблема при збереженні допиÑу." msgid "DB error inserting reply: %s" msgstr "Помилка бази даних при додаванні відповіді: %s" -#: classes/Notice.php:1361 +#: classes/Notice.php:1359 #, php-format msgid "RT @%1$s %2$s" msgstr "RT @%1$s %2$s" @@ -4142,137 +4133,132 @@ msgstr "Інше" msgid "Other options" msgstr "Інші опції" -#: lib/action.php:144 -#, php-format -msgid "%s - %s" -msgstr "%s — %s" - #: lib/action.php:159 msgid "Untitled page" msgstr "Сторінка без заголовку" -#: lib/action.php:426 +#: lib/action.php:427 msgid "Primary site navigation" msgstr "Відправна Ð½Ð°Ð²Ñ–Ð³Ð°Ñ†Ñ–Ñ Ð¿Ð¾ Ñайту" -#: lib/action.php:432 +#: lib/action.php:433 msgid "Home" msgstr "Дім" -#: lib/action.php:432 +#: lib/action.php:433 msgid "Personal profile and friends timeline" msgstr "ПерÑональний профіль Ñ– Ñтрічка друзів" -#: lib/action.php:434 +#: lib/action.php:435 msgid "Account" msgstr "Ðкаунт" -#: lib/action.php:434 +#: lib/action.php:435 msgid "Change your email, avatar, password, profile" msgstr "Змінити електронну адреÑу, аватару, пароль, профіль" -#: lib/action.php:437 +#: lib/action.php:438 msgid "Connect" msgstr "З’єднаннÑ" -#: lib/action.php:437 +#: lib/action.php:438 msgid "Connect to services" msgstr "Ð—â€™Ñ”Ð´Ð½Ð°Ð½Ð½Ñ Ð· ÑервіÑами" -#: lib/action.php:441 +#: lib/action.php:442 msgid "Change site configuration" msgstr "Змінити конфігурацію Ñайту" -#: lib/action.php:445 lib/subgroupnav.php:105 +#: lib/action.php:446 lib/subgroupnav.php:105 msgid "Invite" msgstr "ЗапроÑити" -#: lib/action.php:446 lib/subgroupnav.php:106 +#: lib/action.php:447 lib/subgroupnav.php:106 #, php-format msgid "Invite friends and colleagues to join you on %s" msgstr "ЗапроÑÑ–Ñ‚ÑŒ друзів та колег приєднатиÑÑŒ до Ð’Ð°Ñ Ð½Ð° %s" -#: lib/action.php:451 +#: lib/action.php:452 msgid "Logout" msgstr "Вийти" -#: lib/action.php:451 +#: lib/action.php:452 msgid "Logout from the site" msgstr "Вийти з Ñайту" -#: lib/action.php:456 +#: lib/action.php:457 msgid "Create an account" msgstr "Створити новий акаунт" -#: lib/action.php:459 +#: lib/action.php:460 msgid "Login to the site" msgstr "Увійти на Ñайт" -#: lib/action.php:462 lib/action.php:725 +#: lib/action.php:463 lib/action.php:726 msgid "Help" msgstr "Допомога" -#: lib/action.php:462 +#: lib/action.php:463 msgid "Help me!" msgstr "Допоможіть!" -#: lib/action.php:465 lib/searchaction.php:127 +#: lib/action.php:466 lib/searchaction.php:127 msgid "Search" msgstr "Пошук" -#: lib/action.php:465 +#: lib/action.php:466 msgid "Search for people or text" msgstr "Пошук людей або текÑтів" -#: lib/action.php:486 +#: lib/action.php:487 msgid "Site notice" msgstr "Ð—Ð°ÑƒÐ²Ð°Ð¶ÐµÐ½Ð½Ñ Ñайту" -#: lib/action.php:552 +#: lib/action.php:553 msgid "Local views" msgstr "ОглÑд" -#: lib/action.php:618 +#: lib/action.php:619 msgid "Page notice" msgstr "Ð—Ð°ÑƒÐ²Ð°Ð¶ÐµÐ½Ð½Ñ Ñторінки" -#: lib/action.php:720 +#: lib/action.php:721 msgid "Secondary site navigation" msgstr "ДругорÑдна Ð½Ð°Ð²Ñ–Ð³Ð°Ñ†Ñ–Ñ Ð¿Ð¾ Ñайту" -#: lib/action.php:727 +#: lib/action.php:728 msgid "About" msgstr "Про" -#: lib/action.php:729 +#: lib/action.php:730 msgid "FAQ" msgstr "ЧаПи" -#: lib/action.php:733 +#: lib/action.php:734 msgid "TOS" msgstr "Умови" -#: lib/action.php:736 +#: lib/action.php:737 msgid "Privacy" msgstr "КонфіденційніÑÑ‚ÑŒ" -#: lib/action.php:738 +#: lib/action.php:739 msgid "Source" msgstr "Джерело" -#: lib/action.php:740 +#: lib/action.php:743 msgid "Contact" msgstr "Контакт" -#: lib/action.php:742 +#: lib/action.php:745 msgid "Badge" msgstr "Бедж" -#: lib/action.php:770 +#: lib/action.php:773 msgid "StatusNet software license" msgstr "Ð›Ñ–Ñ†ÐµÐ½Ð·Ñ–Ñ Ð¿Ñ€Ð¾Ð³Ñ€Ð°Ð¼Ð½Ð¾Ð³Ð¾ Ð·Ð°Ð±ÐµÐ·Ð¿ÐµÑ‡ÐµÐ½Ð½Ñ StatusNet" -#: lib/action.php:773 +#: lib/action.php:776 #, php-format msgid "" "**%%site.name%%** is a microblogging service brought to you by [%%site." @@ -4281,12 +4267,12 @@ msgstr "" "**%%site.name%%** — це ÑÐµÑ€Ð²Ñ–Ñ Ð¼Ñ–ÐºÑ€Ð¾Ð±Ð»Ð¾Ò‘Ñ–Ð² наданий вам [%%site.broughtby%%](%%" "site.broughtbyurl%%). " -#: lib/action.php:775 +#: lib/action.php:778 #, php-format msgid "**%%site.name%%** is a microblogging service. " msgstr "**%%site.name%%** — це ÑÐµÑ€Ð²Ñ–Ñ Ð¼Ñ–ÐºÑ€Ð¾Ð±Ð»Ð¾Ò‘Ñ–Ð². " -#: lib/action.php:777 +#: lib/action.php:780 #, php-format msgid "" "It runs the [StatusNet](http://status.net/) microblogging software, version %" @@ -4297,31 +4283,31 @@ msgstr "" "Ð´Ð»Ñ Ð¼Ñ–ÐºÑ€Ð¾Ð±Ð»Ð¾Ò‘Ñ–Ð², верÑÑ–Ñ %s, доÑтупному під [GNU Affero General Public " "License](http://www.fsf.org/licensing/licenses/agpl-3.0.html)." -#: lib/action.php:791 +#: lib/action.php:794 msgid "Site content license" msgstr "Ð›Ñ–Ñ†ÐµÐ½Ð·Ñ–Ñ Ð·Ð¼Ñ–Ñту Ñайту" -#: lib/action.php:800 +#: lib/action.php:803 msgid "All " msgstr "Ð’ÑÑ– " -#: lib/action.php:805 +#: lib/action.php:808 msgid "license." msgstr "ліцензіÑ." -#: lib/action.php:1099 +#: lib/action.php:1102 msgid "Pagination" msgstr "ÐÑƒÐ¼ÐµÑ€Ð°Ñ†Ñ–Ñ Ñторінок" -#: lib/action.php:1108 +#: lib/action.php:1111 msgid "After" msgstr "Вперед" -#: lib/action.php:1116 +#: lib/action.php:1119 msgid "Before" msgstr "Ðазад" -#: lib/action.php:1164 +#: lib/action.php:1167 msgid "There was a problem with your session token." msgstr "Виникли певні проблеми з токеном поточної ÑеÑÑ–Ñ—." @@ -4329,27 +4315,32 @@ msgstr "Виникли певні проблеми з токеном поточРmsgid "You cannot make changes to this site." msgstr "Ви не можете щоÑÑŒ змінювати на цьому Ñайті." -#: lib/adminpanelaction.php:195 +#: lib/adminpanelaction.php:107 +#, fuzzy +msgid "Changes to that panel are not allowed." +msgstr "РеєÑтрацію не дозволено." + +#: lib/adminpanelaction.php:206 msgid "showForm() not implemented." msgstr "showForm() не виконано." -#: lib/adminpanelaction.php:224 +#: lib/adminpanelaction.php:235 msgid "saveSettings() not implemented." msgstr "saveSettings() не виконано." -#: lib/adminpanelaction.php:247 +#: lib/adminpanelaction.php:258 msgid "Unable to delete design setting." msgstr "Ðемає можливоÑÑ‚Ñ– видалити Ð½Ð°Ð»Ð°ÑˆÑ‚ÑƒÐ²Ð°Ð½Ð½Ñ Ð´Ð¸Ð·Ð°Ð¹Ð½Ñƒ." -#: lib/adminpanelaction.php:300 +#: lib/adminpanelaction.php:312 msgid "Basic site configuration" msgstr "ОÑновна ÐºÐ¾Ð½Ñ„Ñ–Ð³ÑƒÑ€Ð°Ñ†Ñ–Ñ Ñайту" -#: lib/adminpanelaction.php:303 +#: lib/adminpanelaction.php:317 msgid "Design configuration" msgstr "ÐšÐ¾Ð½Ñ„Ñ–Ð³ÑƒÑ€Ð°Ñ†Ñ–Ñ Ð´Ð¸Ð·Ð°Ð¹Ð½Ñƒ" -#: lib/adminpanelaction.php:306 lib/adminpanelaction.php:309 +#: lib/adminpanelaction.php:322 lib/adminpanelaction.php:327 msgid "Paths configuration" msgstr "ÐšÐ¾Ð½Ñ„Ñ–Ð³ÑƒÑ€Ð°Ñ†Ñ–Ñ ÑˆÐ»Ñху" @@ -4373,11 +4364,19 @@ msgstr "ДопиÑи, до Ñких прикріплено це вкладенн msgid "Tags for this attachment" msgstr "Теґи Ð´Ð»Ñ Ñ†ÑŒÐ¾Ð³Ð¾ вкладеннÑ" +#: lib/authenticationplugin.php:182 lib/authenticationplugin.php:187 +msgid "Password changing failed" +msgstr "Ðе вдалоÑÑ Ð·Ð¼Ñ–Ð½Ð¸Ñ‚Ð¸ пароль" + +#: lib/authenticationplugin.php:197 +msgid "Password changing is not allowed" +msgstr "Змінювати пароль не дозволено" + #: lib/channel.php:138 lib/channel.php:158 msgid "Command results" msgstr "Результати команди" -#: lib/channel.php:210 +#: lib/channel.php:210 lib/mailhandler.php:142 msgid "Command complete" msgstr "Команду виконано" @@ -4390,8 +4389,8 @@ msgid "Sorry, this command is not yet implemented." msgstr "Даруйте, але Ð²Ð¸ÐºÐ¾Ð½Ð°Ð½Ð½Ñ ÐºÐ¾Ð¼Ð°Ð½Ð´Ð¸ ще не завершено." #: lib/command.php:88 -#, php-format -msgid "Could not find a user with nickname %s" +#, fuzzy, php-format +msgid "Could not find a user with nickname %s." msgstr "Ðе вдалоÑÑ Ð·Ð½Ð°Ð¹Ñ‚Ð¸ кориÑтувача з іменем %s" #: lib/command.php:92 @@ -4399,8 +4398,8 @@ msgid "It does not make a lot of sense to nudge yourself!" msgstr "Гадаємо, кориÑÑ‚Ñ– від «розштовхуваннÑ» Ñамого Ñебе небагато, чи не так?!" #: lib/command.php:99 -#, php-format -msgid "Nudge sent to %s" +#, fuzzy, php-format +msgid "Nudge sent to %s." msgstr "Спробу «розштовхати» %s зараховано" #: lib/command.php:126 @@ -4415,34 +4414,36 @@ msgstr "" "ДопиÑи: %3$s" #: lib/command.php:152 lib/command.php:399 lib/command.php:460 -msgid "Notice with that id does not exist" +#, fuzzy +msgid "Notice with that id does not exist." msgstr "Такого допиÑу не Ñ–Ñнує" #: lib/command.php:168 lib/command.php:415 lib/command.php:476 #: lib/command.php:532 -msgid "User has no last notice" +#, fuzzy +msgid "User has no last notice." msgstr "КориÑтувач не має оÑтаннього допиÑу" #: lib/command.php:190 msgid "Notice marked as fave." msgstr "Ð”Ð¾Ð¿Ð¸Ñ Ð¿Ð¾Ð·Ð½Ð°Ñ‡ÐµÐ½Ð¾ Ñк обраний." -#: lib/command.php:315 -#, php-format -msgid "%1$s (%2$s)" -msgstr "%1$s (%2$s)" +#: lib/command.php:284 +#, fuzzy, php-format +msgid "Could not remove user %1$s to group %2$s." +msgstr "Ðе вдалоÑÑ Ð²Ð¸Ð´Ð°Ð»Ð¸Ñ‚Ð¸ кориÑтувача %s з групи %s" #: lib/command.php:318 -#, php-format -msgid "Fullname: %s" +#, fuzzy, php-format +msgid "Full name: %s" msgstr "Повне ім’Ñ: %s" -#: lib/command.php:321 +#: lib/command.php:321 lib/mail.php:254 #, php-format msgid "Location: %s" msgstr "ЛокаціÑ: %s" -#: lib/command.php:324 +#: lib/command.php:324 lib/mail.php:256 #, php-format msgid "Homepage: %s" msgstr "Веб-Ñторінка: %s" @@ -4453,25 +4454,17 @@ msgid "About: %s" msgstr "Про мене: %s" #: lib/command.php:358 scripts/xmppdaemon.php:301 -#, php-format -msgid "Message too long - maximum is %d characters, you sent %d" +#, fuzzy, php-format +msgid "Message too long - maximum is %1$d characters, you sent %2$d." msgstr "ÐŸÐ¾Ð²Ñ–Ð´Ð¾Ð¼Ð»ÐµÐ½Ð½Ñ Ð½Ð°Ð´Ñ‚Ð¾ довге — макÑимум %d знаків, а ви надÑилаєте %d" #: lib/command.php:378 msgid "Error sending direct message." msgstr "Помилка при відправці прÑмого повідомленнÑ." -#: lib/command.php:422 -msgid "Cannot repeat your own notice" -msgstr "Ðе можу вторувати Вашому влаÑному допиÑу" - -#: lib/command.php:427 -msgid "Already repeated that notice" -msgstr "Цьому допиÑу вже вторували" - #: lib/command.php:435 -#, php-format -msgid "Notice from %s repeated" +#, fuzzy, php-format +msgid "Notice from %s repeated." msgstr "ДопиÑу від %s вторували" #: lib/command.php:437 @@ -4479,13 +4472,13 @@ msgid "Error repeating notice." msgstr "Помилка із вторуваннÑм допиÑу." #: lib/command.php:491 -#, php-format -msgid "Notice too long - maximum is %d characters, you sent %d" +#, fuzzy, php-format +msgid "Notice too long - maximum is %1$d characters, you sent %2$d." msgstr "Ð”Ð¾Ð¿Ð¸Ñ Ð½Ð°Ð´Ñ‚Ð¾ довгий — макÑимум %d знаків, а ви надÑилаєте %d" #: lib/command.php:500 -#, php-format -msgid "Reply to %s sent" +#, fuzzy, php-format +msgid "Reply to %s sent." msgstr "Відповідь до %s надіÑлано" #: lib/command.php:502 @@ -4493,7 +4486,8 @@ msgid "Error saving notice." msgstr "Проблема при збереженні допиÑу." #: lib/command.php:556 -msgid "Specify the name of the user to subscribe to" +#, fuzzy +msgid "Specify the name of the user to subscribe to." msgstr "Зазначте Ñ–Ð¼â€™Ñ ÐºÐ¾Ñ€Ð¸Ñтувача, до Ñкого бажаєте підпиÑатиÑÑŒ" #: lib/command.php:563 @@ -4502,7 +4496,8 @@ msgid "Subscribed to %s" msgstr "ПідпиÑано до %s" #: lib/command.php:584 -msgid "Specify the name of the user to unsubscribe from" +#, fuzzy +msgid "Specify the name of the user to unsubscribe from." msgstr "Зазначте Ñ–Ð¼â€™Ñ ÐºÐ¾Ñ€Ð¸Ñтувача, від Ñкого бажаєте відпиÑатиÑÑŒ" #: lib/command.php:591 @@ -4531,17 +4526,18 @@ msgid "Can't turn on notification." msgstr "Ðе можна увімкнути ÑповіщеннÑ." #: lib/command.php:650 -msgid "Login command is disabled" +#, fuzzy +msgid "Login command is disabled." msgstr "Команду входу відключено" #: lib/command.php:664 -#, php-format -msgid "Could not create login token for %s" +#, fuzzy, php-format +msgid "Could not create login token for %s." msgstr "Ðе вдалоÑÑ Ñтворити токен входу Ð´Ð»Ñ %s" #: lib/command.php:669 -#, php-format -msgid "This link is useable only once, and is good for only 2 minutes: %s" +#, fuzzy, php-format +msgid "This link is useable only once, and is good for only 2 minutes: %s." msgstr "" "Це поÑÐ¸Ð»Ð°Ð½Ð½Ñ Ð¼Ð¾Ð¶Ð½Ð° викориÑтати лише раз, воно дійÑне протÑгом 2 хвилин: %s" @@ -4770,10 +4766,6 @@ msgstr "Опишіть групу або тему" msgid "Describe the group or topic in %d characters" msgstr "Опишіть групу або тему, вкладаючиÑÑŒ у %d знаків" -#: lib/groupeditform.php:172 -msgid "Description" -msgstr "ОпиÑ" - #: lib/groupeditform.php:179 msgid "" "Location for the group, if any, like \"City, State (or Region), Country\"" @@ -4955,21 +4947,9 @@ msgstr "" "----\n" "Змінити електронну адреÑу або умови ÑÐ¿Ð¾Ð²Ñ–Ñ‰ÐµÐ½Ð½Ñ â€” %8$s\n" -#: lib/mail.php:254 -#, php-format -msgid "Location: %s\n" -msgstr "ЛокаціÑ: %s\n" - -#: lib/mail.php:256 -#, php-format -msgid "Homepage: %s\n" -msgstr "Веб-Ñторінка: %s\n" - #: lib/mail.php:258 -#, php-format -msgid "" -"Bio: %s\n" -"\n" +#, fuzzy, php-format +msgid "Bio: %s" msgstr "" "Про Ñебе: %s\n" "\n" @@ -5170,6 +5150,28 @@ msgstr "" msgid "from" msgstr "від" +#: lib/mailhandler.php:37 +msgid "Could not parse message." +msgstr "Ðе можна розібрати повідомленнÑ." + +#: lib/mailhandler.php:42 +msgid "Not a registered user." +msgstr "Це незареєÑтрований кориÑтувач." + +#: lib/mailhandler.php:46 +msgid "Sorry, that is not your incoming email address." +msgstr "Вибачте, але це не Ñ” Вашою електронною адреÑою Ð´Ð»Ñ Ð²Ñ…Ñ–Ð´Ð½Ð¾Ñ— пошти." + +#: lib/mailhandler.php:50 +msgid "Sorry, no incoming email allowed." +msgstr "" +"Вибачте, але не затверджено жодної електронної адреÑи Ð´Ð»Ñ Ð²Ñ…Ñ–Ð´Ð½Ð¾Ñ— пошти." + +#: lib/mailhandler.php:228 +#, fuzzy, php-format +msgid "Unsupported message type: %s" +msgstr "Формат Ð·Ð¾Ð±Ñ€Ð°Ð¶ÐµÐ½Ð½Ñ Ð½Ðµ підтримуєтьÑÑ." + #: lib/mediafile.php:98 lib/mediafile.php:123 msgid "There was a database error while saving your file. Please try again." msgstr "Виникла помилка під Ñ‡Ð°Ñ Ð·Ð°Ð²Ð°Ð½Ñ‚Ð°Ð¶ÐµÐ½Ð½Ñ Ð’Ð°ÑˆÐ¾Ð³Ð¾ файлу. Спробуйте ще." @@ -5203,7 +5205,8 @@ msgid "File upload stopped by extension." msgstr "Ð—Ð°Ð²Ð°Ð½Ñ‚Ð°Ð¶ÐµÐ½Ð½Ñ Ñ„Ð°Ð¹Ð»Ñƒ зупинено розширеннÑм." #: lib/mediafile.php:179 lib/mediafile.php:216 -msgid "File exceeds user's quota!" +#, fuzzy +msgid "File exceeds user's quota." msgstr "Файл перевищив квоту кориÑтувача!" #: lib/mediafile.php:196 lib/mediafile.php:233 @@ -5211,7 +5214,8 @@ msgid "File could not be moved to destination directory." msgstr "Файл не може бути переміщений у директорію призначеннÑ." #: lib/mediafile.php:201 lib/mediafile.php:237 -msgid "Could not determine file's mime-type!" +#, fuzzy +msgid "Could not determine file's MIME type." msgstr "Ðе вдаєтьÑÑ Ð²Ð¸Ð·Ð½Ð°Ñ‡Ð¸Ñ‚Ð¸ мімічний тип файлу." #: lib/mediafile.php:270 @@ -5220,8 +5224,8 @@ msgid " Try using another %s format." msgstr " Спробуйте викориÑтати інший %s формат." #: lib/mediafile.php:275 -#, php-format -msgid "%s is not a supported filetype on this server." +#, fuzzy, php-format +msgid "%s is not a supported file type on this server." msgstr "%s не підтримуєтьÑÑ Ñк тип файлу на цьому Ñервері." #: lib/messageform.php:120 @@ -5254,9 +5258,19 @@ msgid "Attach a file" msgstr "ВклаÑти файл" #: lib/noticeform.php:212 -msgid "Share your location" +#, fuzzy +msgid "Share my location." +msgstr "Показувати міÑцезнаходженнÑ" + +#: lib/noticeform.php:214 +#, fuzzy +msgid "Do not share my location." msgstr "Показувати міÑцезнаходженнÑ" +#: lib/noticeform.php:215 +msgid "Hide this info" +msgstr "" + #: lib/noticelist.php:428 #, php-format msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s" @@ -5371,6 +5385,11 @@ msgstr "ÐадіÑлані вами повідомленнÑ" msgid "Tags in %s's notices" msgstr "Теґи у допиÑах %s" +#: lib/plugin.php:114 +#, fuzzy +msgid "Unknown" +msgstr "Ð”Ñ–Ñ Ð½ÐµÐ²Ñ–Ð´Ð¾Ð¼Ð°" + #: lib/profileaction.php:109 lib/profileaction.php:192 lib/subgroupnav.php:82 msgid "Subscriptions" msgstr "ПідпиÑки" @@ -5540,10 +5559,6 @@ msgstr "Хмарка теґів (позначки Ñамих кориÑÑ‚ÑƒÐ²Ð°Ñ msgid "People Tagcloud as tagged" msgstr "Хмарка теґів (позначки, Ñкими Ви позначили кориÑтувачів)" -#: lib/subscriptionlist.php:126 -msgid "(none)" -msgstr "(пуÑто)" - #: lib/tagcloudsection.php:56 msgid "None" msgstr "ПуÑто" @@ -5657,20 +5672,3 @@ msgstr "%s Ñ” неприпуÑтимим кольором!" #, php-format msgid "%s is not a valid color! Use 3 or 6 hex chars." msgstr "%s неприпуÑтимий колір! ВикориÑтайте 3 або 6 знаків (HEX-формат)" - -#: scripts/maildaemon.php:48 -msgid "Could not parse message." -msgstr "Ðе можна розібрати повідомленнÑ." - -#: scripts/maildaemon.php:53 -msgid "Not a registered user." -msgstr "Це незареєÑтрований кориÑтувач." - -#: scripts/maildaemon.php:57 -msgid "Sorry, that is not your incoming email address." -msgstr "Вибачте, але це не Ñ” Вашою електронною адреÑою Ð´Ð»Ñ Ð²Ñ…Ñ–Ð´Ð½Ð¾Ñ— пошти." - -#: scripts/maildaemon.php:61 -msgid "Sorry, no incoming email allowed." -msgstr "" -"Вибачте, але не затверджено жодної електронної адреÑи Ð´Ð»Ñ Ð²Ñ…Ñ–Ð´Ð½Ð¾Ñ— пошти." diff --git a/locale/vi/LC_MESSAGES/statusnet.po b/locale/vi/LC_MESSAGES/statusnet.po index 916264939..c1721569a 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-01-03 10:37+0000\n" -"PO-Revision-Date: 2010-01-03 10:39:00+0000\n" +"POT-Creation-Date: 2010-01-10 11:27+0000\n" +"PO-Revision-Date: 2010-01-10 11:29:18+0000\n" "Language-Team: Vietnamese\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha (r60575); Translate extension (2009-12-06)\n" +"X-Generator: MediaWiki 1.16alpha (r60888); Translate extension (2010-01-04)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: vi\n" "X-Message-Group: out-statusnet\n" @@ -50,11 +50,6 @@ msgstr "Không có tin nhắn nà o." msgid "No such user." msgstr "Không có user nà o." -#: actions/all.php:84 -#, fuzzy, php-format -msgid "%s and friends, page %d" -msgstr "%s và bạn bè" - #: actions/all.php:86 actions/all.php:167 actions/allrss.php:115 #: actions/apitimelinefriends.php:115 actions/apitimelinehome.php:115 #: lib/personalgroupnav.php:100 @@ -93,8 +88,8 @@ msgstr "" #: actions/all.php:134 #, php-format msgid "" -"You can try to [nudge %s](../%s) from his profile or [post something to his " -"or her attention](%%%%action.newnotice%%%%?status_textarea=%s)." +"You can try to [nudge %1$s](../%2$s) from his profile or [post something to " +"his or her attention](%%%%action.newnotice%%%%?status_textarea=%3$s)." msgstr "" #: actions/all.php:137 actions/replies.php:209 actions/showstream.php:202 @@ -120,6 +115,23 @@ msgstr "" #: actions/apiaccountupdateprofile.php:97 #: actions/apiaccountupdateprofilebackgroundimage.php:94 #: actions/apiaccountupdateprofilecolors.php:118 +#: actions/apidirectmessage.php:156 actions/apifavoritecreate.php:99 +#: actions/apifavoritedestroy.php:100 actions/apifriendshipscreate.php:100 +#: actions/apifriendshipsdestroy.php:100 actions/apifriendshipsshow.php:129 +#: actions/apigroupcreate.php:136 actions/apigroupismember.php:114 +#: actions/apigroupjoin.php:155 actions/apigroupleave.php:141 +#: actions/apigrouplist.php:132 actions/apigrouplistall.php:120 +#: actions/apigroupmembership.php:106 actions/apigroupshow.php:105 +#: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102 +#: actions/apistatusesretweets.php:112 actions/apistatusesshow.php:108 +#: actions/apistatusnetconfig.php:133 actions/apistatusnetversion.php:93 +#: actions/apisubscriptions.php:111 actions/apitimelinefavorites.php:146 +#: actions/apitimelinefriends.php:156 actions/apitimelinegroup.php:150 +#: actions/apitimelinehome.php:156 actions/apitimelinementions.php:151 +#: actions/apitimelinepublic.php:131 actions/apitimelineretweetedbyme.php:122 +#: actions/apitimelineretweetedtome.php:121 +#: actions/apitimelineretweetsofme.php:122 actions/apitimelinetag.php:141 +#: actions/apitimelineuser.php:165 actions/apiusershow.php:101 #, fuzzy msgid "API method not found." msgstr "PhÆ°Æ¡ng thức API không tìm thấy!" @@ -178,6 +190,9 @@ msgstr "" #: actions/apiaccountupdateprofilebackgroundimage.php:146 #: actions/apiaccountupdateprofilecolors.php:164 #: actions/apiaccountupdateprofilecolors.php:174 +#: actions/groupdesignsettings.php:287 actions/groupdesignsettings.php:297 +#: actions/userdesignsettings.php:210 actions/userdesignsettings.php:220 +#: actions/userdesignsettings.php:263 actions/userdesignsettings.php:273 #, fuzzy msgid "Unable to save your design settings." msgstr "Không thể lÆ°u thông tin Twitter của bạn!" @@ -221,26 +236,6 @@ msgstr "Tin nhắn riêng" msgid "All the direct messages sent to %s" msgstr "" -#: actions/apidirectmessage.php:156 actions/apifavoritecreate.php:99 -#: actions/apifavoritedestroy.php:100 actions/apifriendshipscreate.php:100 -#: actions/apifriendshipsdestroy.php:100 actions/apifriendshipsshow.php:129 -#: actions/apigroupcreate.php:136 actions/apigroupismember.php:114 -#: actions/apigroupjoin.php:155 actions/apigroupleave.php:141 -#: actions/apigrouplist.php:132 actions/apigrouplistall.php:120 -#: actions/apigroupmembership.php:106 actions/apigroupshow.php:105 -#: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102 -#: actions/apistatusesretweets.php:112 actions/apistatusesshow.php:108 -#: actions/apistatusnetconfig.php:133 actions/apistatusnetversion.php:93 -#: actions/apisubscriptions.php:111 actions/apitimelinefavorites.php:146 -#: actions/apitimelinefriends.php:156 actions/apitimelinegroup.php:150 -#: actions/apitimelinehome.php:156 actions/apitimelinementions.php:151 -#: actions/apitimelinepublic.php:131 actions/apitimelineretweetedbyme.php:122 -#: actions/apitimelineretweetedtome.php:121 -#: actions/apitimelineretweetsofme.php:122 actions/apitimelinetag.php:141 -#: actions/apitimelineuser.php:165 actions/apiusershow.php:101 -msgid "API method not found!" -msgstr "PhÆ°Æ¡ng thức API không tìm thấy!" - #: actions/apidirectmessagenew.php:126 #, fuzzy msgid "No message text!" @@ -267,7 +262,7 @@ msgstr "Không tìm thấy trạng thái nà o tÆ°Æ¡ng ứng vá»›i ID đó." #: actions/apifavoritecreate.php:119 #, fuzzy -msgid "This status is already a favorite!" +msgid "This status is already a favorite." msgstr "Tin nhắn nà y đã có trong danh sách tin nhắn Æ°a thÃch của bạn rồi!" #: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:176 @@ -276,7 +271,7 @@ msgstr "Không thể tạo favorite." #: actions/apifavoritedestroy.php:122 #, fuzzy -msgid "That status is not a favorite!" +msgid "That status is not a favorite." msgstr "Tin nhắn nà y đã có trong danh sách tin nhắn Æ°a thÃch của bạn rồi!" #: actions/apifavoritedestroy.php:134 actions/disfavor.php:87 @@ -300,8 +295,9 @@ msgid "Could not unfollow user: User not found." msgstr "Không thể theo bạn nà y: %s đã có trong danh sách bạn bè của bạn rồi." #: actions/apifriendshipsdestroy.php:120 -msgid "You cannot unfollow yourself!" -msgstr "" +#, fuzzy +msgid "You cannot unfollow yourself." +msgstr "Không thể cáºp nháºt thà nh viên." #: actions/apifriendshipsexists.php:94 msgid "Two user ids or screen_names must be supplied." @@ -388,7 +384,7 @@ msgstr "" msgid "Group not found!" msgstr "PhÆ°Æ¡ng thức API không tìm thấy!" -#: actions/apigroupjoin.php:110 +#: actions/apigroupjoin.php:110 actions/joingroup.php:90 lib/command.php:217 #, fuzzy msgid "You are already a member of that group." msgstr "Bạn đã theo những ngÆ°á»i nà y:" @@ -397,9 +393,9 @@ msgstr "Bạn đã theo những ngÆ°á»i nà y:" msgid "You have been blocked from that group by the admin." msgstr "" -#: actions/apigroupjoin.php:138 +#: actions/apigroupjoin.php:138 actions/joingroup.php:128 lib/command.php:234 #, fuzzy, php-format -msgid "Could not join user %s to group %s." +msgid "Could not join user %1$s to group %2$s." msgstr "Không thể theo bạn nà y: %s đã có trong danh sách bạn bè của bạn rồi." #: actions/apigroupleave.php:114 @@ -407,9 +403,9 @@ msgstr "Không thể theo bạn nà y: %s đã có trong danh sách bạn bè cá» msgid "You are not a member of this group." msgstr "Bạn chÆ°a cáºp nháºt thông tin riêng" -#: actions/apigroupleave.php:124 +#: actions/apigroupleave.php:124 actions/leavegroup.php:127 #, fuzzy, php-format -msgid "Could not remove user %s to group %s." +msgid "Could not remove user %1$s from group %2$s." msgstr "Không thể theo bạn nà y: %s đã có trong danh sách bạn bè của bạn rồi." #: actions/apigrouplist.php:95 @@ -417,11 +413,6 @@ msgstr "Không thể theo bạn nà y: %s đã có trong danh sách bạn bè cá» msgid "%s's groups" msgstr "%s và nhóm" -#: actions/apigrouplist.php:103 -#, php-format -msgid "Groups %s is a member of on %s." -msgstr "Bạn chÆ°a cáºp nháºt thông tin riêng" - #: actions/apigrouplistall.php:90 actions/usergroups.php:62 #, fuzzy, php-format msgid "%s groups" @@ -445,12 +436,12 @@ msgstr "Bạn đã không xóa trạng thái của những ngÆ°á»i khác." msgid "No such notice." msgstr "Không có tin nhắn nà o." -#: actions/apistatusesretweet.php:83 +#: actions/apistatusesretweet.php:83 lib/command.php:422 #, fuzzy msgid "Cannot repeat your own notice." msgstr "Bạn không thể đăng ký nếu không đồng ý các Ä‘iá»u khoản." -#: actions/apistatusesretweet.php:91 +#: actions/apistatusesretweet.php:91 lib/command.php:427 #, fuzzy msgid "Already repeated that notice." msgstr "Xóa tin nhắn" @@ -465,7 +456,7 @@ msgid "No status with that ID found." msgstr "Không tìm thấy trạng thái nà o tÆ°Æ¡ng ứng vá»›i ID đó." #: actions/apistatusesupdate.php:157 actions/newnotice.php:155 -#: scripts/maildaemon.php:71 +#: lib/mailhandler.php:60 #, fuzzy, php-format msgid "That's too long. Max notice size is %d chars." msgstr "Quá dà i. Tối Ä‘a là 140 ký tá»±." @@ -486,12 +477,12 @@ msgstr "Không há»— trợ kiểu file ảnh nà y." #: actions/apitimelinefavorites.php:108 #, fuzzy, php-format -msgid "%s / Favorites from %s" +msgid "%1$s / Favorites from %2$s" msgstr "Tìm kiếm các tin nhắn Æ°a thÃch của %s" #: actions/apitimelinefavorites.php:120 #, fuzzy, php-format -msgid "%s updates favorited by %s / %s." +msgid "%1$s updates favorited by %2$s / %2$s." msgstr "Tất cả các cáºp nháºt của %s" #: actions/apitimelinegroup.php:109 actions/apitimelineuser.php:118 @@ -561,8 +552,11 @@ msgstr "Không tìm thấy" msgid "No such attachment." msgstr "Không có tà i liệu nà o." -#: actions/avatarbynickname.php:59 actions/grouprss.php:91 -#: actions/leavegroup.php:76 +#: actions/avatarbynickname.php:59 actions/blockedfromgroup.php:73 +#: actions/editgroup.php:84 actions/groupdesignsettings.php:84 +#: actions/grouplogo.php:86 actions/groupmembers.php:76 +#: actions/grouprss.php:91 actions/joingroup.php:76 actions/leavegroup.php:76 +#: actions/showgroup.php:121 msgid "No nickname." msgstr "Không có biệt hiệu." @@ -587,8 +581,8 @@ msgstr "" "vá» bạn." #: actions/avatarsettings.php:106 actions/avatarsettings.php:185 -#: actions/grouplogo.php:178 actions/remotesubscribe.php:191 -#: actions/userauthorization.php:72 actions/userrss.php:103 +#: actions/remotesubscribe.php:191 actions/userauthorization.php:72 +#: actions/userrss.php:103 #, fuzzy msgid "User without matching profile" msgstr "Hồ sÆ¡ ở nÆ¡i khác không khá»›p vá»›i hồ sÆ¡ nà y của bạn" @@ -623,9 +617,9 @@ msgstr "Tải file" msgid "Crop" msgstr "Nhóm" -#: actions/avatarsettings.php:268 actions/disfavor.php:74 -#: actions/emailsettings.php:238 actions/favor.php:75 actions/geocode.php:50 -#: actions/groupblock.php:66 actions/grouplogo.php:309 +#: actions/avatarsettings.php:268 actions/deletenotice.php:157 +#: actions/disfavor.php:74 actions/emailsettings.php:238 actions/favor.php:75 +#: actions/geocode.php:50 actions/groupblock.php:66 actions/grouplogo.php:309 #: actions/groupunblock.php:66 actions/imsettings.php:206 #: actions/invite.php:56 actions/login.php:135 actions/makeadmin.php:66 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80 @@ -709,21 +703,16 @@ msgstr "Ban user" msgid "Failed to save block information." msgstr "" -#: actions/blockedfromgroup.php:73 actions/editgroup.php:84 -#: actions/groupdesignsettings.php:84 actions/grouplogo.php:86 -#: actions/groupmembers.php:76 actions/joingroup.php:76 -#: actions/showgroup.php:121 -#, fuzzy -msgid "No nickname" -msgstr "Không có biệt hiệu." - #: actions/blockedfromgroup.php:80 actions/editgroup.php:96 +#: actions/foafgroup.php:44 actions/foafgroup.php:62 actions/groupblock.php:86 #: actions/groupbyid.php:83 actions/groupdesignsettings.php:97 #: actions/grouplogo.php:99 actions/groupmembers.php:83 -#: actions/joingroup.php:83 actions/showgroup.php:137 +#: actions/grouprss.php:98 actions/groupunblock.php:86 +#: actions/joingroup.php:83 actions/leavegroup.php:83 actions/makeadmin.php:86 +#: actions/showgroup.php:137 lib/command.php:212 lib/command.php:263 #, fuzzy -msgid "No such group" -msgstr "Không có user nà o." +msgid "No such group." +msgstr "Không có tin nhắn nà o." #: actions/blockedfromgroup.php:90 #, fuzzy, php-format @@ -732,7 +721,7 @@ msgstr "Hồ sÆ¡" #: actions/blockedfromgroup.php:93 #, fuzzy, php-format -msgid "%s blocked profiles, page %d" +msgid "%1$s blocked profiles, page %2$d" msgstr "%s và bạn bè" #: actions/blockedfromgroup.php:108 @@ -848,11 +837,6 @@ msgstr "Không thể xóa tin nhắn nà y." msgid "Delete this notice" msgstr "Xóa tin nhắn" -#: actions/deletenotice.php:157 -#, fuzzy -msgid "There was a problem with your session token. Try again, please." -msgstr "Có lá»—i xảy ra khi thao tác. Hãy thá» lại lần nữa." - #: actions/deleteuser.php:67 #, fuzzy msgid "You cannot delete users." @@ -880,7 +864,7 @@ msgid "Delete this user" msgstr "Xóa tin nhắn" #: actions/designadminpanel.php:62 lib/accountsettingsaction.php:124 -#: lib/adminpanelaction.php:302 lib/groupnav.php:119 +#: lib/adminpanelaction.php:316 lib/groupnav.php:119 msgid "Design" msgstr "" @@ -1037,7 +1021,7 @@ msgstr "Bạn phải đăng nháºp và o má»›i có thể gá»i thÆ° má»i những #: actions/editgroup.php:103 actions/editgroup.php:168 #: actions/groupdesignsettings.php:104 actions/grouplogo.php:106 #, fuzzy -msgid "You must be an admin to edit the group" +msgid "You must be an admin to edit the group." msgstr "Bạn phải đăng nháºp và o má»›i có thể gá»i thÆ° má»i những " #: actions/editgroup.php:154 @@ -1065,7 +1049,8 @@ msgid "Options saved." msgstr "Äã lÆ°u các Ä‘iá»u chỉnh." #: actions/emailsettings.php:60 -msgid "Email Settings" +#, fuzzy +msgid "Email settings" msgstr "Thiết láºp địa chỉ email" #: actions/emailsettings.php:71 @@ -1103,7 +1088,7 @@ msgstr "Hủy" #: actions/emailsettings.php:121 #, fuzzy -msgid "Email Address" +msgid "Email address" msgstr "Äịa chỉ email" #: actions/emailsettings.php:123 @@ -1182,9 +1167,9 @@ msgstr "Không có địa chỉ email." msgid "Cannot normalize that email address" msgstr "Không thể bình thÆ°á»ng hóa địa chỉ GTalk nà y" -#: actions/emailsettings.php:331 actions/siteadminpanel.php:157 -#, fuzzy -msgid "Not a valid email address" +#: actions/emailsettings.php:331 actions/register.php:201 +#: actions/siteadminpanel.php:157 +msgid "Not a valid email address." msgstr "Äịa chỉ email không hợp lệ." #: actions/emailsettings.php:334 @@ -1379,20 +1364,12 @@ msgstr "Không biết phiên bản của giao thức OMB." msgid "Error updating remote profile" msgstr "Lá»—i xảy ra khi cáºp nháºt hồ sÆ¡ cá nhân" -#: actions/foafgroup.php:44 actions/foafgroup.php:62 actions/groupblock.php:86 -#: actions/grouprss.php:98 actions/groupunblock.php:86 -#: actions/leavegroup.php:83 actions/makeadmin.php:86 lib/command.php:212 -#: lib/command.php:263 -#, fuzzy -msgid "No such group." -msgstr "Không có tin nhắn nà o." - -#: actions/getfile.php:75 +#: actions/getfile.php:79 #, fuzzy msgid "No such file." msgstr "Không có tin nhắn nà o." -#: actions/getfile.php:79 +#: actions/getfile.php:83 #, fuzzy msgid "Cannot read file." msgstr "Không có tin nhắn nà o." @@ -1405,7 +1382,7 @@ msgstr "" #: actions/groupblock.php:76 actions/groupunblock.php:76 #: actions/makeadmin.php:76 actions/subedit.php:53 actions/tagother.php:46 -#: lib/profileformaction.php:77 +#: actions/unsubscribe.php:84 lib/profileformaction.php:77 #, fuzzy msgid "No profile with that ID." msgstr "Không tìm thấy trạng thái nà o tÆ°Æ¡ng ứng vá»›i ID đó." @@ -1437,9 +1414,9 @@ msgstr "Ban user" #: actions/groupblock.php:162 #, php-format msgid "" -"Are you sure you want to block user \"%s\" from the group \"%s\"? They will " -"be removed from the group, unable to post, and unable to subscribe to the " -"group in the future." +"Are you sure you want to block user \"%1$s\" from the group \"%2$s\"? They " +"will be removed from the group, unable to post, and unable to subscribe to " +"the group in the future." msgstr "" #: actions/groupblock.php:178 @@ -1456,9 +1433,10 @@ msgstr "Ban user" msgid "Database error blocking user from group." msgstr "" -#: actions/groupbyid.php:74 -msgid "No ID" -msgstr "" +#: actions/groupbyid.php:74 actions/userbyid.php:70 +#, fuzzy +msgid "No ID." +msgstr "Không có id." #: actions/groupdesignsettings.php:68 #, fuzzy @@ -1482,13 +1460,6 @@ msgstr "" msgid "Couldn't update your design." msgstr "Không thể cáºp nháºt thà nh viên." -#: actions/groupdesignsettings.php:287 actions/groupdesignsettings.php:297 -#: actions/userdesignsettings.php:210 actions/userdesignsettings.php:220 -#: actions/userdesignsettings.php:263 actions/userdesignsettings.php:273 -#, fuzzy -msgid "Unable to save your design settings!" -msgstr "Không thể lÆ°u thông tin Twitter của bạn!" - #: actions/groupdesignsettings.php:308 actions/userdesignsettings.php:231 #, fuzzy msgid "Design preferences saved." @@ -1505,6 +1476,11 @@ msgid "" "You can upload a logo image for your group. The maximum file size is %s." msgstr "" +#: actions/grouplogo.php:178 +#, fuzzy +msgid "User without matching profile." +msgstr "Hồ sÆ¡ ở nÆ¡i khác không khá»›p vá»›i hồ sÆ¡ nà y của bạn" + #: actions/grouplogo.php:362 msgid "Pick a square area of the image to be the logo." msgstr "" @@ -1525,15 +1501,15 @@ msgid "%s group members" msgstr "Thà nh viên" #: actions/groupmembers.php:96 -#, php-format -msgid "%s group members, page %d" -msgstr "" +#, fuzzy, php-format +msgid "%1$s group members, page %2$d" +msgstr "Thà nh viên" #: actions/groupmembers.php:111 msgid "A list of the users in this group." msgstr "" -#: actions/groupmembers.php:175 lib/action.php:441 lib/groupnav.php:107 +#: actions/groupmembers.php:175 lib/action.php:442 lib/groupnav.php:107 msgid "Admin" msgstr "" @@ -1635,7 +1611,8 @@ msgid "Error removing the block." msgstr "Lá»—i xảy ra khi lÆ°u thà nh viên." #: actions/imsettings.php:59 -msgid "IM Settings" +#, fuzzy +msgid "IM settings" msgstr "Cấu hình IM" #: actions/imsettings.php:70 @@ -1666,7 +1643,8 @@ msgstr "" "nháºn tin nhắn và lá»i hÆ°á»›ng dẫn. (Bạn đã thêm %s và o danh sách bạn thân chÆ°a?)" #: actions/imsettings.php:124 -msgid "IM Address" +#, fuzzy +msgid "IM address" msgstr "IM" #: actions/imsettings.php:126 @@ -1729,11 +1707,6 @@ msgstr "" msgid "That is not your Jabber ID." msgstr "Äây không phải Jabber ID của bạn." -#: actions/inbox.php:59 -#, php-format -msgid "Inbox for %s - page %d" -msgstr "Há»™p thÆ° đến của %s - trang %d" - #: actions/inbox.php:62 #, php-format msgid "Inbox for %s" @@ -1769,9 +1742,9 @@ msgstr "Gá»i thÆ° má»i đến những ngÆ°á»i chÆ°a có tà i khoản" msgid "You are already subscribed to these users:" msgstr "Bạn đã theo những ngÆ°á»i nà y:" -#: actions/invite.php:131 actions/invite.php:139 -#, php-format -msgid "%s (%s)" +#: actions/invite.php:131 actions/invite.php:139 lib/command.php:315 +#, fuzzy, php-format +msgid "%1$s (%2$s)" msgstr "%s (%s)" #: actions/invite.php:136 @@ -1817,7 +1790,7 @@ msgstr "Tin nhắn cá nhân" msgid "Optionally add a personal message to the invitation." msgstr "Không bắt buá»™c phải thêm thông Ä‘iệp và o thÆ° má»i." -#: actions/invite.php:197 lib/messageform.php:178 lib/noticeform.php:232 +#: actions/invite.php:197 lib/messageform.php:178 lib/noticeform.php:234 msgid "Send" msgstr "Gá»i" @@ -1888,19 +1861,9 @@ msgstr "" msgid "You must be logged in to join a group." msgstr "Bạn phải đăng nháºp và o má»›i có thể gá»i thÆ° má»i những " -#: actions/joingroup.php:90 lib/command.php:217 -#, fuzzy -msgid "You are already a member of that group" -msgstr "Bạn đã theo những ngÆ°á»i nà y:" - -#: actions/joingroup.php:128 lib/command.php:234 -#, fuzzy, php-format -msgid "Could not join user %s to group %s" -msgstr "Không thể theo bạn nà y: %s đã có trong danh sách bạn bè của bạn rồi." - #: actions/joingroup.php:135 lib/command.php:239 #, fuzzy, php-format -msgid "%s joined group %s" +msgid "%1$s joined group %2$s" msgstr "%s và nhóm" #: actions/leavegroup.php:60 @@ -1918,14 +1881,9 @@ msgstr "Bạn chÆ°a cáºp nháºt thông tin riêng" msgid "Could not find membership record." msgstr "Không thể cáºp nháºt thà nh viên." -#: actions/leavegroup.php:127 lib/command.php:284 -#, fuzzy, php-format -msgid "Could not remove user %s to group %s" -msgstr "Không thể theo bạn nà y: %s đã có trong danh sách bạn bè của bạn rồi." - #: actions/leavegroup.php:134 lib/command.php:289 #, fuzzy, php-format -msgid "%s left group %s" +msgid "%1$s left group %2$s" msgstr "%s và nhóm" #: actions/login.php:83 actions/register.php:137 @@ -1946,7 +1904,7 @@ msgstr "Sai tên đăng nháºp hoặc máºt khẩu." msgid "Error setting user. You are probably not authorized." msgstr "ChÆ°a được phép." -#: actions/login.php:208 actions/login.php:261 lib/action.php:459 +#: actions/login.php:208 actions/login.php:261 lib/action.php:460 #: lib/logingroupnav.php:79 msgid "Login" msgstr "Äăng nháºp" @@ -2001,19 +1959,19 @@ msgid "Only an admin can make another user an admin." msgstr "" #: actions/makeadmin.php:95 -#, php-format -msgid "%s is already an admin for group \"%s\"." -msgstr "" +#, fuzzy, php-format +msgid "%1$s is already an admin for group \"%2$s\"." +msgstr "NgÆ°á»i dùng không có thông tin." #: actions/makeadmin.php:132 -#, php-format -msgid "Can't get membership record for %s in group %s" -msgstr "" +#, fuzzy, php-format +msgid "Can't get membership record for %1$s in group %2$s." +msgstr "Không thể theo bạn nà y: %s đã có trong danh sách bạn bè của bạn rồi." #: actions/makeadmin.php:145 -#, php-format -msgid "Can't make %s an admin for group %s" -msgstr "" +#, fuzzy, php-format +msgid "Can't make %1$s an admin for group %2$s." +msgstr "Bạn phải đăng nháºp và o má»›i có thể gá»i thÆ° má»i những " #: actions/microsummary.php:69 msgid "No current status" @@ -2059,7 +2017,7 @@ msgstr "Tin má»›i nhất" #: actions/newmessage.php:185 lib/command.php:376 #, fuzzy, php-format -msgid "Direct message to %s sent" +msgid "Direct message to %s sent." msgstr "Tin nhắn riêng" #: actions/newmessage.php:210 actions/newnotice.php:245 lib/channel.php:170 @@ -2091,7 +2049,7 @@ msgstr "Chuá»—i cần tìm" #: actions/noticesearch.php:91 #, fuzzy, php-format -msgid "Search results for \"%s\" on %s" +msgid "Search results for \"%1$s\" on %2$s" msgstr " Tìm dòng thông tin cho \"%s\"" #: actions/noticesearch.php:121 @@ -2200,11 +2158,6 @@ msgstr "" msgid "URL shortening service is too long (max 50 chars)." msgstr "Tên khu vá»±c quá dà i (không quá 255 ký tá»±)." -#: actions/outbox.php:58 -#, php-format -msgid "Outbox for %s - page %d" -msgstr "Há»™p thÆ° gá»i Ä‘i của %s - trang %d" - #: actions/outbox.php:61 #, php-format msgid "Outbox for %s" @@ -2280,7 +2233,7 @@ msgstr "Không thể lÆ°u máºt khẩu má»›i" msgid "Password saved." msgstr "Äã lÆ°u máºt khẩu." -#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:308 +#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:326 msgid "Paths" msgstr "" @@ -2313,7 +2266,7 @@ msgid "Invalid SSL server. The maximum length is 255 characters." msgstr "" #: actions/pathsadminpanel.php:217 actions/siteadminpanel.php:58 -#: lib/adminpanelaction.php:299 +#: lib/adminpanelaction.php:311 #, fuzzy msgid "Site" msgstr "ThÆ° má»i" @@ -2419,8 +2372,9 @@ msgid "When to use SSL" msgstr "" #: actions/pathsadminpanel.php:308 -msgid "SSL Server" -msgstr "" +#, fuzzy +msgid "SSL server" +msgstr "Khôi phục" #: actions/pathsadminpanel.php:309 msgid "Server to direct SSL requests to" @@ -2450,9 +2404,9 @@ msgid "Not a valid people tag: %s" msgstr "Äịa chỉ email không hợp lệ." #: actions/peopletag.php:144 -#, php-format -msgid "Users self-tagged with %s - page %d" -msgstr "" +#, fuzzy, php-format +msgid "Users self-tagged with %1$s - page %2$d" +msgstr "Dòng tin nhắn cho %s" #: actions/postnotice.php:84 msgid "Invalid notice content" @@ -2460,7 +2414,7 @@ msgstr "Ná»™i dung tin nhắn không hợp lệ" #: actions/postnotice.php:90 #, php-format -msgid "Notice license ‘%s’ is not compatible with site license ‘%s’." +msgid "Notice license ‘%1$s’ is not compatible with site license ‘%2$s’." msgstr "" #: actions/profilesettings.php:60 @@ -2583,21 +2537,21 @@ msgstr "Trang chủ '%s' không hợp lệ" msgid "Couldn't update user for autosubscribe." msgstr "Không thể cáºp nháºt thà nh viên." -#: actions/profilesettings.php:354 +#: actions/profilesettings.php:359 #, fuzzy msgid "Couldn't save location prefs." msgstr "Không thể lÆ°u hồ sÆ¡ cá nhân." -#: actions/profilesettings.php:366 +#: actions/profilesettings.php:371 msgid "Couldn't save profile." msgstr "Không thể lÆ°u hồ sÆ¡ cá nhân." -#: actions/profilesettings.php:374 +#: actions/profilesettings.php:379 #, fuzzy msgid "Couldn't save tags." msgstr "Không thể lÆ°u hồ sÆ¡ cá nhân." -#: actions/profilesettings.php:382 lib/adminpanelaction.php:126 +#: actions/profilesettings.php:387 lib/adminpanelaction.php:137 msgid "Settings saved." msgstr "Äã lÆ°u các Ä‘iá»u chỉnh." @@ -2695,7 +2649,7 @@ msgid "" "one!" msgstr "" -#: actions/publictagcloud.php:135 +#: actions/publictagcloud.php:131 msgid "Tag cloud" msgstr "" @@ -2835,7 +2789,7 @@ msgstr "Lá»—i xảy ra vá»›i mã xác nháºn." msgid "Registration successful" msgstr "Äăng ký thà nh công" -#: actions/register.php:114 actions/register.php:502 lib/action.php:456 +#: actions/register.php:114 actions/register.php:502 lib/action.php:457 #: lib/logingroupnav.php:85 msgid "Register" msgstr "Äăng ký" @@ -2849,10 +2803,6 @@ msgstr "Biệt hiệu không được cho phép." msgid "You can't register if you don't agree to the license." msgstr "Bạn không thể đăng ký nếu không đồng ý các Ä‘iá»u khoản." -#: actions/register.php:201 -msgid "Not a valid email address." -msgstr "Äịa chỉ email không hợp lệ." - #: actions/register.php:212 msgid "Email address already exists." msgstr "Äịa chỉ email đã tồn tại." @@ -2910,12 +2860,12 @@ msgid "" msgstr " ngoại trừ thông tin riêng: máºt khẩu, email, địa chỉ IM, số Ä‘iện thoại" #: actions/register.php:537 -#, php-format +#, fuzzy, php-format msgid "" -"Congratulations, %s! And welcome to %%%%site.name%%%%. From here, you may " +"Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may " "want to...\n" "\n" -"* Go to [your profile](%s) and post your first message.\n" +"* Go to [your profile](%2$s) and post your first message.\n" "* Add a [Jabber/GTalk address](%%%%action.imsettings%%%%) so you can send " "notices through instant messages.\n" "* [Search for people](%%%%action.peoplesearch%%%%) that you may know or that " @@ -3043,11 +2993,6 @@ msgstr "Tạo" msgid "Replies to %s" msgstr "Trả lá»i cho %s" -#: actions/replies.php:127 -#, fuzzy, php-format -msgid "Replies to %s, page %d" -msgstr "Trả lá»i cho %s" - #: actions/replies.php:144 #, fuzzy, php-format msgid "Replies feed for %s (RSS 1.0)" @@ -3066,8 +3011,8 @@ msgstr "Dòng tin nhắn cho %s" #: actions/replies.php:198 #, php-format msgid "" -"This is the timeline showing replies to %s but %s hasn't received a notice " -"to his attention yet." +"This is the timeline showing replies to %1$s but %2$s hasn't received a " +"notice to his attention yet." msgstr "" #: actions/replies.php:203 @@ -3080,8 +3025,8 @@ msgstr "" #: actions/replies.php:205 #, php-format msgid "" -"You can try to [nudge %s](../%s) or [post something to his or her attention]" -"(%%%%action.newnotice%%%%?status_textarea=%s)." +"You can try to [nudge %1$s](../%2$s) or [post something to his or her " +"attention](%%%%action.newnotice%%%%?status_textarea=%3$s)." msgstr "" #: actions/repliesrss.php:72 @@ -3099,11 +3044,6 @@ msgstr "Bạn đã theo những ngÆ°á»i nà y:" msgid "User is already sandboxed." msgstr "NgÆ°á»i dùng không có thông tin." -#: actions/showfavorites.php:79 -#, fuzzy, php-format -msgid "%s's favorite notices, page %d" -msgstr "%s Æ°a thÃch các tin nhắn" - #: actions/showfavorites.php:132 msgid "Could not retrieve favorite notices." msgstr "Không thể lấy lại các tin nhắn Æ°a thÃch" @@ -3153,11 +3093,6 @@ msgstr "" msgid "%s group" msgstr "%s và nhóm" -#: actions/showgroup.php:84 -#, php-format -msgid "%s group, page %d" -msgstr "" - #: actions/showgroup.php:218 #, fuzzy msgid "Group profile" @@ -3209,7 +3144,7 @@ msgstr "Thà nh viên" #: actions/showgroup.php:386 lib/profileaction.php:117 #: lib/profileaction.php:148 lib/profileaction.php:236 lib/section.php:95 -#: lib/tagcloudsection.php:71 +#: lib/subscriptionlist.php:126 lib/tagcloudsection.php:71 msgid "(None)" msgstr "" @@ -3279,14 +3214,9 @@ msgstr "Tin đã gá»i" msgid " tagged %s" msgstr "Thông báo được gắn thẻ %s" -#: actions/showstream.php:79 -#, fuzzy, php-format -msgid "%s, page %d" -msgstr "Há»™p thÆ° đến của %s - trang %d" - #: actions/showstream.php:122 #, fuzzy, php-format -msgid "Notice feed for %s tagged %s (RSS 1.0)" +msgid "Notice feed for %1$s tagged %2$s (RSS 1.0)" msgstr "Dòng tin nhắn cho %s" #: actions/showstream.php:129 @@ -3311,7 +3241,7 @@ msgstr "Há»™p thÆ° Ä‘i của %s" #: actions/showstream.php:191 #, php-format -msgid "This is the timeline for %s but %s hasn't posted anything yet." +msgid "This is the timeline for %1$s but %2$s hasn't posted anything yet." msgstr "" #: actions/showstream.php:196 @@ -3323,8 +3253,8 @@ msgstr "" #: actions/showstream.php:198 #, php-format msgid "" -"You can try to nudge %s or [post something to his or her attention](%%%%" -"action.newnotice%%%%?status_textarea=%s)." +"You can try to nudge %1$s or [post something to his or her attention](%%%%" +"action.newnotice%%%%?status_textarea=%2$s)." msgstr "" #: actions/showstream.php:234 @@ -3369,12 +3299,12 @@ msgstr "" #: actions/siteadminpanel.php:154 #, fuzzy -msgid "You must have a valid contact email address" +msgid "You must have a valid contact email address." msgstr "Äịa chỉ email không hợp lệ." #: actions/siteadminpanel.php:172 #, php-format -msgid "Unknown language \"%s\"" +msgid "Unknown language \"%s\"." msgstr "" #: actions/siteadminpanel.php:179 @@ -3564,7 +3494,8 @@ msgid "Save site settings" msgstr "Thay đổi hình đại diện" #: actions/smssettings.php:58 -msgid "SMS Settings" +#, fuzzy +msgid "SMS settings" msgstr "Thiết láºp SMS" #: actions/smssettings.php:69 @@ -3596,7 +3527,8 @@ msgid "Enter the code you received on your phone." msgstr "Nháºp mã mà bạn nháºn được trên Ä‘iện thoại của bạn." #: actions/smssettings.php:138 -msgid "SMS Phone number" +#, fuzzy +msgid "SMS phone number" msgstr "Số Ä‘iện thoại để nhắn SMS " #: actions/smssettings.php:140 @@ -3698,7 +3630,7 @@ msgstr "Bạn nà y theo tôi" #: actions/subscribers.php:52 #, fuzzy, php-format -msgid "%s subscribers, page %d" +msgid "%1$s subscribers, page %2$d" msgstr "Theo tôi" #: actions/subscribers.php:63 @@ -3735,7 +3667,7 @@ msgstr "Tất cả đăng nháºn" #: actions/subscriptions.php:54 #, fuzzy, php-format -msgid "%s subscriptions, page %d" +msgid "%1$s subscriptions, page %2$d" msgstr "Tất cả đăng nháºn" #: actions/subscriptions.php:65 @@ -3771,11 +3703,6 @@ msgstr "Không có Jabber ID." msgid "SMS" msgstr "SMS" -#: actions/tag.php:68 -#, fuzzy, php-format -msgid "Notices tagged with %s, page %d" -msgstr "Dòng tin nhắn cho %s" - #: actions/tag.php:86 #, fuzzy, php-format msgid "Notice feed for tag %s (RSS 1.0)" @@ -3864,11 +3791,6 @@ msgstr "NgÆ°á»i dùng không có thông tin." msgid "No profile id in request." msgstr "Không có URL cho hồ sÆ¡ để quay vá»." -#: actions/unsubscribe.php:84 -#, fuzzy -msgid "No profile with that id." -msgstr "Không tìm thấy trạng thái nà o tÆ°Æ¡ng ứng vá»›i ID đó." - #: actions/unsubscribe.php:98 #, fuzzy msgid "Unsubscribed" @@ -3876,10 +3798,11 @@ msgstr "Hết theo" #: actions/updateprofile.php:62 actions/userauthorization.php:330 #, php-format -msgid "Listenee stream license ‘%s’ is not compatible with site license ‘%s’." +msgid "" +"Listenee stream license ‘%1$s’ is not compatible with site license ‘%2$s’." msgstr "" -#: actions/useradminpanel.php:58 lib/adminpanelaction.php:305 +#: actions/useradminpanel.php:58 lib/adminpanelaction.php:321 #: lib/personalgroupnav.php:115 msgid "User" msgstr "" @@ -3986,7 +3909,7 @@ msgstr "" "nhắn của các thà nh viên nà y. Nếu bạn không yêu cầu đăng nháºn xem tin nhắn " "của há», hãy nhấn \"Hủy bá»\"" -#: actions/userauthorization.php:188 +#: actions/userauthorization.php:188 actions/version.php:165 msgid "License" msgstr "" @@ -4044,7 +3967,7 @@ msgstr "" #: actions/userauthorization.php:296 #, php-format -msgid "Listener URI ‘%s’ not found here" +msgid "Listener URI ‘%s’ not found here." msgstr "" #: actions/userauthorization.php:301 @@ -4077,11 +4000,6 @@ msgstr "Không thể Ä‘á»c URL cho hình đại diện '%s'" msgid "Wrong image type for avatar URL ‘%s’." msgstr "Kiểu file ảnh không phù hợp vá»›i '%s'" -#: actions/userbyid.php:70 -#, fuzzy -msgid "No ID." -msgstr "Không có id." - #: actions/userdesignsettings.php:76 lib/designsettings.php:65 #, fuzzy msgid "Profile design" @@ -4097,11 +4015,6 @@ msgstr "" msgid "Enjoy your hotdog!" msgstr "" -#: actions/usergroups.php:64 -#, php-format -msgid "%s groups, page %d" -msgstr "" - #: actions/usergroups.php:130 msgid "Search for more groups" msgstr "" @@ -4116,6 +4029,72 @@ msgstr "Bạn chÆ°a cáºp nháºt thông tin riêng" msgid "Try [searching for groups](%%action.groupsearch%%) and joining them." msgstr "" +#: actions/version.php:73 +#, fuzzy, php-format +msgid "StatusNet %s" +msgstr "Số liệu thống kê" + +#: actions/version.php:153 +#, php-format +msgid "" +"This site is powered by %1$s version %2$s, Copyright 2008-2010 StatusNet, " +"Inc. and contributors." +msgstr "" + +#: actions/version.php:157 +#, fuzzy +msgid "StatusNet" +msgstr "Hình đại diện đã được cáºp nháºt." + +#: actions/version.php:161 +msgid "Contributors" +msgstr "" + +#: actions/version.php:168 +msgid "" +"StatusNet is free software: you can redistribute it and/or modify it under " +"the terms of the GNU Affero General Public License as published by the Free " +"Software Foundation, either version 3 of the License, or (at your option) " +"any later version. " +msgstr "" + +#: actions/version.php:174 +msgid "" +"This program is distributed in the hope that it will be useful, but WITHOUT " +"ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or " +"FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License " +"for more details. " +msgstr "" + +#: actions/version.php:180 +#, php-format +msgid "" +"You should have received a copy of the GNU Affero General Public License " +"along with this program. If not, see %s." +msgstr "" + +#: actions/version.php:189 +msgid "Plugins" +msgstr "" + +#: actions/version.php:195 +#, fuzzy +msgid "Name" +msgstr "Biệt danh" + +#: actions/version.php:196 lib/action.php:741 +#, fuzzy +msgid "Version" +msgstr "Cá nhân" + +#: actions/version.php:197 +msgid "Author(s)" +msgstr "" + +#: actions/version.php:198 lib/groupeditform.php:172 +msgid "Description" +msgstr "Mô tả" + #: classes/File.php:137 #, php-format msgid "" @@ -4187,7 +4166,7 @@ msgstr "Có lá»—i xảy ra khi lÆ°u tin nhắn." msgid "DB error inserting reply: %s" msgstr "Lá»—i cÆ¡ sở dữ liệu khi chèn trả lá»i: %s" -#: classes/Notice.php:1361 +#: classes/Notice.php:1359 #, fuzzy, php-format msgid "RT @%1$s %2$s" msgstr "%s (%s)" @@ -4238,149 +4217,144 @@ msgstr "Sau" msgid "Other options" msgstr "" -#: lib/action.php:144 -#, fuzzy, php-format -msgid "%s - %s" -msgstr "%s (%s)" - #: lib/action.php:159 msgid "Untitled page" msgstr "" -#: lib/action.php:426 +#: lib/action.php:427 msgid "Primary site navigation" msgstr "" -#: lib/action.php:432 +#: lib/action.php:433 msgid "Home" msgstr "Trang chủ" -#: lib/action.php:432 +#: lib/action.php:433 msgid "Personal profile and friends timeline" msgstr "" -#: lib/action.php:434 +#: lib/action.php:435 #, fuzzy msgid "Account" msgstr "Giá»›i thiệu" -#: lib/action.php:434 +#: lib/action.php:435 #, fuzzy msgid "Change your email, avatar, password, profile" msgstr "Thay đổi máºt khẩu của bạn" -#: lib/action.php:437 +#: lib/action.php:438 msgid "Connect" msgstr "Kết nối" -#: lib/action.php:437 +#: lib/action.php:438 #, fuzzy msgid "Connect to services" msgstr "Không thể chuyển đến máy chủ: %s" -#: lib/action.php:441 +#: lib/action.php:442 #, fuzzy msgid "Change site configuration" msgstr "Tôi theo" -#: lib/action.php:445 lib/subgroupnav.php:105 +#: lib/action.php:446 lib/subgroupnav.php:105 msgid "Invite" msgstr "ThÆ° má»i" -#: lib/action.php:446 lib/subgroupnav.php:106 +#: lib/action.php:447 lib/subgroupnav.php:106 #, fuzzy, php-format msgid "Invite friends and colleagues to join you on %s" msgstr "" "Äiá»n địa chỉ email và ná»™i dung tin nhắn để gá»i thÆ° má»i bạn bè và đồng nghiệp " "của bạn tham gia và o dịch vụ nà y." -#: lib/action.php:451 +#: lib/action.php:452 msgid "Logout" msgstr "Thoát" -#: lib/action.php:451 +#: lib/action.php:452 msgid "Logout from the site" msgstr "" -#: lib/action.php:456 +#: lib/action.php:457 #, fuzzy msgid "Create an account" msgstr "Tạo tà i khoản má»›i" -#: lib/action.php:459 +#: lib/action.php:460 msgid "Login to the site" msgstr "" -#: lib/action.php:462 lib/action.php:725 +#: lib/action.php:463 lib/action.php:726 msgid "Help" msgstr "HÆ°á»›ng dẫn" -#: lib/action.php:462 +#: lib/action.php:463 #, fuzzy msgid "Help me!" msgstr "HÆ°á»›ng dẫn" -#: lib/action.php:465 lib/searchaction.php:127 +#: lib/action.php:466 lib/searchaction.php:127 msgid "Search" msgstr "Tìm kiếm" -#: lib/action.php:465 +#: lib/action.php:466 msgid "Search for people or text" msgstr "" -#: lib/action.php:486 +#: lib/action.php:487 #, fuzzy msgid "Site notice" msgstr "Thông báo má»›i" -#: lib/action.php:552 +#: lib/action.php:553 msgid "Local views" msgstr "" -#: lib/action.php:618 +#: lib/action.php:619 #, fuzzy msgid "Page notice" msgstr "Thông báo má»›i" -#: lib/action.php:720 +#: lib/action.php:721 #, fuzzy msgid "Secondary site navigation" msgstr "Tôi theo" -#: lib/action.php:727 +#: lib/action.php:728 msgid "About" msgstr "Giá»›i thiệu" -#: lib/action.php:729 +#: lib/action.php:730 msgid "FAQ" msgstr "FAQ" -#: lib/action.php:733 +#: lib/action.php:734 msgid "TOS" msgstr "" -#: lib/action.php:736 +#: lib/action.php:737 msgid "Privacy" msgstr "Riêng tÆ°" -#: lib/action.php:738 +#: lib/action.php:739 msgid "Source" msgstr "Nguồn" -#: lib/action.php:740 +#: lib/action.php:743 msgid "Contact" msgstr "Liên hệ" -#: lib/action.php:742 +#: lib/action.php:745 #, fuzzy msgid "Badge" msgstr "Tin đã gá»i" -#: lib/action.php:770 +#: lib/action.php:773 msgid "StatusNet software license" msgstr "" -#: lib/action.php:773 +#: lib/action.php:776 #, php-format msgid "" "**%%site.name%%** is a microblogging service brought to you by [%%site." @@ -4389,12 +4363,12 @@ msgstr "" "**%%site.name%%** là dịch vụ gá»i tin nhắn được cung cấp từ [%%site.broughtby%" "%](%%site.broughtbyurl%%). " -#: lib/action.php:775 +#: lib/action.php:778 #, php-format msgid "**%%site.name%%** is a microblogging service. " msgstr "**%%site.name%%** là dịch vụ gá»i tin nhắn. " -#: lib/action.php:777 +#: lib/action.php:780 #, fuzzy, php-format msgid "" "It runs the [StatusNet](http://status.net/) microblogging software, version %" @@ -4405,34 +4379,34 @@ msgstr "" "quyá»n [GNU Affero General Public License](http://www.fsf.org/licensing/" "licenses/agpl-3.0.html)." -#: lib/action.php:791 +#: lib/action.php:794 #, fuzzy msgid "Site content license" msgstr "Tìm theo ná»™i dung của tin nhắn" -#: lib/action.php:800 +#: lib/action.php:803 msgid "All " msgstr "" -#: lib/action.php:805 +#: lib/action.php:808 msgid "license." msgstr "" -#: lib/action.php:1099 +#: lib/action.php:1102 msgid "Pagination" msgstr "" -#: lib/action.php:1108 +#: lib/action.php:1111 #, fuzzy msgid "After" msgstr "Sau" -#: lib/action.php:1116 +#: lib/action.php:1119 #, fuzzy msgid "Before" msgstr "TrÆ°á»›c" -#: lib/action.php:1164 +#: lib/action.php:1167 #, fuzzy msgid "There was a problem with your session token." msgstr "Có lá»—i xảy ra khi thao tác. Hãy thá» lại lần nữa." @@ -4442,30 +4416,35 @@ msgstr "Có lá»—i xảy ra khi thao tác. Hãy thá» lại lần nữa." msgid "You cannot make changes to this site." msgstr "Bạn đã theo những ngÆ°á»i nà y:" -#: lib/adminpanelaction.php:195 +#: lib/adminpanelaction.php:107 +#, fuzzy +msgid "Changes to that panel are not allowed." +msgstr "Biệt hiệu không được cho phép." + +#: lib/adminpanelaction.php:206 msgid "showForm() not implemented." msgstr "" -#: lib/adminpanelaction.php:224 +#: lib/adminpanelaction.php:235 msgid "saveSettings() not implemented." msgstr "" -#: lib/adminpanelaction.php:247 +#: lib/adminpanelaction.php:258 #, fuzzy msgid "Unable to delete design setting." msgstr "Không thể lÆ°u thông tin Twitter của bạn!" -#: lib/adminpanelaction.php:300 +#: lib/adminpanelaction.php:312 #, fuzzy msgid "Basic site configuration" msgstr "Xac nhan dia chi email" -#: lib/adminpanelaction.php:303 +#: lib/adminpanelaction.php:317 #, fuzzy msgid "Design configuration" msgstr "Xác nháºn SMS" -#: lib/adminpanelaction.php:306 lib/adminpanelaction.php:309 +#: lib/adminpanelaction.php:322 lib/adminpanelaction.php:327 #, fuzzy msgid "Paths configuration" msgstr "Xác nháºn SMS" @@ -4491,12 +4470,22 @@ msgstr "" msgid "Tags for this attachment" msgstr "" +#: lib/authenticationplugin.php:182 lib/authenticationplugin.php:187 +#, fuzzy +msgid "Password changing failed" +msgstr "Äã lÆ°u máºt khẩu." + +#: lib/authenticationplugin.php:197 +#, fuzzy +msgid "Password changing is not allowed" +msgstr "Äã lÆ°u máºt khẩu." + #: lib/channel.php:138 lib/channel.php:158 #, fuzzy msgid "Command results" msgstr "Không có kết quả nà o" -#: lib/channel.php:210 +#: lib/channel.php:210 lib/mailhandler.php:142 msgid "Command complete" msgstr "" @@ -4511,7 +4500,7 @@ msgstr "" #: lib/command.php:88 #, fuzzy, php-format -msgid "Could not find a user with nickname %s" +msgid "Could not find a user with nickname %s." msgstr "Không thể cáºp nháºt thông tin user vá»›i địa chỉ email đã được xác nháºn." #: lib/command.php:92 @@ -4520,7 +4509,7 @@ msgstr "" #: lib/command.php:99 #, fuzzy, php-format -msgid "Nudge sent to %s" +msgid "Nudge sent to %s." msgstr "Tin đã gá»i" #: lib/command.php:126 @@ -4532,13 +4521,14 @@ msgid "" msgstr "" #: lib/command.php:152 lib/command.php:399 lib/command.php:460 -msgid "Notice with that id does not exist" -msgstr "" +#, fuzzy +msgid "Notice with that id does not exist." +msgstr "Không tìm thấy trạng thái nà o tÆ°Æ¡ng ứng vá»›i ID đó." #: lib/command.php:168 lib/command.php:415 lib/command.php:476 #: lib/command.php:532 #, fuzzy -msgid "User has no last notice" +msgid "User has no last notice." msgstr "NgÆ°á»i dùng không có thông tin." #: lib/command.php:190 @@ -4546,22 +4536,22 @@ msgstr "NgÆ°á»i dùng không có thông tin." msgid "Notice marked as fave." msgstr "Tin nhắn nà y đã có trong danh sách tin nhắn Æ°a thÃch của bạn rồi!" -#: lib/command.php:315 +#: lib/command.php:284 #, fuzzy, php-format -msgid "%1$s (%2$s)" -msgstr "%s (%s)" +msgid "Could not remove user %1$s to group %2$s." +msgstr "Không thể theo bạn nà y: %s đã có trong danh sách bạn bè của bạn rồi." #: lib/command.php:318 #, fuzzy, php-format -msgid "Fullname: %s" +msgid "Full name: %s" msgstr "Tên đầy đủ" -#: lib/command.php:321 +#: lib/command.php:321 lib/mail.php:254 #, fuzzy, php-format msgid "Location: %s" msgstr "Thà nh phố: %s" -#: lib/command.php:324 +#: lib/command.php:324 lib/mail.php:256 #, fuzzy, php-format msgid "Homepage: %s" msgstr "Trang chủ hoặc Blog: %s" @@ -4573,7 +4563,7 @@ msgstr "Giá»›i thiệu" #: lib/command.php:358 scripts/xmppdaemon.php:301 #, php-format -msgid "Message too long - maximum is %d characters, you sent %d" +msgid "Message too long - maximum is %1$d characters, you sent %2$d." msgstr "" #: lib/command.php:378 @@ -4581,18 +4571,9 @@ msgstr "" msgid "Error sending direct message." msgstr "ThÆ° bạn đã gá»i" -#: lib/command.php:422 -msgid "Cannot repeat your own notice" -msgstr "" - -#: lib/command.php:427 -#, fuzzy -msgid "Already repeated that notice" -msgstr "Xóa tin nhắn" - #: lib/command.php:435 #, fuzzy, php-format -msgid "Notice from %s repeated" +msgid "Notice from %s repeated." msgstr "Tin đã gá»i" #: lib/command.php:437 @@ -4602,12 +4583,12 @@ msgstr "Có lá»—i xảy ra khi lÆ°u tin nhắn." #: lib/command.php:491 #, php-format -msgid "Notice too long - maximum is %d characters, you sent %d" +msgid "Notice too long - maximum is %1$d characters, you sent %2$d." msgstr "" #: lib/command.php:500 #, fuzzy, php-format -msgid "Reply to %s sent" +msgid "Reply to %s sent." msgstr "Trả lá»i tin nhắn nà y" #: lib/command.php:502 @@ -4616,7 +4597,7 @@ msgid "Error saving notice." msgstr "Có lá»—i xảy ra khi lÆ°u tin nhắn." #: lib/command.php:556 -msgid "Specify the name of the user to subscribe to" +msgid "Specify the name of the user to subscribe to." msgstr "" #: lib/command.php:563 @@ -4625,7 +4606,7 @@ msgid "Subscribed to %s" msgstr "Theo nhóm nà y" #: lib/command.php:584 -msgid "Specify the name of the user to unsubscribe from" +msgid "Specify the name of the user to unsubscribe from." msgstr "" #: lib/command.php:591 @@ -4656,17 +4637,17 @@ msgid "Can't turn on notification." msgstr "" #: lib/command.php:650 -msgid "Login command is disabled" +msgid "Login command is disabled." msgstr "" #: lib/command.php:664 #, fuzzy, php-format -msgid "Could not create login token for %s" +msgid "Could not create login token for %s." msgstr "Không thể tạo favorite." #: lib/command.php:669 #, php-format -msgid "This link is useable only once, and is good for only 2 minutes: %s" +msgid "This link is useable only once, and is good for only 2 minutes: %s." msgstr "" #: lib/command.php:685 @@ -4866,10 +4847,6 @@ msgstr "Nói vá» những sở thÃch của nhóm trong vòng 140 ký tá»±" msgid "Describe the group or topic in %d characters" msgstr "Nói vá» những sở thÃch của nhóm trong vòng 140 ký tá»±" -#: lib/groupeditform.php:172 -msgid "Description" -msgstr "Mô tả" - #: lib/groupeditform.php:179 #, fuzzy msgid "" @@ -5061,22 +5038,10 @@ msgstr "" "NgÆ°á»i bạn trung thà nh của bạn,\n" "%4$s.\n" -#: lib/mail.php:254 -#, fuzzy, php-format -msgid "Location: %s\n" -msgstr "Thà nh phố: %s\n" - -#: lib/mail.php:256 -#, fuzzy, php-format -msgid "Homepage: %s\n" -msgstr "Trang chủ hoặc Blog: %s\n" - #: lib/mail.php:258 -#, php-format -msgid "" -"Bio: %s\n" -"\n" -msgstr "" +#, fuzzy, php-format +msgid "Bio: %s" +msgstr "Thà nh phố: %s" #: lib/mail.php:286 #, php-format @@ -5246,6 +5211,28 @@ msgstr "" msgid "from" msgstr " từ " +#: lib/mailhandler.php:37 +#, fuzzy +msgid "Could not parse message." +msgstr "Không thể cáºp nháºt thà nh viên." + +#: lib/mailhandler.php:42 +msgid "Not a registered user." +msgstr "Không có ngÆ°á»i dùng nà o đăng ký" + +#: lib/mailhandler.php:46 +msgid "Sorry, that is not your incoming email address." +msgstr "Xin lá»—i, đó không phải là địa chỉ email mà bạn nháºp và o." + +#: lib/mailhandler.php:50 +msgid "Sorry, no incoming email allowed." +msgstr "Xin lá»—i, không có địa chỉ email cho phép." + +#: lib/mailhandler.php:228 +#, fuzzy, php-format +msgid "Unsupported message type: %s" +msgstr "Không há»— trợ kiểu file ảnh nà y." + #: lib/mediafile.php:98 lib/mediafile.php:123 msgid "There was a database error while saving your file. Please try again." msgstr "" @@ -5277,7 +5264,7 @@ msgid "File upload stopped by extension." msgstr "" #: lib/mediafile.php:179 lib/mediafile.php:216 -msgid "File exceeds user's quota!" +msgid "File exceeds user's quota." msgstr "" #: lib/mediafile.php:196 lib/mediafile.php:233 @@ -5285,7 +5272,8 @@ msgid "File could not be moved to destination directory." msgstr "" #: lib/mediafile.php:201 lib/mediafile.php:237 -msgid "Could not determine file's mime-type!" +#, fuzzy +msgid "Could not determine file's MIME type." msgstr "Không thể lấy lại các tin nhắn Æ°a thÃch" #: lib/mediafile.php:270 @@ -5295,7 +5283,7 @@ msgstr "" #: lib/mediafile.php:275 #, php-format -msgid "%s is not a supported filetype on this server." +msgid "%s is not a supported file type on this server." msgstr "" #: lib/messageform.php:120 @@ -5331,7 +5319,17 @@ msgid "Attach a file" msgstr "" #: lib/noticeform.php:212 -msgid "Share your location" +#, fuzzy +msgid "Share my location." +msgstr "Không thể lÆ°u hồ sÆ¡ cá nhân." + +#: lib/noticeform.php:214 +#, fuzzy +msgid "Do not share my location." +msgstr "Không thể lÆ°u hồ sÆ¡ cá nhân." + +#: lib/noticeform.php:215 +msgid "Hide this info" msgstr "" #: lib/noticelist.php:428 @@ -5457,6 +5455,11 @@ msgstr "ThÆ° bạn đã gá»i" msgid "Tags in %s's notices" msgstr "cảnh báo tin nhắn" +#: lib/plugin.php:114 +#, fuzzy +msgid "Unknown" +msgstr "Không tìm thấy action" + #: lib/profileaction.php:109 lib/profileaction.php:192 lib/subgroupnav.php:82 msgid "Subscriptions" msgstr "Tôi theo bạn nà y" @@ -5646,10 +5649,6 @@ msgstr "" msgid "People Tagcloud as tagged" msgstr "" -#: lib/subscriptionlist.php:126 -msgid "(none)" -msgstr "" - #: lib/tagcloudsection.php:56 #, fuzzy msgid "None" @@ -5772,20 +5771,3 @@ msgstr "Trang chủ không phải là URL" #, php-format msgid "%s is not a valid color! Use 3 or 6 hex chars." msgstr "" - -#: scripts/maildaemon.php:48 -#, fuzzy -msgid "Could not parse message." -msgstr "Không thể cáºp nháºt thà nh viên." - -#: scripts/maildaemon.php:53 -msgid "Not a registered user." -msgstr "Không có ngÆ°á»i dùng nà o đăng ký" - -#: scripts/maildaemon.php:57 -msgid "Sorry, that is not your incoming email address." -msgstr "Xin lá»—i, đó không phải là địa chỉ email mà bạn nháºp và o." - -#: scripts/maildaemon.php:61 -msgid "Sorry, no incoming email allowed." -msgstr "Xin lá»—i, không có địa chỉ email cho phép." diff --git a/locale/zh_CN/LC_MESSAGES/statusnet.po b/locale/zh_CN/LC_MESSAGES/statusnet.po index c27fbe4eb..84ddd53d5 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-01-03 10:37+0000\n" -"PO-Revision-Date: 2010-01-03 10:39:03+0000\n" +"POT-Creation-Date: 2010-01-10 11:27+0000\n" +"PO-Revision-Date: 2010-01-10 11:29:22+0000\n" "Language-Team: Simplified Chinese\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha (r60575); Translate extension (2009-12-06)\n" +"X-Generator: MediaWiki 1.16alpha (r60888); Translate extension (2010-01-04)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: zh-hans\n" "X-Message-Group: out-statusnet\n" @@ -52,11 +52,6 @@ msgstr "没有该页é¢" msgid "No such user." msgstr "没有这个用户。" -#: actions/all.php:84 -#, php-format -msgid "%s and friends, page %d" -msgstr "%s åŠå¥½å‹ï¼Œé¡µé¢ %d" - #: actions/all.php:86 actions/all.php:167 actions/allrss.php:115 #: actions/apitimelinefriends.php:115 actions/apitimelinehome.php:115 #: lib/personalgroupnav.php:100 @@ -95,8 +90,8 @@ msgstr "" #: actions/all.php:134 #, php-format msgid "" -"You can try to [nudge %s](../%s) from his profile or [post something to his " -"or her attention](%%%%action.newnotice%%%%?status_textarea=%s)." +"You can try to [nudge %1$s](../%2$s) from his profile or [post something to " +"his or her attention](%%%%action.newnotice%%%%?status_textarea=%3$s)." msgstr "" #: actions/all.php:137 actions/replies.php:209 actions/showstream.php:202 @@ -122,6 +117,23 @@ msgstr "æ¥è‡ª%2$s 上 %1$s 和好å‹çš„æ›´æ–°ï¼" #: actions/apiaccountupdateprofile.php:97 #: actions/apiaccountupdateprofilebackgroundimage.php:94 #: actions/apiaccountupdateprofilecolors.php:118 +#: actions/apidirectmessage.php:156 actions/apifavoritecreate.php:99 +#: actions/apifavoritedestroy.php:100 actions/apifriendshipscreate.php:100 +#: actions/apifriendshipsdestroy.php:100 actions/apifriendshipsshow.php:129 +#: actions/apigroupcreate.php:136 actions/apigroupismember.php:114 +#: actions/apigroupjoin.php:155 actions/apigroupleave.php:141 +#: actions/apigrouplist.php:132 actions/apigrouplistall.php:120 +#: actions/apigroupmembership.php:106 actions/apigroupshow.php:105 +#: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102 +#: actions/apistatusesretweets.php:112 actions/apistatusesshow.php:108 +#: actions/apistatusnetconfig.php:133 actions/apistatusnetversion.php:93 +#: actions/apisubscriptions.php:111 actions/apitimelinefavorites.php:146 +#: actions/apitimelinefriends.php:156 actions/apitimelinegroup.php:150 +#: actions/apitimelinehome.php:156 actions/apitimelinementions.php:151 +#: actions/apitimelinepublic.php:131 actions/apitimelineretweetedbyme.php:122 +#: actions/apitimelineretweetedtome.php:121 +#: actions/apitimelineretweetsofme.php:122 actions/apitimelinetag.php:141 +#: actions/apitimelineuser.php:165 actions/apiusershow.php:101 #, fuzzy msgid "API method not found." msgstr "API 方法未实现ï¼" @@ -180,6 +192,9 @@ msgstr "" #: actions/apiaccountupdateprofilebackgroundimage.php:146 #: actions/apiaccountupdateprofilecolors.php:164 #: actions/apiaccountupdateprofilecolors.php:174 +#: actions/groupdesignsettings.php:287 actions/groupdesignsettings.php:297 +#: actions/userdesignsettings.php:210 actions/userdesignsettings.php:220 +#: actions/userdesignsettings.php:263 actions/userdesignsettings.php:273 #, fuzzy msgid "Unable to save your design settings." msgstr "æ— æ³•ä¿å˜ Twitter 设置ï¼" @@ -223,26 +238,6 @@ msgstr "å‘ç»™ %s 的直接消æ¯" msgid "All the direct messages sent to %s" msgstr "å‘ç»™ %s 的直接消æ¯" -#: actions/apidirectmessage.php:156 actions/apifavoritecreate.php:99 -#: actions/apifavoritedestroy.php:100 actions/apifriendshipscreate.php:100 -#: actions/apifriendshipsdestroy.php:100 actions/apifriendshipsshow.php:129 -#: actions/apigroupcreate.php:136 actions/apigroupismember.php:114 -#: actions/apigroupjoin.php:155 actions/apigroupleave.php:141 -#: actions/apigrouplist.php:132 actions/apigrouplistall.php:120 -#: actions/apigroupmembership.php:106 actions/apigroupshow.php:105 -#: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102 -#: actions/apistatusesretweets.php:112 actions/apistatusesshow.php:108 -#: actions/apistatusnetconfig.php:133 actions/apistatusnetversion.php:93 -#: actions/apisubscriptions.php:111 actions/apitimelinefavorites.php:146 -#: actions/apitimelinefriends.php:156 actions/apitimelinegroup.php:150 -#: actions/apitimelinehome.php:156 actions/apitimelinementions.php:151 -#: actions/apitimelinepublic.php:131 actions/apitimelineretweetedbyme.php:122 -#: actions/apitimelineretweetedtome.php:121 -#: actions/apitimelineretweetsofme.php:122 actions/apitimelinetag.php:141 -#: actions/apitimelineuser.php:165 actions/apiusershow.php:101 -msgid "API method not found!" -msgstr "API 方法未实现ï¼" - #: actions/apidirectmessagenew.php:126 msgid "No message text!" msgstr "消æ¯æ²¡æœ‰æ£æ–‡ï¼" @@ -267,7 +262,7 @@ msgstr "没有找到æ¤IDçš„ä¿¡æ¯ã€‚" #: actions/apifavoritecreate.php:119 #, fuzzy -msgid "This status is already a favorite!" +msgid "This status is already a favorite." msgstr "已收è—æ¤é€šå‘Šï¼" #: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:176 @@ -276,7 +271,7 @@ msgstr "æ— æ³•åˆ›å»ºæ”¶è—。" #: actions/apifavoritedestroy.php:122 #, fuzzy -msgid "That status is not a favorite!" +msgid "That status is not a favorite." msgstr "æ¤é€šå‘Šæœªè¢«æ”¶è—ï¼" #: actions/apifavoritedestroy.php:134 actions/disfavor.php:87 @@ -298,8 +293,9 @@ msgid "Could not unfollow user: User not found." msgstr "æ— æ³•è®¢é˜…ç”¨æˆ·ï¼šæœªæ‰¾åˆ°ã€‚" #: actions/apifriendshipsdestroy.php:120 -msgid "You cannot unfollow yourself!" -msgstr "" +#, fuzzy +msgid "You cannot unfollow yourself." +msgstr "æ— æ³•æ›´æ–°ç”¨æˆ·ã€‚" #: actions/apifriendshipsexists.php:94 msgid "Two user ids or screen_names must be supplied." @@ -386,7 +382,7 @@ msgstr "" msgid "Group not found!" msgstr "API 方法未实现ï¼" -#: actions/apigroupjoin.php:110 +#: actions/apigroupjoin.php:110 actions/joingroup.php:90 lib/command.php:217 #, fuzzy msgid "You are already a member of that group." msgstr "您已ç»æ˜¯è¯¥ç»„æˆå‘˜" @@ -395,9 +391,9 @@ msgstr "您已ç»æ˜¯è¯¥ç»„æˆå‘˜" msgid "You have been blocked from that group by the admin." msgstr "" -#: actions/apigroupjoin.php:138 +#: actions/apigroupjoin.php:138 actions/joingroup.php:128 lib/command.php:234 #, fuzzy, php-format -msgid "Could not join user %s to group %s." +msgid "Could not join user %1$s to group %2$s." msgstr "æ— æ³•æŠŠ %s ç”¨æˆ·æ·»åŠ åˆ° %s 组" #: actions/apigroupleave.php:114 @@ -405,9 +401,9 @@ msgstr "æ— æ³•æŠŠ %s ç”¨æˆ·æ·»åŠ åˆ° %s 组" msgid "You are not a member of this group." msgstr "您未告知æ¤ä¸ªäººä¿¡æ¯" -#: actions/apigroupleave.php:124 +#: actions/apigroupleave.php:124 actions/leavegroup.php:127 #, fuzzy, php-format -msgid "Could not remove user %s to group %s." +msgid "Could not remove user %1$s from group %2$s." msgstr "æ— æ³•è®¢é˜…ç”¨æˆ·ï¼šæœªæ‰¾åˆ°ã€‚" #: actions/apigrouplist.php:95 @@ -415,11 +411,6 @@ msgstr "æ— æ³•è®¢é˜…ç”¨æˆ·ï¼šæœªæ‰¾åˆ°ã€‚" msgid "%s's groups" msgstr "%s 群组" -#: actions/apigrouplist.php:103 -#, fuzzy, php-format -msgid "Groups %s is a member of on %s." -msgstr "%s 组是æˆå‘˜ç»„æˆäº†" - #: actions/apigrouplistall.php:90 actions/usergroups.php:62 #, php-format msgid "%s groups" @@ -443,12 +434,12 @@ msgstr "您ä¸èƒ½åˆ 除其他用户的状æ€ã€‚" msgid "No such notice." msgstr "没有这份通告。" -#: actions/apistatusesretweet.php:83 +#: actions/apistatusesretweet.php:83 lib/command.php:422 #, fuzzy msgid "Cannot repeat your own notice." msgstr "æ— æ³•å¼€å¯é€šå‘Šã€‚" -#: actions/apistatusesretweet.php:91 +#: actions/apistatusesretweet.php:91 lib/command.php:427 #, fuzzy msgid "Already repeated that notice." msgstr "åˆ é™¤é€šå‘Š" @@ -463,7 +454,7 @@ msgid "No status with that ID found." msgstr "没有找到æ¤IDçš„ä¿¡æ¯ã€‚" #: actions/apistatusesupdate.php:157 actions/newnotice.php:155 -#: scripts/maildaemon.php:71 +#: lib/mailhandler.php:60 #, fuzzy, php-format msgid "That's too long. Max notice size is %d chars." msgstr "超出长度é™åˆ¶ã€‚ä¸èƒ½è¶…过 140 个å—符。" @@ -483,13 +474,13 @@ msgid "Unsupported format." msgstr "ä¸æ”¯æŒè¿™ç§å›¾åƒæ ¼å¼ã€‚" #: actions/apitimelinefavorites.php:108 -#, php-format -msgid "%s / Favorites from %s" +#, fuzzy, php-format +msgid "%1$s / Favorites from %2$s" msgstr "%s çš„æ”¶è— / %s" #: actions/apitimelinefavorites.php:120 -#, php-format -msgid "%s updates favorited by %s / %s." +#, fuzzy, php-format +msgid "%1$s updates favorited by %2$s / %2$s." msgstr "%s 收è—了 %s çš„ %s 通告。" #: actions/apitimelinegroup.php:109 actions/apitimelineuser.php:118 @@ -559,8 +550,11 @@ msgstr "未找到" msgid "No such attachment." msgstr "没有这份文档。" -#: actions/avatarbynickname.php:59 actions/grouprss.php:91 -#: actions/leavegroup.php:76 +#: actions/avatarbynickname.php:59 actions/blockedfromgroup.php:73 +#: actions/editgroup.php:84 actions/groupdesignsettings.php:84 +#: actions/grouplogo.php:86 actions/groupmembers.php:76 +#: actions/grouprss.php:91 actions/joingroup.php:76 actions/leavegroup.php:76 +#: actions/showgroup.php:121 msgid "No nickname." msgstr "没有昵称。" @@ -583,8 +577,8 @@ msgid "You can upload your personal avatar. The maximum file size is %s." msgstr "您å¯ä»¥åœ¨è¿™é‡Œä¸Šä¼ 个人头åƒã€‚" #: actions/avatarsettings.php:106 actions/avatarsettings.php:185 -#: actions/grouplogo.php:178 actions/remotesubscribe.php:191 -#: actions/userauthorization.php:72 actions/userrss.php:103 +#: actions/remotesubscribe.php:191 actions/userauthorization.php:72 +#: actions/userrss.php:103 msgid "User without matching profile" msgstr "找ä¸åˆ°åŒ¹é…的用户。" @@ -617,9 +611,9 @@ msgstr "ä¸Šä¼ " msgid "Crop" msgstr "剪è£" -#: actions/avatarsettings.php:268 actions/disfavor.php:74 -#: actions/emailsettings.php:238 actions/favor.php:75 actions/geocode.php:50 -#: actions/groupblock.php:66 actions/grouplogo.php:309 +#: actions/avatarsettings.php:268 actions/deletenotice.php:157 +#: actions/disfavor.php:74 actions/emailsettings.php:238 actions/favor.php:75 +#: actions/geocode.php:50 actions/groupblock.php:66 actions/grouplogo.php:309 #: actions/groupunblock.php:66 actions/imsettings.php:206 #: actions/invite.php:56 actions/login.php:135 actions/makeadmin.php:66 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80 @@ -703,20 +697,15 @@ msgstr "阻æ¢è¯¥ç”¨æˆ·" msgid "Failed to save block information." msgstr "ä¿å˜é˜»æ¢ä¿¡æ¯å¤±è´¥ã€‚" -#: actions/blockedfromgroup.php:73 actions/editgroup.php:84 -#: actions/groupdesignsettings.php:84 actions/grouplogo.php:86 -#: actions/groupmembers.php:76 actions/joingroup.php:76 -#: actions/showgroup.php:121 -#, fuzzy -msgid "No nickname" -msgstr "没有昵称。" - #: actions/blockedfromgroup.php:80 actions/editgroup.php:96 +#: actions/foafgroup.php:44 actions/foafgroup.php:62 actions/groupblock.php:86 #: actions/groupbyid.php:83 actions/groupdesignsettings.php:97 #: actions/grouplogo.php:99 actions/groupmembers.php:83 -#: actions/joingroup.php:83 actions/showgroup.php:137 -msgid "No such group" -msgstr "没有这个组" +#: actions/grouprss.php:98 actions/groupunblock.php:86 +#: actions/joingroup.php:83 actions/leavegroup.php:83 actions/makeadmin.php:86 +#: actions/showgroup.php:137 lib/command.php:212 lib/command.php:263 +msgid "No such group." +msgstr "没有这个组。" #: actions/blockedfromgroup.php:90 #, fuzzy, php-format @@ -725,7 +714,7 @@ msgstr "用户没有个人信æ¯ã€‚" #: actions/blockedfromgroup.php:93 #, fuzzy, php-format -msgid "%s blocked profiles, page %d" +msgid "%1$s blocked profiles, page %2$d" msgstr "%s åŠå¥½å‹" #: actions/blockedfromgroup.php:108 @@ -844,11 +833,6 @@ msgstr "æ— æ³•åˆ é™¤é€šå‘Šã€‚" msgid "Delete this notice" msgstr "åˆ é™¤é€šå‘Š" -#: actions/deletenotice.php:157 -#, fuzzy -msgid "There was a problem with your session token. Try again, please." -msgstr "会è¯æ ‡è¯†æœ‰é—®é¢˜ï¼Œè¯·é‡è¯•ã€‚" - #: actions/deleteuser.php:67 #, fuzzy msgid "You cannot delete users." @@ -876,7 +860,7 @@ msgid "Delete this user" msgstr "åˆ é™¤é€šå‘Š" #: actions/designadminpanel.php:62 lib/accountsettingsaction.php:124 -#: lib/adminpanelaction.php:302 lib/groupnav.php:119 +#: lib/adminpanelaction.php:316 lib/groupnav.php:119 msgid "Design" msgstr "" @@ -1024,7 +1008,8 @@ msgstr "您必须登录æ‰èƒ½åˆ›å»ºå°ç»„。" #: actions/editgroup.php:103 actions/editgroup.php:168 #: actions/groupdesignsettings.php:104 actions/grouplogo.php:106 -msgid "You must be an admin to edit the group" +#, fuzzy +msgid "You must be an admin to edit the group." msgstr "åªæœ‰adminæ‰èƒ½ç¼–辑这个组" #: actions/editgroup.php:154 @@ -1050,7 +1035,8 @@ msgid "Options saved." msgstr "选项已ä¿å˜ã€‚" #: actions/emailsettings.php:60 -msgid "Email Settings" +#, fuzzy +msgid "Email settings" msgstr "电å邮件设置" #: actions/emailsettings.php:71 @@ -1087,7 +1073,8 @@ msgid "Cancel" msgstr "å–消" #: actions/emailsettings.php:121 -msgid "Email Address" +#, fuzzy +msgid "Email address" msgstr "电å邮件地å€" #: actions/emailsettings.php:123 @@ -1162,9 +1149,10 @@ msgstr "没有电å邮件地å€ã€‚" msgid "Cannot normalize that email address" msgstr "æ— æ³•è¯†åˆ«æ¤ç”µå邮件" -#: actions/emailsettings.php:331 actions/siteadminpanel.php:157 -msgid "Not a valid email address" -msgstr "ä¸æ˜¯æœ‰æ•ˆçš„电å邮件" +#: actions/emailsettings.php:331 actions/register.php:201 +#: actions/siteadminpanel.php:157 +msgid "Not a valid email address." +msgstr "ä¸æ˜¯æœ‰æ•ˆçš„电å邮件。" #: actions/emailsettings.php:334 msgid "That is already your email address." @@ -1351,19 +1339,12 @@ msgstr "æ¤OMBåè®®ç‰ˆæœ¬æ— æ•ˆã€‚" msgid "Error updating remote profile" msgstr "更新远程的个人信æ¯æ—¶å‡ºé”™" -#: actions/foafgroup.php:44 actions/foafgroup.php:62 actions/groupblock.php:86 -#: actions/grouprss.php:98 actions/groupunblock.php:86 -#: actions/leavegroup.php:83 actions/makeadmin.php:86 lib/command.php:212 -#: lib/command.php:263 -msgid "No such group." -msgstr "没有这个组。" - -#: actions/getfile.php:75 +#: actions/getfile.php:79 #, fuzzy msgid "No such file." msgstr "没有这份通告。" -#: actions/getfile.php:79 +#: actions/getfile.php:83 #, fuzzy msgid "Cannot read file." msgstr "没有这份通告。" @@ -1377,7 +1358,7 @@ msgstr "没有收件人。" #: actions/groupblock.php:76 actions/groupunblock.php:76 #: actions/makeadmin.php:76 actions/subedit.php:53 actions/tagother.php:46 -#: lib/profileformaction.php:77 +#: actions/unsubscribe.php:84 lib/profileformaction.php:77 #, fuzzy msgid "No profile with that ID." msgstr "没有找到æ¤IDçš„ä¿¡æ¯ã€‚" @@ -1410,9 +1391,9 @@ msgstr "阻æ¢ç”¨æˆ·" #: actions/groupblock.php:162 #, php-format msgid "" -"Are you sure you want to block user \"%s\" from the group \"%s\"? They will " -"be removed from the group, unable to post, and unable to subscribe to the " -"group in the future." +"Are you sure you want to block user \"%1$s\" from the group \"%2$s\"? They " +"will be removed from the group, unable to post, and unable to subscribe to " +"the group in the future." msgstr "" #: actions/groupblock.php:178 @@ -1429,8 +1410,9 @@ msgstr "该组æˆå‘˜åˆ—表。" msgid "Database error blocking user from group." msgstr "" -#: actions/groupbyid.php:74 -msgid "No ID" +#: actions/groupbyid.php:74 actions/userbyid.php:70 +#, fuzzy +msgid "No ID." msgstr "没有ID" #: actions/groupdesignsettings.php:68 @@ -1455,13 +1437,6 @@ msgstr "" msgid "Couldn't update your design." msgstr "æ— æ³•æ›´æ–°ç”¨æˆ·ã€‚" -#: actions/groupdesignsettings.php:287 actions/groupdesignsettings.php:297 -#: actions/userdesignsettings.php:210 actions/userdesignsettings.php:220 -#: actions/userdesignsettings.php:263 actions/userdesignsettings.php:273 -#, fuzzy -msgid "Unable to save your design settings!" -msgstr "æ— æ³•ä¿å˜ Twitter 设置ï¼" - #: actions/groupdesignsettings.php:308 actions/userdesignsettings.php:231 #, fuzzy msgid "Design preferences saved." @@ -1477,6 +1452,11 @@ msgid "" "You can upload a logo image for your group. The maximum file size is %s." msgstr "ä½ å¯ä»¥ç»™ä½ 的组上载一个logo图。" +#: actions/grouplogo.php:178 +#, fuzzy +msgid "User without matching profile." +msgstr "找ä¸åˆ°åŒ¹é…的用户。" + #: actions/grouplogo.php:362 #, fuzzy msgid "Pick a square area of the image to be the logo." @@ -1497,15 +1477,15 @@ msgid "%s group members" msgstr "%s 组æˆå‘˜" #: actions/groupmembers.php:96 -#, php-format -msgid "%s group members, page %d" +#, fuzzy, php-format +msgid "%1$s group members, page %2$d" msgstr "%s 组æˆå‘˜, 第 %d 页" #: actions/groupmembers.php:111 msgid "A list of the users in this group." msgstr "该组æˆå‘˜åˆ—表。" -#: actions/groupmembers.php:175 lib/action.php:441 lib/groupnav.php:107 +#: actions/groupmembers.php:175 lib/action.php:442 lib/groupnav.php:107 msgid "Admin" msgstr "admin管ç†å‘˜" @@ -1605,7 +1585,8 @@ msgid "Error removing the block." msgstr "ä¿å˜ç”¨æˆ·æ—¶å‡ºé”™ã€‚" #: actions/imsettings.php:59 -msgid "IM Settings" +#, fuzzy +msgid "IM settings" msgstr "IM 设置" #: actions/imsettings.php:70 @@ -1636,7 +1617,8 @@ msgstr "" "ï¼ˆä½ æ˜¯å¦å·²ç»æ·»åŠ %sä¸ºä½ çš„å¥½å‹ï¼Ÿï¼‰" #: actions/imsettings.php:124 -msgid "IM Address" +#, fuzzy +msgid "IM address" msgstr "IM å¸å·" #: actions/imsettings.php:126 @@ -1695,11 +1677,6 @@ msgstr "验è¯ç 已被å‘é€åˆ°æ‚¨æ–°å¢žçš„å³æ—¶é€šè®¯å¸å·ã€‚您必须å…许 msgid "That is not your Jabber ID." msgstr "è¿™ä¸æ˜¯æ‚¨çš„Jabberå¸å·ã€‚" -#: actions/inbox.php:59 -#, php-format -msgid "Inbox for %s - page %d" -msgstr "%s 的收件箱 - 第 %d 页" - #: actions/inbox.php:62 #, php-format msgid "Inbox for %s" @@ -1735,10 +1712,10 @@ msgstr "邀请新用户" msgid "You are already subscribed to these users:" msgstr "您已订阅这些用户：" -#: actions/invite.php:131 actions/invite.php:139 +#: actions/invite.php:131 actions/invite.php:139 lib/command.php:315 #, php-format -msgid "%s (%s)" -msgstr "%s (%s)" +msgid "%1$s (%2$s)" +msgstr "%1$s (%2$s)" #: actions/invite.php:136 msgid "" @@ -1776,7 +1753,7 @@ msgstr "个人消æ¯" msgid "Optionally add a personal message to the invitation." msgstr "在邀请ä¸åŠ å‡ å¥è¯(å¯é€‰)。" -#: actions/invite.php:197 lib/messageform.php:178 lib/noticeform.php:232 +#: actions/invite.php:197 lib/messageform.php:178 lib/noticeform.php:234 msgid "Send" msgstr "å‘é€" @@ -1841,18 +1818,9 @@ msgstr "" msgid "You must be logged in to join a group." msgstr "您必须登录æ‰èƒ½åŠ 入组。" -#: actions/joingroup.php:90 lib/command.php:217 -msgid "You are already a member of that group" -msgstr "您已ç»æ˜¯è¯¥ç»„æˆå‘˜" - -#: actions/joingroup.php:128 lib/command.php:234 -#, fuzzy, php-format -msgid "Could not join user %s to group %s" -msgstr "æ— æ³•æŠŠ %s ç”¨æˆ·æ·»åŠ åˆ° %s 组" - #: actions/joingroup.php:135 lib/command.php:239 #, fuzzy, php-format -msgid "%s joined group %s" +msgid "%1$s joined group %2$s" msgstr "%s åŠ å…¥ %s 组" #: actions/leavegroup.php:60 @@ -1870,14 +1838,9 @@ msgstr "您未告知æ¤ä¸ªäººä¿¡æ¯" msgid "Could not find membership record." msgstr "æ— æ³•æ›´æ–°ç”¨æˆ·è®°å½•ã€‚" -#: actions/leavegroup.php:127 lib/command.php:284 -#, fuzzy, php-format -msgid "Could not remove user %s to group %s" -msgstr "æ— æ³•è®¢é˜…ç”¨æˆ·ï¼šæœªæ‰¾åˆ°ã€‚" - #: actions/leavegroup.php:134 lib/command.php:289 -#, php-format -msgid "%s left group %s" +#, fuzzy, php-format +msgid "%1$s left group %2$s" msgstr "%s 离开群 %s" #: actions/login.php:83 actions/register.php:137 @@ -1898,7 +1861,7 @@ msgstr "用户å或密ç ä¸æ£ç¡®ã€‚" msgid "Error setting user. You are probably not authorized." msgstr "未认è¯ã€‚" -#: actions/login.php:208 actions/login.php:261 lib/action.php:459 +#: actions/login.php:208 actions/login.php:261 lib/action.php:460 #: lib/logingroupnav.php:79 msgid "Login" msgstr "登录" @@ -1950,19 +1913,19 @@ msgid "Only an admin can make another user an admin." msgstr "" #: actions/makeadmin.php:95 -#, php-format -msgid "%s is already an admin for group \"%s\"." -msgstr "" +#, fuzzy, php-format +msgid "%1$s is already an admin for group \"%2$s\"." +msgstr "用户没有个人信æ¯ã€‚" #: actions/makeadmin.php:132 -#, php-format -msgid "Can't get membership record for %s in group %s" -msgstr "" +#, fuzzy, php-format +msgid "Can't get membership record for %1$s in group %2$s." +msgstr "æ— æ³•è®¢é˜…ç”¨æˆ·ï¼šæœªæ‰¾åˆ°ã€‚" #: actions/makeadmin.php:145 -#, php-format -msgid "Can't make %s an admin for group %s" -msgstr "" +#, fuzzy, php-format +msgid "Can't make %1$s an admin for group %2$s." +msgstr "åªæœ‰adminæ‰èƒ½ç¼–辑这个组" #: actions/microsummary.php:69 msgid "No current status" @@ -2004,8 +1967,8 @@ msgid "Message sent" msgstr "新消æ¯" #: actions/newmessage.php:185 lib/command.php:376 -#, php-format -msgid "Direct message to %s sent" +#, fuzzy, php-format +msgid "Direct message to %s sent." msgstr "å·²å‘ %s å‘é€æ¶ˆæ¯" #: actions/newmessage.php:210 actions/newnotice.php:245 lib/channel.php:170 @@ -2035,7 +1998,7 @@ msgstr "æœç´¢æ–‡æœ¬" #: actions/noticesearch.php:91 #, fuzzy, php-format -msgid "Search results for \"%s\" on %s" +msgid "Search results for \"%1$s\" on %2$s" msgstr "æœç´¢æœ‰å…³\"%s\"的消æ¯" #: actions/noticesearch.php:121 @@ -2141,11 +2104,6 @@ msgstr "" msgid "URL shortening service is too long (max 50 chars)." msgstr "URL缩çŸæœåŠ¡è¶…é•¿(最多50个å—符)。" -#: actions/outbox.php:58 -#, php-format -msgid "Outbox for %s - page %d" -msgstr "%s çš„å‘件箱 - 第 %d 页" - #: actions/outbox.php:61 #, php-format msgid "Outbox for %s" @@ -2218,7 +2176,7 @@ msgstr "æ— æ³•ä¿å˜æ–°å¯†ç 。" msgid "Password saved." msgstr "密ç å·²ä¿å˜ã€‚" -#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:308 +#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:326 msgid "Paths" msgstr "" @@ -2251,7 +2209,7 @@ msgid "Invalid SSL server. The maximum length is 255 characters." msgstr "" #: actions/pathsadminpanel.php:217 actions/siteadminpanel.php:58 -#: lib/adminpanelaction.php:299 +#: lib/adminpanelaction.php:311 #, fuzzy msgid "Site" msgstr "邀请" @@ -2353,8 +2311,9 @@ msgid "When to use SSL" msgstr "" #: actions/pathsadminpanel.php:308 -msgid "SSL Server" -msgstr "" +#, fuzzy +msgid "SSL server" +msgstr "æ¢å¤" #: actions/pathsadminpanel.php:309 msgid "Server to direct SSL requests to" @@ -2384,8 +2343,8 @@ msgid "Not a valid people tag: %s" msgstr "ä¸æ˜¯æœ‰æ•ˆçš„电å邮件" #: actions/peopletag.php:144 -#, php-format -msgid "Users self-tagged with %s - page %d" +#, fuzzy, php-format +msgid "Users self-tagged with %1$s - page %2$d" msgstr "ç”¨æˆ·è‡ªåŠ æ ‡ç¾ %s - 第 %d 页" #: actions/postnotice.php:84 @@ -2394,7 +2353,7 @@ msgstr "通告内容ä¸æ£ç¡®" #: actions/postnotice.php:90 #, php-format -msgid "Notice license ‘%s’ is not compatible with site license ‘%s’." +msgid "Notice license ‘%1$s’ is not compatible with site license ‘%2$s’." msgstr "" #: actions/profilesettings.php:60 @@ -2513,21 +2472,21 @@ msgstr "主页'%s'ä¸æ£ç¡®" msgid "Couldn't update user for autosubscribe." msgstr "æ— æ³•æ›´æ–°ç”¨æˆ·çš„è‡ªåŠ¨è®¢é˜…é€‰é¡¹ã€‚" -#: actions/profilesettings.php:354 +#: actions/profilesettings.php:359 #, fuzzy msgid "Couldn't save location prefs." msgstr "æ— æ³•ä¿å˜ä¸ªäººä¿¡æ¯ã€‚" -#: actions/profilesettings.php:366 +#: actions/profilesettings.php:371 msgid "Couldn't save profile." msgstr "æ— æ³•ä¿å˜ä¸ªäººä¿¡æ¯ã€‚" -#: actions/profilesettings.php:374 +#: actions/profilesettings.php:379 #, fuzzy msgid "Couldn't save tags." msgstr "æ— æ³•ä¿å˜ä¸ªäººä¿¡æ¯ã€‚" -#: actions/profilesettings.php:382 lib/adminpanelaction.php:126 +#: actions/profilesettings.php:387 lib/adminpanelaction.php:137 msgid "Settings saved." msgstr "设置已ä¿å˜ã€‚" @@ -2627,7 +2586,7 @@ msgid "" "one!" msgstr "" -#: actions/publictagcloud.php:135 +#: actions/publictagcloud.php:131 msgid "Tag cloud" msgstr "æ ‡ç¾äº‘èšé›†" @@ -2764,7 +2723,7 @@ msgstr "验è¯ç 出错。" msgid "Registration successful" msgstr "注册æˆåŠŸã€‚" -#: actions/register.php:114 actions/register.php:502 lib/action.php:456 +#: actions/register.php:114 actions/register.php:502 lib/action.php:457 #: lib/logingroupnav.php:85 msgid "Register" msgstr "注册" @@ -2777,10 +2736,6 @@ msgstr "ä¸å…许注册。" msgid "You can't register if you don't agree to the license." msgstr "您必须åŒæ„æ¤æŽˆæƒæ–¹å¯æ³¨å†Œã€‚" -#: actions/register.php:201 -msgid "Not a valid email address." -msgstr "ä¸æ˜¯æœ‰æ•ˆçš„电å邮件。" - #: actions/register.php:212 msgid "Email address already exists." msgstr "电å邮件地å€å·²å˜åœ¨ã€‚" @@ -2836,12 +2791,12 @@ msgid "" msgstr "除了éšç§å†…容：密ç ，电å邮件，å³æ—¶é€šè®¯å¸å·ï¼Œç”µè¯å·ç 。" #: actions/register.php:537 -#, php-format +#, fuzzy, php-format msgid "" -"Congratulations, %s! And welcome to %%%%site.name%%%%. From here, you may " +"Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may " "want to...\n" "\n" -"* Go to [your profile](%s) and post your first message.\n" +"* Go to [your profile](%2$s) and post your first message.\n" "* Add a [Jabber/GTalk address](%%%%action.imsettings%%%%) so you can send " "notices through instant messages.\n" "* [Search for people](%%%%action.peoplesearch%%%%) that you may know or that " @@ -2968,11 +2923,6 @@ msgstr "创建" msgid "Replies to %s" msgstr "%s 的回å¤" -#: actions/replies.php:127 -#, fuzzy, php-format -msgid "Replies to %s, page %d" -msgstr "%s 的回å¤ï¼Œç¬¬ % 页" - #: actions/replies.php:144 #, fuzzy, php-format msgid "Replies feed for %s (RSS 1.0)" @@ -2989,11 +2939,11 @@ msgid "Replies feed for %s (Atom)" msgstr "%s 的通告èšåˆ" #: actions/replies.php:198 -#, php-format +#, fuzzy, php-format msgid "" -"This is the timeline showing replies to %s but %s hasn't received a notice " -"to his attention yet." -msgstr "" +"This is the timeline showing replies to %1$s but %2$s hasn't received a " +"notice to his attention yet." +msgstr "这是 %s 和好å‹çš„时间线，但是没有任何人å‘布内容。" #: actions/replies.php:203 #, php-format @@ -3005,8 +2955,8 @@ msgstr "" #: actions/replies.php:205 #, php-format msgid "" -"You can try to [nudge %s](../%s) or [post something to his or her attention]" -"(%%%%action.newnotice%%%%?status_textarea=%s)." +"You can try to [nudge %1$s](../%2$s) or [post something to his or her " +"attention](%%%%action.newnotice%%%%?status_textarea=%3$s)." msgstr "" #: actions/repliesrss.php:72 @@ -3024,11 +2974,6 @@ msgstr "æ— æ³•å‘æ¤ç”¨æˆ·å‘é€æ¶ˆæ¯ã€‚" msgid "User is already sandboxed." msgstr "用户没有个人信æ¯ã€‚" -#: actions/showfavorites.php:79 -#, fuzzy, php-format -msgid "%s's favorite notices, page %d" -msgstr "%s 收è—的通告" - #: actions/showfavorites.php:132 msgid "Could not retrieve favorite notices." msgstr "æ— æ³•èŽ·å–收è—的通告。" @@ -3078,11 +3023,6 @@ msgstr "" msgid "%s group" msgstr "%s 组" -#: actions/showgroup.php:84 -#, php-format -msgid "%s group, page %d" -msgstr "%s 组, 第 %d 页" - #: actions/showgroup.php:218 #, fuzzy msgid "Group profile" @@ -3134,7 +3074,7 @@ msgstr "注册于" #: actions/showgroup.php:386 lib/profileaction.php:117 #: lib/profileaction.php:148 lib/profileaction.php:236 lib/section.php:95 -#: lib/tagcloudsection.php:71 +#: lib/subscriptionlist.php:126 lib/tagcloudsection.php:71 msgid "(None)" msgstr "（没有）" @@ -3205,14 +3145,9 @@ msgstr "消æ¯å·²å‘布。" msgid " tagged %s" msgstr "带 %s æ ‡ç¾çš„通告" -#: actions/showstream.php:79 -#, fuzzy, php-format -msgid "%s, page %d" -msgstr "%s 的收件箱 - 第 %d 页" - #: actions/showstream.php:122 #, fuzzy, php-format -msgid "Notice feed for %s tagged %s (RSS 1.0)" +msgid "Notice feed for %1$s tagged %2$s (RSS 1.0)" msgstr "%s 的通告èšåˆ" #: actions/showstream.php:129 @@ -3236,9 +3171,9 @@ msgid "FOAF for %s" msgstr "%s çš„å‘件箱" #: actions/showstream.php:191 -#, php-format -msgid "This is the timeline for %s but %s hasn't posted anything yet." -msgstr "" +#, fuzzy, php-format +msgid "This is the timeline for %1$s but %2$s hasn't posted anything yet." +msgstr "这是 %s 和好å‹çš„时间线，但是没有任何人å‘布内容。" #: actions/showstream.php:196 msgid "" @@ -3249,8 +3184,8 @@ msgstr "" #: actions/showstream.php:198 #, php-format msgid "" -"You can try to nudge %s or [post something to his or her attention](%%%%" -"action.newnotice%%%%?status_textarea=%s)." +"You can try to nudge %1$s or [post something to his or her attention](%%%%" +"action.newnotice%%%%?status_textarea=%2$s)." msgstr "" #: actions/showstream.php:234 @@ -3297,12 +3232,12 @@ msgstr "" #: actions/siteadminpanel.php:154 #, fuzzy -msgid "You must have a valid contact email address" +msgid "You must have a valid contact email address." msgstr "ä¸æ˜¯æœ‰æ•ˆçš„电å邮件" #: actions/siteadminpanel.php:172 #, php-format -msgid "Unknown language \"%s\"" +msgid "Unknown language \"%s\"." msgstr "" #: actions/siteadminpanel.php:179 @@ -3493,7 +3428,8 @@ msgid "Save site settings" msgstr "头åƒè®¾ç½®" #: actions/smssettings.php:58 -msgid "SMS Settings" +#, fuzzy +msgid "SMS settings" msgstr "SMSçŸä¿¡è®¾ç½®" #: actions/smssettings.php:69 @@ -3523,7 +3459,8 @@ msgid "Enter the code you received on your phone." msgstr "输入手机收到的验è¯ç 。" #: actions/smssettings.php:138 -msgid "SMS Phone number" +#, fuzzy +msgid "SMS phone number" msgstr "SMSçŸä¿¡ç”µè¯å·ç " #: actions/smssettings.php:140 @@ -3617,8 +3554,8 @@ msgid "%s subscribers" msgstr "订阅者" #: actions/subscribers.php:52 -#, php-format -msgid "%s subscribers, page %d" +#, fuzzy, php-format +msgid "%1$s subscribers, page %2$d" msgstr "%s 订阅者, 第 %d 页" #: actions/subscribers.php:63 @@ -3655,7 +3592,7 @@ msgstr "所有订阅" #: actions/subscriptions.php:54 #, fuzzy, php-format -msgid "%s subscriptions, page %d" +msgid "%1$s subscriptions, page %2$d" msgstr "所有订阅" #: actions/subscriptions.php:65 @@ -3691,11 +3628,6 @@ msgstr "没有 Jabber ID。" msgid "SMS" msgstr "SMSçŸä¿¡" -#: actions/tag.php:68 -#, fuzzy, php-format -msgid "Notices tagged with %s, page %d" -msgstr "带 %s æ ‡ç¾çš„通告" - #: actions/tag.php:86 #, fuzzy, php-format msgid "Notice feed for tag %s (RSS 1.0)" @@ -3785,11 +3717,6 @@ msgstr "用户没有个人信æ¯ã€‚" msgid "No profile id in request." msgstr "æœåŠ¡å™¨æ²¡æœ‰è¿”回个人信æ¯URL。" -#: actions/unsubscribe.php:84 -#, fuzzy -msgid "No profile with that id." -msgstr "没有找到æ¤IDçš„ä¿¡æ¯ã€‚" - #: actions/unsubscribe.php:98 #, fuzzy msgid "Unsubscribed" @@ -3797,10 +3724,11 @@ msgstr "退订" #: actions/updateprofile.php:62 actions/userauthorization.php:330 #, php-format -msgid "Listenee stream license ‘%s’ is not compatible with site license ‘%s’." +msgid "" +"Listenee stream license ‘%1$s’ is not compatible with site license ‘%2$s’." msgstr "" -#: actions/useradminpanel.php:58 lib/adminpanelaction.php:305 +#: actions/useradminpanel.php:58 lib/adminpanelaction.php:321 #: lib/personalgroupnav.php:115 msgid "User" msgstr "用户" @@ -3906,7 +3834,7 @@ msgstr "" "请检查详细信æ¯ï¼Œç¡®è®¤å¸Œæœ›è®¢é˜…æ¤ç”¨æˆ·çš„通告。如果您刚æ‰æ²¡æœ‰è¦æ±‚订阅任何人的通" "告，请点击\"å–消\"。" -#: actions/userauthorization.php:188 +#: actions/userauthorization.php:188 actions/version.php:165 #, fuzzy msgid "License" msgstr "注册è¯" @@ -3961,7 +3889,7 @@ msgstr "订阅已被拒ç»ï¼Œä½†æ˜¯æ²¡æœ‰å›žä¼ URL。请到æ¤ç½‘站查看如何 #: actions/userauthorization.php:296 #, php-format -msgid "Listener URI ‘%s’ not found here" +msgid "Listener URI ‘%s’ not found here." msgstr "" #: actions/userauthorization.php:301 @@ -3994,11 +3922,6 @@ msgstr "æ— æ³•è®¿é—®å¤´åƒURL '%s'" msgid "Wrong image type for avatar URL ‘%s’." msgstr "'%s' 图åƒæ ¼å¼é”™è¯¯" -#: actions/userbyid.php:70 -#, fuzzy -msgid "No ID." -msgstr "没有ID" - #: actions/userdesignsettings.php:76 lib/designsettings.php:65 #, fuzzy msgid "Profile design" @@ -4014,11 +3937,6 @@ msgstr "" msgid "Enjoy your hotdog!" msgstr "" -#: actions/usergroups.php:64 -#, php-format -msgid "%s groups, page %d" -msgstr "%s 群组, 第 %d 页" - #: actions/usergroups.php:130 #, fuzzy msgid "Search for more groups" @@ -4034,6 +3952,73 @@ msgstr "您未告知æ¤ä¸ªäººä¿¡æ¯" msgid "Try [searching for groups](%%action.groupsearch%%) and joining them." msgstr "" +#: actions/version.php:73 +#, fuzzy, php-format +msgid "StatusNet %s" +msgstr "统计" + +#: actions/version.php:153 +#, php-format +msgid "" +"This site is powered by %1$s version %2$s, Copyright 2008-2010 StatusNet, " +"Inc. and contributors." +msgstr "" + +#: actions/version.php:157 +#, fuzzy +msgid "StatusNet" +msgstr "头åƒå·²æ›´æ–°ã€‚" + +#: actions/version.php:161 +msgid "Contributors" +msgstr "" + +#: actions/version.php:168 +msgid "" +"StatusNet is free software: you can redistribute it and/or modify it under " +"the terms of the GNU Affero General Public License as published by the Free " +"Software Foundation, either version 3 of the License, or (at your option) " +"any later version. " +msgstr "" + +#: actions/version.php:174 +msgid "" +"This program is distributed in the hope that it will be useful, but WITHOUT " +"ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or " +"FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License " +"for more details. " +msgstr "" + +#: actions/version.php:180 +#, php-format +msgid "" +"You should have received a copy of the GNU Affero General Public License " +"along with this program. If not, see %s." +msgstr "" + +#: actions/version.php:189 +msgid "Plugins" +msgstr "" + +#: actions/version.php:195 +#, fuzzy +msgid "Name" +msgstr "昵称" + +#: actions/version.php:196 lib/action.php:741 +#, fuzzy +msgid "Version" +msgstr "个人" + +#: actions/version.php:197 +msgid "Author(s)" +msgstr "" + +#: actions/version.php:198 lib/groupeditform.php:172 +#, fuzzy +msgid "Description" +msgstr "æè¿°" + #: classes/File.php:137 #, php-format msgid "" @@ -4104,7 +4089,7 @@ msgstr "ä¿å˜é€šå‘Šæ—¶å‡ºé”™ã€‚" msgid "DB error inserting reply: %s" msgstr "æ·»åŠ å›žå¤æ—¶æ•°æ®åº“出错：%s" -#: classes/Notice.php:1361 +#: classes/Notice.php:1359 #, fuzzy, php-format msgid "RT @%1$s %2$s" msgstr "%1$s (%2$s)" @@ -4152,146 +4137,141 @@ msgstr "其他" msgid "Other options" msgstr "其他选项" -#: lib/action.php:144 -#, fuzzy, php-format -msgid "%s - %s" -msgstr "%s (%s)" - #: lib/action.php:159 msgid "Untitled page" msgstr "æ— æ ‡é¢˜é¡µ" -#: lib/action.php:426 +#: lib/action.php:427 msgid "Primary site navigation" msgstr "主站导航" -#: lib/action.php:432 +#: lib/action.php:433 msgid "Home" msgstr "主页" -#: lib/action.php:432 +#: lib/action.php:433 msgid "Personal profile and friends timeline" msgstr "个人资料åŠæœ‹å‹å¹´è¡¨" -#: lib/action.php:434 +#: lib/action.php:435 msgid "Account" msgstr "å¸å·" -#: lib/action.php:434 +#: lib/action.php:435 #, fuzzy msgid "Change your email, avatar, password, profile" msgstr "修改资料" -#: lib/action.php:437 +#: lib/action.php:438 msgid "Connect" msgstr "连接" -#: lib/action.php:437 +#: lib/action.php:438 #, fuzzy msgid "Connect to services" msgstr "æ— æ³•é‡å®šå‘到æœåŠ¡å™¨ï¼š%s" -#: lib/action.php:441 +#: lib/action.php:442 #, fuzzy msgid "Change site configuration" msgstr "主站导航" -#: lib/action.php:445 lib/subgroupnav.php:105 +#: lib/action.php:446 lib/subgroupnav.php:105 msgid "Invite" msgstr "邀请" -#: lib/action.php:446 lib/subgroupnav.php:106 +#: lib/action.php:447 lib/subgroupnav.php:106 #, fuzzy, php-format msgid "Invite friends and colleagues to join you on %s" msgstr "使用这个表å•æ¥é‚€è¯·å¥½å‹å’ŒåŒäº‹åŠ 入。" -#: lib/action.php:451 +#: lib/action.php:452 msgid "Logout" msgstr "登出" -#: lib/action.php:451 +#: lib/action.php:452 msgid "Logout from the site" msgstr "登出本站" -#: lib/action.php:456 +#: lib/action.php:457 #, fuzzy msgid "Create an account" msgstr "创建新å¸å·" -#: lib/action.php:459 +#: lib/action.php:460 msgid "Login to the site" msgstr "登入本站" -#: lib/action.php:462 lib/action.php:725 +#: lib/action.php:463 lib/action.php:726 msgid "Help" msgstr "帮助" -#: lib/action.php:462 +#: lib/action.php:463 #, fuzzy msgid "Help me!" msgstr "帮助" -#: lib/action.php:465 lib/searchaction.php:127 +#: lib/action.php:466 lib/searchaction.php:127 msgid "Search" msgstr "æœç´¢" -#: lib/action.php:465 +#: lib/action.php:466 msgid "Search for people or text" msgstr "检索人或文å—" -#: lib/action.php:486 +#: lib/action.php:487 #, fuzzy msgid "Site notice" msgstr "新通告" -#: lib/action.php:552 +#: lib/action.php:553 msgid "Local views" msgstr "本地显示" -#: lib/action.php:618 +#: lib/action.php:619 #, fuzzy msgid "Page notice" msgstr "新通告" -#: lib/action.php:720 +#: lib/action.php:721 #, fuzzy msgid "Secondary site navigation" msgstr "次项站导航" -#: lib/action.php:727 +#: lib/action.php:728 msgid "About" msgstr "关于" -#: lib/action.php:729 +#: lib/action.php:730 msgid "FAQ" msgstr "常è§é—®é¢˜FAQ" -#: lib/action.php:733 +#: lib/action.php:734 msgid "TOS" msgstr "" -#: lib/action.php:736 +#: lib/action.php:737 msgid "Privacy" msgstr "éšç§" -#: lib/action.php:738 +#: lib/action.php:739 msgid "Source" msgstr "æ¥æº" -#: lib/action.php:740 +#: lib/action.php:743 msgid "Contact" msgstr "è”系人" -#: lib/action.php:742 +#: lib/action.php:745 #, fuzzy msgid "Badge" msgstr "呼å«" -#: lib/action.php:770 +#: lib/action.php:773 msgid "StatusNet software license" msgstr "StatusNet软件注册è¯" -#: lib/action.php:773 +#: lib/action.php:776 #, php-format msgid "" "**%%site.name%%** is a microblogging service brought to you by [%%site." @@ -4300,12 +4280,12 @@ msgstr "" "**%%site.name%%** 是一个微åšå®¢æœåŠ¡ï¼Œæ供者为 [%%site.broughtby%%](%%site." "broughtbyurl%%)。" -#: lib/action.php:775 +#: lib/action.php:778 #, php-format msgid "**%%site.name%%** is a microblogging service. " msgstr "**%%site.name%%** 是一个微åšå®¢æœåŠ¡ã€‚" -#: lib/action.php:777 +#: lib/action.php:780 #, php-format msgid "" "It runs the [StatusNet](http://status.net/) microblogging software, version %" @@ -4316,34 +4296,34 @@ msgstr "" "General Public License](http://www.fsf.org/licensing/licenses/agpl-3.0.html)" "授æƒã€‚" -#: lib/action.php:791 +#: lib/action.php:794 #, fuzzy msgid "Site content license" msgstr "StatusNet软件注册è¯" -#: lib/action.php:800 +#: lib/action.php:803 msgid "All " msgstr "全部" -#: lib/action.php:805 +#: lib/action.php:808 msgid "license." msgstr "注册è¯" -#: lib/action.php:1099 +#: lib/action.php:1102 msgid "Pagination" msgstr "分页" -#: lib/action.php:1108 +#: lib/action.php:1111 #, fuzzy msgid "After" msgstr "« 之åŽ" -#: lib/action.php:1116 +#: lib/action.php:1119 #, fuzzy msgid "Before" msgstr "ä¹‹å‰ Â»" -#: lib/action.php:1164 +#: lib/action.php:1167 #, fuzzy msgid "There was a problem with your session token." msgstr "会è¯æ ‡è¯†æœ‰é—®é¢˜ï¼Œè¯·é‡è¯•ã€‚" @@ -4353,32 +4333,37 @@ msgstr "会è¯æ ‡è¯†æœ‰é—®é¢˜ï¼Œè¯·é‡è¯•ã€‚" msgid "You cannot make changes to this site." msgstr "æ— æ³•å‘æ¤ç”¨æˆ·å‘é€æ¶ˆæ¯ã€‚" -#: lib/adminpanelaction.php:195 +#: lib/adminpanelaction.php:107 +#, fuzzy +msgid "Changes to that panel are not allowed." +msgstr "ä¸å…许注册。" + +#: lib/adminpanelaction.php:206 #, fuzzy msgid "showForm() not implemented." msgstr "命令尚未实现。" -#: lib/adminpanelaction.php:224 +#: lib/adminpanelaction.php:235 #, fuzzy msgid "saveSettings() not implemented." msgstr "命令尚未实现。" -#: lib/adminpanelaction.php:247 +#: lib/adminpanelaction.php:258 #, fuzzy msgid "Unable to delete design setting." msgstr "æ— æ³•ä¿å˜ Twitter 设置ï¼" -#: lib/adminpanelaction.php:300 +#: lib/adminpanelaction.php:312 #, fuzzy msgid "Basic site configuration" msgstr "电å邮件地å€ç¡®è®¤" -#: lib/adminpanelaction.php:303 +#: lib/adminpanelaction.php:317 #, fuzzy msgid "Design configuration" msgstr "SMSçŸä¿¡ç¡®è®¤" -#: lib/adminpanelaction.php:306 lib/adminpanelaction.php:309 +#: lib/adminpanelaction.php:322 lib/adminpanelaction.php:327 #, fuzzy msgid "Paths configuration" msgstr "SMSçŸä¿¡ç¡®è®¤" @@ -4404,11 +4389,21 @@ msgstr "" msgid "Tags for this attachment" msgstr "" +#: lib/authenticationplugin.php:182 lib/authenticationplugin.php:187 +#, fuzzy +msgid "Password changing failed" +msgstr "密ç å·²ä¿å˜ã€‚" + +#: lib/authenticationplugin.php:197 +#, fuzzy +msgid "Password changing is not allowed" +msgstr "密ç å·²ä¿å˜ã€‚" + #: lib/channel.php:138 lib/channel.php:158 msgid "Command results" msgstr "执行结果" -#: lib/channel.php:210 +#: lib/channel.php:210 lib/mailhandler.php:142 msgid "Command complete" msgstr "执行完毕" @@ -4422,7 +4417,7 @@ msgstr "对ä¸èµ·ï¼Œè¿™ä¸ªå‘½ä»¤è¿˜æ²¡æœ‰å®žçŽ°ã€‚" #: lib/command.php:88 #, fuzzy, php-format -msgid "Could not find a user with nickname %s" +msgid "Could not find a user with nickname %s." msgstr "æ— æ³•æ›´æ–°å·²ç¡®è®¤çš„ç”µå邮件。" #: lib/command.php:92 @@ -4431,7 +4426,7 @@ msgstr "" #: lib/command.php:99 #, fuzzy, php-format -msgid "Nudge sent to %s" +msgid "Nudge sent to %s." msgstr "振铃呼å«å‘出。" #: lib/command.php:126 @@ -4443,34 +4438,36 @@ msgid "" msgstr "" #: lib/command.php:152 lib/command.php:399 lib/command.php:460 -msgid "Notice with that id does not exist" -msgstr "" +#, fuzzy +msgid "Notice with that id does not exist." +msgstr "没有找到æ¤IDçš„ä¿¡æ¯ã€‚" #: lib/command.php:168 lib/command.php:415 lib/command.php:476 #: lib/command.php:532 -msgid "User has no last notice" +#, fuzzy +msgid "User has no last notice." msgstr "用户没有通告。" #: lib/command.php:190 msgid "Notice marked as fave." msgstr "é€šå‘Šè¢«æ ‡è®°ä¸ºæ”¶è—。" -#: lib/command.php:315 -#, php-format -msgid "%1$s (%2$s)" -msgstr "%1$s (%2$s)" +#: lib/command.php:284 +#, fuzzy, php-format +msgid "Could not remove user %1$s to group %2$s." +msgstr "æ— æ³•è®¢é˜…ç”¨æˆ·ï¼šæœªæ‰¾åˆ°ã€‚" #: lib/command.php:318 -#, php-format -msgid "Fullname: %s" +#, fuzzy, php-format +msgid "Full name: %s" msgstr "å…¨å：%s" -#: lib/command.php:321 +#: lib/command.php:321 lib/mail.php:254 #, php-format msgid "Location: %s" msgstr "ä½ç½®ï¼š%s" -#: lib/command.php:324 +#: lib/command.php:324 lib/mail.php:256 #, php-format msgid "Homepage: %s" msgstr "主页：%s" @@ -4482,26 +4479,16 @@ msgstr "关于：%s" #: lib/command.php:358 scripts/xmppdaemon.php:301 #, fuzzy, php-format -msgid "Message too long - maximum is %d characters, you sent %d" +msgid "Message too long - maximum is %1$d characters, you sent %2$d." msgstr "您的消æ¯åŒ…å« %d 个å—符，超出长度é™åˆ¶ - ä¸èƒ½è¶…过 140 个å—符。" #: lib/command.php:378 msgid "Error sending direct message." msgstr "å‘é€æ¶ˆæ¯å‡ºé”™ã€‚" -#: lib/command.php:422 -#, fuzzy -msgid "Cannot repeat your own notice" -msgstr "æ— æ³•å¼€å¯é€šå‘Šã€‚" - -#: lib/command.php:427 -#, fuzzy -msgid "Already repeated that notice" -msgstr "åˆ é™¤é€šå‘Š" - #: lib/command.php:435 #, fuzzy, php-format -msgid "Notice from %s repeated" +msgid "Notice from %s repeated." msgstr "消æ¯å·²å‘布。" #: lib/command.php:437 @@ -4511,12 +4498,12 @@ msgstr "ä¿å˜é€šå‘Šæ—¶å‡ºé”™ã€‚" #: lib/command.php:491 #, fuzzy, php-format -msgid "Notice too long - maximum is %d characters, you sent %d" +msgid "Notice too long - maximum is %1$d characters, you sent %2$d." msgstr "您的消æ¯åŒ…å« %d 个å—符，超出长度é™åˆ¶ - ä¸èƒ½è¶…过 140 个å—符。" #: lib/command.php:500 #, fuzzy, php-format -msgid "Reply to %s sent" +msgid "Reply to %s sent." msgstr "æ— æ³•åˆ é™¤é€šå‘Šã€‚" #: lib/command.php:502 @@ -4525,7 +4512,8 @@ msgid "Error saving notice." msgstr "ä¿å˜é€šå‘Šæ—¶å‡ºé”™ã€‚" #: lib/command.php:556 -msgid "Specify the name of the user to subscribe to" +#, fuzzy +msgid "Specify the name of the user to subscribe to." msgstr "指定è¦è®¢é˜…的用户å" #: lib/command.php:563 @@ -4534,7 +4522,8 @@ msgid "Subscribed to %s" msgstr "订阅 %s" #: lib/command.php:584 -msgid "Specify the name of the user to unsubscribe from" +#, fuzzy +msgid "Specify the name of the user to unsubscribe from." msgstr "指定è¦å–消订阅的用户å" #: lib/command.php:591 @@ -4563,17 +4552,17 @@ msgid "Can't turn on notification." msgstr "æ— æ³•å¼€å¯é€šå‘Šã€‚" #: lib/command.php:650 -msgid "Login command is disabled" +msgid "Login command is disabled." msgstr "" #: lib/command.php:664 #, fuzzy, php-format -msgid "Could not create login token for %s" +msgid "Could not create login token for %s." msgstr "æ— æ³•åˆ›å»ºæ”¶è—。" #: lib/command.php:669 #, php-format -msgid "This link is useable only once, and is good for only 2 minutes: %s" +msgid "This link is useable only once, and is good for only 2 minutes: %s." msgstr "" #: lib/command.php:685 @@ -4772,11 +4761,6 @@ msgstr "用ä¸è¶…过140个å—符æ述您自己和您的爱好" msgid "Describe the group or topic in %d characters" msgstr "用ä¸è¶…过140个å—符æ述您自己和您的爱好" -#: lib/groupeditform.php:172 -#, fuzzy -msgid "Description" -msgstr "æè¿°" - #: lib/groupeditform.php:179 #, fuzzy msgid "" @@ -4948,21 +4932,9 @@ msgstr "" "\n" "为您效力的 %4$s\n" -#: lib/mail.php:254 -#, fuzzy, php-format -msgid "Location: %s\n" -msgstr "ä½ç½®ï¼š%s\n" - -#: lib/mail.php:256 -#, fuzzy, php-format -msgid "Homepage: %s\n" -msgstr "主页：%s\n" - #: lib/mail.php:258 -#, php-format -msgid "" -"Bio: %s\n" -"\n" +#, fuzzy, php-format +msgid "Bio: %s" msgstr "" "è‡ªä¼ Bio: %s\n" "\n" @@ -5107,6 +5079,27 @@ msgstr "" msgid "from" msgstr " 从 " +#: lib/mailhandler.php:37 +msgid "Could not parse message." +msgstr "æ— æ³•è§£æžæ¶ˆæ¯ã€‚" + +#: lib/mailhandler.php:42 +msgid "Not a registered user." +msgstr "ä¸æ˜¯å·²æ³¨å†Œç”¨æˆ·ã€‚" + +#: lib/mailhandler.php:46 +msgid "Sorry, that is not your incoming email address." +msgstr "对ä¸èµ·ï¼Œè¿™ä¸ªå‘布用的电å邮件属于其他用户。" + +#: lib/mailhandler.php:50 +msgid "Sorry, no incoming email allowed." +msgstr "对ä¸èµ·ï¼Œå‘布用的电åé‚®ä»¶æ— æ³•ä½¿ç”¨ã€‚" + +#: lib/mailhandler.php:228 +#, fuzzy, php-format +msgid "Unsupported message type: %s" +msgstr "ä¸æ”¯æŒè¿™ç§å›¾åƒæ ¼å¼ã€‚" + #: lib/mediafile.php:98 lib/mediafile.php:123 msgid "There was a database error while saving your file. Please try again." msgstr "" @@ -5138,7 +5131,7 @@ msgid "File upload stopped by extension." msgstr "" #: lib/mediafile.php:179 lib/mediafile.php:216 -msgid "File exceeds user's quota!" +msgid "File exceeds user's quota." msgstr "" #: lib/mediafile.php:196 lib/mediafile.php:233 @@ -5146,7 +5139,8 @@ msgid "File could not be moved to destination directory." msgstr "" #: lib/mediafile.php:201 lib/mediafile.php:237 -msgid "Could not determine file's mime-type!" +#, fuzzy +msgid "Could not determine file's MIME type." msgstr "æ— æ³•èŽ·å–收è—的通告。" #: lib/mediafile.php:270 @@ -5156,7 +5150,7 @@ msgstr "" #: lib/mediafile.php:275 #, php-format -msgid "%s is not a supported filetype on this server." +msgid "%s is not a supported file type on this server." msgstr "" #: lib/messageform.php:120 @@ -5192,7 +5186,17 @@ msgid "Attach a file" msgstr "" #: lib/noticeform.php:212 -msgid "Share your location" +#, fuzzy +msgid "Share my location." +msgstr "æ— æ³•ä¿å˜ä¸ªäººä¿¡æ¯ã€‚" + +#: lib/noticeform.php:214 +#, fuzzy +msgid "Do not share my location." +msgstr "æ— æ³•ä¿å˜ä¸ªäººä¿¡æ¯ã€‚" + +#: lib/noticeform.php:215 +msgid "Hide this info" msgstr "" #: lib/noticelist.php:428 @@ -5318,6 +5322,11 @@ msgstr "您å‘é€çš„消æ¯" msgid "Tags in %s's notices" msgstr "%s's 的消æ¯çš„æ ‡ç¾" +#: lib/plugin.php:114 +#, fuzzy +msgid "Unknown" +msgstr "未知动作" + #: lib/profileaction.php:109 lib/profileaction.php:192 lib/subgroupnav.php:82 msgid "Subscriptions" msgstr "订阅" @@ -5504,10 +5513,6 @@ msgstr "" msgid "People Tagcloud as tagged" msgstr "" -#: lib/subscriptionlist.php:126 -msgid "(none)" -msgstr "(none 没有)" - #: lib/tagcloudsection.php:56 #, fuzzy msgid "None" @@ -5631,19 +5636,3 @@ msgstr "主页的URLä¸æ£ç¡®ã€‚" #, php-format msgid "%s is not a valid color! Use 3 or 6 hex chars." msgstr "" - -#: scripts/maildaemon.php:48 -msgid "Could not parse message." -msgstr "æ— æ³•è§£æžæ¶ˆæ¯ã€‚" - -#: scripts/maildaemon.php:53 -msgid "Not a registered user." -msgstr "ä¸æ˜¯å·²æ³¨å†Œç”¨æˆ·ã€‚" - -#: scripts/maildaemon.php:57 -msgid "Sorry, that is not your incoming email address." -msgstr "对ä¸èµ·ï¼Œè¿™ä¸ªå‘布用的电å邮件属于其他用户。" - -#: scripts/maildaemon.php:61 -msgid "Sorry, no incoming email allowed." -msgstr "对ä¸èµ·ï¼Œå‘布用的电åé‚®ä»¶æ— æ³•ä½¿ç”¨ã€‚" diff --git a/locale/zh_TW/LC_MESSAGES/statusnet.po b/locale/zh_TW/LC_MESSAGES/statusnet.po index 59e3a3c18..57f56c001 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-01-03 10:37+0000\n" -"PO-Revision-Date: 2010-01-03 10:39:06+0000\n" +"POT-Creation-Date: 2010-01-10 11:27+0000\n" +"PO-Revision-Date: 2010-01-10 11:29:25+0000\n" "Language-Team: Traditional Chinese\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha (r60575); Translate extension (2009-12-06)\n" +"X-Generator: MediaWiki 1.16alpha (r60888); Translate extension (2010-01-04)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: zh-hant\n" "X-Message-Group: out-statusnet\n" @@ -50,11 +50,6 @@ msgstr "ç„¡æ¤é€šçŸ¥" msgid "No such user." msgstr "ç„¡æ¤ä½¿ç”¨è€…" -#: actions/all.php:84 -#, fuzzy, php-format -msgid "%s and friends, page %d" -msgstr "%s與好å‹" - #: actions/all.php:86 actions/all.php:167 actions/allrss.php:115 #: actions/apitimelinefriends.php:115 actions/apitimelinehome.php:115 #: lib/personalgroupnav.php:100 @@ -93,8 +88,8 @@ msgstr "" #: actions/all.php:134 #, php-format msgid "" -"You can try to [nudge %s](../%s) from his profile or [post something to his " -"or her attention](%%%%action.newnotice%%%%?status_textarea=%s)." +"You can try to [nudge %1$s](../%2$s) from his profile or [post something to " +"his or her attention](%%%%action.newnotice%%%%?status_textarea=%3$s)." msgstr "" #: actions/all.php:137 actions/replies.php:209 actions/showstream.php:202 @@ -120,6 +115,23 @@ msgstr "" #: actions/apiaccountupdateprofile.php:97 #: actions/apiaccountupdateprofilebackgroundimage.php:94 #: actions/apiaccountupdateprofilecolors.php:118 +#: actions/apidirectmessage.php:156 actions/apifavoritecreate.php:99 +#: actions/apifavoritedestroy.php:100 actions/apifriendshipscreate.php:100 +#: actions/apifriendshipsdestroy.php:100 actions/apifriendshipsshow.php:129 +#: actions/apigroupcreate.php:136 actions/apigroupismember.php:114 +#: actions/apigroupjoin.php:155 actions/apigroupleave.php:141 +#: actions/apigrouplist.php:132 actions/apigrouplistall.php:120 +#: actions/apigroupmembership.php:106 actions/apigroupshow.php:105 +#: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102 +#: actions/apistatusesretweets.php:112 actions/apistatusesshow.php:108 +#: actions/apistatusnetconfig.php:133 actions/apistatusnetversion.php:93 +#: actions/apisubscriptions.php:111 actions/apitimelinefavorites.php:146 +#: actions/apitimelinefriends.php:156 actions/apitimelinegroup.php:150 +#: actions/apitimelinehome.php:156 actions/apitimelinementions.php:151 +#: actions/apitimelinepublic.php:131 actions/apitimelineretweetedbyme.php:122 +#: actions/apitimelineretweetedtome.php:121 +#: actions/apitimelineretweetsofme.php:122 actions/apitimelinetag.php:141 +#: actions/apitimelineuser.php:165 actions/apiusershow.php:101 #, fuzzy msgid "API method not found." msgstr "確èªç¢¼éºå¤±" @@ -178,6 +190,9 @@ msgstr "" #: actions/apiaccountupdateprofilebackgroundimage.php:146 #: actions/apiaccountupdateprofilecolors.php:164 #: actions/apiaccountupdateprofilecolors.php:174 +#: actions/groupdesignsettings.php:287 actions/groupdesignsettings.php:297 +#: actions/userdesignsettings.php:210 actions/userdesignsettings.php:220 +#: actions/userdesignsettings.php:263 actions/userdesignsettings.php:273 msgid "Unable to save your design settings." msgstr "" @@ -220,26 +235,6 @@ msgstr "" msgid "All the direct messages sent to %s" msgstr "" -#: actions/apidirectmessage.php:156 actions/apifavoritecreate.php:99 -#: actions/apifavoritedestroy.php:100 actions/apifriendshipscreate.php:100 -#: actions/apifriendshipsdestroy.php:100 actions/apifriendshipsshow.php:129 -#: actions/apigroupcreate.php:136 actions/apigroupismember.php:114 -#: actions/apigroupjoin.php:155 actions/apigroupleave.php:141 -#: actions/apigrouplist.php:132 actions/apigrouplistall.php:120 -#: actions/apigroupmembership.php:106 actions/apigroupshow.php:105 -#: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102 -#: actions/apistatusesretweets.php:112 actions/apistatusesshow.php:108 -#: actions/apistatusnetconfig.php:133 actions/apistatusnetversion.php:93 -#: actions/apisubscriptions.php:111 actions/apitimelinefavorites.php:146 -#: actions/apitimelinefriends.php:156 actions/apitimelinegroup.php:150 -#: actions/apitimelinehome.php:156 actions/apitimelinementions.php:151 -#: actions/apitimelinepublic.php:131 actions/apitimelineretweetedbyme.php:122 -#: actions/apitimelineretweetedtome.php:121 -#: actions/apitimelineretweetsofme.php:122 actions/apitimelinetag.php:141 -#: actions/apitimelineuser.php:165 actions/apiusershow.php:101 -msgid "API method not found!" -msgstr "" - #: actions/apidirectmessagenew.php:126 msgid "No message text!" msgstr "" @@ -263,7 +258,7 @@ msgid "No status found with that ID." msgstr "" #: actions/apifavoritecreate.php:119 -msgid "This status is already a favorite!" +msgid "This status is already a favorite." msgstr "" #: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:176 @@ -271,7 +266,7 @@ msgid "Could not create favorite." msgstr "" #: actions/apifavoritedestroy.php:122 -msgid "That status is not a favorite!" +msgid "That status is not a favorite." msgstr "" #: actions/apifavoritedestroy.php:134 actions/disfavor.php:87 @@ -293,8 +288,9 @@ msgid "Could not unfollow user: User not found." msgstr "無法連çµåˆ°ä¼ºæœå™¨:%s" #: actions/apifriendshipsdestroy.php:120 -msgid "You cannot unfollow yourself!" -msgstr "" +#, fuzzy +msgid "You cannot unfollow yourself." +msgstr "無法更新使用者" #: actions/apifriendshipsexists.php:94 msgid "Two user ids or screen_names must be supplied." @@ -381,7 +377,7 @@ msgstr "" msgid "Group not found!" msgstr "ç›®å‰ç„¡è«‹æ±‚" -#: actions/apigroupjoin.php:110 +#: actions/apigroupjoin.php:110 actions/joingroup.php:90 lib/command.php:217 msgid "You are already a member of that group." msgstr "" @@ -389,9 +385,9 @@ msgstr "" msgid "You have been blocked from that group by the admin." msgstr "" -#: actions/apigroupjoin.php:138 +#: actions/apigroupjoin.php:138 actions/joingroup.php:128 lib/command.php:234 #, fuzzy, php-format -msgid "Could not join user %s to group %s." +msgid "Could not join user %1$s to group %2$s." msgstr "無法連çµåˆ°ä¼ºæœå™¨:%s" #: actions/apigroupleave.php:114 @@ -399,9 +395,9 @@ msgstr "無法連çµåˆ°ä¼ºæœå™¨:%s" msgid "You are not a member of this group." msgstr "無法連çµåˆ°ä¼ºæœå™¨:%s" -#: actions/apigroupleave.php:124 +#: actions/apigroupleave.php:124 actions/leavegroup.php:127 #, fuzzy, php-format -msgid "Could not remove user %s to group %s." +msgid "Could not remove user %1$s from group %2$s." msgstr "無法從 %s 建立OpenID" #: actions/apigrouplist.php:95 @@ -409,11 +405,6 @@ msgstr "無法從 %s 建立OpenID" msgid "%s's groups" msgstr "ç„¡æ¤é€šçŸ¥" -#: actions/apigrouplist.php:103 -#, php-format -msgid "Groups %s is a member of on %s." -msgstr "" - #: actions/apigrouplistall.php:90 actions/usergroups.php:62 #, php-format msgid "%s groups" @@ -437,12 +428,12 @@ msgstr "" msgid "No such notice." msgstr "ç„¡æ¤é€šçŸ¥" -#: actions/apistatusesretweet.php:83 +#: actions/apistatusesretweet.php:83 lib/command.php:422 #, fuzzy msgid "Cannot repeat your own notice." msgstr "儲å˜ä½¿ç”¨è€…發生錯誤" -#: actions/apistatusesretweet.php:91 +#: actions/apistatusesretweet.php:91 lib/command.php:427 #, fuzzy msgid "Already repeated that notice." msgstr "ç„¡æ¤ä½¿ç”¨è€…" @@ -457,7 +448,7 @@ msgid "No status with that ID found." msgstr "" #: actions/apistatusesupdate.php:157 actions/newnotice.php:155 -#: scripts/maildaemon.php:71 +#: lib/mailhandler.php:60 #, php-format msgid "That's too long. Max notice size is %d chars." msgstr "" @@ -476,14 +467,14 @@ msgid "Unsupported format." msgstr "" #: actions/apitimelinefavorites.php:108 -#, php-format -msgid "%s / Favorites from %s" -msgstr "" +#, fuzzy, php-format +msgid "%1$s / Favorites from %2$s" +msgstr "%1$s的狀態是%2$s" #: actions/apitimelinefavorites.php:120 -#, php-format -msgid "%s updates favorited by %s / %s." -msgstr "" +#, fuzzy, php-format +msgid "%1$s updates favorited by %2$s / %2$s." +msgstr "&s的微型部è½æ ¼" #: actions/apitimelinegroup.php:109 actions/apitimelineuser.php:118 #: actions/grouprss.php:131 actions/userrss.php:90 @@ -552,8 +543,11 @@ msgstr "ç›®å‰ç„¡è«‹æ±‚" msgid "No such attachment." msgstr "ç„¡æ¤æ–‡ä»¶" -#: actions/avatarbynickname.php:59 actions/grouprss.php:91 -#: actions/leavegroup.php:76 +#: actions/avatarbynickname.php:59 actions/blockedfromgroup.php:73 +#: actions/editgroup.php:84 actions/groupdesignsettings.php:84 +#: actions/grouplogo.php:86 actions/groupmembers.php:76 +#: actions/grouprss.php:91 actions/joingroup.php:76 actions/leavegroup.php:76 +#: actions/showgroup.php:121 msgid "No nickname." msgstr "無暱稱" @@ -576,8 +570,8 @@ msgid "You can upload your personal avatar. The maximum file size is %s." msgstr "" #: actions/avatarsettings.php:106 actions/avatarsettings.php:185 -#: actions/grouplogo.php:178 actions/remotesubscribe.php:191 -#: actions/userauthorization.php:72 actions/userrss.php:103 +#: actions/remotesubscribe.php:191 actions/userauthorization.php:72 +#: actions/userrss.php:103 msgid "User without matching profile" msgstr "" @@ -610,9 +604,9 @@ msgstr "" msgid "Crop" msgstr "" -#: actions/avatarsettings.php:268 actions/disfavor.php:74 -#: actions/emailsettings.php:238 actions/favor.php:75 actions/geocode.php:50 -#: actions/groupblock.php:66 actions/grouplogo.php:309 +#: actions/avatarsettings.php:268 actions/deletenotice.php:157 +#: actions/disfavor.php:74 actions/emailsettings.php:238 actions/favor.php:75 +#: actions/geocode.php:50 actions/groupblock.php:66 actions/grouplogo.php:309 #: actions/groupunblock.php:66 actions/imsettings.php:206 #: actions/invite.php:56 actions/login.php:135 actions/makeadmin.php:66 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80 @@ -696,20 +690,15 @@ msgstr "ç„¡æ¤ä½¿ç”¨è€…" msgid "Failed to save block information." msgstr "" -#: actions/blockedfromgroup.php:73 actions/editgroup.php:84 -#: actions/groupdesignsettings.php:84 actions/grouplogo.php:86 -#: actions/groupmembers.php:76 actions/joingroup.php:76 -#: actions/showgroup.php:121 -#, fuzzy -msgid "No nickname" -msgstr "無暱稱" - #: actions/blockedfromgroup.php:80 actions/editgroup.php:96 +#: actions/foafgroup.php:44 actions/foafgroup.php:62 actions/groupblock.php:86 #: actions/groupbyid.php:83 actions/groupdesignsettings.php:97 #: actions/grouplogo.php:99 actions/groupmembers.php:83 -#: actions/joingroup.php:83 actions/showgroup.php:137 +#: actions/grouprss.php:98 actions/groupunblock.php:86 +#: actions/joingroup.php:83 actions/leavegroup.php:83 actions/makeadmin.php:86 +#: actions/showgroup.php:137 lib/command.php:212 lib/command.php:263 #, fuzzy -msgid "No such group" +msgid "No such group." msgstr "ç„¡æ¤é€šçŸ¥" #: actions/blockedfromgroup.php:90 @@ -719,7 +708,7 @@ msgstr "ç„¡æ¤é€šçŸ¥" #: actions/blockedfromgroup.php:93 #, fuzzy, php-format -msgid "%s blocked profiles, page %d" +msgid "%1$s blocked profiles, page %2$d" msgstr "%s與好å‹" #: actions/blockedfromgroup.php:108 @@ -834,10 +823,6 @@ msgstr "ç„¡æ¤é€šçŸ¥" msgid "Delete this notice" msgstr "" -#: actions/deletenotice.php:157 -msgid "There was a problem with your session token. Try again, please." -msgstr "" - #: actions/deleteuser.php:67 #, fuzzy msgid "You cannot delete users." @@ -864,7 +849,7 @@ msgid "Delete this user" msgstr "ç„¡æ¤ä½¿ç”¨è€…" #: actions/designadminpanel.php:62 lib/accountsettingsaction.php:124 -#: lib/adminpanelaction.php:302 lib/groupnav.php:119 +#: lib/adminpanelaction.php:316 lib/groupnav.php:119 msgid "Design" msgstr "" @@ -1010,7 +995,7 @@ msgstr "" #: actions/editgroup.php:103 actions/editgroup.php:168 #: actions/groupdesignsettings.php:104 actions/grouplogo.php:106 -msgid "You must be an admin to edit the group" +msgid "You must be an admin to edit the group." msgstr "" #: actions/editgroup.php:154 @@ -1037,8 +1022,9 @@ msgid "Options saved." msgstr "" #: actions/emailsettings.php:60 -msgid "Email Settings" -msgstr "" +#, fuzzy +msgid "Email settings" +msgstr "線上å³æ™‚通è¨å®š" #: actions/emailsettings.php:71 #, php-format @@ -1072,8 +1058,9 @@ msgid "Cancel" msgstr "å–消" #: actions/emailsettings.php:121 -msgid "Email Address" -msgstr "" +#, fuzzy +msgid "Email address" +msgstr "確èªä¿¡ç®±" #: actions/emailsettings.php:123 msgid "Email address, like \"UserName@example.org\"" @@ -1146,9 +1133,10 @@ msgstr "" msgid "Cannot normalize that email address" msgstr "" -#: actions/emailsettings.php:331 actions/siteadminpanel.php:157 -msgid "Not a valid email address" -msgstr "" +#: actions/emailsettings.php:331 actions/register.php:201 +#: actions/siteadminpanel.php:157 +msgid "Not a valid email address." +msgstr "æ¤ä¿¡ç®±ç„¡æ•ˆ" #: actions/emailsettings.php:334 msgid "That is already your email address." @@ -1328,20 +1316,12 @@ msgstr "" msgid "Error updating remote profile" msgstr "æ›´æ–°é 端個人資料發生錯誤" -#: actions/foafgroup.php:44 actions/foafgroup.php:62 actions/groupblock.php:86 -#: actions/grouprss.php:98 actions/groupunblock.php:86 -#: actions/leavegroup.php:83 actions/makeadmin.php:86 lib/command.php:212 -#: lib/command.php:263 -#, fuzzy -msgid "No such group." -msgstr "ç„¡æ¤é€šçŸ¥" - -#: actions/getfile.php:75 +#: actions/getfile.php:79 #, fuzzy msgid "No such file." msgstr "ç„¡æ¤é€šçŸ¥" -#: actions/getfile.php:79 +#: actions/getfile.php:83 #, fuzzy msgid "Cannot read file." msgstr "ç„¡æ¤é€šçŸ¥" @@ -1354,7 +1334,7 @@ msgstr "" #: actions/groupblock.php:76 actions/groupunblock.php:76 #: actions/makeadmin.php:76 actions/subedit.php:53 actions/tagother.php:46 -#: lib/profileformaction.php:77 +#: actions/unsubscribe.php:84 lib/profileformaction.php:77 msgid "No profile with that ID." msgstr "" @@ -1383,9 +1363,9 @@ msgstr "ç„¡æ¤ä½¿ç”¨è€…" #: actions/groupblock.php:162 #, php-format msgid "" -"Are you sure you want to block user \"%s\" from the group \"%s\"? They will " -"be removed from the group, unable to post, and unable to subscribe to the " -"group in the future." +"Are you sure you want to block user \"%1$s\" from the group \"%2$s\"? They " +"will be removed from the group, unable to post, and unable to subscribe to " +"the group in the future." msgstr "" #: actions/groupblock.php:178 @@ -1402,9 +1382,10 @@ msgstr "ç„¡æ¤ä½¿ç”¨è€…" msgid "Database error blocking user from group." msgstr "" -#: actions/groupbyid.php:74 -msgid "No ID" -msgstr "" +#: actions/groupbyid.php:74 actions/userbyid.php:70 +#, fuzzy +msgid "No ID." +msgstr "查無æ¤Jabber ID" #: actions/groupdesignsettings.php:68 msgid "You must be logged in to edit a group." @@ -1426,12 +1407,6 @@ msgstr "" msgid "Couldn't update your design." msgstr "無法更新使用者" -#: actions/groupdesignsettings.php:287 actions/groupdesignsettings.php:297 -#: actions/userdesignsettings.php:210 actions/userdesignsettings.php:220 -#: actions/userdesignsettings.php:263 actions/userdesignsettings.php:273 -msgid "Unable to save your design settings!" -msgstr "" - #: actions/groupdesignsettings.php:308 actions/userdesignsettings.php:231 msgid "Design preferences saved." msgstr "" @@ -1446,6 +1421,10 @@ msgid "" "You can upload a logo image for your group. The maximum file size is %s." msgstr "" +#: actions/grouplogo.php:178 +msgid "User without matching profile." +msgstr "" + #: actions/grouplogo.php:362 msgid "Pick a square area of the image to be the logo." msgstr "" @@ -1467,14 +1446,14 @@ msgstr "" #: actions/groupmembers.php:96 #, php-format -msgid "%s group members, page %d" +msgid "%1$s group members, page %2$d" msgstr "" #: actions/groupmembers.php:111 msgid "A list of the users in this group." msgstr "" -#: actions/groupmembers.php:175 lib/action.php:441 lib/groupnav.php:107 +#: actions/groupmembers.php:175 lib/action.php:442 lib/groupnav.php:107 msgid "Admin" msgstr "" @@ -1569,7 +1548,8 @@ msgid "Error removing the block." msgstr "儲å˜ä½¿ç”¨è€…發生錯誤" #: actions/imsettings.php:59 -msgid "IM Settings" +#, fuzzy +msgid "IM settings" msgstr "線上å³æ™‚通è¨å®š" #: actions/imsettings.php:70 @@ -1598,7 +1578,8 @@ msgstr "" "好å‹æ¸…單了嗎？)" #: actions/imsettings.php:124 -msgid "IM Address" +#, fuzzy +msgid "IM address" msgstr "線上å³æ™‚通信箱" #: actions/imsettings.php:126 @@ -1655,11 +1636,6 @@ msgstr "確èªä¿¡å·²å¯„åˆ°ä½ çš„ç·šä¸Šå³æ™‚通信箱。%sé€çµ¦ä½ 得訊æ¯è¦å msgid "That is not your Jabber ID." msgstr "" -#: actions/inbox.php:59 -#, php-format -msgid "Inbox for %s - page %d" -msgstr "" - #: actions/inbox.php:62 #, php-format msgid "Inbox for %s" @@ -1695,9 +1671,9 @@ msgstr "" msgid "You are already subscribed to these users:" msgstr "" -#: actions/invite.php:131 actions/invite.php:139 +#: actions/invite.php:131 actions/invite.php:139 lib/command.php:315 #, php-format -msgid "%s (%s)" +msgid "%1$s (%2$s)" msgstr "" #: actions/invite.php:136 @@ -1736,7 +1712,7 @@ msgstr "" msgid "Optionally add a personal message to the invitation." msgstr "" -#: actions/invite.php:197 lib/messageform.php:178 lib/noticeform.php:232 +#: actions/invite.php:197 lib/messageform.php:178 lib/noticeform.php:234 msgid "Send" msgstr "" @@ -1780,18 +1756,9 @@ msgstr "" msgid "You must be logged in to join a group." msgstr "" -#: actions/joingroup.php:90 lib/command.php:217 -msgid "You are already a member of that group" -msgstr "" - -#: actions/joingroup.php:128 lib/command.php:234 -#, fuzzy, php-format -msgid "Could not join user %s to group %s" -msgstr "無法連çµåˆ°ä¼ºæœå™¨:%s" - #: actions/joingroup.php:135 lib/command.php:239 #, php-format -msgid "%s joined group %s" +msgid "%1$s joined group %2$s" msgstr "" #: actions/leavegroup.php:60 @@ -1806,15 +1773,10 @@ msgstr "" msgid "Could not find membership record." msgstr "" -#: actions/leavegroup.php:127 lib/command.php:284 -#, fuzzy, php-format -msgid "Could not remove user %s to group %s" -msgstr "無法從 %s 建立OpenID" - #: actions/leavegroup.php:134 lib/command.php:289 -#, php-format -msgid "%s left group %s" -msgstr "" +#, fuzzy, php-format +msgid "%1$s left group %2$s" +msgstr "%1$s的狀態是%2$s" #: actions/login.php:83 actions/register.php:137 msgid "Already logged in." @@ -1832,7 +1794,7 @@ msgstr "使用者å稱或密碼錯誤" msgid "Error setting user. You are probably not authorized." msgstr "" -#: actions/login.php:208 actions/login.php:261 lib/action.php:459 +#: actions/login.php:208 actions/login.php:261 lib/action.php:460 #: lib/logingroupnav.php:79 msgid "Login" msgstr "登入" @@ -1883,18 +1845,18 @@ msgstr "" #: actions/makeadmin.php:95 #, php-format -msgid "%s is already an admin for group \"%s\"." +msgid "%1$s is already an admin for group \"%2$s\"." msgstr "" #: actions/makeadmin.php:132 -#, php-format -msgid "Can't get membership record for %s in group %s" -msgstr "" +#, fuzzy, php-format +msgid "Can't get membership record for %1$s in group %2$s." +msgstr "無法從 %s 建立OpenID" #: actions/makeadmin.php:145 -#, php-format -msgid "Can't make %s an admin for group %s" -msgstr "" +#, fuzzy, php-format +msgid "Can't make %1$s an admin for group %2$s." +msgstr "無法從 %s 建立OpenID" #: actions/microsummary.php:69 msgid "No current status" @@ -1936,7 +1898,7 @@ msgstr "" #: actions/newmessage.php:185 lib/command.php:376 #, php-format -msgid "Direct message to %s sent" +msgid "Direct message to %s sent." msgstr "" #: actions/newmessage.php:210 actions/newnotice.php:245 lib/channel.php:170 @@ -1964,7 +1926,7 @@ msgstr "" #: actions/noticesearch.php:91 #, fuzzy, php-format -msgid "Search results for \"%s\" on %s" +msgid "Search results for \"%1$s\" on %2$s" msgstr "æœå°‹ \"%s\"相關資料" #: actions/noticesearch.php:121 @@ -2069,11 +2031,6 @@ msgstr "" msgid "URL shortening service is too long (max 50 chars)." msgstr "地點éŽé•·ï¼ˆå…±255個å—）" -#: actions/outbox.php:58 -#, php-format -msgid "Outbox for %s - page %d" -msgstr "" - #: actions/outbox.php:61 #, php-format msgid "Outbox for %s" @@ -2145,7 +2102,7 @@ msgstr "無法å˜å–新密碼" msgid "Password saved." msgstr "" -#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:308 +#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:326 msgid "Paths" msgstr "" @@ -2178,7 +2135,7 @@ msgid "Invalid SSL server. The maximum length is 255 characters." msgstr "" #: actions/pathsadminpanel.php:217 actions/siteadminpanel.php:58 -#: lib/adminpanelaction.php:299 +#: lib/adminpanelaction.php:311 msgid "Site" msgstr "" @@ -2276,8 +2233,9 @@ msgid "When to use SSL" msgstr "" #: actions/pathsadminpanel.php:308 -msgid "SSL Server" -msgstr "" +#, fuzzy +msgid "SSL server" +msgstr "線上å³æ™‚通è¨å®š" #: actions/pathsadminpanel.php:309 msgid "Server to direct SSL requests to" @@ -2305,9 +2263,9 @@ msgid "Not a valid people tag: %s" msgstr "æ¤ä¿¡ç®±ç„¡æ•ˆ" #: actions/peopletag.php:144 -#, php-format -msgid "Users self-tagged with %s - page %d" -msgstr "" +#, fuzzy, php-format +msgid "Users self-tagged with %1$s - page %2$d" +msgstr "&s的微型部è½æ ¼" #: actions/postnotice.php:84 msgid "Invalid notice content" @@ -2315,7 +2273,7 @@ msgstr "" #: actions/postnotice.php:90 #, php-format -msgid "Notice license ‘%s’ is not compatible with site license ‘%s’." +msgid "Notice license ‘%1$s’ is not compatible with site license ‘%2$s’." msgstr "" #: actions/profilesettings.php:60 @@ -2433,21 +2391,21 @@ msgstr "個人首é 連çµ%s無效" msgid "Couldn't update user for autosubscribe." msgstr "" -#: actions/profilesettings.php:354 +#: actions/profilesettings.php:359 #, fuzzy msgid "Couldn't save location prefs." msgstr "無法儲å˜å€‹äººè³‡æ–™" -#: actions/profilesettings.php:366 +#: actions/profilesettings.php:371 msgid "Couldn't save profile." msgstr "無法儲å˜å€‹äººè³‡æ–™" -#: actions/profilesettings.php:374 +#: actions/profilesettings.php:379 #, fuzzy msgid "Couldn't save tags." msgstr "無法儲å˜å€‹äººè³‡æ–™" -#: actions/profilesettings.php:382 lib/adminpanelaction.php:126 +#: actions/profilesettings.php:387 lib/adminpanelaction.php:137 msgid "Settings saved." msgstr "" @@ -2541,7 +2499,7 @@ msgid "" "one!" msgstr "" -#: actions/publictagcloud.php:135 +#: actions/publictagcloud.php:131 msgid "Tag cloud" msgstr "" @@ -2678,7 +2636,7 @@ msgstr "確èªç¢¼ç™¼ç”ŸéŒ¯èª¤" msgid "Registration successful" msgstr "" -#: actions/register.php:114 actions/register.php:502 lib/action.php:456 +#: actions/register.php:114 actions/register.php:502 lib/action.php:457 #: lib/logingroupnav.php:85 msgid "Register" msgstr "" @@ -2691,10 +2649,6 @@ msgstr "" msgid "You can't register if you don't agree to the license." msgstr "" -#: actions/register.php:201 -msgid "Not a valid email address." -msgstr "æ¤ä¿¡ç®±ç„¡æ•ˆ" - #: actions/register.php:212 msgid "Email address already exists." msgstr "æ¤é›»å信箱已註冊éŽäº†" @@ -2752,10 +2706,10 @@ msgstr "ä¸åŒ…å«é€™äº›å€‹äººè³‡æ–™ï¼šå¯†ç¢¼ã€é›»åä¿¡ç®±ã€ç·šä¸Šå³æ™‚通信 #: actions/register.php:537 #, php-format msgid "" -"Congratulations, %s! And welcome to %%%%site.name%%%%. From here, you may " +"Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may " "want to...\n" "\n" -"* Go to [your profile](%s) and post your first message.\n" +"* Go to [your profile](%2$s) and post your first message.\n" "* Add a [Jabber/GTalk address](%%%%action.imsettings%%%%) so you can send " "notices through instant messages.\n" "* [Search for people](%%%%action.peoplesearch%%%%) that you may know or that " @@ -2862,11 +2816,6 @@ msgstr "新增" msgid "Replies to %s" msgstr "" -#: actions/replies.php:127 -#, php-format -msgid "Replies to %s, page %d" -msgstr "" - #: actions/replies.php:144 #, fuzzy, php-format msgid "Replies feed for %s (RSS 1.0)" @@ -2885,8 +2834,8 @@ msgstr "發é€çµ¦%s好å‹çš„訂閱" #: actions/replies.php:198 #, php-format msgid "" -"This is the timeline showing replies to %s but %s hasn't received a notice " -"to his attention yet." +"This is the timeline showing replies to %1$s but %2$s hasn't received a " +"notice to his attention yet." msgstr "" #: actions/replies.php:203 @@ -2899,8 +2848,8 @@ msgstr "" #: actions/replies.php:205 #, php-format msgid "" -"You can try to [nudge %s](../%s) or [post something to his or her attention]" -"(%%%%action.newnotice%%%%?status_textarea=%s)." +"You can try to [nudge %1$s](../%2$s) or [post something to his or her " +"attention](%%%%action.newnotice%%%%?status_textarea=%3$s)." msgstr "" #: actions/repliesrss.php:72 @@ -2917,11 +2866,6 @@ msgstr "無法連çµåˆ°ä¼ºæœå™¨:%s" msgid "User is already sandboxed." msgstr "" -#: actions/showfavorites.php:79 -#, fuzzy, php-format -msgid "%s's favorite notices, page %d" -msgstr "ç„¡æ¤é€šçŸ¥" - #: actions/showfavorites.php:132 msgid "Could not retrieve favorite notices." msgstr "" @@ -2971,11 +2915,6 @@ msgstr "" msgid "%s group" msgstr "" -#: actions/showgroup.php:84 -#, php-format -msgid "%s group, page %d" -msgstr "" - #: actions/showgroup.php:218 #, fuzzy msgid "Group profile" @@ -3026,7 +2965,7 @@ msgstr "ä½•æ™‚åŠ å…¥æœƒå“¡çš„å‘¢ï¼Ÿ" #: actions/showgroup.php:386 lib/profileaction.php:117 #: lib/profileaction.php:148 lib/profileaction.php:236 lib/section.php:95 -#: lib/tagcloudsection.php:71 +#: lib/subscriptionlist.php:126 lib/tagcloudsection.php:71 msgid "(None)" msgstr "" @@ -3094,15 +3033,10 @@ msgstr "更新個人圖åƒ" msgid " tagged %s" msgstr "" -#: actions/showstream.php:79 -#, php-format -msgid "%s, page %d" -msgstr "" - #: actions/showstream.php:122 -#, php-format -msgid "Notice feed for %s tagged %s (RSS 1.0)" -msgstr "" +#, fuzzy, php-format +msgid "Notice feed for %1$s tagged %2$s (RSS 1.0)" +msgstr "發é€çµ¦%s好å‹çš„訂閱" #: actions/showstream.php:129 #, php-format @@ -3126,7 +3060,7 @@ msgstr "" #: actions/showstream.php:191 #, php-format -msgid "This is the timeline for %s but %s hasn't posted anything yet." +msgid "This is the timeline for %1$s but %2$s hasn't posted anything yet." msgstr "" #: actions/showstream.php:196 @@ -3138,8 +3072,8 @@ msgstr "" #: actions/showstream.php:198 #, php-format msgid "" -"You can try to nudge %s or [post something to his or her attention](%%%%" -"action.newnotice%%%%?status_textarea=%s)." +"You can try to nudge %1$s or [post something to his or her attention](%%%%" +"action.newnotice%%%%?status_textarea=%2$s)." msgstr "" #: actions/showstream.php:234 @@ -3182,12 +3116,12 @@ msgstr "" #: actions/siteadminpanel.php:154 #, fuzzy -msgid "You must have a valid contact email address" +msgid "You must have a valid contact email address." msgstr "æ¤ä¿¡ç®±ç„¡æ•ˆ" #: actions/siteadminpanel.php:172 #, php-format -msgid "Unknown language \"%s\"" +msgid "Unknown language \"%s\"." msgstr "" #: actions/siteadminpanel.php:179 @@ -3373,8 +3307,9 @@ msgid "Save site settings" msgstr "線上å³æ™‚通è¨å®š" #: actions/smssettings.php:58 -msgid "SMS Settings" -msgstr "" +#, fuzzy +msgid "SMS settings" +msgstr "線上å³æ™‚通è¨å®š" #: actions/smssettings.php:69 #, php-format @@ -3403,7 +3338,7 @@ msgid "Enter the code you received on your phone." msgstr "" #: actions/smssettings.php:138 -msgid "SMS Phone number" +msgid "SMS phone number" msgstr "" #: actions/smssettings.php:140 @@ -3491,9 +3426,9 @@ msgid "%s subscribers" msgstr "æ¤å¸³è™Ÿå·²è¨»å†Š" #: actions/subscribers.php:52 -#, php-format -msgid "%s subscribers, page %d" -msgstr "" +#, fuzzy, php-format +msgid "%1$s subscribers, page %2$d" +msgstr "所有訂閱" #: actions/subscribers.php:63 msgid "These are the people who listen to your notices." @@ -3529,7 +3464,7 @@ msgstr "所有訂閱" #: actions/subscriptions.php:54 #, fuzzy, php-format -msgid "%s subscriptions, page %d" +msgid "%1$s subscriptions, page %2$d" msgstr "所有訂閱" #: actions/subscriptions.php:65 @@ -3565,11 +3500,6 @@ msgstr "查無æ¤Jabber ID" msgid "SMS" msgstr "" -#: actions/tag.php:68 -#, fuzzy, php-format -msgid "Notices tagged with %s, page %d" -msgstr "&s的微型部è½æ ¼" - #: actions/tag.php:86 #, php-format msgid "Notice feed for tag %s (RSS 1.0)" @@ -3655,10 +3585,6 @@ msgstr "" msgid "No profile id in request." msgstr "無確èªè«‹æ±‚" -#: actions/unsubscribe.php:84 -msgid "No profile with that id." -msgstr "" - #: actions/unsubscribe.php:98 #, fuzzy msgid "Unsubscribed" @@ -3666,10 +3592,11 @@ msgstr "æ¤å¸³è™Ÿå·²è¨»å†Š" #: actions/updateprofile.php:62 actions/userauthorization.php:330 #, php-format -msgid "Listenee stream license ‘%s’ is not compatible with site license ‘%s’." +msgid "" +"Listenee stream license ‘%1$s’ is not compatible with site license ‘%2$s’." msgstr "" -#: actions/useradminpanel.php:58 lib/adminpanelaction.php:305 +#: actions/useradminpanel.php:58 lib/adminpanelaction.php:321 #: lib/personalgroupnav.php:115 msgid "User" msgstr "" @@ -3769,7 +3696,7 @@ msgid "" "click “Rejectâ€." msgstr "" -#: actions/userauthorization.php:188 +#: actions/userauthorization.php:188 actions/version.php:165 msgid "License" msgstr "" @@ -3819,7 +3746,7 @@ msgstr "" #: actions/userauthorization.php:296 #, php-format -msgid "Listener URI ‘%s’ not found here" +msgid "Listener URI ‘%s’ not found here." msgstr "" #: actions/userauthorization.php:301 @@ -3852,11 +3779,6 @@ msgstr "無法讀å–æ¤%sURL的圖åƒ" msgid "Wrong image type for avatar URL ‘%s’." msgstr "" -#: actions/userbyid.php:70 -#, fuzzy -msgid "No ID." -msgstr "查無æ¤Jabber ID" - #: actions/userdesignsettings.php:76 lib/designsettings.php:65 msgid "Profile design" msgstr "" @@ -3871,11 +3793,6 @@ msgstr "" msgid "Enjoy your hotdog!" msgstr "" -#: actions/usergroups.php:64 -#, php-format -msgid "%s groups, page %d" -msgstr "" - #: actions/usergroups.php:130 msgid "Search for more groups" msgstr "" @@ -3890,6 +3807,73 @@ msgstr "" msgid "Try [searching for groups](%%action.groupsearch%%) and joining them." msgstr "" +#: actions/version.php:73 +#, php-format +msgid "StatusNet %s" +msgstr "" + +#: actions/version.php:153 +#, php-format +msgid "" +"This site is powered by %1$s version %2$s, Copyright 2008-2010 StatusNet, " +"Inc. and contributors." +msgstr "" + +#: actions/version.php:157 +#, fuzzy +msgid "StatusNet" +msgstr "更新個人圖åƒ" + +#: actions/version.php:161 +msgid "Contributors" +msgstr "" + +#: actions/version.php:168 +msgid "" +"StatusNet is free software: you can redistribute it and/or modify it under " +"the terms of the GNU Affero General Public License as published by the Free " +"Software Foundation, either version 3 of the License, or (at your option) " +"any later version. " +msgstr "" + +#: actions/version.php:174 +msgid "" +"This program is distributed in the hope that it will be useful, but WITHOUT " +"ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or " +"FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License " +"for more details. " +msgstr "" + +#: actions/version.php:180 +#, php-format +msgid "" +"You should have received a copy of the GNU Affero General Public License " +"along with this program. If not, see %s." +msgstr "" + +#: actions/version.php:189 +msgid "Plugins" +msgstr "" + +#: actions/version.php:195 +#, fuzzy +msgid "Name" +msgstr "暱稱" + +#: actions/version.php:196 lib/action.php:741 +#, fuzzy +msgid "Version" +msgstr "地點" + +#: actions/version.php:197 +msgid "Author(s)" +msgstr "" + +#: actions/version.php:198 lib/groupeditform.php:172 +#, fuzzy +msgid "Description" +msgstr "所有訂閱" + #: classes/File.php:137 #, php-format msgid "" @@ -3958,7 +3942,7 @@ msgstr "" msgid "DB error inserting reply: %s" msgstr "å¢žåŠ å›žè¦†æ™‚,資料庫發生錯誤: %s" -#: classes/Notice.php:1361 +#: classes/Notice.php:1359 #, php-format msgid "RT @%1$s %2$s" msgstr "" @@ -4008,143 +3992,138 @@ msgstr "" msgid "Other options" msgstr "" -#: lib/action.php:144 -#, php-format -msgid "%s - %s" -msgstr "" - #: lib/action.php:159 msgid "Untitled page" msgstr "" -#: lib/action.php:426 +#: lib/action.php:427 msgid "Primary site navigation" msgstr "" -#: lib/action.php:432 +#: lib/action.php:433 msgid "Home" msgstr "主é " -#: lib/action.php:432 +#: lib/action.php:433 msgid "Personal profile and friends timeline" msgstr "" -#: lib/action.php:434 +#: lib/action.php:435 #, fuzzy msgid "Account" msgstr "關於" -#: lib/action.php:434 +#: lib/action.php:435 msgid "Change your email, avatar, password, profile" msgstr "" -#: lib/action.php:437 +#: lib/action.php:438 msgid "Connect" msgstr "連çµ" -#: lib/action.php:437 +#: lib/action.php:438 #, fuzzy msgid "Connect to services" msgstr "無法連çµåˆ°ä¼ºæœå™¨:%s" -#: lib/action.php:441 +#: lib/action.php:442 msgid "Change site configuration" msgstr "" -#: lib/action.php:445 lib/subgroupnav.php:105 +#: lib/action.php:446 lib/subgroupnav.php:105 msgid "Invite" msgstr "" -#: lib/action.php:446 lib/subgroupnav.php:106 +#: lib/action.php:447 lib/subgroupnav.php:106 #, php-format msgid "Invite friends and colleagues to join you on %s" msgstr "" -#: lib/action.php:451 +#: lib/action.php:452 msgid "Logout" msgstr "登出" -#: lib/action.php:451 +#: lib/action.php:452 msgid "Logout from the site" msgstr "" -#: lib/action.php:456 +#: lib/action.php:457 #, fuzzy msgid "Create an account" msgstr "新增帳號" -#: lib/action.php:459 +#: lib/action.php:460 msgid "Login to the site" msgstr "" -#: lib/action.php:462 lib/action.php:725 +#: lib/action.php:463 lib/action.php:726 msgid "Help" msgstr "求救" -#: lib/action.php:462 +#: lib/action.php:463 #, fuzzy msgid "Help me!" msgstr "求救" -#: lib/action.php:465 lib/searchaction.php:127 +#: lib/action.php:466 lib/searchaction.php:127 msgid "Search" msgstr "" -#: lib/action.php:465 +#: lib/action.php:466 msgid "Search for people or text" msgstr "" -#: lib/action.php:486 +#: lib/action.php:487 #, fuzzy msgid "Site notice" msgstr "新訊æ¯" -#: lib/action.php:552 +#: lib/action.php:553 msgid "Local views" msgstr "" -#: lib/action.php:618 +#: lib/action.php:619 #, fuzzy msgid "Page notice" msgstr "新訊æ¯" -#: lib/action.php:720 +#: lib/action.php:721 msgid "Secondary site navigation" msgstr "" -#: lib/action.php:727 +#: lib/action.php:728 msgid "About" msgstr "關於" -#: lib/action.php:729 +#: lib/action.php:730 msgid "FAQ" msgstr "常見å•é¡Œ" -#: lib/action.php:733 +#: lib/action.php:734 msgid "TOS" msgstr "" -#: lib/action.php:736 +#: lib/action.php:737 msgid "Privacy" msgstr "" -#: lib/action.php:738 +#: lib/action.php:739 msgid "Source" msgstr "" -#: lib/action.php:740 +#: lib/action.php:743 msgid "Contact" msgstr "好å‹åå–®" -#: lib/action.php:742 +#: lib/action.php:745 msgid "Badge" msgstr "" -#: lib/action.php:770 +#: lib/action.php:773 msgid "StatusNet software license" msgstr "" -#: lib/action.php:773 +#: lib/action.php:776 #, php-format msgid "" "**%%site.name%%** is a microblogging service brought to you by [%%site." @@ -4153,12 +4132,12 @@ msgstr "" "**%%site.name%%**是由[%%site.broughtby%%](%%site.broughtbyurl%%)所æ供的微型" "部è½æ ¼æœå‹™" -#: lib/action.php:775 +#: lib/action.php:778 #, php-format msgid "**%%site.name%%** is a microblogging service. " msgstr "**%%site.name%%**是個微型部è½æ ¼" -#: lib/action.php:777 +#: lib/action.php:780 #, php-format msgid "" "It runs the [StatusNet](http://status.net/) microblogging software, version %" @@ -4166,33 +4145,33 @@ msgid "" "org/licensing/licenses/agpl-3.0.html)." msgstr "" -#: lib/action.php:791 +#: lib/action.php:794 #, fuzzy msgid "Site content license" msgstr "新訊æ¯" -#: lib/action.php:800 +#: lib/action.php:803 msgid "All " msgstr "" -#: lib/action.php:805 +#: lib/action.php:808 msgid "license." msgstr "" -#: lib/action.php:1099 +#: lib/action.php:1102 msgid "Pagination" msgstr "" -#: lib/action.php:1108 +#: lib/action.php:1111 msgid "After" msgstr "" -#: lib/action.php:1116 +#: lib/action.php:1119 #, fuzzy msgid "Before" msgstr "之å‰çš„內容»" -#: lib/action.php:1164 +#: lib/action.php:1167 msgid "There was a problem with your session token." msgstr "" @@ -4200,29 +4179,33 @@ msgstr "" msgid "You cannot make changes to this site." msgstr "" -#: lib/adminpanelaction.php:195 +#: lib/adminpanelaction.php:107 +msgid "Changes to that panel are not allowed." +msgstr "" + +#: lib/adminpanelaction.php:206 msgid "showForm() not implemented." msgstr "" -#: lib/adminpanelaction.php:224 +#: lib/adminpanelaction.php:235 msgid "saveSettings() not implemented." msgstr "" -#: lib/adminpanelaction.php:247 +#: lib/adminpanelaction.php:258 msgid "Unable to delete design setting." msgstr "" -#: lib/adminpanelaction.php:300 +#: lib/adminpanelaction.php:312 #, fuzzy msgid "Basic site configuration" msgstr "確èªä¿¡ç®±" -#: lib/adminpanelaction.php:303 +#: lib/adminpanelaction.php:317 #, fuzzy msgid "Design configuration" msgstr "確èªä¿¡ç®±" -#: lib/adminpanelaction.php:306 lib/adminpanelaction.php:309 +#: lib/adminpanelaction.php:322 lib/adminpanelaction.php:327 #, fuzzy msgid "Paths configuration" msgstr "確èªä¿¡ç®±" @@ -4247,11 +4230,19 @@ msgstr "" msgid "Tags for this attachment" msgstr "" +#: lib/authenticationplugin.php:182 lib/authenticationplugin.php:187 +msgid "Password changing failed" +msgstr "" + +#: lib/authenticationplugin.php:197 +msgid "Password changing is not allowed" +msgstr "" + #: lib/channel.php:138 lib/channel.php:158 msgid "Command results" msgstr "" -#: lib/channel.php:210 +#: lib/channel.php:210 lib/mailhandler.php:142 msgid "Command complete" msgstr "" @@ -4264,8 +4255,8 @@ msgid "Sorry, this command is not yet implemented." msgstr "" #: lib/command.php:88 -#, php-format -msgid "Could not find a user with nickname %s" +#, fuzzy, php-format +msgid "Could not find a user with nickname %s." msgstr "無法更新使用者" #: lib/command.php:92 @@ -4274,7 +4265,7 @@ msgstr "" #: lib/command.php:99 #, php-format -msgid "Nudge sent to %s" +msgid "Nudge sent to %s." msgstr "" #: lib/command.php:126 @@ -4286,34 +4277,34 @@ msgid "" msgstr "" #: lib/command.php:152 lib/command.php:399 lib/command.php:460 -msgid "Notice with that id does not exist" +msgid "Notice with that id does not exist." msgstr "" #: lib/command.php:168 lib/command.php:415 lib/command.php:476 #: lib/command.php:532 -msgid "User has no last notice" +msgid "User has no last notice." msgstr "" #: lib/command.php:190 msgid "Notice marked as fave." msgstr "" -#: lib/command.php:315 -#, php-format -msgid "%1$s (%2$s)" -msgstr "" +#: lib/command.php:284 +#, fuzzy, php-format +msgid "Could not remove user %1$s to group %2$s." +msgstr "無法從 %s 建立OpenID" #: lib/command.php:318 -#, php-format -msgid "Fullname: %s" -msgstr "" +#, fuzzy, php-format +msgid "Full name: %s" +msgstr "å…¨å" -#: lib/command.php:321 +#: lib/command.php:321 lib/mail.php:254 #, php-format msgid "Location: %s" msgstr "" -#: lib/command.php:324 +#: lib/command.php:324 lib/mail.php:256 #, php-format msgid "Homepage: %s" msgstr "" @@ -4325,24 +4316,16 @@ msgstr "" #: lib/command.php:358 scripts/xmppdaemon.php:301 #, php-format -msgid "Message too long - maximum is %d characters, you sent %d" +msgid "Message too long - maximum is %1$d characters, you sent %2$d." msgstr "" #: lib/command.php:378 msgid "Error sending direct message." msgstr "" -#: lib/command.php:422 -msgid "Cannot repeat your own notice" -msgstr "" - -#: lib/command.php:427 -msgid "Already repeated that notice" -msgstr "" - #: lib/command.php:435 #, fuzzy, php-format -msgid "Notice from %s repeated" +msgid "Notice from %s repeated." msgstr "更新個人圖åƒ" #: lib/command.php:437 @@ -4352,12 +4335,12 @@ msgstr "儲å˜ä½¿ç”¨è€…發生錯誤" #: lib/command.php:491 #, php-format -msgid "Notice too long - maximum is %d characters, you sent %d" +msgid "Notice too long - maximum is %1$d characters, you sent %2$d." msgstr "" #: lib/command.php:500 #, php-format -msgid "Reply to %s sent" +msgid "Reply to %s sent." msgstr "" #: lib/command.php:502 @@ -4365,7 +4348,7 @@ msgid "Error saving notice." msgstr "儲å˜ä½¿ç”¨è€…發生錯誤" #: lib/command.php:556 -msgid "Specify the name of the user to subscribe to" +msgid "Specify the name of the user to subscribe to." msgstr "" #: lib/command.php:563 @@ -4374,7 +4357,7 @@ msgid "Subscribed to %s" msgstr "" #: lib/command.php:584 -msgid "Specify the name of the user to unsubscribe from" +msgid "Specify the name of the user to unsubscribe from." msgstr "" #: lib/command.php:591 @@ -4403,17 +4386,17 @@ msgid "Can't turn on notification." msgstr "" #: lib/command.php:650 -msgid "Login command is disabled" +msgid "Login command is disabled." msgstr "" #: lib/command.php:664 #, fuzzy, php-format -msgid "Could not create login token for %s" +msgid "Could not create login token for %s." msgstr "無法å˜å–個人圖åƒè³‡æ–™" #: lib/command.php:669 #, php-format -msgid "This link is useable only once, and is good for only 2 minutes: %s" +msgid "This link is useable only once, and is good for only 2 minutes: %s." msgstr "" #: lib/command.php:685 @@ -4605,11 +4588,6 @@ msgstr "請在140個å—以內æè¿°ä½ è‡ªå·±èˆ‡ä½ çš„èˆˆè¶£" msgid "Describe the group or topic in %d characters" msgstr "請在140個å—以內æè¿°ä½ è‡ªå·±èˆ‡ä½ çš„èˆˆè¶£" -#: lib/groupeditform.php:172 -#, fuzzy -msgid "Description" -msgstr "所有訂閱" - #: lib/groupeditform.php:179 msgid "" "Location for the group, if any, like \"City, State (or Region), Country\"" @@ -4781,22 +4759,10 @@ msgstr "" "%4$s.\n" "敬上。\n" -#: lib/mail.php:254 -#, fuzzy, php-format -msgid "Location: %s\n" -msgstr "地點" - -#: lib/mail.php:256 -#, fuzzy, php-format -msgid "Homepage: %s\n" -msgstr "個人首é " - #: lib/mail.php:258 -#, php-format -msgid "" -"Bio: %s\n" -"\n" -msgstr "" +#, fuzzy, php-format +msgid "Bio: %s" +msgstr "自我介紹" #: lib/mail.php:286 #, php-format @@ -4930,6 +4896,27 @@ msgstr "" msgid "from" msgstr "" +#: lib/mailhandler.php:37 +msgid "Could not parse message." +msgstr "" + +#: lib/mailhandler.php:42 +msgid "Not a registered user." +msgstr "" + +#: lib/mailhandler.php:46 +msgid "Sorry, that is not your incoming email address." +msgstr "" + +#: lib/mailhandler.php:50 +msgid "Sorry, no incoming email allowed." +msgstr "" + +#: lib/mailhandler.php:228 +#, php-format +msgid "Unsupported message type: %s" +msgstr "" + #: lib/mediafile.php:98 lib/mediafile.php:123 msgid "There was a database error while saving your file. Please try again." msgstr "" @@ -4961,7 +4948,7 @@ msgid "File upload stopped by extension." msgstr "" #: lib/mediafile.php:179 lib/mediafile.php:216 -msgid "File exceeds user's quota!" +msgid "File exceeds user's quota." msgstr "" #: lib/mediafile.php:196 lib/mediafile.php:233 @@ -4970,7 +4957,7 @@ msgstr "" #: lib/mediafile.php:201 lib/mediafile.php:237 #, fuzzy -msgid "Could not determine file's mime-type!" +msgid "Could not determine file's MIME type." msgstr "無法更新使用者" #: lib/mediafile.php:270 @@ -4980,7 +4967,7 @@ msgstr "" #: lib/mediafile.php:275 #, php-format -msgid "%s is not a supported filetype on this server." +msgid "%s is not a supported file type on this server." msgstr "" #: lib/messageform.php:120 @@ -5015,7 +5002,17 @@ msgid "Attach a file" msgstr "" #: lib/noticeform.php:212 -msgid "Share your location" +#, fuzzy +msgid "Share my location." +msgstr "無法儲å˜å€‹äººè³‡æ–™" + +#: lib/noticeform.php:214 +#, fuzzy +msgid "Do not share my location." +msgstr "無法儲å˜å€‹äººè³‡æ–™" + +#: lib/noticeform.php:215 +msgid "Hide this info" msgstr "" #: lib/noticelist.php:428 @@ -5136,6 +5133,10 @@ msgstr "" msgid "Tags in %s's notices" msgstr "" +#: lib/plugin.php:114 +msgid "Unknown" +msgstr "" + #: lib/profileaction.php:109 lib/profileaction.php:192 lib/subgroupnav.php:82 msgid "Subscriptions" msgstr "" @@ -5314,10 +5315,6 @@ msgstr "" msgid "People Tagcloud as tagged" msgstr "" -#: lib/subscriptionlist.php:126 -msgid "(none)" -msgstr "" - #: lib/tagcloudsection.php:56 msgid "None" msgstr "" @@ -5435,19 +5432,3 @@ msgstr "個人首é ä½å€éŒ¯èª¤" #, php-format msgid "%s is not a valid color! Use 3 or 6 hex chars." msgstr "" - -#: scripts/maildaemon.php:48 -msgid "Could not parse message." -msgstr "" - -#: scripts/maildaemon.php:53 -msgid "Not a registered user." -msgstr "" - -#: scripts/maildaemon.php:57 -msgid "Sorry, that is not your incoming email address." -msgstr "" - -#: scripts/maildaemon.php:61 -msgid "Sorry, no incoming email allowed." -msgstr "" diff --git a/plugins/APCPlugin.php b/plugins/APCPlugin.php index 18409e29e..666f64b14 100644 --- a/plugins/APCPlugin.php +++ b/plugins/APCPlugin.php @@ -104,5 +104,16 @@ class APCPlugin extends Plugin Event::handle('EndCacheDelete', array($key)); return false; } + + function onPluginVersion(&$versions) + { + $versions[] = array('name' => 'APC', + 'version' => STATUSNET_VERSION, + 'author' => 'Evan Prodromou', + 'homepage' => 'http://status.net/wiki/Plugin:APC', + 'rawdescription' => + _m('Use the <a href="http://pecl.php.net/package/apc">APC</a> variable cache to cache query results.')); + return true; + } } diff --git a/plugins/Autocomplete/AutocompletePlugin.php b/plugins/Autocomplete/AutocompletePlugin.php index baaec73c1..d586631a4 100644 --- a/plugins/Autocomplete/AutocompletePlugin.php +++ b/plugins/Autocomplete/AutocompletePlugin.php @@ -61,5 +61,16 @@ class AutocompletePlugin extends Plugin } } + function onPluginVersion(&$versions) + { + $versions[] = array('name' => 'Autocomplete', + 'version' => STATUSNET_VERSION, + 'author' => 'Craig Andrews', + 'homepage' => 'http://status.net/wiki/Plugin:Autocomplete', + 'rawdescription' => + _m('The autocomplete plugin allows users to autocomplete screen names in @ replies. When an "@" is typed into the notice text area, an autocomplete box is displayed populated with the user\'s friend\' screen names.')); + return true; + } + } ?> diff --git a/plugins/Autocomplete/readme.txt b/plugins/Autocomplete/README index 1db4c6565..1db4c6565 100644 --- a/plugins/Autocomplete/readme.txt +++ b/plugins/Autocomplete/README diff --git a/plugins/BitlyUrl/BitlyUrlPlugin.php b/plugins/BitlyUrl/BitlyUrlPlugin.php index 65d0f70e6..f7f28b4d6 100644 --- a/plugins/BitlyUrl/BitlyUrlPlugin.php +++ b/plugins/BitlyUrl/BitlyUrlPlugin.php @@ -49,6 +49,18 @@ class BitlyUrlPlugin extends UrlShortenerPlugin if(!$response) return; return current(json_decode($response)->results)->hashUrl; } -} + function onPluginVersion(&$versions) + { + $versions[] = array('name' => sprintf('BitlyUrl (%s)', $this->shortenerName), + 'version' => STATUSNET_VERSION, + 'author' => 'Craig Andrews', + 'homepage' => 'http://status.net/wiki/Plugin:BitlyUrl', + 'rawdescription' => + sprintf(_m('Uses <a href="http://%1$s/">%1$s</a> URL-shortener service.'), + $this->shortenerName)); + + return true; + } +} diff --git a/plugins/Blacklist/BlacklistPlugin.php b/plugins/Blacklist/BlacklistPlugin.php index 655b0926b..84a2cb616 100644 --- a/plugins/Blacklist/BlacklistPlugin.php +++ b/plugins/Blacklist/BlacklistPlugin.php @@ -43,6 +43,8 @@ if (!defined('STATUSNET')) { class BlacklistPlugin extends Plugin { + const VERSION = STATUSNET_VERSION; + public $nicknames = array(); public $urls = array(); @@ -200,4 +202,15 @@ class BlacklistPlugin extends Plugin return true; } + + function onPluginVersion(&$versions) + { + $versions[] = array('name' => 'Blacklist', + 'version' => self::VERSION, + 'author' => 'Evan Prodromou', + 'homepage' => 'http://status.net/wiki/Plugin:Blacklist', + 'description' => + _m('Keep a blacklist of forbidden nickname and URL patterns.')); + return true; + } } diff --git a/plugins/CacheLogPlugin.php b/plugins/CacheLogPlugin.php index f1e5dd83a..4c47de80e 100644 --- a/plugins/CacheLogPlugin.php +++ b/plugins/CacheLogPlugin.php @@ -106,5 +106,16 @@ class CacheLogPlugin extends Plugin $this->log(LOG_INFO, "Done deleting cache value for key '$key'"); return true; } + + function onPluginVersion(&$versions) + { + $versions[] = array('name' => 'CacheLog', + 'version' => STATUSNET_VERSION, + 'author' => 'Evan Prodromou', + 'homepage' => 'http://status.net/wiki/Plugin:CacheLog', + 'description' => + _m('Log reads and writes to the cache')); + return true; + } } diff --git a/plugins/CasAuthentication/CasAuthenticationPlugin.php b/plugins/CasAuthentication/CasAuthenticationPlugin.php index 8f29c7d2a..483b060ab 100644 --- a/plugins/CasAuthentication/CasAuthenticationPlugin.php +++ b/plugins/CasAuthentication/CasAuthenticationPlugin.php @@ -34,7 +34,6 @@ if (!defined('STATUSNET') && !defined('LACONICA')) { // We bundle the phpCAS library... set_include_path(get_include_path() . PATH_SEPARATOR . dirname(__FILE__) . '/extlib/CAS'); -require_once INSTALLDIR.'/plugins/Authentication/AuthenticationPlugin.php'; class CasAuthenticationPlugin extends AuthenticationPlugin { public $server; @@ -58,8 +57,6 @@ class CasAuthenticationPlugin extends AuthenticationPlugin case 'CasloginAction': require_once(INSTALLDIR.'/plugins/CasAuthentication/' . strtolower(mb_substr($cls, 0, -6)) . '.php'); return false; - default: - return parent::onAutoload($cls); } } @@ -141,4 +138,15 @@ class CasAuthenticationPlugin extends AuthenticationPlugin $casSettings['port']=$this->port; $casSettings['path']=$this->path; } + + function onPluginVersion(&$versions) + { + $versions[] = array('name' => 'CAS Authentication', + 'version' => STATUSNET_VERSION, + 'author' => 'Craig Andrews', + 'homepage' => 'http://status.net/wiki/Plugin:CasAuthentication', + 'rawdescription' => + _m('The CAS Authentication plugin allows for StatusNet to handle authentication through CAS (Central Authentication Service).')); + return true; + } } diff --git a/plugins/EmailAuthentication/EmailAuthenticationPlugin.php b/plugins/EmailAuthentication/EmailAuthenticationPlugin.php index 25e537735..406c00073 100644 --- a/plugins/EmailAuthentication/EmailAuthenticationPlugin.php +++ b/plugins/EmailAuthentication/EmailAuthenticationPlugin.php @@ -50,5 +50,16 @@ class EmailAuthenticationPlugin extends Plugin } } } + + function onPluginVersion(&$versions) + { + $versions[] = array('name' => 'Email Authentication', + 'version' => STATUSNET_VERSION, + 'author' => 'Craig Andrews', + 'homepage' => 'http://status.net/wiki/Plugin:EmailAuthentication', + 'rawdescription' => + _m('The Email Authentication plugin allows users to login using their email address.')); + return true; + } } diff --git a/plugins/Facebook/FacebookPlugin.php b/plugins/Facebook/FacebookPlugin.php index 39b2ef287..de91bf24a 100644 --- a/plugins/Facebook/FacebookPlugin.php +++ b/plugins/Facebook/FacebookPlugin.php @@ -32,6 +32,7 @@ if (!defined('STATUSNET')) { } define("FACEBOOK_CONNECT_SERVICE", 3); +define('FACEBOOKPLUGIN_VERSION', '0.9'); require_once INSTALLDIR . '/plugins/Facebook/facebookutil.php'; @@ -554,4 +555,18 @@ class FacebookPlugin extends Plugin return true; } + function onPluginVersion(&$versions) + { + $versions[] = array('name' => 'Facebook', + 'version' => FACEBOOKPLUGIN_VERSION, + 'author' => 'Zach Copley', + 'homepage' => 'http://status.net/wiki/Plugin:Facebook', + 'rawdescription' => + _m('The Facebook plugin allows you to integrate ' . + 'your StatusNet instance with ' . + '<a href="http://facebook.com/">Facebook</a> ' . + 'and Facebook Connect.')); + return true; + } + } diff --git a/plugins/FirePHP/FirePHPPlugin.php b/plugins/FirePHP/FirePHPPlugin.php index 37b397796..452f79024 100644 --- a/plugins/FirePHP/FirePHPPlugin.php +++ b/plugins/FirePHP/FirePHPPlugin.php @@ -55,5 +55,16 @@ class FirePHPPlugin extends Plugin $priority = $firephp_priorities[$priority]; $this->firephp->fb($msg, $priority); } + + function onPluginVersion(&$versions) + { + $versions[] = array('name' => 'FirePHP', + 'version' => STATUSNET_VERSION, + 'author' => 'Craig Andrews', + 'homepage' => 'http://status.net/wiki/Plugin:FirePHP', + 'rawdescription' => + _m('The FirePHP plugin writes StatusNet\'s log output to FirePHP.')); + return true; + } } diff --git a/plugins/FirePHP/README b/plugins/FirePHP/README index ee22794d5..22ed1e9be 100644 --- a/plugins/FirePHP/README +++ b/plugins/FirePHP/README @@ -1,4 +1,4 @@ -The FirePHP writes StatusNet's log output to FirePHP. +The FirePHP plugin writes StatusNet's log output to FirePHP. Using FirePHP on production sites can expose sensitive information. You must protect the security of your application by disabling FirePHP diff --git a/plugins/GeoURLPlugin.php b/plugins/GeoURLPlugin.php index 30ff2c278..01178f39c 100644 --- a/plugins/GeoURLPlugin.php +++ b/plugins/GeoURLPlugin.php @@ -116,4 +116,16 @@ class GeoURLPlugin extends Plugin return true; } + + function onPluginVersion(&$versions) + { + $versions[] = array('name' => 'GeoURL', + 'version' => STATUSNET_VERSION, + 'author' => 'Evan Prodromou', + 'homepage' => 'http://status.net/wiki/Plugin:GeoURL', + 'rawdescription' => + _m('Ping <a href="http://geourl.org/">GeoURL</a> when '. + 'new geolocation-enhanced notices are posted.')); + return true; + } } diff --git a/plugins/GeonamesPlugin.php b/plugins/GeonamesPlugin.php index 805166eaa..52cc9c97f 100644 --- a/plugins/GeonamesPlugin.php +++ b/plugins/GeonamesPlugin.php @@ -426,4 +426,16 @@ class GeonamesPlugin extends Plugin return $document->geoname; } + + function onPluginVersion(&$versions) + { + $versions[] = array('name' => 'Geonames', + 'version' => STATUSNET_VERSION, + 'author' => 'Evan Prodromou', + 'homepage' => 'http://status.net/wiki/Plugin:Geonames', + 'rawdescription' => + _m('Uses <a href="http://geonames.org/">Geonames</a> service to get human-readable '. + 'names for locations based on user-provided lat/long pairs.')); + return true; + } } diff --git a/plugins/GoogleAnalyticsPlugin.php b/plugins/GoogleAnalyticsPlugin.php index 6891ee6a7..c646bf113 100644 --- a/plugins/GoogleAnalyticsPlugin.php +++ b/plugins/GoogleAnalyticsPlugin.php @@ -70,4 +70,16 @@ class GoogleAnalyticsPlugin extends Plugin $action->inlineScript($js1); $action->inlineScript($js2); } + + function onPluginVersion(&$versions) + { + $versions[] = array('name' => 'GoogleAnalytics', + 'version' => STATUSNET_VERSION, + 'author' => 'Evan Prodromou', + 'homepage' => 'http://status.net/wiki/Plugin:GoogleAnalytics', + 'rawdescription' => + _m('Use <a href="http://www.google.com/analytics/">Google Analytics</a>'. + ' to track Web access.')); + return true; + } } diff --git a/plugins/Gravatar/GravatarPlugin.php b/plugins/Gravatar/GravatarPlugin.php index 3c61a682e..580852072 100644 --- a/plugins/Gravatar/GravatarPlugin.php +++ b/plugins/Gravatar/GravatarPlugin.php @@ -185,4 +185,16 @@ class GravatarPlugin extends Plugin "&size=".$size; return $url; } + + function onPluginVersion(&$versions) + { + $versions[] = array('name' => 'Gravatar', + 'version' => STATUSNET_VERSION, + 'author' => 'Eric Helgeson', + 'homepage' => 'http://status.net/wiki/Plugin:Gravatar', + 'rawdescription' => + _m('The Gravatar plugin allows users to use their <a href="http://www.gravatar.com/">Gravatar</a> with StatusNet.')); + + return true; + } } diff --git a/plugins/Imap/ImapPlugin.php b/plugins/Imap/ImapPlugin.php new file mode 100644 index 000000000..d9768b680 --- /dev/null +++ b/plugins/Imap/ImapPlugin.php @@ -0,0 +1,96 @@ +<?php +/** + * StatusNet, the distributed open-source microblogging tool + * + * Plugin to add a StatusNet Facebook application + * + * PHP version 5 + * + * LICENCE: This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * + * @category Plugin + * @package StatusNet + * @author Zach Copley <zach@status.net> + * @copyright 2009 StatusNet, Inc. + * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 + * @link http://status.net/ + */ + +if (!defined('STATUSNET')) { + exit(1); +} + +/** + * IMAP plugin to allow StatusNet to grab incoming emails and handle them as new user posts + * + * @category Plugin + * @package StatusNet + * @author Craig Andrews <candrews@integralblue.com + * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 + * @link http://status.net/ + */ +class ImapPlugin extends Plugin +{ + public $mailbox; + public $user; + public $password; + public $poll_frequency = 60; + public static $instances = array(); + public static $daemon_added = array(); + + function initialize(){ + if(!isset($this->mailbox)){ + throw new Exception("must specify a mailbox"); + } + if(!isset($this->user)){ + throw new Exception("must specify a user"); + } + if(!isset($this->password)){ + throw new Exception("must specify a password"); + } + if(!isset($this->poll_frequency)){ + throw new Exception("must specify a poll_frequency"); + } + + self::$instances[] = $this; + return true; + } + + function cleanup(){ + $index = array_search($this, self::$instances); + unset(self::$instances[$index]); + return true; + } + + function onGetValidDaemons($daemons) + { + if(! self::$daemon_added){ + array_push($daemons, INSTALLDIR . + '/plugins/Imap/imapdaemon.php'); + self::$daemon_added = true; + } + return true; + } + + function onPluginVersion(&$versions) + { + $versions[] = array('name' => 'IMAP', + 'version' => STATUSNET_VERSION, + 'author' => 'Craig Andrews', + 'homepage' => 'http://status.net/wiki/Plugin:IMAP', + 'rawdescription' => + _m('The IMAP plugin allows for StatusNet to check a POP or IMAP mailbox for incoming mail containing user posts.')); + return true; + } +} diff --git a/plugins/Imap/README b/plugins/Imap/README new file mode 100644 index 000000000..640a411a8 --- /dev/null +++ b/plugins/Imap/README @@ -0,0 +1,32 @@ +The IMAP plugin allows for StatusNet to check a POP or IMAP mailbox for +incoming mail containing user posts. + +Installation +============ +addPlugin('imap', array( + 'mailbox' => '...', + 'user' => '...', + 'password' => '...' +)); +to the bottom of your config.php + +Also, make sure: +$config['mail']['domain'] = 'yourdomain.example.net'; +is set in your config.php + +Create a catch-all account for your domain, and use this account with this +plugin. Whenever a user sends a message to their personal notice posting +address, the message should end up in this mailbox, and then the plugin daemon +will pick it up and post the notice on the user's behalf. + +The daemon included with this plugin must be running. It will be started by +the plugin along with their other daemons when you run scripts/startdaemons.sh. +See the StatusNet README for more about queuing and daemons. + +Settings +======== +mailbox*: the mailbox specifier. + See http://www.php.net/manual/en/function.imap-open.php for details +user*: username to use when authenticating to the mailbox +password*: password to use when authenticating to the mailbox +poll_frequency: how often (in seconds) to check for new messages diff --git a/plugins/Imap/imapdaemon.php b/plugins/Imap/imapdaemon.php new file mode 100755 index 000000000..7e60e1376 --- /dev/null +++ b/plugins/Imap/imapdaemon.php @@ -0,0 +1,147 @@ +#!/usr/bin/env php +<?php +/* + * StatusNet - the distributed open-source microblogging tool + * Copyright (C) 2008, 2009, StatusNet, Inc. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + */ + +define('INSTALLDIR', realpath(dirname(__FILE__) . '/../..')); + +$shortoptions = 'fi::'; +$longoptions = array('id::', 'foreground'); + +$helptext = <<<END_OF_IMAP_HELP +Daemon script for receiving new notices from users via a mail box (IMAP, POP3, etc) + + -i --id Identity (default none) + -f --foreground Stay in the foreground (default background) + +END_OF_IMAP_HELP; + +require_once INSTALLDIR.'/scripts/commandline.inc'; + +require_once INSTALLDIR . '/lib/common.php'; +require_once INSTALLDIR . '/lib/daemon.php'; +require_once INSTALLDIR.'/lib/mailhandler.php'; + +class IMAPDaemon extends Daemon +{ + function __construct($resource=null, $daemonize=true, $attrs) + { + parent::__construct($daemonize); + + foreach ($attrs as $attr=>$value) + { + $this->$attr = $value; + } + + $this->log(LOG_INFO, "INITIALIZE IMAPDaemon {" . $this->name() . "}"); + } + + function name() + { + return strtolower('imapdaemon.'.$this->user.'.'.crc32($this->mailbox)); + } + + function run() + { + $this->connect(); + while(true) + { + if(imap_ping($this->conn) || $this->connect()) + { + $this->check_mailbox(); + } + sleep($this->poll_frequency); + } + } + + function check_mailbox() + { + $count = imap_num_msg($this->conn); + $this->log(LOG_INFO, "Found $count messages"); + if($count > 0){ + $handler = new IMAPMailHandler(); + for($i=1; $i <= $count; $i++) + { + $rawmessage = imap_fetchheader($this->conn, $count, FT_PREFETCHTEXT) . imap_body($this->conn, $i); + $handler->handle_message($rawmessage); + imap_delete($this->conn, $i); + } + imap_expunge($this->conn); + $this->log(LOG_INFO, "Finished processing messages"); + } + } + + function log($level, $msg) + { + $text = $this->name() . ': '.$msg; + common_log($level, $text); + if (!$this->daemonize) + { + $line = common_log_line($level, $text); + echo $line; + echo "\n"; + } + } + + function connect() + { + $this->conn = imap_open($this->mailbox, $this->user, $this->password); + if($this->conn){ + $this->log(LOG_INFO, "Connected"); + return true; + }else{ + $this->log(LOG_INFO, "Failed to connect: " . imap_last_error()); + return false; + } + } +} + +class IMAPMailHandler extends MailHandler +{ + function error($from, $msg) + { + $this->log(LOG_INFO, "Error: $from $msg"); + $headers['To'] = $from; + $headers['Subject'] = _m('Error'); + + return mail_send(array($from), $headers, $msg); + } +} + +if (have_option('i', 'id')) { + $id = get_option_value('i', 'id'); +} else if (count($args) > 0) { + $id = $args[0]; +} else { + $id = null; +} + +$foreground = have_option('f', 'foreground'); + +foreach(ImapPlugin::$instances as $pluginInstance){ + + $daemon = new IMAPDaemon($id, !$foreground, array( + 'mailbox' => $pluginInstance->mailbox, + 'user' => $pluginInstance->user, + 'password' => $pluginInstance->password, + 'poll_frequency' => $pluginInstance->poll_frequency + )); + + $daemon->runOnce(); + +} diff --git a/plugins/InfiniteScroll/InfiniteScrollPlugin.php b/plugins/InfiniteScroll/InfiniteScrollPlugin.php index 5928c007f..a4d1a5d05 100644 --- a/plugins/InfiniteScroll/InfiniteScrollPlugin.php +++ b/plugins/InfiniteScroll/InfiniteScrollPlugin.php @@ -43,4 +43,15 @@ class InfiniteScrollPlugin extends Plugin $action->script('plugins/InfiniteScroll/jquery.infinitescroll.js'); $action->script('plugins/InfiniteScroll/infinitescroll.js'); } + + function onPluginVersion(&$versions) + { + $versions[] = array('name' => 'InfiniteScroll', + 'version' => STATUSNET_VERSION, + 'author' => 'Craig Andrews', + 'homepage' => 'http://status.net/wiki/Plugin:InfiniteScroll', + 'rawdescription' => + _m('Infinite Scroll adds the following functionality to your StatusNet installation: When a user scrolls towards the bottom of the page, the next page of notices is automatically retrieved and appended. This means they never need to click "Next Page", which dramatically increases stickiness.')); + return true; + } } diff --git a/plugins/InfiniteScroll/readme.txt b/plugins/InfiniteScroll/README index 2428cc69a..2428cc69a 100644 --- a/plugins/InfiniteScroll/readme.txt +++ b/plugins/InfiniteScroll/README diff --git a/plugins/LdapAuthentication/LdapAuthenticationPlugin.php b/plugins/LdapAuthentication/LdapAuthenticationPlugin.php index 39967fe42..eb3a05117 100644 --- a/plugins/LdapAuthentication/LdapAuthenticationPlugin.php +++ b/plugins/LdapAuthentication/LdapAuthenticationPlugin.php @@ -31,7 +31,6 @@ if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); } -require_once INSTALLDIR.'/plugins/Authentication/AuthenticationPlugin.php'; require_once 'Net/LDAP2.php'; class LdapAuthenticationPlugin extends AuthenticationPlugin @@ -75,8 +74,6 @@ class LdapAuthenticationPlugin extends AuthenticationPlugin case 'MemcacheSchemaCache': require_once(INSTALLDIR.'/plugins/LdapAuthentication/MemcacheSchemaCache.php'); return false; - default: - return parent::onAutoload($cls); } } @@ -349,4 +346,15 @@ class LdapAuthenticationPlugin extends AuthenticationPlugin return $str; } + + function onPluginVersion(&$versions) + { + $versions[] = array('name' => 'LDAP Authentication', + 'version' => STATUSNET_VERSION, + 'author' => 'Craig Andrews', + 'homepage' => 'http://status.net/wiki/Plugin:LdapAuthentication', + 'rawdescription' => + _m('The LDAP Authentication plugin allows for StatusNet to handle authentication through LDAP.')); + return true; + } } diff --git a/plugins/LdapAuthorization/LdapAuthorizationPlugin.php b/plugins/LdapAuthorization/LdapAuthorizationPlugin.php index 5e759c379..7f48ce5e1 100644 --- a/plugins/LdapAuthorization/LdapAuthorizationPlugin.php +++ b/plugins/LdapAuthorization/LdapAuthorizationPlugin.php @@ -31,7 +31,6 @@ if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); } -require_once INSTALLDIR.'/plugins/Authorization/AuthorizationPlugin.php'; require_once 'Net/LDAP2.php'; class LdapAuthorizationPlugin extends AuthorizationPlugin @@ -53,7 +52,6 @@ class LdapAuthorizationPlugin extends AuthorizationPlugin public $attributes = array(); function onInitializePlugin(){ - parent::onInitializePlugin(); if(!isset($this->host)){ throw new Exception("must specify a host"); } @@ -208,4 +206,15 @@ class LdapAuthorizationPlugin extends AuthorizationPlugin return false; } } + + function onPluginVersion(&$versions) + { + $versions[] = array('name' => 'LDAP Authorization', + 'version' => STATUSNET_VERSION, + 'author' => 'Craig Andrews', + 'homepage' => 'http://status.net/wiki/Plugin:LdapAuthorization', + 'rawdescription' => + _m('The LDAP Authorization plugin allows for StatusNet to handle authorization through LDAP.')); + return true; + } } diff --git a/plugins/LilUrl/LilUrlPlugin.php b/plugins/LilUrl/LilUrlPlugin.php index 4a6f1cdc7..c3e37c0c0 100644 --- a/plugins/LilUrl/LilUrlPlugin.php +++ b/plugins/LilUrl/LilUrlPlugin.php @@ -46,9 +46,9 @@ class LilUrlPlugin extends UrlShortenerPlugin protected function shorten($url) { $data = array('longurl' => $url); - + $responseBody = $this->http_post($this->serviceUrl,$data); - + if (!$responseBody) return; $y = @simplexml_load_string($responseBody); if (!isset($y->body)) return; @@ -57,5 +57,18 @@ class LilUrlPlugin extends UrlShortenerPlugin return strval($x['href']); } } + + function onPluginVersion(&$versions) + { + $versions[] = array('name' => sprintf('LilUrl (%s)', $this->shortenerName), + 'version' => STATUSNET_VERSION, + 'author' => 'Craig Andrews', + 'homepage' => 'http://status.net/wiki/Plugin:LilUrl', + 'rawdescription' => + sprintf(_m('Uses <a href="http://%1$s/">%1$s</a> URL-shortener service.'), + $this->shortenerName)); + + return true; + } } diff --git a/plugins/LinkbackPlugin.php b/plugins/LinkbackPlugin.php index f220fff8f..15e57ab0e 100644 --- a/plugins/LinkbackPlugin.php +++ b/plugins/LinkbackPlugin.php @@ -231,4 +231,18 @@ class LinkbackPlugin extends Plugin return 'LinkbackPlugin/'.LINKBACKPLUGIN_VERSION . ' StatusNet/' . STATUSNET_VERSION; } + + function onPluginVersion(&$versions) + { + $versions[] = array('name' => 'Linkback', + 'version' => LINKBACKPLUGIN_VERSION, + 'author' => 'Evan Prodromou', + 'homepage' => 'http://status.net/wiki/Plugin:Linkback', + 'rawdescription' => + _m('Notify blog authors when their posts have been linked in '. + 'microblog notices using '. + '<a href="http://www.hixie.ch/specs/pingback/pingback">Pingback</a> '. + 'or <a href="http://www.movabletype.org/docs/mttrackback.html">Trackback</a> protocols.')); + return true; + } } diff --git a/plugins/Mapstraction/MapstractionPlugin.php b/plugins/Mapstraction/MapstractionPlugin.php index 93679e56c..868933fd4 100644 --- a/plugins/Mapstraction/MapstractionPlugin.php +++ b/plugins/Mapstraction/MapstractionPlugin.php @@ -47,6 +47,8 @@ if (!defined('STATUSNET')) { class MapstractionPlugin extends Plugin { + const VERSION = STATUSNET_VERSION; + /** provider name, one of: 'cloudmade', 'google', 'microsoft', 'openlayers', 'yahoo' */ public $provider = 'openlayers'; @@ -192,4 +194,17 @@ class MapstractionPlugin extends Plugin $action->elementEnd('div'); } + + function onPluginVersion(&$versions) + { + $versions[] = array('name' => 'Mapstraction', + 'version' => self::VERSION, + 'author' => 'Evan Prodromou', + 'homepage' => 'http://status.net/wiki/Plugin:Mapstraction', + 'rawdescription' => + _m('Show maps of users\' and friends\' notices '. + 'with <a href="http://www.mapstraction.com/">Mapstraction</a> '. + 'JavaScript library.')); + return true; + } } diff --git a/plugins/MemcachePlugin.php b/plugins/MemcachePlugin.php index 998766313..5f93e9a83 100644 --- a/plugins/MemcachePlugin.php +++ b/plugins/MemcachePlugin.php @@ -57,6 +57,8 @@ class MemcachePlugin extends Plugin public $compressThreshold = 20480; public $compressMinSaving = 0.2; + public $persistent = null; + /** * Initialize the plugin * @@ -67,6 +69,9 @@ class MemcachePlugin extends Plugin function onInitializePlugin() { + if (is_null($this->persistent)) { + $this->persistent = (php_sapi_name() == 'cli') ? false : true; + } $this->_ensureConn(); return true; } @@ -149,15 +154,15 @@ class MemcachePlugin extends Plugin $port = 11211; } - $this->_conn->addServer($host, $port); + $this->_conn->addServer($host, $port, $this->persistent); } } else { - $this->_conn->addServer($this->servers); + $this->_conn->addServer($this->servers, $this->persistent); list($host, $port) = explode(';', $this->servers); if (empty($port)) { $port = 11211; } - $this->_conn->addServer($host, $port); + $this->_conn->addServer($host, $port, $this->persistent); } // Compress items stored in the cache if they're over threshold in size @@ -171,5 +176,16 @@ class MemcachePlugin extends Plugin $this->compressMinSaving); } } + + function onPluginVersion(&$versions) + { + $versions[] = array('name' => 'Memcache', + 'version' => STATUSNET_VERSION, + 'author' => 'Evan Prodromou, Craig Andrews', + 'homepage' => 'http://status.net/wiki/Plugin:Memcache', + 'rawdescription' => + _m('Use <a href="http://memcached.org/">Memcached</a> to cache query results.')); + return true; + } } diff --git a/plugins/Minify/MinifyPlugin.php b/plugins/Minify/MinifyPlugin.php index 71fade19a..b49b6a4ba 100644 --- a/plugins/Minify/MinifyPlugin.php +++ b/plugins/Minify/MinifyPlugin.php @@ -84,7 +84,7 @@ class MinifyPlugin extends Plugin function onStartScriptElement($action,&$src,&$type) { $url = parse_url($src); - if( empty($url->scheme) && empty($url->host) && empty($url->query) && empty($url->fragment)) + if( empty($url['scheme']) && empty($url['host']) && empty($url['query']) && empty($url['fragment'])) { $src = $this->minifyUrl($src); } @@ -164,5 +164,16 @@ class MinifyPlugin extends Plugin require_once('Minify/CSS.php'); return Minify_CSS::minify($code,$options); } + + function onPluginVersion(&$versions) + { + $versions[] = array('name' => 'Minify', + 'version' => STATUSNET_VERSION, + 'author' => 'Craig Andrews', + 'homepage' => 'http://status.net/wiki/Plugin:Minify', + 'rawdescription' => + _m('The Minify plugin minifies your CSS and Javascript, removing whitespace and comments.')); + return true; + } } diff --git a/plugins/Mollom/MollomPlugin.php b/plugins/Mollom/MollomPlugin.php new file mode 100644 index 000000000..4c82c481a --- /dev/null +++ b/plugins/Mollom/MollomPlugin.php @@ -0,0 +1,893 @@ +<?php +/** + * Laconica, the distributed open-source microblogging tool + * + * Plugin to check submitted notices with Mollom + * + * PHP version 5 + * + * LICENCE: This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * + * Mollom is a bayesian spam checker, wrapped into a webservice + * This plugin is based on the Drupal Mollom module + * + * @category Plugin + * @package Laconica + * @author Brenda Wallace <brenda@cpan.org> + * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 + * + */ + +if (!defined('STATUSNET')) { + exit(1); +} + +define('MOLLOMPLUGIN_VERSION', '0.1'); +define('MOLLOM_API_VERSION', '1.0'); + +define('MOLLOM_ANALYSIS_UNKNOWN' , 0); +define('MOLLOM_ANALYSIS_HAM' , 1); +define('MOLLOM_ANALYSIS_SPAM' , 2); +define('MOLLOM_ANALYSIS_UNSURE' , 3); + +define('MOLLOM_MODE_DISABLED', 0); +define('MOLLOM_MODE_CAPTCHA' , 1); +define('MOLLOM_MODE_ANALYSIS', 2); + +define('MOLLOM_FALLBACK_BLOCK' , 0); +define('MOLLOM_FALLBACK_ACCEPT', 1); + +define('MOLLOM_ERROR' , 1000); +define('MOLLOM_REFRESH' , 1100); +define('MOLLOM_REDIRECT', 1200); + +/** + * Plugin to check submitted notices with Mollom + * + * Mollom is a bayesian spam filter provided by webservice. + * + * @category Plugin + * @package Laconica + * @author Brenda Wallace <shiny@cpan.org> + * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 + * + * @see Event + */ + + + +class MollomPlugin extends Plugin +{ + public $public_key; + public $private_key; + public $servers; + + function onStartNoticeSave($notice) + { + if ( $this->public_key ) { + //Check spam + $data = array( + 'post_body' => $notice->content, + 'author_name' => $profile->nickname, + 'author_url' => $profile->homepage, + 'author_id' => $profile->id, + 'author_ip' => $this->getClientIp(), + ); + $response = $this->mollom('mollom.checkContent', $data); + if ($response['spam'] == MOLLOM_ANALYSIS_SPAM) { + throw new ClientException(_("Spam Detected"), 400); + } + if ($response['spam'] == MOLLOM_ANALYSIS_UNSURE) { + //if unsure, let through + } + if($response['spam'] == MOLLOM_ANALYSIS_HAM) { + // all good! :-) + } + } + + return true; + } + + function getClientIP() { + if (isset($_SERVER) && array_key_exists('REQUEST_METHOD', $_SERVER)) { + // Note: order matters here; use proxy-forwarded stuff first + foreach (array('HTTP_X_FORWARDED_FOR', 'CLIENT-IP', 'REMOTE_ADDR') as $k) { + if (isset($_SERVER[$k])) { + return $_SERVER[$k]; + } + } + } + return '127.0.0.1'; + } + /** + * Call a remote procedure at the Mollom server. This function will + * automatically add the information required to authenticate against + * Mollom. + */ + function mollom($method, $data = array()) { + if (!extension_loaded('xmlrpc')) { + if (!dl('xmlrpc.so')) { + common_log(LOG_ERR, "Can't pingback; xmlrpc extension not available."); + } + } + + // Construct the server URL: + $public_key = $this->public_key; + // Retrieve the list of Mollom servers from the database: + $servers = $this->servers; + + if ($servers == NULL) { + // Retrieve a list of valid Mollom servers from mollom.com: + $servers = $this->xmlrpc('http://xmlrpc.mollom.com/'. MOLLOM_API_VERSION, 'mollom.getServerList', $this->authentication()); + + // Store the list of servers in the database: + // TODO! variable_set('mollom_servers', $servers); + } + + if (is_array($servers)) { + // Send the request to the first server, if that fails, try the other servers in the list: + foreach ($servers as $server) { + $auth = $this->authentication(); + $data = array_merge($data, $auth); + $result = $this->xmlrpc($server .'/'. MOLLOM_API_VERSION, $method, $data); + + // Debug output: + if (isset($data['session_id'])) { + common_debug("called $method at server $server with session ID '". $data['session_id'] ."'"); + } + else { + common_debug("called $method at server $server with no session ID"); + } + + if ($errno = $this->xmlrpc_errno()) { + common_log(LOG_ERR, sprintf('Error @errno: %s - %s - %s - <pre>%s</pre>', $this->xmlrpc_errno(), $server, $this->xmlrpc_error_msg(), $method, print_r($data, TRUE))); + + if ($errno == MOLLOM_REFRESH) { + // Retrieve a list of valid Mollom servers from mollom.com: + $servers = $this->xmlrpc('http://xmlrpc.mollom.com/'. MOLLOM_API_VERSION, 'mollom.getServerList', $this->authentication()); + + // Store the updated list of servers in the database: + //tODO variable_set('mollom_servers', $servers); + } + else if ($errno == MOLLOM_ERROR) { + return $result; + } + else if ($errno == MOLLOM_REDIRECT) { + // Do nothing, we select the next client automatically. + } + + // Reset the XMLRPC error: + $this->xmlrpc_error(0); // FIXME: this is crazy. + } + else { + common_debug("Result = " . print_r($result, TRUE)); + return $result; + } + } + } + + // If none of the servers worked, activate the fallback mechanism: + common_debug("none of the servers worked"); + // _mollom_fallback(); + + // If everything failed, we reset the server list to force Mollom to request a new list: + //TODO variable_set('mollom_servers', array()); + } + + /** + * This function generate an array with all the information required to + * authenticate against Mollom. To prevent that requests are forged and + * that you are impersonated, each request is signed with a hash computed + * based on a private key and a timestamp. + * + * Both the client and the server share the secret key that is used to + * create the authentication hash based on a timestamp. They both hash + * the timestamp with the secret key, and if the hashes match, the + * authenticity of the message has been validated. + * + * To avoid that someone can intercept a (hash, timestamp)-pair and + * use that to impersonate a client, Mollom will reject the request + * when the timestamp is more than 15 minutes off. + * + * Make sure your server's time is synchronized with the world clocks, + * and that you don't share your private key with anyone else. + */ + private function authentication() { + + $public_key = $this->public_key; + $private_key = $this->private_key; + + // Generate a timestamp according to the dateTime format (http://www.w3.org/TR/xmlschema-2/#dateTime): + $time = gmdate("Y-m-d\TH:i:s.\\0\\0\\0O", time()); + + // Calculate a HMAC-SHA1 according to RFC2104 (http://www.ietf.org/rfc/rfc2104.txt): + $hash = base64_encode( + pack("H*", sha1((str_pad($private_key, 64, chr(0x00)) ^ (str_repeat(chr(0x5c), 64))) . + pack("H*", sha1((str_pad($private_key, 64, chr(0x00)) ^ (str_repeat(chr(0x36), 64))) . + $time)))) + ); + + // Store everything in an array. Elsewhere in the code, we'll add the + // acutal data before we pass it onto the XML-RPC library: + $data['public_key'] = $public_key; + $data['time'] = $time; + $data['hash'] = $hash; + + return $data; + } + + + function xmlrpc($url) { + //require_once './includes/xmlrpc.inc'; + $args = func_get_args(); + return call_user_func_array(array('MollomPlugin', '_xmlrpc'), $args); + } + + /** + * Recursively turn a data structure into objects with 'data' and 'type' attributes. + * + * @param $data + * The data structure. + * @param $type + * Optional type assign to $data. + * @return + * Object. + */ + function xmlrpc_value($data, $type = FALSE) { + $xmlrpc_value = new stdClass(); + $xmlrpc_value->data = $data; + if (!$type) { + $type = $this->xmlrpc_value_calculate_type($xmlrpc_value); + } + $xmlrpc_value->type = $type; + if ($type == 'struct') { + // Turn all the values in the array into new xmlrpc_values + foreach ($xmlrpc_value->data as $key => $value) { + $xmlrpc_value->data[$key] = $this->xmlrpc_value($value); + } + } + if ($type == 'array') { + for ($i = 0, $j = count($xmlrpc_value->data); $i < $j; $i++) { + $xmlrpc_value->data[$i] = $this->xmlrpc_value($xmlrpc_value->data[$i]); + } + } + return $xmlrpc_value; + } + + /** + * Map PHP type to XML-RPC type. + * + * @param $xmlrpc_value + * Variable whose type should be mapped. + * @return + * XML-RPC type as string. + * @see + * http://www.xmlrpc.com/spec#scalars + */ + function xmlrpc_value_calculate_type(&$xmlrpc_value) { + // http://www.php.net/gettype: Never use gettype() to test for a certain type [...] Instead, use the is_* functions. + if (is_bool($xmlrpc_value->data)) { + return 'boolean'; + } + if (is_double($xmlrpc_value->data)) { + return 'double'; + } + if (is_int($xmlrpc_value->data)) { + return 'int'; + } + if (is_array($xmlrpc_value->data)) { + // empty or integer-indexed arrays are 'array', string-indexed arrays 'struct' + return empty($xmlrpc_value->data) || range(0, count($xmlrpc_value->data) - 1) === array_keys($xmlrpc_value->data) ? 'array' : 'struct'; + } + if (is_object($xmlrpc_value->data)) { + if ($xmlrpc_value->data->is_date) { + return 'date'; + } + if ($xmlrpc_value->data->is_base64) { + return 'base64'; + } + $xmlrpc_value->data = get_object_vars($xmlrpc_value->data); + return 'struct'; + } + // default + return 'string'; + } + +/** + * Generate XML representing the given value. + * + * @param $xmlrpc_value + * @return + * XML representation of value. + */ +function xmlrpc_value_get_xml($xmlrpc_value) { + switch ($xmlrpc_value->type) { + case 'boolean': + return '<boolean>'. (($xmlrpc_value->data) ? '1' : '0') .'</boolean>'; + break; + case 'int': + return '<int>'. $xmlrpc_value->data .'</int>'; + break; + case 'double': + return '<double>'. $xmlrpc_value->data .'</double>'; + break; + case 'string': + // Note: we don't escape apostrophes because of the many blogging clients + // that don't support numerical entities (and XML in general) properly. + return '<string>'. htmlspecialchars($xmlrpc_value->data) .'</string>'; + break; + case 'array': + $return = '<array><data>'."\n"; + foreach ($xmlrpc_value->data as $item) { + $return .= ' <value>'. $this->xmlrpc_value_get_xml($item) ."</value>\n"; + } + $return .= '</data></array>'; + return $return; + break; + case 'struct': + $return = '<struct>'."\n"; + foreach ($xmlrpc_value->data as $name => $value) { + $return .= " <member><name>". htmlentities($name) ."</name><value>"; + $return .= $this->xmlrpc_value_get_xml($value) ."</value></member>\n"; + } + $return .= '</struct>'; + return $return; + break; + case 'date': + return $this->xmlrpc_date_get_xml($xmlrpc_value->data); + break; + case 'base64': + return $this->xmlrpc_base64_get_xml($xmlrpc_value->data); + break; + } + return FALSE; +} + + /** + * Perform an HTTP request. + * + * This is a flexible and powerful HTTP client implementation. Correctly handles + * GET, POST, PUT or any other HTTP requests. Handles redirects. + * + * @param $url + * A string containing a fully qualified URI. + * @param $headers + * An array containing an HTTP header => value pair. + * @param $method + * A string defining the HTTP request to use. + * @param $data + * A string containing data to include in the request. + * @param $retry + * An integer representing how many times to retry the request in case of a + * redirect. + * @return + * An object containing the HTTP request headers, response code, headers, + * data and redirect status. + */ + function http_request($url, $headers = array(), $method = 'GET', $data = NULL, $retry = 3) { + global $db_prefix; + + $result = new stdClass(); + + // Parse the URL and make sure we can handle the schema. + $uri = parse_url($url); + + if ($uri == FALSE) { + $result->error = 'unable to parse URL'; + return $result; + } + + if (!isset($uri['scheme'])) { + $result->error = 'missing schema'; + return $result; + } + + switch ($uri['scheme']) { + case 'http': + $port = isset($uri['port']) ? $uri['port'] : 80; + $host = $uri['host'] . ($port != 80 ? ':'. $port : ''); + $fp = @fsockopen($uri['host'], $port, $errno, $errstr, 15); + break; + case 'https': + // Note: Only works for PHP 4.3 compiled with OpenSSL. + $port = isset($uri['port']) ? $uri['port'] : 443; + $host = $uri['host'] . ($port != 443 ? ':'. $port : ''); + $fp = @fsockopen('ssl://'. $uri['host'], $port, $errno, $errstr, 20); + break; + default: + $result->error = 'invalid schema '. $uri['scheme']; + return $result; + } + + // Make sure the socket opened properly. + if (!$fp) { + // When a network error occurs, we use a negative number so it does not + // clash with the HTTP status codes. + $result->code = -$errno; + $result->error = trim($errstr); + + // Mark that this request failed. This will trigger a check of the web + // server's ability to make outgoing HTTP requests the next time that + // requirements checking is performed. + // @see system_requirements() + //TODO variable_set('drupal_http_request_fails', TRUE); + + return $result; + } + + // Construct the path to act on. + $path = isset($uri['path']) ? $uri['path'] : '/'; + if (isset($uri['query'])) { + $path .= '?'. $uri['query']; + } + + // Create HTTP request. + $defaults = array( + // RFC 2616: "non-standard ports MUST, default ports MAY be included". + // We don't add the port to prevent from breaking rewrite rules checking the + // host that do not take into account the port number. + 'Host' => "Host: $host", + 'User-Agent' => 'User-Agent: Drupal (+http://drupal.org/)', + 'Content-Length' => 'Content-Length: '. strlen($data) + ); + + // If the server url has a user then attempt to use basic authentication + if (isset($uri['user'])) { + $defaults['Authorization'] = 'Authorization: Basic '. base64_encode($uri['user'] . (!empty($uri['pass']) ? ":". $uri['pass'] : '')); + } + + // If the database prefix is being used by SimpleTest to run the tests in a copied + // database then set the user-agent header to the database prefix so that any + // calls to other Drupal pages will run the SimpleTest prefixed database. The + // user-agent is used to ensure that multiple testing sessions running at the + // same time won't interfere with each other as they would if the database + // prefix were stored statically in a file or database variable. + if (is_string($db_prefix) && preg_match("/^simpletest\d+$/", $db_prefix, $matches)) { + $defaults['User-Agent'] = 'User-Agent: ' . $matches[0]; + } + + foreach ($headers as $header => $value) { + $defaults[$header] = $header .': '. $value; + } + + $request = $method .' '. $path ." HTTP/1.0\r\n"; + $request .= implode("\r\n", $defaults); + $request .= "\r\n\r\n"; + $request .= $data; + + $result->request = $request; + + fwrite($fp, $request); + + // Fetch response. + $response = ''; + while (!feof($fp) && $chunk = fread($fp, 1024)) { + $response .= $chunk; + } + fclose($fp); + + // Parse response. + list($split, $result->data) = explode("\r\n\r\n", $response, 2); + $split = preg_split("/\r\n|\n|\r/", $split); + + list($protocol, $code, $text) = explode(' ', trim(array_shift($split)), 3); + $result->headers = array(); + + // Parse headers. + while ($line = trim(array_shift($split))) { + list($header, $value) = explode(':', $line, 2); + if (isset($result->headers[$header]) && $header == 'Set-Cookie') { + // RFC 2109: the Set-Cookie response header comprises the token Set- + // Cookie:, followed by a comma-separated list of one or more cookies. + $result->headers[$header] .= ','. trim($value); + } + else { + $result->headers[$header] = trim($value); + } + } + + $responses = array( + 100 => 'Continue', 101 => 'Switching Protocols', + 200 => 'OK', 201 => 'Created', 202 => 'Accepted', 203 => 'Non-Authoritative Information', 204 => 'No Content', 205 => 'Reset Content', 206 => 'Partial Content', + 300 => 'Multiple Choices', 301 => 'Moved Permanently', 302 => 'Found', 303 => 'See Other', 304 => 'Not Modified', 305 => 'Use Proxy', 307 => 'Temporary Redirect', + 400 => 'Bad Request', 401 => 'Unauthorized', 402 => 'Payment Required', 403 => 'Forbidden', 404 => 'Not Found', 405 => 'Method Not Allowed', 406 => 'Not Acceptable', 407 => 'Proxy Authentication Required', 408 => 'Request Time-out', 409 => 'Conflict', 410 => 'Gone', 411 => 'Length Required', 412 => 'Precondition Failed', 413 => 'Request Entity Too Large', 414 => 'Request-URI Too Large', 415 => 'Unsupported Media Type', 416 => 'Requested range not satisfiable', 417 => 'Expectation Failed', + 500 => 'Internal Server Error', 501 => 'Not Implemented', 502 => 'Bad Gateway', 503 => 'Service Unavailable', 504 => 'Gateway Time-out', 505 => 'HTTP Version not supported' + ); + // RFC 2616 states that all unknown HTTP codes must be treated the same as the + // base code in their class. + if (!isset($responses[$code])) { + $code = floor($code / 100) * 100; + } + + switch ($code) { + case 200: // OK + case 304: // Not modified + break; + case 301: // Moved permanently + case 302: // Moved temporarily + case 307: // Moved temporarily + $location = $result->headers['Location']; + + if ($retry) { + $result = drupal_http_request($result->headers['Location'], $headers, $method, $data, --$retry); + $result->redirect_code = $result->code; + } + $result->redirect_url = $location; + + break; + default: + $result->error = $text; + } + + $result->code = $code; + return $result; + } + + /** + * Construct an object representing an XML-RPC message. + * + * @param $message + * String containing XML as defined at http://www.xmlrpc.com/spec + * @return + * Object + */ + function xmlrpc_message($message) { + $xmlrpc_message = new stdClass(); + $xmlrpc_message->array_structs = array(); // The stack used to keep track of the current array/struct + $xmlrpc_message->array_structs_types = array(); // The stack used to keep track of if things are structs or array + $xmlrpc_message->current_struct_name = array(); // A stack as well + $xmlrpc_message->message = $message; + return $xmlrpc_message; + } + + /** + * Parse an XML-RPC message. If parsing fails, the faultCode and faultString + * will be added to the message object. + * + * @param $xmlrpc_message + * Object generated by xmlrpc_message() + * @return + * TRUE if parsing succeeded; FALSE otherwise + */ + function xmlrpc_message_parse(&$xmlrpc_message) { + // First remove the XML declaration + $xmlrpc_message->message = preg_replace('/<\?xml(.*)?\?'.'>/', '', $xmlrpc_message->message); + if (trim($xmlrpc_message->message) == '') { + return FALSE; + } + $xmlrpc_message->_parser = xml_parser_create(); + // Set XML parser to take the case of tags into account. + xml_parser_set_option($xmlrpc_message->_parser, XML_OPTION_CASE_FOLDING, FALSE); + // Set XML parser callback functions + xml_set_element_handler($xmlrpc_message->_parser, array('MollomPlugin', 'xmlrpc_message_tag_open'), array('MollomPlugin', 'xmlrpc_message_tag_close')); + xml_set_character_data_handler($xmlrpc_message->_parser, array('MollomPlugin', 'xmlrpc_message_cdata')); + $this->xmlrpc_message_set($xmlrpc_message); + if (!xml_parse($xmlrpc_message->_parser, $xmlrpc_message->message)) { + return FALSE; + } + xml_parser_free($xmlrpc_message->_parser); + // Grab the error messages, if any + $xmlrpc_message = $this->xmlrpc_message_get(); + if ($xmlrpc_message->messagetype == 'fault') { + $xmlrpc_message->fault_code = $xmlrpc_message->params[0]['faultCode']; + $xmlrpc_message->fault_string = $xmlrpc_message->params[0]['faultString']; + } + return TRUE; + } + + /** + * Store a copy of the $xmlrpc_message object temporarily. + * + * @param $value + * Object + * @return + * The most recently stored $xmlrpc_message + */ + function xmlrpc_message_set($value = NULL) { + static $xmlrpc_message; + if ($value) { + $xmlrpc_message = $value; + } + return $xmlrpc_message; + } + + function xmlrpc_message_get() { + return $this->xmlrpc_message_set(); + } + + function xmlrpc_message_tag_open($parser, $tag, $attr) { + $xmlrpc_message = $this->xmlrpc_message_get(); + $xmlrpc_message->current_tag_contents = ''; + $xmlrpc_message->last_open = $tag; + switch ($tag) { + case 'methodCall': + case 'methodResponse': + case 'fault': + $xmlrpc_message->messagetype = $tag; + break; + // Deal with stacks of arrays and structs + case 'data': + $xmlrpc_message->array_structs_types[] = 'array'; + $xmlrpc_message->array_structs[] = array(); + break; + case 'struct': + $xmlrpc_message->array_structs_types[] = 'struct'; + $xmlrpc_message->array_structs[] = array(); + break; + } + $this->xmlrpc_message_set($xmlrpc_message); + } + + function xmlrpc_message_cdata($parser, $cdata) { + $xmlrpc_message = $this->xmlrpc_message_get(); + $xmlrpc_message->current_tag_contents .= $cdata; + $this->xmlrpc_message_set($xmlrpc_message); + } + + function xmlrpc_message_tag_close($parser, $tag) { + $xmlrpc_message = $this->xmlrpc_message_get(); + $value_flag = FALSE; + switch ($tag) { + case 'int': + case 'i4': + $value = (int)trim($xmlrpc_message->current_tag_contents); + $value_flag = TRUE; + break; + case 'double': + $value = (double)trim($xmlrpc_message->current_tag_contents); + $value_flag = TRUE; + break; + case 'string': + $value = $xmlrpc_message->current_tag_contents; + $value_flag = TRUE; + break; + case 'dateTime.iso8601': + $value = xmlrpc_date(trim($xmlrpc_message->current_tag_contents)); + // $value = $iso->getTimestamp(); + $value_flag = TRUE; + break; + case 'value': + // If no type is indicated, the type is string + // We take special care for empty values + if (trim($xmlrpc_message->current_tag_contents) != '' || (isset($xmlrpc_message->last_open) && ($xmlrpc_message->last_open == 'value'))) { + $value = (string)$xmlrpc_message->current_tag_contents; + $value_flag = TRUE; + } + unset($xmlrpc_message->last_open); + break; + case 'boolean': + $value = (boolean)trim($xmlrpc_message->current_tag_contents); + $value_flag = TRUE; + break; + case 'base64': + $value = base64_decode(trim($xmlrpc_message->current_tag_contents)); + $value_flag = TRUE; + break; + // Deal with stacks of arrays and structs + case 'data': + case 'struct': + $value = array_pop($xmlrpc_message->array_structs ); + array_pop($xmlrpc_message->array_structs_types); + $value_flag = TRUE; + break; + case 'member': + array_pop($xmlrpc_message->current_struct_name); + break; + case 'name': + $xmlrpc_message->current_struct_name[] = trim($xmlrpc_message->current_tag_contents); + break; + case 'methodName': + $xmlrpc_message->methodname = trim($xmlrpc_message->current_tag_contents); + break; + } + if ($value_flag) { + if (count($xmlrpc_message->array_structs ) > 0) { + // Add value to struct or array + if ($xmlrpc_message->array_structs_types[count($xmlrpc_message->array_structs_types)-1] == 'struct') { + // Add to struct + $xmlrpc_message->array_structs [count($xmlrpc_message->array_structs )-1][$xmlrpc_message->current_struct_name[count($xmlrpc_message->current_struct_name)-1]] = $value; + } + else { + // Add to array + $xmlrpc_message->array_structs [count($xmlrpc_message->array_structs )-1][] = $value; + } + } + else { + // Just add as a parameter + $xmlrpc_message->params[] = $value; + } + } + if (!in_array($tag, array("data", "struct", "member"))) { + $xmlrpc_message->current_tag_contents = ''; + } + $this->xmlrpc_message_set($xmlrpc_message); + } + + /** + * Construct an object representing an XML-RPC request + * + * @param $method + * The name of the method to be called + * @param $args + * An array of parameters to send with the method. + * @return + * Object + */ + function xmlrpc_request($method, $args) { + $xmlrpc_request = new stdClass(); + $xmlrpc_request->method = $method; + $xmlrpc_request->args = $args; + $xmlrpc_request->xml = <<<EOD + <?xml version="1.0"?> + <methodCall> + <methodName>{$xmlrpc_request->method}</methodName> + <params> + +EOD; + foreach ($xmlrpc_request->args as $arg) { + $xmlrpc_request->xml .= '<param><value>'; + $v = $this->xmlrpc_value($arg); + $xmlrpc_request->xml .= $this->xmlrpc_value_get_xml($v); + $xmlrpc_request->xml .= "</value></param>\n"; + } + $xmlrpc_request->xml .= '</params></methodCall>'; + return $xmlrpc_request; + } + + + function xmlrpc_error($code = NULL, $message = NULL, $reset = FALSE) { + static $xmlrpc_error; + if (isset($code)) { + $xmlrpc_error = new stdClass(); + $xmlrpc_error->is_error = TRUE; + $xmlrpc_error->code = $code; + $xmlrpc_error->message = $message; + } + elseif ($reset) { + $xmlrpc_error = NULL; + } + return $xmlrpc_error; + } + + function xmlrpc_error_get_xml($xmlrpc_error) { + return <<<EOD + <methodResponse> + <fault> + <value> + <struct> + <member> + <name>faultCode</name> + <value><int>{$xmlrpc_error->code}</int></value> + </member> + <member> + <name>faultString</name> + <value><string>{$xmlrpc_error->message}</string></value> + </member> + </struct> + </value> + </fault> + </methodResponse> + +EOD; + } + + function xmlrpc_date($time) { + $xmlrpc_date = new stdClass(); + $xmlrpc_date->is_date = TRUE; + // $time can be a PHP timestamp or an ISO one + if (is_numeric($time)) { + $xmlrpc_date->year = gmdate('Y', $time); + $xmlrpc_date->month = gmdate('m', $time); + $xmlrpc_date->day = gmdate('d', $time); + $xmlrpc_date->hour = gmdate('H', $time); + $xmlrpc_date->minute = gmdate('i', $time); + $xmlrpc_date->second = gmdate('s', $time); + $xmlrpc_date->iso8601 = gmdate('Ymd\TH:i:s', $time); + } + else { + $xmlrpc_date->iso8601 = $time; + $time = str_replace(array('-', ':'), '', $time); + $xmlrpc_date->year = substr($time, 0, 4); + $xmlrpc_date->month = substr($time, 4, 2); + $xmlrpc_date->day = substr($time, 6, 2); + $xmlrpc_date->hour = substr($time, 9, 2); + $xmlrpc_date->minute = substr($time, 11, 2); + $xmlrpc_date->second = substr($time, 13, 2); + } + return $xmlrpc_date; + } + + function xmlrpc_date_get_xml($xmlrpc_date) { + return '<dateTime.iso8601>'. $xmlrpc_date->year . $xmlrpc_date->month . $xmlrpc_date->day .'T'. $xmlrpc_date->hour .':'. $xmlrpc_date->minute .':'. $xmlrpc_date->second .'</dateTime.iso8601>'; + } + + function xmlrpc_base64($data) { + $xmlrpc_base64 = new stdClass(); + $xmlrpc_base64->is_base64 = TRUE; + $xmlrpc_base64->data = $data; + return $xmlrpc_base64; + } + + function xmlrpc_base64_get_xml($xmlrpc_base64) { + return '<base64>'. base64_encode($xmlrpc_base64->data) .'</base64>'; + } + + /** + * Execute an XML remote procedural call. This is private function; call xmlrpc() + * in common.inc instead of this function. + * + * @return + * A $xmlrpc_message object if the call succeeded; FALSE if the call failed + */ + function _xmlrpc() { + $args = func_get_args(); + $url = array_shift($args); + $this->xmlrpc_clear_error(); + if (is_array($args[0])) { + $method = 'system.multicall'; + $multicall_args = array(); + foreach ($args[0] as $call) { + $multicall_args[] = array('methodName' => array_shift($call), 'params' => $call); + } + $args = array($multicall_args); + } + else { + $method = array_shift($args); + } + $xmlrpc_request = $this->xmlrpc_request($method, $args); + $result = $this->http_request($url, array("Content-Type" => "text/xml"), 'POST', $xmlrpc_request->xml); + if ($result->code != 200) { + $this->xmlrpc_error($result->code, $result->error); + return FALSE; + } + $message = $this->xmlrpc_message($result->data); + // Now parse what we've got back + if (!$this->xmlrpc_message_parse($message)) { + // XML error + $this->xmlrpc_error(-32700, t('Parse error. Not well formed')); + return FALSE; + } + // Is the message a fault? + if ($message->messagetype == 'fault') { + $this->xmlrpc_error($message->fault_code, $message->fault_string); + return FALSE; + } + // Message must be OK + return $message->params[0]; + } + + /** + * Returns the last XML-RPC client error number + */ + function xmlrpc_errno() { + $error = $this->xmlrpc_error(); + return ($error != NULL ? $error->code : NULL); + } + + /** + * Returns the last XML-RPC client error message + */ + function xmlrpc_error_msg() { + $error = xmlrpc_error(); + return ($error != NULL ? $error->message : NULL); + } + + /** + * Clears any previous error. + */ + function xmlrpc_clear_error() { + $this->xmlrpc_error(NULL, NULL, TRUE); + } + +} diff --git a/plugins/Mollom/README b/plugins/Mollom/README new file mode 100644 index 000000000..2b8c2d8a0 --- /dev/null +++ b/plugins/Mollom/README @@ -0,0 +1,22 @@ +The mollom plugin uses mollom.com to filter SN notices for spam. + +== Dependencies == +Your webserver needs to have xmlrpc php extention loaded. +This is called php5-xmlrpc in Debian/Ubuntu + +== Installation == +Add the following to your config.php +<?php +addPlugin('Mollom', + array( + 'public_key' => '...', + 'private_key' => '...', + 'servers' => array('http://88.151.243.81', 'http://82.103.131.136') + ) +); + +?> + +replace '...' with your own public and private keys for your site, which you can get from mollom.com + +If you're using this plugin, i'd love to know about it -- shiny@cpan.org or shiny on freenode. diff --git a/plugins/OpenID/OpenIDPlugin.php b/plugins/OpenID/OpenIDPlugin.php index a37d5465e..248afe3fa 100644 --- a/plugins/OpenID/OpenIDPlugin.php +++ b/plugins/OpenID/OpenIDPlugin.php @@ -70,7 +70,7 @@ class OpenIDPlugin extends Plugin $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; } @@ -101,11 +101,11 @@ class OpenIDPlugin extends Plugin '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')); - + //provider $xrdsOutputter->showXrdsService('http://specs.openid.net/auth/2.0/signon', common_local_url('openidserver'), @@ -308,4 +308,15 @@ class OpenIDPlugin extends Plugin $tables[] = 'User_openid_trustroot'; return true; } + + function onPluginVersion(&$versions) + { + $versions[] = array('name' => 'OpenID', + 'version' => STATUSNET_VERSION, + 'author' => 'Evan Prodromou, Craig Andrews', + 'homepage' => 'http://status.net/wiki/Plugin:OpenID', + 'rawdescription' => + _m('Use <a href="http://openid.net/">OpenID</a> to login to the site.')); + return true; + } } diff --git a/plugins/OpenID/User_openid_trustroot.php b/plugins/OpenID/User_openid_trustroot.php index 44288945b..0b411b8f7 100644 --- a/plugins/OpenID/User_openid_trustroot.php +++ b/plugins/OpenID/User_openid_trustroot.php @@ -22,7 +22,7 @@ class User_openid_trustroot extends Memcached_DataObject /* the code above is auto generated do not remove the tag below */ ###END_AUTOCODE - function &pkeyGet($kv) + function pkeyGet($kv) { return Memcached_DataObject::pkeyGet('User_openid_trustroot', $kv); } diff --git a/plugins/OpenID/finishopenidlogin.php b/plugins/OpenID/finishopenidlogin.php index 987fa9213..d25ce696c 100644 --- a/plugins/OpenID/finishopenidlogin.php +++ b/plugins/OpenID/finishopenidlogin.php @@ -363,6 +363,7 @@ class FinishopenidloginAction extends Action if ($url) { # We don't have to return to it again common_set_returnto(null); + $url = common_inject_session($url); } else { $url = common_local_url('all', array('nickname' => diff --git a/plugins/PiwikAnalyticsPlugin.php b/plugins/PiwikAnalyticsPlugin.php index fefd09867..b353d7255 100644 --- a/plugins/PiwikAnalyticsPlugin.php +++ b/plugins/PiwikAnalyticsPlugin.php @@ -97,4 +97,16 @@ ENDOFPIWIK; $action->inlineScript($piwikCode2); return true; } + + function onPluginVersion(&$versions) + { + $versions[] = array('name' => 'PiwikAnalytics', + 'version' => STATUSNET_VERSION, + 'author' => 'Tobias Diekershoff, Evan Prodromou', + 'homepage' => 'http://status.net/wiki/Plugin:Piwik', + 'rawdescription' => + _m('Use <a href="http://piwik.org/">Piwik</a> Open Source Web analytics software.')); + return true; + } + } diff --git a/plugins/PoweredByStatusNet/PoweredByStatusNetPlugin.php b/plugins/PoweredByStatusNet/PoweredByStatusNetPlugin.php index 460550518..c59fcca89 100644 --- a/plugins/PoweredByStatusNet/PoweredByStatusNetPlugin.php +++ b/plugins/PoweredByStatusNet/PoweredByStatusNetPlugin.php @@ -31,6 +31,16 @@ if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); } +/** + * Outputs 'powered by StatusNet' after site name + * + * @category Plugin + * @package StatusNet + * @author Sarven Capadisli <csarven@status.net> + * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 + * @link http://status.net/ + */ + class PoweredByStatusNetPlugin extends Plugin { function onEndAddressData($action) @@ -42,4 +52,15 @@ class PoweredByStatusNetPlugin extends Plugin return true; } + + function onPluginVersion(&$versions) + { + $versions[] = array('name' => 'PoweredByStatusNet', + 'version' => STATUSNET_VERSION, + 'author' => 'Sarven Capadisli', + 'homepage' => 'http://status.net/wiki/Plugin:PoweredByStatusNet', + 'rawdescription' => + _m('Outputs powered by <a href="http://status.net/">StatusNet</a> after site name.')); + return true; + } } diff --git a/plugins/PtitUrl/PtitUrlPlugin.php b/plugins/PtitUrl/PtitUrlPlugin.php index 76a438dd5..ddba942e6 100644 --- a/plugins/PtitUrl/PtitUrlPlugin.php +++ b/plugins/PtitUrl/PtitUrlPlugin.php @@ -56,5 +56,18 @@ class PtitUrlPlugin extends UrlShortenerPlugin return strval($xml['href']); } } + + function onPluginVersion(&$versions) + { + $versions[] = array('name' => sprintf('PtitUrl (%s)', $this->shortenerName), + 'version' => STATUSNET_VERSION, + 'author' => 'Craig Andrews', + 'homepage' => 'http://status.net/wiki/Plugin:PtitUrl', + 'rawdescription' => + sprintf(_m('Uses <a href="http://%1$s/">%1$s</a> URL-shortener service.'), + $this->shortenerName)); + + return true; + } } diff --git a/plugins/PubSubHubBub/PubSubHubBubPlugin.php b/plugins/PubSubHubBub/PubSubHubBubPlugin.php index d15a869cb..c40d906a5 100644 --- a/plugins/PubSubHubBub/PubSubHubBubPlugin.php +++ b/plugins/PubSubHubBub/PubSubHubBubPlugin.php @@ -118,4 +118,16 @@ class PubSubHubBubPlugin extends Plugin } } } + + function onPluginVersion(&$versions) + { + $versions[] = array('name' => 'PubSubHubBub', + 'version' => STATUSNET_VERSION, + 'author' => 'Craig Andrews', + 'homepage' => 'http://status.net/wiki/Plugin:PubSubHubBub', + 'rawdescription' => + _m('The PubSubHubBub plugin pushes RSS/Atom updates to a <a href="http://pubsubhubbub.googlecode.com/">PubSubHubBub</a> hub.')); + + return true; + } } diff --git a/plugins/RSSCloud/LoggingAggregator.php b/plugins/RSSCloud/LoggingAggregator.php new file mode 100644 index 000000000..e37eed16a --- /dev/null +++ b/plugins/RSSCloud/LoggingAggregator.php @@ -0,0 +1,140 @@ +<?php +/** + * This test class pretends to be an RSS aggregator. It logs notifications + * from the cloud. + * + * PHP version 5 + * + * @category Plugin + * @package StatusNet + * @author Zach Copley <zach@status.net> + * @license http://www.fsf.org/licensing/licenses/agpl.html AGPLv3 + * @link http://status.net/ + * + * StatusNet - the distributed open-source microblogging tool + * Copyright (C) 2009, StatusNet, Inc. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + */ + +if (!defined('STATUSNET')) { + exit(1); +} + +/** + * Dummy aggregator that acts as a proper notification handler. It + * doesn't do anything but respond correctly when notified via + * REST. Mostly, this is just and action I used to develop the plugin + * and easily test things end-to-end. I'm leaving it in here as it + * may be useful for developing the plugin further. + * + * @category Plugin + * @package StatusNet + * @author Zach Copley <zach@status.net> + * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 + * @link http://status.net/ + **/ +class LoggingAggregatorAction extends Action +{ + + var $challenge = null; + var $url = null; + + /** + * Initialization. + * + * @param array $args Web and URL arguments + * + * @return boolean false if user doesn't exist + */ + + function prepare($args) + { + parent::prepare($args); + + $this->url = $this->arg('url'); + $this->challenge = $this->arg('challenge'); + + common_debug("args = " . var_export($this->args, true)); + common_debug('url = ' . $this->url . ' challenge = ' . $this->challenge); + + return true; + } + + /** + * Handle the request + * + * @param array $args $_REQUEST data (unused) + * + * @return void + */ + + function handle($args) + { + parent::handle($args); + + if (empty($this->url)) { + $this->showError('Hey, you have to provide a url parameter.'); + return; + } + + if (!empty($this->challenge)) { + + // must be a GET + + if ($_SERVER['REQUEST_METHOD'] != 'GET') { + $this->showError('This resource requires an HTTP GET.'); + return; + } + + header('Content-Type: text/xml'); + echo $this->challenge; + + } else { + + // must be a POST + + if ($_SERVER['REQUEST_METHOD'] != 'POST') { + $this->showError('This resource requires an HTTP POST.'); + return; + } + + header('Content-Type: text/xml'); + Echo "<notifyResult success='true' msg='Thanks for the update.' />\n"; + } + + $this->ip = $_SERVER['REMOTE_ADDR']; + + common_log(LOG_INFO, 'RSSCloud Logging Aggregator - ' . + $this->ip . ' claims the feed at ' . + $this->url . ' has been updated.'); + } + + /** + * Show an XML error when things go badly + * + * @param string $msg the error message + * + * @return void + */ + + function showError($msg) + { + header('HTTP/1.1 400 Bad Request'); + header('Content-Type: text/xml'); + echo "<?xml version='1.0'?>\n"; + echo "<notifyResult success='false' msg='$msg' />\n"; + } + +}
\ No newline at end of file diff --git a/plugins/RSSCloud/README b/plugins/RSSCloud/README new file mode 100644 index 000000000..1237e3e0e --- /dev/null +++ b/plugins/RSSCloud/README @@ -0,0 +1,54 @@ +This plugin enables RSSCloud (http://rsscloud.org/) publishing and +subscription handling for RSS 2.0 profile feeds (i.e: +http://SITE/PATH/api/statuses/user_timeline/USERNAME.rss). When the +plugin is enabled, StatusNet acts as both the publisher and hub ('writer' and +'cloud' in RSSCloud parlance), but only for local StatusNet feeds. It's +not possible to use it as a general purpose hub -- for instance you can't +subscribe and get updates to a Wordpress feed from StatusNet using this +plugin. + +To use the plugin, add the following to your config.php: + + addPlugin('RSSCloud'); + +Enabling the plugin will add a <cloud> element to your RSS 2.0 profile feeds +that looks like this: + + <cloud domain="SITE" port="80" path="/main/rsscloud/request_notify" + registerProcedure="" protocol="http-post"/> + +Aggregators may subscribe by sending a proper REST RSSCloud subscription +request (the optional 'domain' parameter with challenge is supported). +Subscribing aggregators will be notified ('pinged') when users they have +subscribed to post new notices. Currently, REST is the only protocol +supported for notifications. + +Deamon +------ + +There's also a daemon for offline processing of queued notices with +RSSCloud destinations, which will start automatically if/when you run +scripts/startdaemons.sh. + +Notes +----- + +- Again, only RSS 2.0 profile feeds may be subscribed to, and they have + to be the ones with user names in them, like: + http://SITE/PATH/api/statuses/user_timeline/USERNAME.rss +- Subscriptions are deleted after three notification failures in a row + (not sure this is optimal). +- The plugin includes a dummy LoggingAggregator class that can be used + for end-to-end testing. You probably don't want to mess with it. + +TODO +---- + +- Figure out why the RSSCloudSubcription can't ->delete() or ->update() +- Support pinging via XML-RPC and SOAP +- Automatically delete subscriptions? Point of reference: Dave's hub + implementation auto-deletes them after 25 hours. WordPress never deletes them. +- Support additional feed URL addresses for the same feed (e.g.: by numeric ID, + ?user_id=xxx, etc.) +- Support additional feeds that make sense (e.g: replies)? +- Possibly use "rssCloud" (like Dave) instead of "RSSCloud" everywhere diff --git a/plugins/RSSCloud/RSSCloudNotifier.php b/plugins/RSSCloud/RSSCloudNotifier.php new file mode 100644 index 000000000..d454691c8 --- /dev/null +++ b/plugins/RSSCloud/RSSCloudNotifier.php @@ -0,0 +1,240 @@ +<?php +/** + * StatusNet, the distributed open-source microblogging tool + * + * Class to ping an rssCloud endpoint when a feed has been updated + * + * PHP version 5 + * + * LICENCE: This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * + * @category Plugin + * @package StatusNet + * @author Zach Copley <zach@status.net> + * @copyright 2009 StatusNet, Inc. + * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 + * @link http://status.net/ + */ + +if (!defined('STATUSNET')) { + exit(1); +} + +/** + * Class for notifying cloud-enabled RSS aggregators that StatusNet + * feeds have been updated. + * + * @category Plugin + * @package StatusNet + * @author Zach Copley <zach@status.net> + * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 + * @link http://status.net/ + **/ +class RSSCloudNotifier +{ + const MAX_FAILURES = 3; + + /** + * Send an HTTP GET to the notification handler with a + * challenge string to see if it repsonds correctly. + * + * @param string $endpoint URL of the notification handler + * @param string $feed the feed being subscribed to + * + * @return boolean success + */ + function challenge($endpoint, $feed) + { + $code = common_confirmation_code(128); + $params = array('url' => $feed, 'challenge' => $code); + $url = $endpoint . '?' . http_build_query($params); + + try { + $client = new HTTPClient(); + $response = $client->get($url); + } catch (HTTP_Request2_Exception $e) { + common_log(LOG_INFO, + 'RSSCloud plugin - failure testing notify handler ' . + $endpoint . ' - ' . $e->getMessage()); + return false; + } + + // Check response is betweet 200 and 299 and body contains challenge data + + $status = $response->getStatus(); + $body = $response->getBody(); + + if ($status >= 200 && $status < 300) { + + // NOTE: the spec says that the body must contain the string + // challenge. It doesn't say that the body must contain the + // challenge string ONLY, although that seems to be the way + // the other implementors have interpreted it. + + if (strpos($body, $code) !== false) { + common_log(LOG_INFO, 'RSSCloud plugin - ' . + "success testing notify handler: $endpoint"); + return true; + } else { + common_log(LOG_INFO, 'RSSCloud plugin - ' . + 'challenge/repsonse failed for notify handler ' . + $endpoint); + common_debug('body = ' . var_export($body, true)); + return false; + } + } else { + common_log(LOG_INFO, 'RSSCloud plugin - ' . + "failure testing notify handler: $endpoint " . + ' - got HTTP ' . $status); + common_debug('body = ' . var_export($body, true)); + return false; + } + } + + /** + * HTTP POST a notification that a feed has been updated + * ('ping the cloud'). + * + * @param String $endpoint URL of the notification handler + * @param String $feed the feed being subscribed to + * + * @return boolean success + */ + function postUpdate($endpoint, $feed) + { + + $headers = array(); + $postdata = array('url' => $feed); + + try { + $client = new HTTPClient(); + $response = $client->post($endpoint, $headers, $postdata); + } catch (HTTP_Request2_Exception $e) { + common_log(LOG_INFO, 'RSSCloud plugin - failure notifying ' . + $endpoint . ' that feed ' . $feed . + ' has changed: ' . $e->getMessage()); + return false; + } + + $status = $response->getStatus(); + + if ($status >= 200 && $status < 300) { + common_log(LOG_INFO, 'RSSCloud plugin - success notifying ' . + $endpoint . ' that feed ' . $feed . ' has changed.'); + return true; + } else { + common_log(LOG_INFO, 'RSSCloud plugin - failure notifying ' . + $endpoint . ' that feed ' . $feed . + ' has changed: got HTTP ' . $status); + return false; + } + } + + /** + * Notify all subscribers to a profile feed that it has changed. + * + * @param Profile $profile the profile whose feed has been + * updated + * + * @return boolean success + */ + function notify($profile) + { + $feed = common_path('api/statuses/user_timeline/') . + $profile->nickname . '.rss'; + + $cloudSub = new RSSCloudSubscription(); + + $cloudSub->subscribed = $profile->id; + + if ($cloudSub->find()) { + while ($cloudSub->fetch()) { + $result = $this->postUpdate($cloudSub->url, $feed); + if ($result == false) { + $this->handleFailure($cloudSub); + } + } + } + + return true; + } + + /** + * Handle problems posting cloud notifications. Increment the failure + * count, or delete the subscription if the maximum number of failures + * is exceeded. + * + * XXX: Redo with proper DB_DataObject methods once I figure out what + * what the problem is with pluginized DB_DataObjects. -Z + * + * @param RSSCloudSubscription $cloudSub the subscription in question + * + * @return boolean success + */ + function handleFailure($cloudSub) + { + $failCnt = $cloudSub->failures + 1; + + if ($failCnt == self::MAX_FAILURES) { + + common_log(LOG_INFO, + 'Deleting RSSCloud subcription ' . + '(max failure count reached), profile: ' . + $cloudSub->subscribed . + ' handler: ' . + $cloudSub->url); + + // XXX: WTF! ->delete() doesn't work. Clearly, there are some issues with + // the DB_DataObject, or my understanding of it. Have to drop into SQL. + + // $result = $cloudSub->delete(); + + $qry = 'DELETE from rsscloud_subscription' . + ' WHERE subscribed = ' . $cloudSub->subscribed . + ' AND url = \'' . $cloudSub->url . '\''; + + $result = $cloudSub->query($qry); + + if (!$result) { + common_log_db_error($cloudSub, 'DELETE', __FILE__); + common_log(LOG_ERR, 'Could not delete RSSCloud subscription.'); + } + + } else { + + common_debug('Updating failure count on RSSCloud subscription. ' . + $failCnt); + + $failCnt = $cloudSub->failures + 1; + + // XXX: ->update() not working either, gar! + + $qry = 'UPDATE rsscloud_subscription' . + ' SET failures = ' . $failCnt . + ' WHERE subscribed = ' . $cloudSub->subscribed . + ' AND url = \'' . $cloudSub->url . '\''; + + $result = $cloudSub->query($qry); + + if (!$result) { + common_log_db_error($cloudsub, 'UPDATE', __FILE__); + common_log(LOG_ERR, + 'Could not update failure ' . + 'count on RSSCloud subscription'); + } + } + } + +} + diff --git a/plugins/RSSCloud/RSSCloudPlugin.php b/plugins/RSSCloud/RSSCloudPlugin.php new file mode 100644 index 000000000..2de162628 --- /dev/null +++ b/plugins/RSSCloud/RSSCloudPlugin.php @@ -0,0 +1,295 @@ +<?php +/** + * StatusNet, the distributed open-source microblogging tool + * + * Plugin to support RSSCloud + * + * PHP version 5 + * + * LICENCE: This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * + * @category Plugin + * @package StatusNet + * @author Zach Copley <zach@status.net> + * @copyright 2009 StatusNet, Inc. + * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 + * @link http://status.net/ + */ + +if (!defined('STATUSNET')) { + exit(1); +} + +define('RSSCLOUDPLUGIN_VERSION', '0.1'); + +/** + * Plugin class for adding RSSCloud capabilities to StatusNet + * + * @category Plugin + * @package StatusNet + * @author Zach Copley <zach@status.net> + * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 + * @link http://status.net/ + **/ + +class RSSCloudPlugin extends Plugin +{ + /** + * Our friend, the constructor + * + * @return void + */ + function __construct() + { + parent::__construct(); + } + + /** + * Setup the info for the subscription handler. Allow overriding + * to point at another cloud hub (not currently used). + * + * @return void + */ + + function onInitializePlugin() + { + $this->domain = common_config('rsscloud', 'domain'); + $this->port = common_config('rsscloud', 'port'); + $this->path = common_config('rsscloud', 'path'); + $this->funct = common_config('rsscloud', 'function'); + $this->protocol = common_config('rsscloud', 'protocol'); + + // set defaults + + $local_server = parse_url(common_path('main/rsscloud/request_notify')); + + if (empty($this->domain)) { + $this->domain = $local_server['host']; + } + + if (empty($this->port)) { + $this->port = '80'; + } + + if (empty($this->path)) { + $this->path = $local_server['path']; + } + + if (empty($this->funct)) { + $this->funct = ''; + } + + if (empty($this->protocol)) { + $this->protocol = 'http-post'; + } + } + + /** + * Add RSSCloud-related paths to the router table + * + * Hook for RouterInitialized event. + * + * @param Mapper &$m URL parser and mapper + * + * @return boolean hook return + */ + + function onRouterInitialized(&$m) + { + $m->connect('/main/rsscloud/request_notify', + array('action' => 'RSSCloudRequestNotify')); + + // XXX: This is just for end-to-end testing. Uncomment if you need to pretend + // to be a cloud hub for some reason. + //$m->connect('/main/rsscloud/notify', + // array('action' => 'LoggingAggregator')); + + return true; + } + + /** + * Automatically load the actions and libraries used by + * the RSSCloud plugin + * + * @param Class $cls the class + * + * @return boolean hook return + * + */ + + function onAutoload($cls) + { + switch ($cls) + { + case 'RSSCloudSubscription': + include_once INSTALLDIR . '/plugins/RSSCloud/RSSCloudSubscription.php'; + return false; + case 'RSSCloudNotifier': + include_once INSTALLDIR . '/plugins/RSSCloud/RSSCloudNotifier.php'; + return false; + case 'RSSCloudRequestNotifyAction': + case 'LoggingAggregatorAction': + include_once INSTALLDIR . '/plugins/RSSCloud/' . + mb_substr($cls, 0, -6) . '.php'; + return false; + default: + return true; + } + } + + /** + * Add a <cloud> element to the RSS feed (after the rss <channel> + * element is started). + * + * @param Action $action the ApiAction + * + * @return void + */ + + function onStartApiRss($action) + { + if (get_class($action) == 'ApiTimelineUserAction') { + + $attrs = array('domain' => $this->domain, + 'port' => $this->port, + 'path' => $this->path, + 'registerProcedure' => $this->funct, + 'protocol' => $this->protocol); + + // Dipping into XMLWriter to avoid a full end element (</cloud>). + + $action->xw->startElement('cloud'); + foreach ($attrs as $name => $value) { + $action->xw->writeAttribute($name, $value); + } + + $action->xw->endElement(); + } + } + + /** + * Add an RSSCloud queue item for each notice + * + * @param Notice $notice the notice + * @param array &$transports the list of transports (queues) + * + * @return boolean hook return + */ + + function onStartEnqueueNotice($notice, &$transports) + { + array_push($transports, 'rsscloud'); + return true; + } + + /** + * broadcast the message when not using queuehandler + * + * @param Notice &$notice the notice + * @param array $queue destination queue + * + * @return boolean hook return + */ + + function onUnqueueHandleNotice(&$notice, $queue) + { + if (($queue == 'rsscloud') && ($this->_isLocal($notice))) { + + common_debug('broadcasting rssCloud bound notice ' . $notice->id); + + $profile = $notice->getProfile(); + + $notifier = new RSSCloudNotifier(); + $notifier->notify($profile); + + return false; + } + + return true; + } + + /** + * Determine whether the notice was locally created + * + * @param Notice $notice the notice in question + * + * @return boolean locality + */ + + function _isLocal($notice) + { + return ($notice->is_local == Notice::LOCAL_PUBLIC || + $notice->is_local == Notice::LOCAL_NONPUBLIC); + } + + /** + * Create the rsscloud_subscription table if it's not + * already in the DB + * + * @return boolean hook return + */ + + function onCheckSchema() + { + $schema = Schema::get(); + $schema->ensureTable('rsscloud_subscription', + array(new ColumnDef('subscribed', 'integer', + null, false, 'PRI'), + new ColumnDef('url', 'varchar', + '255', false, 'PRI'), + new ColumnDef('failures', 'integer', + null, false, null, 0), + new ColumnDef('created', 'datetime', + null, false), + new ColumnDef('modified', 'timestamp', + null, false, null, + 'CURRENT_TIMESTAMP', + 'on update CURRENT_TIMESTAMP') + )); + return true; + } + + /** + * Add RSSCloudQueueHandler to the list of valid daemons to + * start + * + * @param array $daemons the list of daemons to run + * + * @return boolean hook return + * + */ + + function onGetValidDaemons($daemons) + { + array_push($daemons, INSTALLDIR . + '/plugins/RSSCloud/RSSCloudQueueHandler.php'); + return true; + } + + function onPluginVersion(&$versions) + { + $versions[] = array('name' => 'RSSCloud', + 'version' => RSSCLOUDPLUGIN_VERSION, + 'author' => 'Zach Copley', + 'homepage' => 'http://status.net/wiki/Plugin:RSSCloud', + 'rawdescription' => + _m('The RSSCloud plugin enables your StatusNet instance to publish ' . + 'real-time updates for profile RSS feeds using the ' . + '<a href="http://rsscloud.org/">RSSCloud protocol</a>".')); + + return true; + } + +} + diff --git a/plugins/RSSCloud/RSSCloudQueueHandler.php b/plugins/RSSCloud/RSSCloudQueueHandler.php new file mode 100755 index 000000000..693dd27c1 --- /dev/null +++ b/plugins/RSSCloud/RSSCloudQueueHandler.php @@ -0,0 +1,78 @@ +#!/usr/bin/env php +<?php +/* + * StatusNet - the distributed open-source microblogging tool + * Copyright (C) 2008, 2009, StatusNet, Inc. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + */ + +define('INSTALLDIR', realpath(dirname(__FILE__) . '/../..')); + +$shortoptions = 'i::'; +$longoptions = array('id::'); + +$helptext = <<<END_OF_ENJIT_HELP +Daemon script for pushing new notices to RSSCloud subscribers. + + -i --id Identity (default none) + +END_OF_ENJIT_HELP; + +require_once INSTALLDIR . '/scripts/commandline.inc'; +require_once INSTALLDIR . '/lib/queuehandler.php'; +require_once INSTALLDIR . '/plugins/RSSCloud/RSSCloudNotifier.php'; +require_once INSTALLDIR . '/plugins/RSSCloud/RSSCloudSubscription.php'; + +class RSSCloudQueueHandler extends QueueHandler +{ + var $notifier = null; + + function transport() + { + return 'rsscloud'; + } + + function start() + { + $this->log(LOG_INFO, "INITIALIZE"); + $this->notifier = new RSSCloudNotifier(); + return true; + } + + function handle_notice($notice) + { + $profile = $notice->getProfile(); + return $this->notifier->notify($profile); + } + + function finish() + { + } + +} + +if (have_option('i')) { + $id = get_option_value('i'); +} else if (have_option('--id')) { + $id = get_option_value('--id'); +} else if (count($args) > 0) { + $id = $args[0]; +} else { + $id = null; +} + +$handler = new RSSCloudQueueHandler($id); + +$handler->runOnce(); diff --git a/plugins/RSSCloud/RSSCloudRequestNotify.php b/plugins/RSSCloud/RSSCloudRequestNotify.php new file mode 100644 index 000000000..d76c08d37 --- /dev/null +++ b/plugins/RSSCloud/RSSCloudRequestNotify.php @@ -0,0 +1,347 @@ +<?php +/** + * Action to let RSSCloud aggregators request update notification when + * user profile feeds change. + * + * PHP version 5 + * + * @category Plugin + * @package StatusNet + * @author Zach Copley <zach@status.net> + * @license http://www.fsf.org/licensing/licenses/agpl.html AGPLv3 + * @link http://status.net/ + * + * StatusNet - the distributed open-source microblogging tool + * Copyright (C) 2009, StatusNet, Inc. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + */ + +if (!defined('STATUSNET')) { + exit(1); +} + +/** + * Action class to handle RSSCloud notification (subscription) requests + * + * @category Plugin + * @package StatusNet + * @author Zach Copley <zach@status.net> + * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 + * @link http://status.net/ + **/ + +class RSSCloudRequestNotifyAction extends Action +{ + /** + * Initialization. + * + * @param array $args Web and URL arguments + * + * @return boolean false if user doesn't exist + */ + + function prepare($args) + { + parent::prepare($args); + + $this->ip = $_SERVER['REMOTE_ADDR']; + $this->port = $this->arg('port'); + $this->path = $this->arg('path'); + + if ($this->path[0] != '/') { + $this->path = '/' . $this->path; + } + + $this->protocol = $this->arg('protocol'); + $this->procedure = $this->arg('notifyProcedure'); + $this->domain = $this->arg('domain'); + + $this->feeds = $this->getFeeds(); + + return true; + } + + /** + * Handle the request + * + * Checks for all the required parameters for a subscription, + * validates that the feed being subscribed to is real, and then + * saves the subsctiption. + * + * @param array $args $_REQUEST data (unused) + * + * @return void + */ + + function handle($args) + { + parent::handle($args); + + if ($_SERVER['REQUEST_METHOD'] != 'POST') { + $this->showResult(false, 'Request must be POST.'); + return; + } + + $missing = array(); + + if (empty($this->port)) { + $missing[] = 'port'; + } + + if (empty($this->path)) { + $missing[] = 'path'; + } + + if (empty($this->protocol)) { + $missing[] = 'protocol'; + } else if (strtolower($this->protocol) != 'http-post') { + $msg = 'Only http-post notifications are supported at this time.'; + $this->showResult(false, $msg); + return; + } + + if (!isset($this->procedure)) { + $missing[] = 'notifyProcedure'; + } + + if (!empty($missing)) { + $msg = 'The following parameters were missing from the request body: ' . + implode(', ', $missing) . '.'; + $this->showResult(false, $msg); + return; + } + + if (empty($this->feeds)) { + $msg = 'You must provide at least one valid profile feed url ' . + '(url1, url2, url3 ... urlN).'; + $this->showResult(false, $msg); + return; + } + + // We have to validate everything before saving anything. + // We only return one success or failure no matter how + // many feeds the subscriber is trying to subscribe to + + foreach ($this->feeds as $feed) { + + if (!$this->validateFeed($feed)) { + + $nh = $this->getNotifyUrl(); + common_log(LOG_WARNING, + "RSSCloud plugin - $nh tried to subscribe to invalid feed: $feed"); + + $msg = 'Feed subscription failed - Not a valid feed.'; + $this->showResult(false, $msg); + return; + } + + if (!$this->testNotificationHandler($feed)) { + $msg = 'Feed subscription failed - ' . + 'notification handler doesn\'t respond correctly.'; + $this->showResult(false, $msg); + return; + } + + } + + foreach ($this->feeds as $feed) { + $this->saveSubscription($feed); + } + + // XXX: What to do about deleting stale subscriptions? + // 25 hours seems harsh. WordPress doesn't ever remove + // subscriptions. + + $msg = 'Thanks for the subscription. ' . + 'When the feed(s) update(s) we\'ll notify you.'; + + $this->showResult(true, $msg); + } + + /** + * Validate that the requested feed is one we serve + * up via RSSCloud. + * + * @param string $feed the feed in question + * + * @return void + */ + + function validateFeed($feed) + { + $user = $this->userFromFeed($feed); + + if (empty($user)) { + return false; + } + + return true; + } + + /** + * Pull all of the urls (url1, url2, url3...urlN) that + * the subscriber wants to subscribe to. + * + * @return array $feeds the list of feeds + */ + + function getFeeds() + { + $feeds = array(); + + while (list($key, $feed) = each($this->args)) { + if (preg_match('/^url\d*$/', $key)) { + $feeds[] = $feed; + } + } + + return $feeds; + } + + /** + * Test that a notification handler is there and is reponding + * correctly. This is called before adding a subscription. + * + * @param string $feed the feed to verify + * + * @return boolean success result + */ + + function testNotificationHandler($feed) + { + $notifyUrl = $this->getNotifyUrl(); + + $notifier = new RSSCloudNotifier(); + + if (isset($this->domain)) { + + // 'domain' param set, so we have to use GET and send a challenge + + common_log(LOG_INFO, + 'RSSCloud plugin - Testing notification handler with challenge: ' . + $notifyUrl); + return $notifier->challenge($notifyUrl, $feed); + + } else { + common_log(LOG_INFO, 'RSSCloud plugin - Testing notification handler: ' . + $notifyUrl); + + return $notifier->postUpdate($notifyUrl, $feed); + } + } + + /** + * Build the URL for the notification handler based on the + * parameters passed in with the subscription request. + * + * @return string notification handler url + */ + + function getNotifyUrl() + { + if (isset($this->domain)) { + return 'http://' . $this->domain . ':' . $this->port . $this->path; + } else { + return 'http://' . $this->ip . ':' . $this->port . $this->path; + } + } + + /** + * Uses the nickname part of the subscribed feed URL to figure out + * whethere there's really a user with such a feed. Used to + * validate feeds before adding a subscription. + * + * @param string $feed the feed in question + * + * @return boolean success + */ + + function userFromFeed($feed) + { + // We only do profile feeds + + $path = common_path('api/statuses/user_timeline/'); + $valid = '%^' . $path . '(?<nickname>.*)\.rss$%'; + + if (preg_match($valid, $feed, $matches)) { + $user = User::staticGet('nickname', $matches['nickname']); + if (!empty($user)) { + return $user; + } + } + + return false; + } + + /** + * Save an RSSCloud subscription + * + * @param string $feed a valid profile feed + * + * @return boolean success result + */ + + function saveSubscription($feed) + { + $user = $this->userFromFeed($feed); + + $notifyUrl = $this->getNotifyUrl(); + + $sub = RSSCloudSubscription::getSubscription($user->id, $notifyUrl); + + if ($sub) { + common_log(LOG_INFO, "RSSCloud plugin - $notifyUrl refreshed subscription" . + " to user $user->nickname (id: $user->id)."); + } else { + + $sub = new RSSCloudSubscription(); + + $sub->subscribed = $user->id; + $sub->url = $notifyUrl; + $sub->created = common_sql_now(); + + if (!$sub->insert()) { + common_log_db_error($sub, 'INSERT', __FILE__); + return false; + } + + common_log(LOG_INFO, "RSSCloud plugin - $notifyUrl subscribed" . + " to user $user->nickname (id: $user->id)"); + } + + return true; + } + + /** + * Show an XML message indicating the subscription + * was successful or failed. + * + * @param boolean $success whether it was good or bad + * @param string $msg the message to output + * + * @return boolean success result + */ + + function showResult($success, $msg) + { + $this->startXML(); + $this->elementStart('notifyResult', + array('success' => ($success) ? 'true' : 'false', + 'msg' => $msg)); + $this->endXML(); + } + +} + diff --git a/plugins/RSSCloud/RSSCloudSubscription.php b/plugins/RSSCloud/RSSCloudSubscription.php new file mode 100644 index 000000000..396c604e7 --- /dev/null +++ b/plugins/RSSCloud/RSSCloudSubscription.php @@ -0,0 +1,79 @@ +<?php +/* + * StatusNet - the distributed open-source microblogging tool + * Copyright (C) 2008, 2009, StatusNet, Inc. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + */ + +if (!defined('STATUSNET') && !defined('LACONICA')) { + exit(1); +} + +/** + * Table Definition for rsscloud_subscription + */ + +require_once INSTALLDIR . '/classes/Memcached_DataObject.php'; + +class RSSCloudSubscription extends Memcached_DataObject { + + var $__table='rsscloud_subscription'; // table name + var $subscribed; // int primary key user id + var $url; // string primary key + var $failures; // int + var $created; // datestamp() + var $modified; // timestamp() not_null default_CURRENT_TIMESTAMP + + function staticGet($k,$v=NULL) { return DB_DataObject::staticGet('DataObjects_Grp',$k,$v); } + + function table() + { + + $db = $this->getDatabaseConnection(); + $dbtype = $db->phptype; + + $cols = array('subscribed' => DB_DATAOBJECT_INT + DB_DATAOBJECT_NOTNULL, + 'url' => DB_DATAOBJECT_STR + DB_DATAOBJECT_NOTNULL, + 'failures' => DB_DATAOBJECT_INT, + 'created' => DB_DATAOBJECT_STR + DB_DATAOBJECT_DATE + DB_DATAOBJECT_TIME + DB_DATAOBJECT_NOTNULL, + 'modified' => ($dbtype == 'mysql' || $dbtype == 'mysqli') ? + DB_DATAOBJECT_MYSQLTIMESTAMP + DB_DATAOBJECT_NOTNULL : + DB_DATAOBJECT_STR + DB_DATAOBJECT_DATE + DB_DATAOBJECT_TIME + ); + + return $cols; + } + + function keys() + { + return array('subscribed' => 'N', 'url' => 'N'); + } + + static function getSubscription($subscribed, $url) + { + $sub = new RSSCloudSubscription(); + $sub->whereAdd("subscribed = $subscribed"); + $sub->whereAdd("url = '$url'"); + $sub->limit(1); + + if ($sub->find()) { + $sub->fetch(); + return $sub; + } + + return false; + } + +} diff --git a/plugins/Realtime/RealtimePlugin.php b/plugins/Realtime/RealtimePlugin.php index a810b7165..21e465b53 100644 --- a/plugins/Realtime/RealtimePlugin.php +++ b/plugins/Realtime/RealtimePlugin.php @@ -310,8 +310,7 @@ class RealtimePlugin extends Plugin function _getScripts() { - return array('plugins/Realtime/realtimeupdate.js', - 'plugins/Realtime/json2.js'); + return array('plugins/Realtime/realtimeupdate.js'); } function _updateInitialize($timeline, $user_id) diff --git a/plugins/Realtime/json2.js b/plugins/Realtime/json2.js deleted file mode 100644 index 7e27df518..000000000 --- a/plugins/Realtime/json2.js +++ /dev/null @@ -1,478 +0,0 @@ -/* - http://www.JSON.org/json2.js - 2009-04-16 - - Public Domain. - - NO WARRANTY EXPRESSED OR IMPLIED. USE AT YOUR OWN RISK. - - See http://www.JSON.org/js.html - - This file creates a global JSON object containing two methods: stringify - and parse. - - JSON.stringify(value, replacer, space) - value any JavaScript value, usually an object or array. - - replacer an optional parameter that determines how object - values are stringified for objects. It can be a - function or an array of strings. - - space an optional parameter that specifies the indentation - of nested structures. If it is omitted, the text will - be packed without extra whitespace. If it is a number, - it will specify the number of spaces to indent at each - level. If it is a string (such as '\t' or ' '), - it contains the characters used to indent at each level. - - This method produces a JSON text from a JavaScript value. - - When an object value is found, if the object contains a toJSON - method, its toJSON method will be called and the result will be - stringified. A toJSON method does not serialize: it returns the - value represented by the name/value pair that should be serialized, - or undefined if nothing should be serialized. The toJSON method - will be passed the key associated with the value, and this will be - bound to the object holding the key. - - For example, this would serialize Dates as ISO strings. - - Date.prototype.toJSON = function (key) { - function f(n) { - // Format integers to have at least two digits. - return n < 10 ? '0' + n : n; - } - - return this.getUTCFullYear() + '-' + - f(this.getUTCMonth() + 1) + '-' + - f(this.getUTCDate()) + 'T' + - f(this.getUTCHours()) + ':' + - f(this.getUTCMinutes()) + ':' + - f(this.getUTCSeconds()) + 'Z'; - }; - - You can provide an optional replacer method. It will be passed the - key and value of each member, with this bound to the containing - object. The value that is returned from your method will be - serialized. If your method returns undefined, then the member will - be excluded from the serialization. - - If the replacer parameter is an array of strings, then it will be - used to select the members to be serialized. It filters the results - such that only members with keys listed in the replacer array are - stringified. - - Values that do not have JSON representations, such as undefined or - functions, will not be serialized. Such values in objects will be - dropped; in arrays they will be replaced with null. You can use - a replacer function to replace those with JSON values. - JSON.stringify(undefined) returns undefined. - - The optional space parameter produces a stringification of the - value that is filled with line breaks and indentation to make it - easier to read. - - If the space parameter is a non-empty string, then that string will - be used for indentation. If the space parameter is a number, then - the indentation will be that many spaces. - - Example: - - text = JSON.stringify(['e', {pluribus: 'unum'}]); - // text is '["e",{"pluribus":"unum"}]' - - - text = JSON.stringify(['e', {pluribus: 'unum'}], null, '\t'); - // text is '[\n\t"e",\n\t{\n\t\t"pluribus": "unum"\n\t}\n]' - - text = JSON.stringify([new Date()], function (key, value) { - return this[key] instanceof Date ? - 'Date(' + this[key] + ')' : value; - }); - // text is '["Date(---current time---)"]' - - - JSON.parse(text, reviver) - This method parses a JSON text to produce an object or array. - It can throw a SyntaxError exception. - - The optional reviver parameter is a function that can filter and - transform the results. It receives each of the keys and values, - and its return value is used instead of the original value. - If it returns what it received, then the structure is not modified. - If it returns undefined then the member is deleted. - - Example: - - // Parse the text. Values that look like ISO date strings will - // be converted to Date objects. - - myData = JSON.parse(text, function (key, value) { - var a; - if (typeof value === 'string') { - a = -/^(\d{4})-(\d{2})-(\d{2})T(\d{2}):(\d{2}):(\d{2}(?:\.\d*)?)Z$/.exec(value); - if (a) { - return new Date(Date.UTC(+a[1], +a[2] - 1, +a[3], +a[4], - +a[5], +a[6])); - } - } - return value; - }); - - myData = JSON.parse('["Date(09/09/2001)"]', function (key, value) { - var d; - if (typeof value === 'string' && - value.slice(0, 5) === 'Date(' && - value.slice(-1) === ')') { - d = new Date(value.slice(5, -1)); - if (d) { - return d; - } - } - return value; - }); - - - This is a reference implementation. You are free to copy, modify, or - redistribute. - - This code should be minified before deployment. - See http://javascript.crockford.com/jsmin.html - - USE YOUR OWN COPY. IT IS EXTREMELY UNWISE TO LOAD CODE FROM SERVERS YOU DO - NOT CONTROL. -*/ - -/*jslint evil: true */ - -/*global JSON */ - -/*members "", "\b", "\t", "\n", "\f", "\r", "\"", JSON, "\\", apply, - call, charCodeAt, getUTCDate, getUTCFullYear, getUTCHours, - getUTCMinutes, getUTCMonth, getUTCSeconds, hasOwnProperty, join, - lastIndex, length, parse, prototype, push, replace, slice, stringify, - test, toJSON, toString, valueOf -*/ - -// Create a JSON object only if one does not already exist. We create the -// methods in a closure to avoid creating global variables. - -if (!this.JSON) { - JSON = {}; -} -(function () { - - function f(n) { - // Format integers to have at least two digits. - return n < 10 ? '0' + n : n; - } - - if (typeof Date.prototype.toJSON !== 'function') { - - Date.prototype.toJSON = function (key) { - - return this.getUTCFullYear() + '-' + - f(this.getUTCMonth() + 1) + '-' + - f(this.getUTCDate()) + 'T' + - f(this.getUTCHours()) + ':' + - f(this.getUTCMinutes()) + ':' + - f(this.getUTCSeconds()) + 'Z'; - }; - - String.prototype.toJSON = - Number.prototype.toJSON = - Boolean.prototype.toJSON = function (key) { - return this.valueOf(); - }; - } - - var cx = /[\u0000\u00ad\u0600-\u0604\u070f\u17b4\u17b5\u200c-\u200f\u2028-\u202f\u2060-\u206f\ufeff\ufff0-\uffff]/g, - escapable = /[\\\"\x00-\x1f\x7f-\x9f\u00ad\u0600-\u0604\u070f\u17b4\u17b5\u200c-\u200f\u2028-\u202f\u2060-\u206f\ufeff\ufff0-\uffff]/g, - gap, - indent, - meta = { // table of character substitutions - '\b': '\\b', - '\t': '\\t', - '\n': '\\n', - '\f': '\\f', - '\r': '\\r', - '"' : '\\"', - '\\': '\\\\' - }, - rep; - - - function quote(string) { - -// If the string contains no control characters, no quote characters, and no -// backslash characters, then we can safely slap some quotes around it. -// Otherwise we must also replace the offending characters with safe escape -// sequences. - - escapable.lastIndex = 0; - return escapable.test(string) ? - '"' + string.replace(escapable, function (a) { - var c = meta[a]; - return typeof c === 'string' ? c : - '\\u' + ('0000' + a.charCodeAt(0).toString(16)).slice(-4); - }) + '"' : - '"' + string + '"'; - } - - - function str(key, holder) { - -// Produce a string from holder[key]. - - var i, // The loop counter. - k, // The member key. - v, // The member value. - length, - mind = gap, - partial, - value = holder[key]; - -// If the value has a toJSON method, call it to obtain a replacement value. - - if (value && typeof value === 'object' && - typeof value.toJSON === 'function') { - value = value.toJSON(key); - } - -// If we were called with a replacer function, then call the replacer to -// obtain a replacement value. - - if (typeof rep === 'function') { - value = rep.call(holder, key, value); - } - -// What happens next depends on the value's type. - - switch (typeof value) { - case 'string': - return quote(value); - - case 'number': - -// JSON numbers must be finite. Encode non-finite numbers as null. - - return isFinite(value) ? String(value) : 'null'; - - case 'boolean': - case 'null': - -// If the value is a boolean or null, convert it to a string. Note: -// typeof null does not produce 'null'. The case is included here in -// the remote chance that this gets fixed someday. - - return String(value); - -// If the type is 'object', we might be dealing with an object or an array or -// null. - - case 'object': - -// Due to a specification blunder in ECMAScript, typeof null is 'object', -// so watch out for that case. - - if (!value) { - return 'null'; - } - -// Make an array to hold the partial results of stringifying this object value. - - gap += indent; - partial = []; - -// Is the value an array? - - if (Object.prototype.toString.apply(value) === '[object Array]') { - -// The value is an array. Stringify every element. Use null as a placeholder -// for non-JSON values. - - length = value.length; - for (i = 0; i < length; i += 1) { - partial[i] = str(i, value) || 'null'; - } - -// Join all of the elements together, separated with commas, and wrap them in -// brackets. - - v = partial.length === 0 ? '[]' : - gap ? '[\n' + gap + - partial.join(',\n' + gap) + '\n' + - mind + ']' : - '[' + partial.join(',') + ']'; - gap = mind; - return v; - } - -// If the replacer is an array, use it to select the members to be stringified. - - if (rep && typeof rep === 'object') { - length = rep.length; - for (i = 0; i < length; i += 1) { - k = rep[i]; - if (typeof k === 'string') { - v = str(k, value); - if (v) { - partial.push(quote(k) + (gap ? ': ' : ':') + v); - } - } - } - } else { - -// Otherwise, iterate through all of the keys in the object. - - for (k in value) { - if (Object.hasOwnProperty.call(value, k)) { - v = str(k, value); - if (v) { - partial.push(quote(k) + (gap ? ': ' : ':') + v); - } - } - } - } - -// Join all of the member texts together, separated with commas, -// and wrap them in braces. - - v = partial.length === 0 ? '{}' : - gap ? '{\n' + gap + partial.join(',\n' + gap) + '\n' + - mind + '}' : '{' + partial.join(',') + '}'; - gap = mind; - return v; - } - } - -// If the JSON object does not yet have a stringify method, give it one. - - if (typeof JSON.stringify !== 'function') { - JSON.stringify = function (value, replacer, space) { - -// The stringify method takes a value and an optional replacer, and an optional -// space parameter, and returns a JSON text. The replacer can be a function -// that can replace values, or an array of strings that will select the keys. -// A default replacer method can be provided. Use of the space parameter can -// produce text that is more easily readable. - - var i; - gap = ''; - indent = ''; - -// If the space parameter is a number, make an indent string containing that -// many spaces. - - if (typeof space === 'number') { - for (i = 0; i < space; i += 1) { - indent += ' '; - } - -// If the space parameter is a string, it will be used as the indent string. - - } else if (typeof space === 'string') { - indent = space; - } - -// If there is a replacer, it must be a function or an array. -// Otherwise, throw an error. - - rep = replacer; - if (replacer && typeof replacer !== 'function' && - (typeof replacer !== 'object' || - typeof replacer.length !== 'number')) { - throw new Error('JSON.stringify'); - } - -// Make a fake root object containing our value under the key of ''. -// Return the result of stringifying the value. - - return str('', {'': value}); - }; - } - - -// If the JSON object does not yet have a parse method, give it one. - - if (typeof JSON.parse !== 'function') { - JSON.parse = function (text, reviver) { - -// The parse method takes a text and an optional reviver function, and returns -// a JavaScript value if the text is a valid JSON text. - - var j; - - function walk(holder, key) { - -// The walk method is used to recursively walk the resulting structure so -// that modifications can be made. - - var k, v, value = holder[key]; - if (value && typeof value === 'object') { - for (k in value) { - if (Object.hasOwnProperty.call(value, k)) { - v = walk(value, k); - if (v !== undefined) { - value[k] = v; - } else { - delete value[k]; - } - } - } - } - return reviver.call(holder, key, value); - } - - -// Parsing happens in four stages. In the first stage, we replace certain -// Unicode characters with escape sequences. JavaScript handles many characters -// incorrectly, either silently deleting them, or treating them as line endings. - - cx.lastIndex = 0; - if (cx.test(text)) { - text = text.replace(cx, function (a) { - return '\\u' + - ('0000' + a.charCodeAt(0).toString(16)).slice(-4); - }); - } - -// In the second stage, we run the text against regular expressions that look -// for non-JSON patterns. We are especially concerned with '()' and 'new' -// because they can cause invocation, and '=' because it can cause mutation. -// But just to be safe, we want to reject all unexpected forms. - -// We split the second stage into 4 regexp operations in order to work around -// crippling inefficiencies in IE's and Safari's regexp engines. First we -// replace the JSON backslash pairs with '@' (a non-JSON character). Second, we -// replace all simple value tokens with ']' characters. Third, we delete all -// open brackets that follow a colon or comma or that begin the text. Finally, -// we look to see that the remaining characters are only whitespace or ']' or -// ',' or ':' or '{' or '}'. If that is so, then the text is safe for eval. - - if (/^[\],:{}\s]*$/. -test(text.replace(/\\(?:["\\\/bfnrt]|u[0-9a-fA-F]{4})/g, '@'). -replace(/"[^"\\\n\r]*"|true|false|null|-?\d+(?:\.\d*)?(?:[eE][+\-]?\d+)?/g, ']'). -replace(/(?:^|:|,)(?:\s*\[)+/g, ''))) { - -// In the third stage we use the eval function to compile the text into a -// JavaScript structure. The '{' operator is subject to a syntactic ambiguity -// in JavaScript: it can begin a block or an object literal. We wrap the text -// in parens to eliminate the ambiguity. - - j = eval('(' + text + ')'); - -// In the optional fourth stage, we recursively walk the new structure, passing -// each name/value pair to a reviver function for possible transformation. - - return typeof reviver === 'function' ? - walk({'': j}, '') : j; - } - -// If the text is not JSON parseable, then a SyntaxError is thrown. - - throw new SyntaxError('JSON.parse'); - }; - } -}()); diff --git a/plugins/Recaptcha/RecaptchaPlugin.php b/plugins/Recaptcha/RecaptchaPlugin.php index db118dbb8..3665214f8 100644 --- a/plugins/Recaptcha/RecaptchaPlugin.php +++ b/plugins/Recaptcha/RecaptchaPlugin.php @@ -62,9 +62,8 @@ class RecaptchaPlugin extends Plugin function onEndRegistrationFormData($action) { - $action->style('#recaptcha_area{float:left;}'); $action->elementStart('li'); - $action->raw('<label for="recaptcha_area">Captcha</label>'); + $action->raw('<label for="recaptcha">Captcha</label>'); if($this->checkssl() === true) { $action->raw(recaptcha_get_html($this->public_key), null, true); } else { diff --git a/plugins/RequireValidatedEmail/RequireValidatedEmailPlugin.php b/plugins/RequireValidatedEmail/RequireValidatedEmailPlugin.php index 04adbf00e..3581f1de9 100644 --- a/plugins/RequireValidatedEmail/RequireValidatedEmailPlugin.php +++ b/plugins/RequireValidatedEmail/RequireValidatedEmailPlugin.php @@ -96,5 +96,16 @@ class RequireValidatedEmailPlugin extends Plugin } return false; } + + function onPluginVersion(&$versions) + { + $versions[] = array('name' => 'Require Validated Email', + 'version' => STATUSNET_VERSION, + 'author' => 'Craig Andrews, Evan Prodromou, Brion Vibber', + 'homepage' => 'http://status.net/wiki/Plugin:RequireValidatedEmail', + 'rawdescription' => + _m('The Require Validated Email plugin disables posting for accounts that do not have a validated email address.')); + return true; + } } diff --git a/plugins/ReverseUsernameAuthentication/ReverseUsernameAuthenticationPlugin.php b/plugins/ReverseUsernameAuthentication/ReverseUsernameAuthenticationPlugin.php index d48283b2e..d9d2137f8 100644 --- a/plugins/ReverseUsernameAuthentication/ReverseUsernameAuthenticationPlugin.php +++ b/plugins/ReverseUsernameAuthentication/ReverseUsernameAuthenticationPlugin.php @@ -31,8 +31,6 @@ if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); } -require_once INSTALLDIR.'/plugins/Authentication/AuthenticationPlugin.php'; - class ReverseUsernameAuthenticationPlugin extends AuthenticationPlugin { //---interface implementation---// @@ -55,4 +53,15 @@ class ReverseUsernameAuthenticationPlugin extends AuthenticationPlugin $registration_data['nickname'] = $username ; return User::register($registration_data); } + + function onPluginVersion(&$versions) + { + $versions[] = array('name' => 'Reverse Username Authentication', + 'version' => STATUSNET_VERSION, + 'author' => 'Craig Andrews', + 'homepage' => 'http://status.net/wiki/Plugin:ReverseUsernameAuthentication', + 'rawdescription' => + _m('The Reverse Username Authentication plugin allows for StatusNet to handle authentication by checking if the provided password is the same as the reverse of the username.')); + return true; + } } diff --git a/plugins/Sample/SamplePlugin.php b/plugins/Sample/SamplePlugin.php index 7ea956af6..913741226 100644 --- a/plugins/Sample/SamplePlugin.php +++ b/plugins/Sample/SamplePlugin.php @@ -266,5 +266,16 @@ class SamplePlugin extends Plugin _m('Hello'), _m('A warm greeting'), false, 'nav_hello'); return true; } + + function onPluginVersion(&$versions) + { + $versions[] = array('name' => 'Sample', + 'version' => STATUSNET_VERSION, + 'author' => 'Brion Vibber, Evan Prodromou', + 'homepage' => 'http://status.net/wiki/Plugin:Sample', + 'rawdescription' => + _m('A sample plugin to show basics of development for new hackers.')); + return true; + } } diff --git a/plugins/SimpleUrl/SimpleUrlPlugin.php b/plugins/SimpleUrl/SimpleUrlPlugin.php index 45b745b07..6eac7dbb1 100644 --- a/plugins/SimpleUrl/SimpleUrlPlugin.php +++ b/plugins/SimpleUrl/SimpleUrlPlugin.php @@ -47,5 +47,18 @@ class SimpleUrlPlugin extends UrlShortenerPlugin protected function shorten($url) { return $this->http_get(sprintf($this->serviceUrl,urlencode($url))); } + + function onPluginVersion(&$versions) + { + $versions[] = array('name' => sprintf('SimpleUrl (%s)', $this->shortenerName), + 'version' => STATUSNET_VERSION, + 'author' => 'Craig Andrews', + 'homepage' => 'http://status.net/wiki/Plugin:SimpleUrl', + 'rawdescription' => + sprintf(_m('Uses <a href="http://%1$s/">%1$s</a> URL-shortener service.'), + $this->shortenerName)); + + return true; + } } diff --git a/plugins/TemplatePlugin.php b/plugins/TemplatePlugin.php index 18aa8034c..80625c5b7 100644 --- a/plugins/TemplatePlugin.php +++ b/plugins/TemplatePlugin.php @@ -22,13 +22,13 @@ if (!defined('STATUSNET')) { define('TEMPLATEPLUGIN_VERSION', '0.1'); class TemplatePlugin extends Plugin { - + var $blocks = array(); - + function __construct() { parent::__construct(); } - + // capture the RouterInitialized event // and connect a new API method // for updating the template @@ -37,8 +37,7 @@ class TemplatePlugin extends Plugin { 'action' => 'template', )); } - - + // <%styles%> // <%scripts%> // <%search%> @@ -50,18 +49,18 @@ class TemplatePlugin extends Plugin { $act->extraHead(); $this->blocks['head'] = $act->xw->flush(); $act->showStylesheets(); - $this->blocks['styles'] = $act->xw->flush(); + $this->blocks['styles'] = $act->xw->flush(); $act->showScripts(); - $this->blocks['scripts'] = $act->xw->flush(); + $this->blocks['scripts'] = $act->xw->flush(); $act->showFeeds(); - $this->blocks['feeds'] = $act->xw->flush(); + $this->blocks['feeds'] = $act->xw->flush(); $act->showOpenSearch(); - $this->blocks['search'] = $act->xw->flush(); + $this->blocks['search'] = $act->xw->flush(); $act->showDescription(); $this->blocks['description'] = $act->xw->flush(); return false; } - + // <%bodytext%> function onStartShowContentBlock( &$act ) { $this->clear_xmlWriter($act); @@ -70,7 +69,7 @@ class TemplatePlugin extends Plugin { function onEndShowContentBlock( &$act ) { $this->blocks['bodytext'] = $act->xw->flush(); } - + // <%localnav%> function onStartShowLocalNavBlock( &$act ) { $this->clear_xmlWriter($act); @@ -79,7 +78,7 @@ class TemplatePlugin extends Plugin { function onEndShowLocalNavBlock( &$act ) { $this->blocks['localnav'] = $act->xw->flush(); } - + // <%export%> function onStartShowExportData( &$act ) { $this->clear_xmlWriter($act); @@ -88,7 +87,7 @@ class TemplatePlugin extends Plugin { function onEndShowExportData( &$act ) { $this->blocks['export'] = $act->xw->flush(); } - + // <%subscriptions%> // <%subscribers%> // <%groups%> @@ -149,7 +148,7 @@ class TemplatePlugin extends Plugin { } return false; } - + // <%logo%> // <%nav%> // <%notice%> @@ -170,7 +169,7 @@ class TemplatePlugin extends Plugin { $this->blocks['noticeform'] = $act->xw->flush(); return false; } - + // <%secondarynav%> // <%licenses%> function onStartShowFooter( &$act ) { @@ -181,19 +180,19 @@ class TemplatePlugin extends Plugin { $this->blocks['licenses'] = $act->xw->flush(); return false; } - + // capture the EndHTML event // and include the template function onEndEndHTML($act) { - + global $action, $tags; - + // set the action and title values $vars = array( 'action'=>$action, 'title'=>$act->title(). " - ". common_config('site', 'name') ); - + // use the PHP template // unless statusnet config: // $config['template']['mode'] = 'html'; @@ -203,55 +202,55 @@ class TemplatePlugin extends Plugin { include $tpl_file; return; } - + $tpl_file = $this->templateFolder() . '/index.html'; - + // read the static template $output = file_get_contents( $tpl_file ); - + $tags = array(); - + // get a list of the <%tags%> in the template $pattern='/<%([a-z]+)%>/'; - + if ( 1 <= preg_match_all( $pattern, $output, $found )) $tags[] = $found; - + // for each found tag, set its value from the rendered blocks foreach( $tags[0][1] as $pos=>$tag ) { if (isset($this->blocks[$tag])) $vars[$tag] = $this->blocks[$tag]; - + // didn't find a block for the tag elseif (!isset($vars[$tag])) $vars[$tag] = ''; } - + // replace the tags in the template foreach( $vars as $key=>$val ) $output = str_replace( '<%'.$key.'%>', $val, $output ); - + echo $output; - + return true; - + } function templateFolder() { return 'tpl'; } - + // catching the StartShowHTML event to halt the rendering function onStartShowHTML( &$act ) { $this->clear_xmlWriter($act); return true; } - + // clear the xmlWriter function clear_xmlWriter( &$act ) { $act->xw->openMemory(); $act->xw->setIndent(true); } - + } /** @@ -267,7 +266,7 @@ class TemplatePlugin extends Plugin { * @link http://megapump.com/ * */ - + class TemplateAction extends Action { @@ -275,54 +274,65 @@ class TemplateAction extends Action parent::prepare($args); return true; } - + function handle($args) { - + parent::handle($args); - + if (!isset($_SERVER['PHP_AUTH_USER'])) { - + // not authenticated, show login form header('WWW-Authenticate: Basic realm="StatusNet API"'); - + // cancelled the browser login form $this->clientError(_('Authentication error!'), $code = 401); - + } else { - + $nick = $_SERVER['PHP_AUTH_USER']; $pass = $_SERVER['PHP_AUTH_PW']; - + // check username and password $user = common_check_user($nick,$pass); - + if ($user) { - + // verify that user is admin if (!($user->id == 1)) $this->clientError(_('Only User #1 can update the template.'), $code = 401); - + // open the old template $tpl_file = $this->templateFolder() . '/index.html'; $fp = fopen( $tpl_file, 'w+' ); - + // overwrite with the new template fwrite($fp, $this->arg('template')); fclose($fp); - + header('HTTP/1.1 200 OK'); header('Content-type: text/plain'); print "Template Updated!"; - + } else { - + // bad username and password $this->clientError(_('Authentication error!'), $code = 401); - + } - + } } + function onPluginVersion(&$versions) + { + $versions[] = array('name' => 'Template', + 'version' => TEMPLATEPLUGIN_VERSION, + 'author' => 'Brian Hendrickson', + 'homepage' => 'http://status.net/wiki/Plugin:Template', + 'rawdescription' => + _m('Use an HTML template for Web output.')); + return true; + } + } /** diff --git a/plugins/TightUrl/TightUrlPlugin.php b/plugins/TightUrl/TightUrlPlugin.php index 6ced9afdc..e2d494a7b 100644 --- a/plugins/TightUrl/TightUrlPlugin.php +++ b/plugins/TightUrl/TightUrlPlugin.php @@ -57,4 +57,16 @@ class TightUrlPlugin extends UrlShortenerPlugin return strval($xml['href']); } } + + function onPluginVersion(&$versions) + { + $versions[] = array('name' => sprintf('TightUrl (%s)', $this->shortenerName), + 'version' => STATUSNET_VERSION, + 'author' => 'Craig Andrews', + 'homepage' => 'http://status.net/wiki/Plugin:TightUrl', + 'rawdescription' => + sprintf(_m('Uses <a href="http://%1$s/">%1$s</a> URL-shortener service.'), + $this->shortenerName)); + return true; + } } diff --git a/plugins/TwitterBridge/TwitterBridgePlugin.php b/plugins/TwitterBridge/TwitterBridgePlugin.php index de1181903..a87ee2894 100644 --- a/plugins/TwitterBridge/TwitterBridgePlugin.php +++ b/plugins/TwitterBridge/TwitterBridgePlugin.php @@ -31,6 +31,8 @@ if (!defined('STATUSNET')) { require_once INSTALLDIR . '/plugins/TwitterBridge/twitter.php'; +define('TWITTERBRIDGEPLUGIN_VERSION', '0.9'); + /** * Plugin for sending and importing Twitter statuses * @@ -189,4 +191,17 @@ class TwitterBridgePlugin extends Plugin return true; } + function onPluginVersion(&$versions) + { + $versions[] = array('name' => 'TwitterBridge', + 'version' => TWITTERBRIDGEPLUGIN_VERSION, + 'author' => 'Zach Copley', + 'homepage' => 'http://status.net/wiki/Plugin:TwitterBridge', + 'rawdescription' => + _m('The Twitter "bridge" plugin allows you to integrate ' . + 'your StatusNet instance with ' . + '<a href="http://twitter.com/">Twitter</a>.')); + return true; + } + } diff --git a/plugins/UserFlag/UserFlagPlugin.php b/plugins/UserFlag/UserFlagPlugin.php index 602a5bfa8..a33869c19 100644 --- a/plugins/UserFlag/UserFlagPlugin.php +++ b/plugins/UserFlag/UserFlagPlugin.php @@ -102,20 +102,20 @@ class UserFlagPlugin extends Plugin function onAutoload($cls) { - switch ($cls) + switch (strtolower($cls)) { - case 'FlagprofileAction': - case 'AdminprofileflagAction': - case 'ClearflagAction': + case 'flagprofileaction': + case 'adminprofileflagaction': + case 'clearflagaction': include_once INSTALLDIR.'/plugins/UserFlag/' . strtolower(mb_substr($cls, 0, -6)) . '.php'; return false; - case 'FlagProfileForm': - case 'ClearFlagForm': + case 'flagprofileform': + case 'clearflagform': include_once INSTALLDIR.'/plugins/UserFlag/' . strtolower($cls . '.php'); return false; - case 'User_flag_profile': - include_once INSTALLDIR.'/plugins/UserFlag/'.$cls.'.php'; + case 'user_flag_profile': + include_once INSTALLDIR.'/plugins/UserFlag/'.ucfirst(strtolower($cls)).'.php'; return false; default: return true; @@ -258,4 +258,39 @@ class UserFlagPlugin extends Plugin } return true; } + + /** + * Ensure that flag entries for a profile are deleted + * along with the profile when deleting users. + * This prevents breakage of the admin profile flag UI. + * + * @param Profile $profile + * @param array &$related list of related tables; entries + * with matching profile_id will be deleted. + * + * @return boolean hook result + */ + + function onProfileDeleteRelated($profile, &$related) + { + $related[] = 'user_flag_profile'; + return true; + } + + /** + * Ensure that flag entries created by a user are deleted + * when that user gets deleted. + * + * @param User $user + * @param array &$related list of related tables; entries + * with matching user_id will be deleted. + * + * @return boolean hook result + */ + + function onUserDeleteRelated($user, &$related) + { + $related[] = 'user_flag_profile'; + return true; + } } diff --git a/plugins/UserFlag/User_flag_profile.php b/plugins/UserFlag/User_flag_profile.php index 658259452..bc4251cf7 100644 --- a/plugins/UserFlag/User_flag_profile.php +++ b/plugins/UserFlag/User_flag_profile.php @@ -90,6 +90,17 @@ class User_flag_profile extends Memcached_DataObject } /** + * return key definitions for DB_DataObject + * + * @return array key definitions + */ + + function keyTypes() + { + return $this->keys(); + } + + /** * Get a single object with multiple keys * * @param array $kv Map of key-value pairs @@ -97,7 +108,7 @@ class User_flag_profile extends Memcached_DataObject * @return User_flag_profile found object or null */ - function &pkeyGet($kv) + function pkeyGet($kv) { return Memcached_DataObject::pkeyGet('User_flag_profile', $kv); } diff --git a/plugins/WikiHashtagsPlugin.php b/plugins/WikiHashtagsPlugin.php index 334fc13ba..c6c976b8f 100644 --- a/plugins/WikiHashtagsPlugin.php +++ b/plugins/WikiHashtagsPlugin.php @@ -31,8 +31,6 @@ if (!defined('STATUSNET')) { exit(1); } -define('WIKIHASHTAGSPLUGIN_VERSION', '0.1'); - /** * Plugin to use WikiHashtags * @@ -47,6 +45,8 @@ define('WIKIHASHTAGSPLUGIN_VERSION', '0.1'); class WikiHashtagsPlugin extends Plugin { + const VERSION = '0.1'; + function __construct($code=null) { parent::__construct(); @@ -99,4 +99,15 @@ class WikiHashtagsPlugin extends Plugin return true; } + + function onPluginVersion(&$versions) + { + $versions[] = array('name' => 'WikiHashtags', + 'version' => self::VERSION, + 'author' => 'Evan Prodromou', + 'homepage' => 'http://status.net/wiki/Plugin:WikiHashtags', + 'rawdescription' => + _m('Gets hashtag descriptions from <a href="http://hashtags.wikia.com/">WikiHashtags</a>.')); + return true; + } } diff --git a/plugins/XCachePlugin.php b/plugins/XCachePlugin.php index 03cb0c06e..2baa290ed 100644 --- a/plugins/XCachePlugin.php +++ b/plugins/XCachePlugin.php @@ -109,5 +109,16 @@ class XCachePlugin extends Plugin Event::handle('EndCacheDelete', array($key)); return false; } + + function onPluginVersion(&$versions) + { + $versions[] = array('name' => 'XCache', + 'version' => STATUSNET_VERSION, + 'author' => 'Craig Andrews', + 'homepage' => 'http://status.net/wiki/Plugin:XCache', + 'rawdescription' => + _m('Use the <a href="http://xcache.lighttpd.net/">XCache</a> variable cache to cache query results.')); + return true; + } } diff --git a/scripts/console.php b/scripts/console.php index 329caf472..8b62a3a96 100755 --- a/scripts/console.php +++ b/scripts/console.php @@ -128,6 +128,8 @@ function console_help() if (CONSOLE_INTERACTIVE) { print "StatusNet interactive PHP console... type ctrl+D or enter 'exit' to exit.\n"; $prompt = common_config('site', 'name') . '> '; +} else { + $prompt = ''; } while (!feof(STDIN)) { $line = read_input_line($prompt); diff --git a/scripts/createsim.php b/scripts/createsim.php index 1266a9700..882d74456 100644 --- a/scripts/createsim.php +++ b/scripts/createsim.php @@ -41,9 +41,12 @@ require_once INSTALLDIR.'/scripts/commandline.inc'; function newUser($i) { global $userprefix; - User::register(array('nickname' => sprintf('%s%d', $userprefix, $i), - 'password' => sprintf('password%d', $i), - 'fullname' => sprintf('Test User %d', $i))); + $user = User::register(array('nickname' => sprintf('%s%d', $userprefix, $i), + 'password' => sprintf('password%d', $i), + 'fullname' => sprintf('Test User %d', $i))); + if (!empty($user)) { + $user->free(); + } } function newNotice($i, $tagmax) @@ -73,6 +76,9 @@ function newNotice($i, $tagmax) } $notice = Notice::saveNew($user->id, $content, 'system'); + + $user->free(); + $notice->free(); } function newSub($i) @@ -106,6 +112,9 @@ function newSub($i) } subs_subscribe_to($from, $to); + + $from->free(); + $to->free(); } function main($usercount, $noticeavg, $subsavg, $tagmax) diff --git a/scripts/deleteuser.php b/scripts/deleteuser.php index 52389123c..5373c73ce 100755 --- a/scripts/deleteuser.php +++ b/scripts/deleteuser.php @@ -21,7 +21,7 @@ define('INSTALLDIR', realpath(dirname(__FILE__) . '/..')); $shortoptions = 'i::n::y'; -$longoptions = array('id::nickname::yes'); +$longoptions = array('id=', 'nickname=', 'yes'); $helptext = <<<END_OF_DELETEUSER_HELP deleteuser.php [options] diff --git a/scripts/maildaemon.php b/scripts/maildaemon.php index b4e4d9f08..3b1ef96a1 100755 --- a/scripts/maildaemon.php +++ b/scripts/maildaemon.php @@ -27,266 +27,9 @@ as STDIN. END_OF_HELP; require_once INSTALLDIR.'/scripts/commandline.inc'; - -require_once(INSTALLDIR . '/lib/mail.php'); -require_once(INSTALLDIR . '/lib/mediafile.php'); -require_once('Mail/mimeDecode.php'); - -# FIXME: we use both Mail_mimeDecode and mailparse -# Need to move everything to mailparse - -class MailerDaemon -{ - function __construct() - { - } - - function handle_message($fname='php://stdin') - { - list($from, $to, $msg, $attachments) = $this->parse_message($fname); - if (!$from || !$to || !$msg) { - $this->error(null, _('Could not parse message.')); - } - common_log(LOG_INFO, "Mail from $from to $to with ".count($attachments) .' attachment(s): ' .substr($msg, 0, 20)); - $user = $this->user_from($from); - if (!$user) { - $this->error($from, _('Not a registered user.')); - return false; - } - if (!$this->user_match_to($user, $to)) { - $this->error($from, _('Sorry, that is not your incoming email address.')); - return false; - } - if (!$user->emailpost) { - $this->error($from, _('Sorry, no incoming email allowed.')); - return false; - } - $response = $this->handle_command($user, $from, $msg); - if ($response) { - return true; - } - $msg = $this->cleanup_msg($msg); - $msg = common_shorten_links($msg); - if (Notice::contentTooLong($msg)) { - $this->error($from, sprintf(_('That\'s too long. '. - 'Max notice size is %d chars.'), - Notice::maxContent())); - } - - $mediafiles = array(); - - foreach($attachments as $attachment){ - - $mf = null; - - try { - $mf = MediaFile::fromFileHandle($attachment, $user); - } catch(ClientException $ce) { - $this->error($from, $ce->getMessage()); - } - - $msg .= ' ' . $mf->shortUrl(); - - array_push($mediafiles, $mf); - fclose($attachment); - } - - $err = $this->add_notice($user, $msg, $mediafiles); - - if (is_string($err)) { - $this->error($from, $err); - return false; - } else { - return true; - } - } - - function error($from, $msg) - { - file_put_contents("php://stderr", $msg . "\n"); - exit(1); - } - - function user_from($from_hdr) - { - $froms = mailparse_rfc822_parse_addresses($from_hdr); - if (!$froms) { - return null; - } - $from = $froms[0]; - $addr = common_canonical_email($from['address']); - $user = User::staticGet('email', $addr); - if (!$user) { - $user = User::staticGet('smsemail', $addr); - } - return $user; - } - - function user_match_to($user, $to_hdr) - { - $incoming = $user->incomingemail; - $tos = mailparse_rfc822_parse_addresses($to_hdr); - foreach ($tos as $to) { - if (strcasecmp($incoming, $to['address']) == 0) { - return true; - } - } - return false; - } - - function handle_command($user, $from, $msg) - { - $inter = new CommandInterpreter(); - $cmd = $inter->handle_command($user, $msg); - if ($cmd) { - $cmd->execute(new MailChannel($from)); - return true; - } - return false; - } - - function respond($from, $to, $response) - { - - $headers['From'] = $to; - $headers['To'] = $from; - $headers['Subject'] = "Command complete"; - - return mail_send(array($from), $headers, $response); - } - - function log($level, $msg) - { - common_log($level, 'MailDaemon: '.$msg); - } - - function add_notice($user, $msg, $mediafiles) - { - try { - $notice = Notice::saveNew($user->id, $msg, 'mail'); - } catch (Exception $e) { - $this->log(LOG_ERR, $e->getMessage()); - return $e->getMessage(); - } - foreach($mediafiles as $mf){ - $mf->attachToNotice($notice); - } - common_broadcast_notice($notice); - $this->log(LOG_INFO, - 'Added notice ' . $notice->id . ' from user ' . $user->nickname); - return true; - } - - function parse_message($fname) - { - $contents = file_get_contents($fname); - $parsed = Mail_mimeDecode::decode(array('input' => $contents, - 'include_bodies' => true, - 'decode_headers' => true, - 'decode_bodies' => true)); - if (!$parsed) { - return null; - } - - $from = $parsed->headers['from']; - - $to = $parsed->headers['to']; - - $type = $parsed->ctype_primary . '/' . $parsed->ctype_secondary; - - $attachments = array(); - - $this->extract_part($parsed,$msg,$attachments); - - return array($from, $to, $msg, $attachments); - } - - function extract_part($parsed,&$msg,&$attachments){ - if ($parsed->ctype_primary == 'multipart') { - if($parsed->ctype_secondary == 'alternative'){ - $altmsg = $this->extract_msg_from_multipart_alternative_part($parsed); - if(!empty($altmsg)) $msg = $altmsg; - }else{ - foreach($parsed->parts as $part){ - $this->extract_part($part,$msg,$attachments); - } - } - } else if ($parsed->ctype_primary == 'text' - && $parsed->ctype_secondary=='plain') { - $msg = $parsed->body; - if(strtolower($parsed->ctype_parameters['charset']) != "utf-8"){ - $msg = utf8_encode($msg); - } - }else if(!empty($parsed->body)){ - if(common_config('attachments', 'uploads')){ - //only save attachments if uploads are enabled - $attachment = tmpfile(); - fwrite($attachment, $parsed->body); - $attachments[] = $attachment; - } - } - } - - function extract_msg_from_multipart_alternative_part($parsed){ - foreach ($parsed->parts as $part) { - $this->extract_part($part,$msg,$attachments); - } - //we don't want any attachments that are a result of this parsing - return $msg; - } - - function unsupported_type($type) - { - $this->error(null, "Unsupported message type: " . $type); - } - - function cleanup_msg($msg) - { - $lines = explode("\n", $msg); - - $output = ''; - - foreach ($lines as $line) { - // skip quotes - if (preg_match('/^\s*>.*$/', $line)) { - continue; - } - // skip start of quote - if (preg_match('/^\s*On.*wrote:\s*$/', $line)) { - continue; - } - // probably interesting to someone, not us - if (preg_match('/^\s*Sent via/', $line)) { - continue; - } - if (preg_match('/^\s*Sent from my/', $line)) { - continue; - } - - // skip everything after a sig - if (preg_match('/^\s*--+\s*$/', $line) || - preg_match('/^\s*__+\s*$/', $line)) - { - break; - } - // skip everything after Outlook quote - if (preg_match('/^\s*-+\s*Original Message\s*-+\s*$/', $line)) { - break; - } - // skip everything after weird forward - if (preg_match('/^\s*Begin\s+forward/', $line)) { - break; - } - - $output .= ' ' . $line; - } - - preg_replace('/\s+/', ' ', $output); - return trim($output); - } -} +require_once INSTALLDIR.'/lib/mailhandler.php'; if (common_config('emailpost', 'enabled')) { - $md = new MailerDaemon(); - $md->handle_message('php://stdin'); + $mh = new MailHandler(); + $mh->handle_message(file_get_contents('php://stdin')); } diff --git a/scripts/stopdaemons.sh b/scripts/stopdaemons.sh index 90e7331ca..c790f1f34 100755 --- a/scripts/stopdaemons.sh +++ b/scripts/stopdaemons.sh @@ -25,7 +25,7 @@ DIR=`php $SDIR/getpiddir.php` for f in jabberhandler ombhandler publichandler smshandler pinghandler \ xmppconfirmhandler xmppdaemon twitterhandler facebookhandler \ - twitterstatusfetcher synctwitterfriends pluginhandler; do + twitterstatusfetcher synctwitterfriends pluginhandler rsscloudhandler; do FILES="$DIR/$f.*.pid" for ff in "$FILES" ; do diff --git a/scripts/xmppdaemon.php b/scripts/xmppdaemon.php index 20105b602..cef9c4bd0 100755 --- a/scripts/xmppdaemon.php +++ b/scripts/xmppdaemon.php @@ -298,7 +298,7 @@ class XMPPDaemon extends Daemon $content_shortened = common_shorten_links($body); if (Notice::contentTooLong($content_shortened)) { $from = jabber_normalize_jid($pl['from']); - $this->from_site($from, sprintf(_("Message too long - maximum is %d characters, you sent %d"), + $this->from_site($from, sprintf(_('Message too long - maximum is %1$d characters, you sent %2$d.'), Notice::maxContent(), mb_strlen($content_shortened))); return; diff --git a/theme/base/css/display.css b/theme/base/css/display.css index f441a4020..cdacb9a62 100644 --- a/theme/base/css/display.css +++ b/theme/base/css/display.css @@ -555,7 +555,7 @@ margin-bottom:0; line-height:1.618; } .form_notice #notice_data-attach_selected code, -.form_notice #notice_data-location_name { +.form_notice #notice_data-geo_name { float:left; width:80%; display:block; @@ -575,7 +575,7 @@ font-size:0.8em; float:left; } -.form_notice #notice_data-location_wrap label { +.form_notice #notice_data-geo_wrap label { position:absolute; top:25px; right:4px; @@ -585,16 +585,16 @@ width:16px; height:16px; display:block; } -.form_notice #notice_data-location_wrap input { +.form_notice #notice_data-geo_wrap input { display:none; } -.form_notice #notice_data-location_wrap label { +.form_notice #notice_data-geo_wrap label { font-weight:normal; font-size:1em; margin-bottom:0; text-indent:-9999px; } -.form_notice #notice_data-location_name { +.form_notice #notice_data-geo_name { display:block; padding-left:21px; } @@ -1328,11 +1328,9 @@ padding-right:30px; .hentry .entry-content p { margin-bottom:18px; } -.system_notice ul, -.instructions ul, -.hentry entry-content ol, +.hentry .entry-content ol, .hentry .entry-content ul { -list-style-position:inside; +margin-left:1.795%; } .hentry .entry-content li { margin-bottom:18px; @@ -1341,6 +1339,31 @@ margin-bottom:18px; margin-left:18px; } +#content #plugin_authors { +min-width:122px; +} +#content thead th { +text-align:left; +} +#content tbody th { +vertical-align:top; +text-align:left; +font-weight:normal; +padding-top:11px; +padding-right:18px; +} +#content tbody tr { +border-top-width:1px; +border-top-style:dotted; +} +#content td { +padding:11px 18px 11px 0; +vertical-align:top; +} +#content td:last-child { +padding-right:0; +} + /* TOP_POSTERS */ .section tbody td { padding-right:18px; @@ -1477,6 +1500,7 @@ margin-left:0; width:auto; } +.system_notice ul, .instructions ul { list-style-position:inside; } diff --git a/theme/cloudy/css/display.css b/theme/cloudy/css/display.css index 3fe05eb3d..726062e47 100644 --- a/theme/cloudy/css/display.css +++ b/theme/cloudy/css/display.css @@ -228,9 +228,21 @@ font-weight:bold; address img + .fn { display:none; } +address a { +text-decoration:none; +} +address .poweredby { +float:left; +clear:left; +display:block; +position:relative; +top:7px; +margin-right:-47px; +} #header { width:100%; +height:10.5em; position:relative; float:left; padding-top:18px; @@ -446,120 +458,156 @@ border-right:0; border-top:0; } -#form_notice { -width:505px; +.form_notice { +width:515px; line-height:1; position:absolute; top:200px; left:20px; z-index:9; } -#form_notice fieldset { +.form_notice fieldset { border:0; -padding:0 0 50px 0; +padding:0; +position:relative; } -#form_notice legend { +.form_notice legend { display:none; } -#form_notice textarea { +.form_notice textarea { float:left; -width:505px; -height:45px; +border-radius:7px; +-moz-border-radius:7px; +-webkit-border-radius:7px; +width:80.789%; +height:67px; line-height:1.5; -padding:5px; -border-width:1px; +padding:7px 7px 16px 7px; +position:relative; +z-index:2; } -#form_notice label { +.form_notice label { display:block; float:left; font-size:1.3em; margin-bottom:7px; } -#form_notice #notice_submit label { -display:none; -} -#form_notice label[for=notice_data-attach], -#form_notice #notice_data-attach { +.form_notice label[for=notice_data-attach], +.form_notice #notice_data-attach { position:absolute; -top:87px; +top:25px; +right:10.5%; cursor:pointer; } -#form_notice label[for=notice_data-attach] { +.form_notice label[for=notice_data-attach] { text-indent:-9999px; -left:82%; width:16px; height:16px; } -#form_notice #notice_data-attach { -left:40%; +.form_notice #notice_data-attach { padding:0; height:16px; } - -#form_notice .form_note { +.form_notice .form_note { position:absolute; -top:-10px; -right:-10px; +bottom:2px; +right:21.715%; z-index:9; -font-family:Georgia, serif; -font-size:1.7em; } -#form_notice .form_note dt { +.form_notice .form_note dt { font-weight:bold; display:none; } -#notice_text-count { +.form_notice #notice_text-count { font-weight:bold; line-height:1.15; padding:1px 2px; } - -#form_notice #notice_action-submit { +.form_notice #notice_action-submit { width:14%; -height:35px; -padding-top:0; -padding-bottom:0; +height:47px; +padding:0; position:absolute; -bottom:10px; -right:-10px; +bottom:0; +right:0; } -#form_notice label[for=to] { +.form_notice label[for=to] { margin-top:7px; } -#form_notice select[id=to] { +.form_notice select[id=to] { margin-bottom:7px; margin-left:18px; float:left; +max-width:322px; } -#form_notice .error, -#form_notice .success { +.form_notice .error, +.form_notice .success { float:left; clear:both; -width:83.5%; +width:81.5%; margin-bottom:0; line-height:1.618; -position:absolute; -top:87px; -left:0; } -#form_notice #notice_data-attach_selected code { +.form_notice #notice_data-attach_selected code, +.form_notice #notice_data-geo_name { float:left; -width:90%; +width:80%; display:block; -font-size:1.1em; -line-height:1.8; overflow:auto; +margin-right:2.5%; +} +.form_notice #notice_data-attach_selected code { +font-size:1.1em; } -#form_notice #notice_data-attach_selected button { +.form_notice #notice_data-attach_selected button.close, +.form_notice #notice_data-geo_selected button.close { float:right; font-size:0.8em; } +.form_notice #notice_data-geo_selected button.minimize { +float:left; +} + +.form_notice #notice_data-geo_wrap label { +position:absolute; +top:25px; +right:4px; +left:auto; +cursor:pointer; +width:16px; +height:16px; +display:block; +} +.form_notice #notice_data-geo_wrap input { +display:none; +} +.form_notice #notice_data-geo_wrap label { +font-weight:normal; +font-size:1em; +margin-bottom:0; +text-indent:-9999px; +} +.form_notice #notice_data-geo_name { +display:block; +padding-left:21px; +} +button.close, +button.minimize { +width:16px; +height:16px; +text-indent:-9999px; +padding:0; +border:0; +text-align:center; +font-weight:bold; +cursor:pointer; +} /* entity_profile */ .entity_profile { position:relative; -width:67.702%; +width:68%; min-height:123px; float:left; margin-bottom:18px; @@ -586,7 +634,8 @@ margin-bottom:18px; .entity_profile .entity_location, .entity_profile .entity_url, .entity_profile .entity_note, -.entity_profile .entity_tags { +.entity_profile .entity_tags, +.entity_profile .entity_aliases { margin-left:113px; margin-bottom:4px; } @@ -595,35 +644,44 @@ margin-bottom:4px; .entity_profile .entity_nickname { margin-left:11px; display:inline; -font-weight:bold; } .entity_profile .entity_nickname { margin-left:0; } - -.entity_profile .entity_fn dd:before { +.entity_profile .fn, +.entity_profile .nickname { +font-size:1.1em; +font-weight:bold; +} +.entity_profile .fn:before { content: "("; font-weight:normal; } -.entity_profile .entity_fn dd:after { +.entity_profile .fn:after { content: ")"; font-weight:normal; } - -.entity_profile dt { -display:none; +.entity_profile .nickname:after, +.entity_profile .nickname:before { +content:""; } +.entity_profile dt, .entity_profile h2 { display:none; } +.entity_profile .role { +margin-left:11px; +font-style:italic; +} /* entity_profile */ /*entity_actions*/ .entity_actions { float:right; -margin-left:4.35%; -max-width:25%; +margin-left:2%; +margin-bottom:18px; +min-width:21%; } .entity_actions h2 { display:none; @@ -632,7 +690,7 @@ display:none; list-style-type:none; } .entity_actions li { -margin-bottom:4px; +margin-bottom:7px; } .entity_actions li:first-child { border-top:0; @@ -650,40 +708,95 @@ display:block; text-align:left; width:100%; } -.entity_actions a, -.entity_nudge p, -.entity_remote_subscribe { +.entity_actions a { text-decoration:none; font-weight:bold; display:block; } +.entity_actions a, +.entity_actions input { +border-radius:4px; +-moz-border-radius:4px; +-webkit-border-radius:4px; +} -.form_user_block input.submit, -.form_user_unblock input.submit, -.entity_send-a-message a, -.entity_edit a, -.form_user_nudge input.submit, -.entity_nudge p { -border:0; -padding-left:20px; +.entity_actions a, +.entity_actions input, +.entity_actions p { +border-width:2px; +border-style:solid; +padding-left:23px; } -.entity_edit a, -.entity_send-a-message a, -.entity_nudge p { -padding:4px 4px 4px 23px; +.entity_actions a, +.entity_actions p { +padding:2px 4px 1px 26px; } -.entity_remote_subscribe { -padding:4px; -border-width:2px; +.entity_actions .accept { +margin-bottom:18px; +} + +.entity_send-a-message button { +position:absolute; +top:3px; +right:3px; +} + +.entity_send-a-message .form_notice { +position:absolute; +top:34px; +right:-1px; +padding:1.795%; +width:92%; +z-index:2; + border-radius:7px; +-moz-border-radius:7px; +-webkit-border-radius:7px; +border-width:1px; border-style:solid; +} +.entity_send-a-message .form_notice legend { +display:block; +margin-bottom:11px; +} + +.entity_send-a-message .form_notice label, +.entity_send-a-message .form_notice select { +display:none; +} +.entity_send-a-message .form_notice input.submit { +text-align:center; +} + +.entity_moderation { +position:relative; +} +.entity_moderation p { border-radius:4px; -moz-border-radius:4px; -webkit-border-radius:4px; +font-weight:bold; +padding-bottom:2px; +margin-bottom:7px; } -.entity_actions .accept { -margin-bottom:18px; +.entity_moderation ul { +display:none; +} +.entity_moderation:hover ul { +display:block; +min-width:21%; +width:100%; +padding:11px; +position:absolute; +top:-1px; +right:-1px; +z-index:1; +border-width:1px; +border-style:solid; +border-radius:7px; +-moz-border-radius:7px; +-webkit-border-radius:7px; } .entity_tags ul { @@ -742,7 +855,6 @@ margin-bottom:0; min-height:60px; } - .profile .form_group_join legend, .profile .form_group_leave legend, .profile .form_user_subscribe legend, @@ -753,18 +865,22 @@ display:none; .profiles { list-style-type:none; } -.profile .entity_profile .entity_location { +.profile .entity_profile .fn.nickname, +.profile .entity_profile .url[rel~=contact] { +margin-left:0; +display:inline; +} + +.profile .entity_profile .fn, +.profile .entity_profile .location { +margin-left:11px; +margin-bottom:4px; width:auto; clear:none; -margin-left:11px; -} -.profile .entity_profile dl, -.profile .entity_profile dd { -display:inline; -float:none; } -.profile .entity_profile .entity_note, -.profile .entity_profile .entity_url, + +.profile .entity_profile .note, +.profile .entity_profile .url, .profile .entity_profile .entity_tags, .profile .entity_profile .form_subscription_edit { margin-left:59px; @@ -777,13 +893,11 @@ display:inline; margin-right:11px; } - .profile .entity_profile .form_subscription_edit label { font-weight:normal; margin-right:11px; } - /* NOTICE */ .notice, .profile { @@ -854,23 +968,26 @@ text-decoration:underline; } .notice .entry-title { -float:none; +float:left; +width:100%; overflow:hidden; -display:inline; +} +.notice .entry-title.ov { +overflow:visible; } #shownotice .notice .entry-title { font-size:2.2em; } -#conversation .notice .entry-title { -display:block; -width:90%; -} - .notice p.entry-content { display:inline; } +#content .notice p.entry-content a:visited { +border-radius:4px; +-moz-border-radius:4px; +-webkit-border-radius:4px; +} .notice p.entry-content .vcard a { border-radius:4px; -moz-border-radius:4px; @@ -878,23 +995,17 @@ border-radius:4px; } .notice div.entry-content { +clear:left; +float:left; font-size:0.95em; margin-left:59px; -margin-top:3px; -width:70%; -font-family:Georgia, serif; -font-style:italic; -font-size:0.8em; -display:block; -} -.notice div.entry-content a { -text-decoration:none; -} -.notice div.entry-content a:hover { -text-decoration:underline; +min-width:60%; +max-width:62%; } -#showstream .notice div.entry-content { +#showstream .notice div.entry-content, +#shownotice .notice div.entry-content { margin-left:0; +max-width:77%; } .notice .notice-options a, @@ -903,83 +1014,84 @@ float:left; font-size:1.025em; } -.notice div.entry-content dl, -.notice div.entry-content dt, -.notice div.entry-content dd { -display:inline; +.notice div.entry-content .timestamp { +display:inline-block; } -.notice div.entry-content .timestamp dt, -.notice div.entry-content .response dt { -display:none; -} -.notice div.entry-content .timestamp a { -display:inline-block; +.entry-content .repeat { +display:block; } -.notice div.entry-content .device dt { -text-transform:lowercase; +.entry-content .repeat .photo { +float:none; +margin-right:1px; +position:relative; +top:4px; +left:0; } +.dialogbox { +position:absolute; +top:-4px; +right:29px; +z-index:9; +min-width:199px; +float:none; +background-color:#FFF; +padding:11px; +border-radius:7px; +-moz-border-radius:7px; +-webkit-border-radius:7px; +border-style:solid; +border-width:1px; +border-color:#DDDDDD; +-moz-box-shadow:3px 7px 5px rgba(194, 194, 194, 0.7); +} +.dialogbox legend { +display:block !important; +margin-right:18px; +} -.notice-data { +.dialogbox button.close { position:absolute; -top:18px; -right:0; -min-height:50px; -margin-bottom:4px; -} -.notice .entry-content .notice-data dt { -display:none; +right:3px; +top:3px; } -.notice-data a { -display:block; -outline:none; +.dialogbox .submit_dialogbox { +text-indent:0; +font-weight:bold; } .notice-options { -padding-left:2%; -float:left; +position:relative; font-size:0.95em; -width:16px; +width:113px; float:right; +margin-right:4px; } -.notices li:hover div.notice-options { -display:block; -} - .notice-options a { float:left; } -.notice-options .notice_delete, .notice-options .notice_reply, +.notice-options .form_repeat, .notice-options .form_favor, -.notice-options .form_disfavor { -position:absolute; +.notice-options .form_disfavor, +.notice-options .repeated { +float:left; +margin-left:14.2%; } .notice-options .form_favor, .notice-options .form_disfavor { -top:7px; -right:7px; -} -.notice-options .notice_reply { -top:30px; -right:7px; -} -.notice-options .notice_delete { -top:47px; -right:7px; +margin-left:0; } - .notice-options input, -.notice-options a { +.notice-options a, +.notice-options .repeated { text-indent:-9999px; outline:none; } - -.notice-options .notice_reply, .notice-options input.submit { display:block; border:0; @@ -987,29 +1099,34 @@ border:0; .notice-options .notice_reply, .notice-options .notice_delete { text-decoration:none; -padding-left:16px; } - -.notice-options .notice_reply .notice_id { -display:none; +.notice .notice-options .notice_delete { +float:right; } - .notice-options form input.submit { width:16px; -padding:2px 0; +height:16px; +padding:0; +border-radius:0; +-moz-border-radius:0; +-webkit-border-radius:0; } - -.notice-options .notice_delete dt, +.notice-options .form_repeat legend, .notice-options .form_favor legend, .notice-options .form_disfavor legend { display:none; } -.notice-options .notice_delete fieldset, +.notice-options .form_repeat fieldset, .notice-options .form_favor fieldset, .notice-options .form_disfavor fieldset { border:0; padding:0; } +.notice-options a, +.notice-options .repeated { +width:16px; +height:16px; +} .notice .attachment { position:relative; @@ -1335,6 +1452,33 @@ clear:both; margin-bottom:0; } +#settings_design_background-image img { +max-width:480px; +max-height:480px; +} + +#settings_design_color .form_data, +#color-picker { +float:left; +} +#settings_design_color .form_data { +width:400px; +margin-right:1%; +} + +#settings_design_color .form_data li { +width:33%; +} +#settings_design_color .form_data label { +float:none; +display:block; +} +#settings_design_color .form_data .swatch { +padding:11px; +margin-left:0; +width:auto; +} + .instructions ul { list-style-position:inside; } @@ -1348,6 +1492,15 @@ display:none; .guide { clear:both; } +#bookmarklet address { +display:none; +} +#bookmarklet .form_notice { +width:auto; +} +#bookmarklet #wrap { +min-width:0; +} #public.user_in #content, #groups.user_in #content, @@ -1363,8 +1516,9 @@ clear:both; #subscriptions.user_in #content, #subscribers.user_in #content, #showgroup.user_in #content, -#conversation.user_in #content { -padding-top:160px; +#conversation.user_in #content, +#attachment.user_in #content { +padding-top:12.5em; } #profilesettings #form_notice, @@ -1390,10 +1544,24 @@ padding-top:160px; #register #form_notice, #shownotice #form_notice, #confirmaddress #form_notice, -#tag #form_notice { +#tag #form_notice, +#siteadminpanel #form_notice, +#designadminpanel #form_notice, +#useradminpanel #form_notice, +#pathsadminpanel #form_notice, +#adminprofileflag #form_notice { display:none; } +#public #core, +#showstream #core { +margin-top:10em; +} +#public.user_in #core, +#showstream.user_in #core { +margin-top:0; +} + #jOverlayContent #core #content { padding-top:11px; } @@ -1432,43 +1600,172 @@ border-color:#ddd; background:none; } + +.form_notice label[for=notice_data-attach], +#export_data li a.rss, +#export_data li a.atom, +#export_data li a.foaf, +.entity_edit a, +.entity_send-a-message a, +.entity_nudge p, +.form_user_nudge input.submit, +.form_user_block input.submit, +.form_user_unblock input.submit, +.form_group_block input.submit, +.form_group_unblock input.submit, +.form_make_admin input.submit, +.notice .attachment, +.notice-options .notice_reply, +.notice-options form.form_favor input.submit, +.notice-options form.form_disfavor input.submit, +.notice-options .notice_delete, +.notice-options form.form_repeat input.submit, +#new_group a, +.pagination .nav_prev a, +.pagination .nav_next a, +button.close, +.form_group_leave input.submit, +.form_user_unsubscribe input.submit, +.form_group_join input.submit, +.form_user_subscribe input.submit, +.entity_subscribe a, +.entity_moderation p, +.entity_sandbox input.submit, +.entity_silence input.submit, +.entity_delete input.submit, +.notice-options .repeated, +.form_notice a#notice_data-geo_name, +.form_notice label[for=notice_data-geo], +button.minimize { +background-image:url(../../base/images/icons/icons-01.gif); +background-repeat:no-repeat; +background-color:transparent; +} + +#wrap form.processing input.submit, +.entity_actions a.processing { +background:#FFFFFF url(../../base/images/icons/icon_processing.gif) no-repeat 47% 47%; +cursor:wait; +text-indent:-9999px; +outline:none; +} +.processing { +background-image:url(../../base/images/icons/icon_processing.gif); +background-repeat:no-repeat; +background-position:47% 47%; +} + +button.close { +background-position:0 -1120px; +} +button.minimize { +background-position:0 -1912px; +} + input.submit, -#form_notice.warning #notice_text-count, -#nav_register a, +.form_notice.warning #notice_text-count, .form_settings .form_note, -.entity_remote_subscribe { -background-color:#9BB43E; +.entity_actions a, +.entity_actions input, +.entity_moderation p, +button { +box-shadow:3px 3px 3px rgba(194, 194, 194, 0.3); +-moz-box-shadow:3px 3px 3px rgba(194, 194, 194, 0.3); +-webkit-box-shadow:3px 3px 3px rgba(194, 194, 194, 0.3); +} +.entity_actions a, +.entity_actions input, +.entity_actions p { +border-color:transparent; +background-color:transparent; } - input:focus, textarea:focus, select:focus, -#form_notice.warning #notice_data-text { +.form_notice.warning #notice_data-text, +.form_notice.warning #notice_text-count, +.form_settings .form_note { border-color:#9BB43E; } +input.submit { +color:#FFFFFF; +} +.entity_actions a, +.entity_actions input, +.entity_actions p { +border-color:transparent; +background-color:transparent; +} +input:focus, textarea:focus, select:focus, +.form_notice.warning #notice_data-text, +.form_notice.warning #notice_text-count, +.form_settings .form_note { +border-color:#9BB43E; +} +input.submit { +color:#FFFFFF; +} +.entity_actions input.submit { +border-color:transparent; +text-shadow:none; +} +.dialogbox .submit_dialogbox, input.submit, -#nav_register a, -.entity_remote_subscribe { -color:#fff; +.form_notice input.submit { +background:#AAAAAA url(../../base/images/illustrations/illu_pattern-01.png) 0 0 repeat-x; +text-shadow:0 1px 0 #FFFFFF; +color:#000000; +border-color:#AAAAAA; +border-top-color:#CCCCCC; +border-left-color:#CCCCCC; +} +.dialogbox .submit_dialogbox:hover, +input.submit:hover { +background-position:0 -5px; +} +.dialogbox .submit_dialogbox:focus, +input.submit:focus { +background-position:0 -15px; +box-shadow:3px 3px 3px rgba(194, 194, 194, 0.1); +-moz-box-shadow:3px 3px 3px rgba(194, 194, 194, 0.1); +-webkit-box-shadow:3px 3px 3px rgba(194, 194, 194, 0.1); +text-shadow:none; +} + +.form_notice span#notice_data-geo_name { +background-position:0 47%; +} +.form_notice a#notice_data-geo_name { +background-position:0 -1711px; +} +.form_notice label[for=notice_data-geo] { +background-position:0 -1780px; +} +.form_notice label[for=notice_data-geo].checked { +background-position:0 -1846px; } a, -div.notice-options input, -.form_user_block input.submit, -.form_user_unblock input.submit, -.entity_send-a-message a, -.form_user_nudge input.submit, -.entity_nudge p, -.form_settings input.form_action-primary { +.form_settings input.form_action-primary, +.notice-options input, +.entity_actions a, +.entity_actions input, +.entity_moderation p { color:#0084B4; } .notice, .profile { +border-top-color:#CEE1E9; +} +.notice, +.profile { border-top-color:#DDFFCC; } .section .profile { border-top-color:#87B4C8; } - +.mark-top { +border-color:#AAAAAA; +} #aside_primary { background-color:#DDFFCC; @@ -1496,11 +1793,13 @@ text-indent:-9999px; #content, #site_nav_local_views a, #aside_primary { -border-color:#fff; +border-color:#FFFFFF; } #content, -#site_nav_local_views .current a { -background-color:#fff; +#site_nav_local_views .current a, +.entity_send-a-message .form_notice, +.entity_moderation:hover ul { +background-color:#FFFFFF; } #site_nav_local_views a { @@ -1535,77 +1834,97 @@ background-repeat:no-repeat; background-position:0 45%; } #export_data li a.rss { -background-image:url(../../base/images/icons/icon_rss.png); +background-position:0 -130px; } #export_data li a.atom { -background-image:url(../../base/images/icons/icon_atom.png); +background-position:0 -64px; } #export_data li a.foaf { -background-image:url(../../base/images/icons/icon_foaf.gif); +background-position:0 1px; } -.entity_edit a, -.entity_send-a-message a, -.form_user_nudge input.submit, -.form_user_block input.submit, -.form_user_unblock input.submit, -.entity_nudge p { -background-position: 0 40%; -background-repeat: no-repeat; -background-color:transparent; -} .form_group_join input.submit, -.form_group_leave input.submit +.form_group_leave input.submit, .form_user_subscribe input.submit, +.form_user_unsubscribe input.submit, +.entity_subscribe a { +background-color:#AAAAAA; +color:#FFFFFF; +} +.form_group_leave input.submit, .form_user_unsubscribe input.submit { -background-color:#9BB43E; -color:#fff; +background-position:5px -1246px; } -.form_user_unsubscribe input.submit, -.form_group_leave input.submit { -background-color:#87B4C8; +.form_group_join input.submit, +.form_user_subscribe input.submit, +.entity_subscribe a { +background-position:5px -1181px; } .entity_edit a { -background-image:url(../images/icons/twotone/green/edit.gif); +background-position: 5px -718px; } .entity_send-a-message a { -background-image:url(../images/icons/twotone/green/quote.gif); +background-position: 5px -852px; } +.entity_send-a-message .form_notice, +.entity_moderation:hover ul { +box-shadow:3px 7px 5px rgba(194, 194, 194, 0.7); +-moz-box-shadow:3px 7px 5px rgba(194, 194, 194, 0.7); +-webkit-box-shadow:3px 7px 5px rgba(194, 194, 194, 0.7); +} + .entity_nudge p, .form_user_nudge input.submit { -background-image:url(../images/icons/twotone/green/mail.gif); +background-position: 5px -785px; } .form_user_block input.submit, -.form_user_unblock input.submit { -background-image:url(../images/icons/twotone/green/shield.gif); +.form_user_unblock input.submit, +.form_group_block input.submit, +.form_group_unblock input.submit { +background-position: 5px -918px; +} +.form_make_admin input.submit { +background-position: 5px -983px; +} +.entity_moderation p { +background-position: 5px -1313px; +} +.entity_sandbox input.submit { +background-position: 5px -1380px; +} +.entity_silence input.submit { +background-position: 5px -1445px; +} +.entity_delete input.submit { +background-position: 5px -1511px; } - /* NOTICES */ .notice .attachment { -background:transparent url(../../base/images/icons/twotone/green/clip-02.gif) no-repeat 0 45%; +background-position:0 -394px; } #attachments .attachment { background:none; } - -.notice-options .notice_reply, -.notice-options form input.submit { -background-color:transparent; -} .notice-options .notice_reply { -background:transparent url(../images/icons/icon_reply.gif) no-repeat 0 45%; +background-position:0 -592px; } .notice-options form.form_favor input.submit { -background:transparent url(../images/icons/icon_favourite.gif) no-repeat 0 45%; +background-position:0 -460px; } .notice-options form.form_disfavor input.submit { -background:transparent url(../images/icons/icon_disfavourite.gif) no-repeat 0 45%; +background-position:0 -526px; } .notice-options .notice_delete { -background:transparent url(../images/icons/icon_trash.gif) no-repeat 0 45%; +background-position:0 -658px; +} +.notice-options form.form_repeat input.submit { +background-position:0 -1582px; +} +.notice-options .repeated { +background-position:0 -1648px; } .notices div.entry-content, @@ -1616,19 +1935,34 @@ opacity:0.4; .notices li:hover div.notice-options { opacity:1; } +.opaque { +opacity:1 !important; +} .notices .notices { -background-color:rgba(200, 200, 200, 0.01); +background-color:rgba(200, 200, 200, 0.050); } .notices .notices .notices { -background-color:rgba(200, 200, 200, 0.02); +background-color:rgba(200, 200, 200, 0.100); } .notices .notices .notices .notices { -background-color:rgba(200, 200, 200, 0.03); +background-color:rgba(200, 200, 200, 0.150); } .notices .notices .notices .notices .notices { -background-color:rgba(200, 200, 200, 0.04); +background-color:rgba(200, 200, 200, 0.300); +} +.notice-options a, +.notice-options input { +font-family:sans-serif; +box-shadow:3px 3px 3px rgba(194, 194, 194, 0.3); +-moz-box-shadow:3px 3px 3px rgba(194, 194, 194, 0.3); +-webkit-box-shadow:3px 3px 3px rgba(194, 194, 194, 0.3); +} +#content .notices li:hover { +background-color:rgba(240, 240, 240, 0.2); +} +#conversation .notices li:hover { +background-color:transparent; } - div.entry-content { color:#333; @@ -1647,21 +1981,34 @@ background-color:transparent; #new_group a { -background:transparent url(../../base/images/icons/twotone/green/news.gif) no-repeat 0 45%; +background-position:0 -1054px; } .pagination .nav_prev a, .pagination .nav_next a { background-repeat:no-repeat; -border-color:#DDFFCC; +box-shadow:3px 3px 3px rgba(194, 194, 194, 0.3); +-moz-box-shadow:3px 3px 3px rgba(194, 194, 194, 0.3); +-webkit-box-shadow:3px 3px 3px rgba(194, 194, 194, 0.3); } .pagination .nav_prev a { -background-image:url(../../base/images/icons/twotone/green/arrow-left.gif); -background-position:10% 45%; +background-position:10% -187px; } .pagination .nav_next a { -background-image:url(../../base/images/icons/twotone/green/arrow-right.gif); -background-position:90% 45%; +background-position:105% -252px; +} +.pagination .nav .processing { +background-image:url(../../base/images/icons/icon_processing.gif); +box-shadow:none; +-moz-box-shadow:none; +-webkit-box-shadow:none; +outline:none; +} +.pagination .nav_next a.processing { +background-position:90% 47%; +} +.pagination .nav_prev a.processing { +background-position:10% 47%; } @@ -1685,15 +2032,6 @@ border-color:#FFFF00; #form_notice .form_note { color:#CCC; } -input.submit { -background-color:#eee; -color:#666; -} - -.notices li.hover { -background-color:#F7F7F7; -} - .notice div.entry-content, .notice div.entry-content a { @@ -1719,12 +2057,12 @@ border-color:transparent; color:#4C4C4C; } #site_nav_local_views .current { -border-left-color:#fff; +border-left-color:#FFFFFF; } #site_nav_local_views .current a, #site_nav_global_primary, #footer { -background-color:#fff; +background-color:#FFFFFF; } diff --git a/theme/default/css/display.css b/theme/default/css/display.css index 50209bfd3..2360976e5 100644 --- a/theme/default/css/display.css +++ b/theme/default/css/display.css @@ -111,6 +111,19 @@ box-shadow:3px 3px 3px rgba(194, 194, 194, 0.1); text-shadow:none; } +.form_notice span#notice_data-geo_name { +background-position:0 47%; +} +.form_notice a#notice_data-geo_name { +background-position:0 -1711px; +} +.form_notice label[for=notice_data-geo] { +background-position:0 -1780px; +} +.form_notice label[for=notice_data-geo].checked { +background-position:0 -1846px; +} + a, .form_settings input.form_action-primary, .notice-options input, @@ -121,7 +134,8 @@ color:#002FA7; } .notice, -.profile { +.profile, +#content tbody tr { border-top-color:#C8D1D5; } .mark-top { @@ -177,7 +191,10 @@ button.close, .entity_sandbox input.submit, .entity_silence input.submit, .entity_delete input.submit, -.notice-options .repeated { +.notice-options .repeated, +.form_notice a#notice_data-geo_name, +.form_notice label[for=notice_data-geo], +button.minimize { background-image:url(../../base/images/icons/icons-01.gif); background-repeat:no-repeat; background-color:transparent; @@ -239,6 +256,9 @@ background-color:#EFF3DC; button.close { background-position:0 -1120px; } +button.minimize { +background-position:0 -1912px; +} #anon_notice { background-color:#87B4C8; @@ -364,7 +384,8 @@ box-shadow:3px 3px 3px rgba(194, 194, 194, 0.3); -moz-box-shadow:3px 3px 3px rgba(194, 194, 194, 0.3); -webkit-box-shadow:3px 3px 3px rgba(194, 194, 194, 0.3); } -#content .notices li:hover { +#content .notices li:hover, +#content tbody tr:hover { background-color:rgba(240, 240, 240, 0.2); } #conversation .notices li:hover { diff --git a/theme/identica/css/display.css b/theme/identica/css/display.css index a3e0f7ec3..91af1d8ec 100644 --- a/theme/identica/css/display.css +++ b/theme/identica/css/display.css @@ -111,10 +111,10 @@ box-shadow:3px 3px 3px rgba(194, 194, 194, 0.1); text-shadow:none; } -.form_notice span#notice_data-location_name { +.form_notice span#notice_data-geo_name { background-position:0 47%; } -.form_notice a#notice_data-location_name { +.form_notice a#notice_data-geo_name { background-position:0 -1711px; } .form_notice label[for=notice_data-geo] { @@ -134,7 +134,8 @@ color:#002FA7; } .notice, -.profile { +.profile, +#content tbody tr { border-top-color:#CEE1E9; } .mark-top { @@ -191,7 +192,7 @@ button.close, .entity_silence input.submit, .entity_delete input.submit, .notice-options .repeated, -.form_notice a#notice_data-location_name, +.form_notice a#notice_data-geo_name, .form_notice label[for=notice_data-geo], button.minimize { background-image:url(../../base/images/icons/icons-01.gif); @@ -382,7 +383,8 @@ box-shadow:3px 3px 3px rgba(194, 194, 194, 0.3); -moz-box-shadow:3px 3px 3px rgba(194, 194, 194, 0.3); -webkit-box-shadow:3px 3px 3px rgba(194, 194, 194, 0.3); } -#content .notices li:hover { +#content .notices li:hover, +#content tbody tr:hover { background-color:rgba(240, 240, 240, 0.2); } #conversation .notices li:hover { |