diff options
| author | Evan Prodromou <evan@status.net> | 2010-01-11 16:28:27 -0800 |
|---|---|---|
| committer | Evan Prodromou <evan@status.net> | 2010-01-11 16:28:27 -0800 |
| commit | ecb3abf84c8b6e868a523b8e721484cb7a4e0f63 (patch) | |
| tree | c27d9b8c427e0e64b0cabe9419c640ac8b382c3b | |
| parent | a180658a3bfcf2b7b312058e3aa76e0e2467c2f8 (diff) | |
| parent | 7e5c15fa80e23d1fb22744553156bcebad716ae8 (diff) | |
Merge branch '0.9.x' into inblob
166 files changed, 23982 insertions, 21570 deletions
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 5627bfc14..6f8d40527 100644 --- a/actions/apigroupleave.php +++ b/actions/apigroupleave.php @@ -121,7 +121,7 @@ class ApiGroupLeaveAction extends ApiAuthAction common_log_db_error($member, 'DELETE', __FILE__); $this->serverError( sprintf( - _('Could not remove user %s from group %s.'), + _('Could not remove user %1$s from group %2$s.'), $this->user->nickname, $this->group->nickname ) @@ -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/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 90c85e1a4..b0f973e1a 100644 --- a/actions/leavegroup.php +++ b/actions/leavegroup.php @@ -124,14 +124,14 @@ class LeavegroupAction extends Action if (!$result) { common_log_db_error($member, 'DELETE', __FILE__); - $this->serverError(sprintf(_('Could not remove user %s from group %s'), + $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/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/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/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 index 2cf914296..c1f673c45 100644 --- a/actions/version.php +++ b/actions/version.php @@ -150,7 +150,7 @@ class VersionAction extends Action { $this->elementStart('p'); - $this->raw(sprintf(_('This site is powered by %s version %s, '. + $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/'), diff --git a/classes/File.php b/classes/File.php index 6173f31d6..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; } 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/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 400b05f97..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 { /** @@ -66,6 +68,7 @@ class Memcached_DataObject extends DB_DataObject // Clear this out so we don't accidentally break global // state in *this* process. $this->_DB_resultid = null; + // We don't have any local DBO refs, so clear these out. $this->_link_loaded = false; } @@ -90,42 +93,30 @@ 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); if (empty($i)) { - $i = false; - return $i; + return false; } $result = $i->get($k, $v); if ($result) { - // Hit! $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); - } - $i = false; + return false; } } - return $i; } - /** - * @fixme Should this return false on lookup fail to match staticGet? - */ - function pkeyGet($cls, $kv) + 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; } @@ -133,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; } @@ -146,9 +132,6 @@ class Memcached_DataObject extends DB_DataObject function insert() { $result = parent::insert(); - if ($result) { - $this->encache(); // in case of cached negative lookups - } return $result; } @@ -188,23 +171,21 @@ 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; } } function keyTypes() { - // ini-based classes return number-indexed arrays. handbuilt - // classes return column => keytype. Make this uniform. - - $keys = $this->keys(); - - $keyskeys = array_keys($keys); - - if (is_string($keyskeys[0])) { - return $keys; - } - global $_DB_DATAOBJECT; if (!isset($_DB_DATAOBJECT['INI'][$this->_database][$this->__table."__keys"])) { $this->databaseStructure(); @@ -216,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'; @@ -334,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/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/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/js/util.js b/js/util.js index 0314668d9..43f492274 100644 --- a/js/util.js +++ b/js/util.js @@ -289,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)); } diff --git a/lib/action.php b/lib/action.php index 1b4cb5cec..a521bcb50 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'))); } 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/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 fb5e5919e..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; 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 index 32a8cd9bc..85be89f18 100644 --- a/lib/mailhandler.php +++ b/lib/mailhandler.php @@ -139,7 +139,7 @@ class MailHandler $headers['From'] = $to; $headers['To'] = $from; - $headers['Subject'] = "Command complete"; + $headers['Subject'] = _('Command complete'); return mail_send(array($from), $headers, $response); } @@ -225,7 +225,7 @@ class MailHandler function unsupported_type($type) { - $this->error(null, "Unsupported message type: " . $type); + $this->error(null, sprintf(_('Unsupported message type: %s'), $type)); } function cleanup_msg($msg) 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 f0b704e87..02e35a8d7 100644 --- a/lib/noticeform.php +++ b/lib/noticeform.php @@ -211,7 +211,7 @@ class NoticeForm extends Form 'title' => common_local_url('geocode'))); $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.').'";'. + $this->out->inlineScript(' var NoticeDataGeoShareDisable_text = "'._('Do not share my location').'";'. ' var NoticeDataGeoInfoMinimize_text = "'._('Hide this info').'";'); } diff --git a/lib/router.php b/lib/router.php index 287d3c79f..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 @@ -442,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/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 68a1ff2fc..7f80c9be3 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-05 22:10+0000\n" -"PO-Revision-Date: 2010-01-05 22:10:28+0000\n" +"POT-Creation-Date: 2010-01-11 23:25+0000\n" +"PO-Revision-Date: 2010-01-11 23:26:04+0000\n" "Language-Team: Arabic\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha (r60693); Translate extension (2010-01-04)\n" +"X-Generator: MediaWiki 1.16alpha (r60950); 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" @@ -40,7 +40,7 @@ msgstr "لا صفحة كهذه" #: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79 #: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75 #: actions/favoritesrss.php:74 actions/foaf.php:40 actions/foaf.php:58 -#: actions/microsummary.php:62 actions/newmessage.php:116 +#: actions/microsummary.php:62 actions/newmessage.php:116 actions/otp.php:76 #: actions/remotesubscribe.php:145 actions/remotesubscribe.php:154 #: actions/replies.php:73 actions/repliesrss.php:38 #: actions/showfavorites.php:105 actions/userbyid.php:74 @@ -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 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 +#, 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" @@ -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,11 +591,11 @@ 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/invite.php:56 actions/login.php:115 actions/makeadmin.php:66 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80 #: actions/othersettings.php:145 actions/passwordsettings.php:138 #: actions/profilesettings.php:194 actions/recoverpassword.php:337 @@ -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" +#: actions/joingroup.php:135 +#, fuzzy, php-format +msgid "%1$s joined group %2$s" msgstr "%s انضم إلى مجموعة %s" #: actions/leavegroup.php:60 @@ -1746,71 +1718,62 @@ 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 "" +#: actions/leavegroup.php:134 +#, fuzzy, php-format +msgid "%1$s left group %2$s" +msgstr "%s انضم إلى مجموعة %s" -#: actions/login.php:83 actions/register.php:137 +#: actions/login.php:80 actions/otp.php:62 actions/register.php:137 msgid "Already logged in." msgstr "والج بالفعل." -#: actions/login.php:114 actions/login.php:124 -msgid "Invalid or expired token." -msgstr "" - -#: actions/login.php:147 +#: actions/login.php:126 msgid "Incorrect username or password." msgstr "اسم المستخدم أو كلمة السر غير صحيحان." -#: actions/login.php:153 +#: actions/login.php:132 actions/otp.php:120 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:188 actions/login.php:241 lib/action.php:460 #: lib/logingroupnav.php:79 msgid "Login" msgstr "لُج" -#: actions/login.php:247 +#: actions/login.php:227 msgid "Login to site" msgstr "لُج إلى الموقع" -#: actions/login.php:250 actions/profilesettings.php:106 -#: actions/register.php:423 actions/showgroup.php:236 actions/tagother.php:94 +#: actions/login.php:230 actions/profilesettings.php:106 +#: actions/register.php:424 actions/showgroup.php:236 actions/tagother.php:94 #: lib/groupeditform.php:152 lib/userprofile.php:131 msgid "Nickname" msgstr "الاسم المستعار" -#: actions/login.php:253 actions/register.php:428 +#: actions/login.php:233 actions/register.php:429 #: lib/accountsettingsaction.php:116 msgid "Password" msgstr "كلمة السر" -#: actions/login.php:256 actions/register.php:477 +#: actions/login.php:236 actions/register.php:478 msgid "Remember me" msgstr "تذكّرني" -#: actions/login.php:257 actions/register.php:479 +#: actions/login.php:237 actions/register.php:480 msgid "Automatically login in the future; not for shared computers!" msgstr "" -#: actions/login.php:267 +#: actions/login.php:247 msgid "Lost or forgotten password?" msgstr "أنسيت كلمة السر؟" -#: actions/login.php:286 +#: actions/login.php:266 msgid "" "For security reasons, please re-enter your user name and password before " "changing your settings." msgstr "" -#: actions/login.php:290 +#: actions/login.php:270 #, php-format msgid "" "Login with your username and password. Don't have a username yet? [Register]" @@ -1823,18 +1786,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,10 +1837,10 @@ msgstr "" msgid "Message sent" msgstr "أُرسلت الرسالة" -#: actions/newmessage.php:185 lib/command.php:376 -#, php-format -msgid "Direct message to %s sent" -msgstr "" +#: actions/newmessage.php:185 +#, 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 +1866,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 @@ -1961,8 +1924,8 @@ msgstr "نوع المحتوى " msgid "Only " msgstr "" -#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1031 -#: lib/api.php:1059 lib/api.php:1169 +#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1033 +#: lib/api.php:1061 lib/api.php:1171 msgid "Not a supported data format." msgstr "ليس نسق بيانات مدعوم." @@ -2006,10 +1969,30 @@ 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/otp.php:69 +#, fuzzy +msgid "No user ID specified." +msgstr "لا مجموعة مُحدّدة." + +#: actions/otp.php:83 +#, fuzzy +msgid "No login token specified." +msgstr "لا ملاحظة محددة." + +#: actions/otp.php:90 +#, fuzzy +msgid "No login token requested." +msgstr "لا طلب استيثاق!" + +#: actions/otp.php:95 +#, fuzzy +msgid "Invalid login token specified." +msgstr "لا ملاحظة محددة." + +#: actions/otp.php:104 +#, fuzzy +msgid "Login token expired." +msgstr "لُج إلى الموقع" #: actions/outbox.php:61 #, php-format @@ -2045,7 +2028,7 @@ msgid "6 or more characters" msgstr "" #: actions/passwordsettings.php:112 actions/recoverpassword.php:239 -#: actions/register.php:432 actions/smssettings.php:134 +#: actions/register.php:433 actions/smssettings.php:134 msgid "Confirm" msgstr "أكّد" @@ -2081,7 +2064,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 +2097,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 +2190,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 +2220,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 +2229,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 @@ -2265,42 +2249,42 @@ msgstr "معلومات الملف الشخصي" msgid "1-64 lowercase letters or numbers, no punctuation or spaces" msgstr "" -#: actions/profilesettings.php:111 actions/register.php:447 +#: actions/profilesettings.php:111 actions/register.php:448 #: actions/showgroup.php:247 actions/tagother.php:104 #: lib/groupeditform.php:157 lib/userprofile.php:149 msgid "Full name" msgstr "الاسم الكامل" -#: actions/profilesettings.php:115 actions/register.php:452 +#: actions/profilesettings.php:115 actions/register.php:453 #: lib/groupeditform.php:161 msgid "Homepage" msgstr "الصفحة الرئيسية" -#: actions/profilesettings.php:117 actions/register.php:454 +#: actions/profilesettings.php:117 actions/register.php:455 msgid "URL of your homepage, blog, or profile on another site" msgstr "" -#: actions/profilesettings.php:122 actions/register.php:460 +#: actions/profilesettings.php:122 actions/register.php:461 #, php-format msgid "Describe yourself and your interests in %d chars" msgstr "" -#: actions/profilesettings.php:125 actions/register.php:463 +#: actions/profilesettings.php:125 actions/register.php:464 msgid "Describe yourself and your interests" msgstr "صِف نفسك واهتماماتك" -#: actions/profilesettings.php:127 actions/register.php:465 +#: actions/profilesettings.php:127 actions/register.php:466 msgid "Bio" msgstr "السيرة" -#: actions/profilesettings.php:132 actions/register.php:470 +#: actions/profilesettings.php:132 actions/register.php:471 #: actions/showgroup.php:256 actions/tagother.php:112 #: actions/userauthorization.php:158 lib/groupeditform.php:177 #: lib/userprofile.php:164 msgid "Location" msgstr "الموقع" -#: actions/profilesettings.php:134 actions/register.php:472 +#: actions/profilesettings.php:134 actions/register.php:473 msgid "Where you are, like \"City, State (or Region), Country\"" msgstr "" @@ -2362,19 +2346,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 "حُفظت الإعدادات." @@ -2597,7 +2581,7 @@ msgstr "خطأ أثناء ضبط المستخدم." msgid "New password successfully saved. You are now logged in." msgstr "" -#: actions/register.php:85 actions/register.php:189 actions/register.php:404 +#: actions/register.php:85 actions/register.php:189 actions/register.php:405 msgid "Sorry, only invited people can register." msgstr "عذرًا، الأشخاص المدعوون وحدهم يستطيعون التسجيل." @@ -2609,7 +2593,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:503 lib/action.php:457 #: lib/logingroupnav.php:85 msgid "Register" msgstr "سجّل" @@ -2622,70 +2606,66 @@ 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 "عنوان البريد الإلكتروني موجود مسبقًا." -#: actions/register.php:243 actions/register.php:264 +#: actions/register.php:243 actions/register.php:265 msgid "Invalid username or password." msgstr "اسم مستخدم أو كلمة سر غير صالحة." -#: actions/register.php:342 +#: actions/register.php:343 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 +#: actions/register.php:425 msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required." msgstr "" -#: actions/register.php:429 +#: actions/register.php:430 msgid "6 or more characters. Required." msgstr "6 حروف أو أكثر. مطلوب." -#: actions/register.php:433 +#: actions/register.php:434 msgid "Same as password above. Required." msgstr "نفس كلمة السر أعلاه. مطلوب." -#: actions/register.php:437 actions/register.php:441 +#: actions/register.php:438 actions/register.php:442 #: actions/siteadminpanel.php:270 lib/accountsettingsaction.php:120 msgid "Email" msgstr "البريد الإلكتروني" -#: actions/register.php:438 actions/register.php:442 +#: actions/register.php:439 actions/register.php:443 msgid "Used only for updates, announcements, and password recovery" msgstr "" -#: actions/register.php:449 +#: actions/register.php:450 msgid "Longer name, preferably your \"real\" name" msgstr "" -#: actions/register.php:493 +#: actions/register.php:494 msgid "My text and files are available under " msgstr "نصوصي وملفاتي متاحة تحت رخصة " -#: actions/register.php:495 +#: actions/register.php:496 msgid "Creative Commons Attribution 3.0" msgstr "المشاع المبدع نسبة المنصف إلى مؤلفه 3.0" -#: actions/register.php:496 +#: actions/register.php:497 msgid "" " except this private data: password, email address, IM address, and phone " "number." msgstr "" -#: actions/register.php:537 +#: actions/register.php:538 #, 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 " @@ -2698,7 +2678,7 @@ msgid "" "Thanks for signing up and we hope you enjoy using this service." msgstr "" -#: actions/register.php:561 +#: actions/register.php:562 msgid "" "(You should receive a message by email momentarily, with instructions on how " "to confirm your email address.)" @@ -2787,11 +2767,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 +2785,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 +2799,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 +2816,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 +2869,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 +2917,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 +2983,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 +3010,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 +3022,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 +3065,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 +3251,8 @@ msgid "Save site settings" msgstr "اذف إعدادت الموقع" #: actions/smssettings.php:58 -msgid "SMS Settings" +#, fuzzy +msgid "SMS settings" msgstr "إعدادات الرسائل القصيرة" #: actions/smssettings.php:69 @@ -3319,8 +3281,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 +3366,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 +3403,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 +3439,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 +3518,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 +3626,7 @@ msgid "" "click “Reject”." msgstr "" -#: actions/userauthorization.php:188 +#: actions/userauthorization.php:188 actions/version.php:165 msgid "License" msgstr "الرخصة" @@ -3720,7 +3675,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 +3708,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 +3722,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,23 +3736,95 @@ msgstr "" msgid "Try [searching for groups](%%action.groupsearch%%) and joining them." msgstr "" -#: classes/File.php:137 +#: 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:144 #, 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 "" -#: classes/File.php:147 +#: classes/File.php:154 #, php-format msgid "A file this large would exceed your user quota of %d bytes." msgstr "" -#: classes/File.php:154 +#: classes/File.php:161 #, php-format msgid "A file this large would exceed your monthly quota of %d bytes." msgstr "" +#: classes/Login_token.php:76 +#, fuzzy, php-format +msgid "Could not create login token for %s" +msgstr "لم يمكن إنشاء توكن الولوج ل%s" + #: classes/Message.php:45 msgid "You are banned from sending direct messages." msgstr "أنت ممنوع من إرسال رسائل مباشرة." @@ -3856,7 +3874,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" @@ -3903,136 +3921,136 @@ msgid "Other options" msgstr "خيارات أخرى" #: lib/action.php:144 -#, php-format -msgid "%s - %s" -msgstr "%s - %s" +#, fuzzy, php-format +msgid "%1$s - %2$s" +msgstr "%1$s (%2$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 +4059,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 +4075,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 +4107,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 "ضبط المسارات" @@ -4147,7 +4170,7 @@ msgstr "تغيير كلمة السر" msgid "Command results" msgstr "نتائج الأمر" -#: lib/channel.php:210 +#: lib/channel.php:210 lib/mailhandler.php:142 msgid "Command complete" msgstr "اكتمل الأمر" @@ -4160,18 +4183,18 @@ msgid "Sorry, this command is not yet implemented." msgstr "" #: lib/command.php:88 -#, php-format +#, fuzzy, php-format msgid "Could not find a user with nickname %s" -msgstr "" +msgstr "تعذّر إيجاد المستخدم الهدف." #: lib/command.php:92 msgid "It does not make a lot of sense to nudge yourself!" msgstr "" #: lib/command.php:99 -#, php-format +#, fuzzy, php-format msgid "Nudge sent to %s" -msgstr "" +msgstr "أرسل التنبيه" #: lib/command.php:126 #, php-format @@ -4185,11 +4208,13 @@ msgstr "" "الإشعارات: %3$s" #: lib/command.php:152 lib/command.php:399 lib/command.php:460 +#, fuzzy msgid "Notice with that id does not exist" -msgstr "" +msgstr "لا ملف بهذه الهوية." #: lib/command.php:168 lib/command.php:415 lib/command.php:476 #: lib/command.php:532 +#, fuzzy msgid "User has no last notice" msgstr "ليس للمستخدم إشعار أخير" @@ -4197,22 +4222,42 @@ msgstr "ليس للمستخدم إشعار أخير" 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:217 +#, fuzzy +msgid "You are already a member of that group" +msgstr "لست عضوا في تلك المجموعة." + +#: lib/command.php:234 +#, fuzzy, php-format +msgid "Could not join user %s to group %s" +msgstr "تعذّر إنشاء المجموعة." + +#: lib/command.php:239 +#, fuzzy, php-format +msgid "%s joined group %s" +msgstr "%s انضم إلى مجموعة %s" + +#: lib/command.php:284 +#, fuzzy, php-format +msgid "Could not remove user %s to group %s" +msgstr "تعذّر إنشاء المجموعة." + +#: lib/command.php:289 +#, fuzzy, php-format +msgid "%s left group %s" +msgstr "%s انضم إلى مجموعة %s" #: lib/command.php:318 -#, php-format +#, fuzzy, php-format msgid "Fullname: %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" @@ -4222,25 +4267,32 @@ msgstr "الصفحة الرئيسية: %s" msgid "About: %s" msgstr "عن: %s" -#: lib/command.php:358 scripts/xmppdaemon.php:301 +#: lib/command.php:358 #, php-format msgid "Message too long - maximum is %d characters, you sent %d" msgstr "" +#: lib/command.php:376 +#, fuzzy, php-format +msgid "Direct message to %s sent" +msgstr "رسالة مباشرة %s" + #: lib/command.php:378 msgid "Error sending direct message." msgstr "" #: lib/command.php:422 +#, fuzzy msgid "Cannot repeat your own notice" -msgstr "" +msgstr "لا يمكنك تكرار ملحوظتك الخاصة." #: lib/command.php:427 +#, fuzzy msgid "Already repeated that notice" -msgstr "كرر بالفعل هذا الإشعار" +msgstr "كرر بالفعل هذه الملاحظة." #: lib/command.php:435 -#, php-format +#, fuzzy, php-format msgid "Notice from %s repeated" msgstr "الإشعار من %s مكرر" @@ -4254,7 +4306,7 @@ msgid "Notice too long - maximum is %d characters, you sent %d" msgstr "" #: lib/command.php:500 -#, php-format +#, fuzzy, php-format msgid "Reply to %s sent" msgstr "رُد على رسالة %s" @@ -4304,21 +4356,16 @@ msgstr "" msgid "Login command is disabled" msgstr "" -#: lib/command.php:664 -#, php-format -msgid "Could not create login token for %s" -msgstr "لم يمكن إنشاء توكن الولوج ل%s" - -#: lib/command.php:669 +#: lib/command.php:661 #, php-format msgid "This link is useable only once, and is good for only 2 minutes: %s" msgstr "" -#: lib/command.php:685 +#: lib/command.php:677 msgid "You are not subscribed to anyone." msgstr "لست مُشتركًا بأي أحد." -#: lib/command.php:687 +#: lib/command.php:679 msgid "You are subscribed to this person:" msgid_plural "You are subscribed to these people:" msgstr[0] "لست مشتركًا بأحد." @@ -4328,11 +4375,11 @@ msgstr[3] "أنت مشترك بهؤلاء الأشخاص:" msgstr[4] "" msgstr[5] "" -#: lib/command.php:707 +#: lib/command.php:699 msgid "No one is subscribed to you." msgstr "لا أحد مشترك بك." -#: lib/command.php:709 +#: lib/command.php:701 msgid "This person is subscribed to you:" msgid_plural "These people are subscribed to you:" msgstr[0] "لا أحد مشترك بك." @@ -4342,11 +4389,11 @@ msgstr[3] "هؤلاء الأشخاص مشتركون بك:" msgstr[4] "" msgstr[5] "" -#: lib/command.php:729 +#: lib/command.php:721 msgid "You are not a member of any groups." msgstr "لست عضوًا في أي مجموعة." -#: lib/command.php:731 +#: lib/command.php:723 msgid "You are a member of this group:" msgid_plural "You are a member of these groups:" msgstr[0] "لست عضوًا في أي مجموعة." @@ -4356,7 +4403,7 @@ msgstr[3] "أنت عضو في هذه المجموعات:" msgstr[4] "" msgstr[5] "" -#: lib/command.php:745 +#: lib/command.php:737 msgid "" "Commands:\n" "on - turn on notifications\n" @@ -4511,10 +4558,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\"" @@ -4673,21 +4716,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 @@ -4822,6 +4853,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 "" @@ -4853,7 +4905,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 @@ -4861,8 +4913,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 @@ -4871,7 +4924,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 @@ -4904,7 +4957,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 @@ -5021,6 +5084,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 "الاشتراكات" @@ -5190,10 +5258,6 @@ msgstr "" msgid "People Tagcloud as tagged" msgstr "" -#: lib/subscriptionlist.php:126 -msgid "(none)" -msgstr "(لا شيء)" - #: lib/tagcloudsection.php:56 msgid "None" msgstr "لا شيء" @@ -5254,47 +5318,47 @@ msgstr "رسالة" msgid "Moderate" msgstr "" -#: lib/util.php:837 +#: lib/util.php:884 msgid "a few seconds ago" msgstr "قبل لحظات قليلة" -#: lib/util.php:839 +#: lib/util.php:886 msgid "about a minute ago" msgstr "قبل دقيقة تقريبًا" -#: lib/util.php:841 +#: lib/util.php:888 #, php-format msgid "about %d minutes ago" msgstr "" -#: lib/util.php:843 +#: lib/util.php:890 msgid "about an hour ago" msgstr "قبل ساعة تقريبًا" -#: lib/util.php:845 +#: lib/util.php:892 #, php-format msgid "about %d hours ago" msgstr "" -#: lib/util.php:847 +#: lib/util.php:894 msgid "about a day ago" msgstr "قبل يوم تقريبا" -#: lib/util.php:849 +#: lib/util.php:896 #, php-format msgid "about %d days ago" msgstr "" -#: lib/util.php:851 +#: lib/util.php:898 msgid "about a month ago" msgstr "قبل شهر تقريبًا" -#: lib/util.php:853 +#: lib/util.php:900 #, php-format msgid "about %d months ago" msgstr "" -#: lib/util.php:855 +#: lib/util.php:902 msgid "about a year ago" msgstr "قبل سنة تقريبًا" @@ -5308,18 +5372,7 @@ msgstr "%s ليس لونًا صحيحًا!" 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." +#: scripts/xmppdaemon.php:301 +#, php-format +msgid "Message too long - maximum is %1$d characters, you sent %2$d." msgstr "" diff --git a/locale/arz/LC_MESSAGES/statusnet.po b/locale/arz/LC_MESSAGES/statusnet.po index 26d2f4ffc..2c8fc18d1 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-05 22:10+0000\n" -"PO-Revision-Date: 2010-01-05 22:10:34+0000\n" +"POT-Creation-Date: 2010-01-11 23:25+0000\n" +"PO-Revision-Date: 2010-01-11 23:26:08+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 (r60693); Translate extension (2010-01-04)\n" +"X-Generator: MediaWiki 1.16alpha (r60950); 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" @@ -39,7 +39,7 @@ msgstr "لا صفحه كهذه" #: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79 #: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75 #: actions/favoritesrss.php:74 actions/foaf.php:40 actions/foaf.php:58 -#: actions/microsummary.php:62 actions/newmessage.php:116 +#: actions/microsummary.php:62 actions/newmessage.php:116 actions/otp.php:76 #: actions/remotesubscribe.php:145 actions/remotesubscribe.php:154 #: actions/replies.php:73 actions/repliesrss.php:38 #: actions/showfavorites.php:105 actions/userbyid.php:74 @@ -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 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 +#, 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" @@ -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,11 +590,11 @@ 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/invite.php:56 actions/login.php:115 actions/makeadmin.php:66 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80 #: actions/othersettings.php:145 actions/passwordsettings.php:138 #: actions/profilesettings.php:194 actions/recoverpassword.php:337 @@ -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" +#: actions/joingroup.php:135 +#, fuzzy, php-format +msgid "%1$s joined group %2$s" msgstr "%s انضم إلى مجموعه %s" #: actions/leavegroup.php:60 @@ -1745,71 +1717,62 @@ 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 "" +#: actions/leavegroup.php:134 +#, fuzzy, php-format +msgid "%1$s left group %2$s" +msgstr "%s انضم إلى مجموعه %s" -#: actions/login.php:83 actions/register.php:137 +#: actions/login.php:80 actions/otp.php:62 actions/register.php:137 msgid "Already logged in." msgstr "والج بالفعل." -#: actions/login.php:114 actions/login.php:124 -msgid "Invalid or expired token." -msgstr "" - -#: actions/login.php:147 +#: actions/login.php:126 msgid "Incorrect username or password." msgstr "اسم المستخدم أو كلمه السر غير صحيحان." -#: actions/login.php:153 +#: actions/login.php:132 actions/otp.php:120 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:188 actions/login.php:241 lib/action.php:460 #: lib/logingroupnav.php:79 msgid "Login" msgstr "لُج" -#: actions/login.php:247 +#: actions/login.php:227 msgid "Login to site" msgstr "لُج إلى الموقع" -#: actions/login.php:250 actions/profilesettings.php:106 -#: actions/register.php:423 actions/showgroup.php:236 actions/tagother.php:94 +#: actions/login.php:230 actions/profilesettings.php:106 +#: actions/register.php:424 actions/showgroup.php:236 actions/tagother.php:94 #: lib/groupeditform.php:152 lib/userprofile.php:131 msgid "Nickname" msgstr "الاسم المستعار" -#: actions/login.php:253 actions/register.php:428 +#: actions/login.php:233 actions/register.php:429 #: lib/accountsettingsaction.php:116 msgid "Password" msgstr "كلمه السر" -#: actions/login.php:256 actions/register.php:477 +#: actions/login.php:236 actions/register.php:478 msgid "Remember me" msgstr "تذكّرني" -#: actions/login.php:257 actions/register.php:479 +#: actions/login.php:237 actions/register.php:480 msgid "Automatically login in the future; not for shared computers!" msgstr "" -#: actions/login.php:267 +#: actions/login.php:247 msgid "Lost or forgotten password?" msgstr "أنسيت كلمه السر؟" -#: actions/login.php:286 +#: actions/login.php:266 msgid "" "For security reasons, please re-enter your user name and password before " "changing your settings." msgstr "" -#: actions/login.php:290 +#: actions/login.php:270 #, php-format msgid "" "Login with your username and password. Don't have a username yet? [Register]" @@ -1822,18 +1785,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" @@ -1873,10 +1836,10 @@ msgstr "" msgid "Message sent" msgstr "أُرسلت الرسالة" -#: actions/newmessage.php:185 lib/command.php:376 -#, php-format -msgid "Direct message to %s sent" -msgstr "" +#: actions/newmessage.php:185 +#, 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 +1865,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 @@ -1960,8 +1923,8 @@ msgstr "نوع المحتوى " msgid "Only " msgstr "" -#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1031 -#: lib/api.php:1059 lib/api.php:1169 +#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1033 +#: lib/api.php:1061 lib/api.php:1171 msgid "Not a supported data format." msgstr "ليس نسق بيانات مدعوم." @@ -2005,10 +1968,30 @@ 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/otp.php:69 +#, fuzzy +msgid "No user ID specified." +msgstr "لا مجموعه مُحدّده." + +#: actions/otp.php:83 +#, fuzzy +msgid "No login token specified." +msgstr "لا ملاحظه محدده." + +#: actions/otp.php:90 +#, fuzzy +msgid "No login token requested." +msgstr "لا طلب استيثاق!" + +#: actions/otp.php:95 +#, fuzzy +msgid "Invalid login token specified." +msgstr "لا ملاحظه محدده." + +#: actions/otp.php:104 +#, fuzzy +msgid "Login token expired." +msgstr "لُج إلى الموقع" #: actions/outbox.php:61 #, php-format @@ -2044,7 +2027,7 @@ msgid "6 or more characters" msgstr "" #: actions/passwordsettings.php:112 actions/recoverpassword.php:239 -#: actions/register.php:432 actions/smssettings.php:134 +#: actions/register.php:433 actions/smssettings.php:134 msgid "Confirm" msgstr "أكّد" @@ -2080,7 +2063,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 +2096,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 +2189,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 +2219,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 +2228,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 @@ -2264,42 +2248,42 @@ msgstr "معلومات الملف الشخصي" msgid "1-64 lowercase letters or numbers, no punctuation or spaces" msgstr "" -#: actions/profilesettings.php:111 actions/register.php:447 +#: actions/profilesettings.php:111 actions/register.php:448 #: actions/showgroup.php:247 actions/tagother.php:104 #: lib/groupeditform.php:157 lib/userprofile.php:149 msgid "Full name" msgstr "الاسم الكامل" -#: actions/profilesettings.php:115 actions/register.php:452 +#: actions/profilesettings.php:115 actions/register.php:453 #: lib/groupeditform.php:161 msgid "Homepage" msgstr "الصفحه الرئيسية" -#: actions/profilesettings.php:117 actions/register.php:454 +#: actions/profilesettings.php:117 actions/register.php:455 msgid "URL of your homepage, blog, or profile on another site" msgstr "" -#: actions/profilesettings.php:122 actions/register.php:460 +#: actions/profilesettings.php:122 actions/register.php:461 #, php-format msgid "Describe yourself and your interests in %d chars" msgstr "" -#: actions/profilesettings.php:125 actions/register.php:463 +#: actions/profilesettings.php:125 actions/register.php:464 msgid "Describe yourself and your interests" msgstr "صِف نفسك واهتماماتك" -#: actions/profilesettings.php:127 actions/register.php:465 +#: actions/profilesettings.php:127 actions/register.php:466 msgid "Bio" msgstr "السيرة" -#: actions/profilesettings.php:132 actions/register.php:470 +#: actions/profilesettings.php:132 actions/register.php:471 #: actions/showgroup.php:256 actions/tagother.php:112 #: actions/userauthorization.php:158 lib/groupeditform.php:177 #: lib/userprofile.php:164 msgid "Location" msgstr "الموقع" -#: actions/profilesettings.php:134 actions/register.php:472 +#: actions/profilesettings.php:134 actions/register.php:473 msgid "Where you are, like \"City, State (or Region), Country\"" msgstr "" @@ -2361,19 +2345,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 "حُفظت الإعدادات." @@ -2596,7 +2580,7 @@ msgstr "خطأ أثناء ضبط المستخدم." msgid "New password successfully saved. You are now logged in." msgstr "" -#: actions/register.php:85 actions/register.php:189 actions/register.php:404 +#: actions/register.php:85 actions/register.php:189 actions/register.php:405 msgid "Sorry, only invited people can register." msgstr "عذرًا، الأشخاص المدعوون وحدهم يستطيعون التسجيل." @@ -2608,7 +2592,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:503 lib/action.php:457 #: lib/logingroupnav.php:85 msgid "Register" msgstr "سجّل" @@ -2621,70 +2605,66 @@ 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 "عنوان البريد الإلكترونى موجود مسبقًا." -#: actions/register.php:243 actions/register.php:264 +#: actions/register.php:243 actions/register.php:265 msgid "Invalid username or password." msgstr "اسم مستخدم أو كلمه سر غير صالحه." -#: actions/register.php:342 +#: actions/register.php:343 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 +#: actions/register.php:425 msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required." msgstr "" -#: actions/register.php:429 +#: actions/register.php:430 msgid "6 or more characters. Required." msgstr "6 حروف أو أكثر. مطلوب." -#: actions/register.php:433 +#: actions/register.php:434 msgid "Same as password above. Required." msgstr "نفس كلمه السر أعلاه. مطلوب." -#: actions/register.php:437 actions/register.php:441 +#: actions/register.php:438 actions/register.php:442 #: actions/siteadminpanel.php:270 lib/accountsettingsaction.php:120 msgid "Email" msgstr "البريد الإلكتروني" -#: actions/register.php:438 actions/register.php:442 +#: actions/register.php:439 actions/register.php:443 msgid "Used only for updates, announcements, and password recovery" msgstr "" -#: actions/register.php:449 +#: actions/register.php:450 msgid "Longer name, preferably your \"real\" name" msgstr "" -#: actions/register.php:493 +#: actions/register.php:494 msgid "My text and files are available under " msgstr "نصوصى وملفاتى متاحه تحت رخصه " -#: actions/register.php:495 +#: actions/register.php:496 msgid "Creative Commons Attribution 3.0" msgstr "المشاع المبدع نسبه المنصف إلى مؤلفه 3.0" -#: actions/register.php:496 +#: actions/register.php:497 msgid "" " except this private data: password, email address, IM address, and phone " "number." msgstr "" -#: actions/register.php:537 +#: actions/register.php:538 #, 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 " @@ -2697,7 +2677,7 @@ msgid "" "Thanks for signing up and we hope you enjoy using this service." msgstr "" -#: actions/register.php:561 +#: actions/register.php:562 msgid "" "(You should receive a message by email momentarily, with instructions on how " "to confirm your email address.)" @@ -2786,11 +2766,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 +2784,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 +2798,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 +2815,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 +2868,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 +2916,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 +2982,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 +3009,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 +3021,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 +3064,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 +3250,8 @@ msgid "Save site settings" msgstr "اذف إعدادت الموقع" #: actions/smssettings.php:58 -msgid "SMS Settings" +#, fuzzy +msgid "SMS settings" msgstr "إعدادات الرسائل القصيرة" #: actions/smssettings.php:69 @@ -3318,8 +3280,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 +3365,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 +3402,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 +3438,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 +3517,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 +3625,7 @@ msgid "" "click “Reject”." msgstr "" -#: actions/userauthorization.php:188 +#: actions/userauthorization.php:188 actions/version.php:165 msgid "License" msgstr "الرخصة" @@ -3719,7 +3674,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 +3707,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 +3721,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,23 +3735,95 @@ msgstr "" msgid "Try [searching for groups](%%action.groupsearch%%) and joining them." msgstr "" -#: classes/File.php:137 +#: 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:144 #, 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 "" -#: classes/File.php:147 +#: classes/File.php:154 #, php-format msgid "A file this large would exceed your user quota of %d bytes." msgstr "" -#: classes/File.php:154 +#: classes/File.php:161 #, php-format msgid "A file this large would exceed your monthly quota of %d bytes." msgstr "" +#: classes/Login_token.php:76 +#, fuzzy, php-format +msgid "Could not create login token for %s" +msgstr "لم يمكن إنشاء توكن الولوج ل%s" + #: classes/Message.php:45 msgid "You are banned from sending direct messages." msgstr "أنت ممنوع من إرسال رسائل مباشره." @@ -3855,7 +3873,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,136 +3920,136 @@ msgid "Other options" msgstr "خيارات أخرى" #: lib/action.php:144 -#, php-format -msgid "%s - %s" -msgstr "%s - %s" +#, fuzzy, php-format +msgid "%1$s - %2$s" +msgstr "%1$s (%2$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 +4058,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 +4074,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 +4106,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 "ضبط المسارات" @@ -4146,7 +4169,7 @@ msgstr "تغيير كلمه السر" msgid "Command results" msgstr "نتائج الأمر" -#: lib/channel.php:210 +#: lib/channel.php:210 lib/mailhandler.php:142 msgid "Command complete" msgstr "اكتمل الأمر" @@ -4159,18 +4182,18 @@ msgid "Sorry, this command is not yet implemented." msgstr "" #: lib/command.php:88 -#, php-format +#, fuzzy, php-format msgid "Could not find a user with nickname %s" -msgstr "" +msgstr "تعذّر إيجاد المستخدم الهدف." #: lib/command.php:92 msgid "It does not make a lot of sense to nudge yourself!" msgstr "" #: lib/command.php:99 -#, php-format +#, fuzzy, php-format msgid "Nudge sent to %s" -msgstr "" +msgstr "أرسل التنبيه" #: lib/command.php:126 #, php-format @@ -4184,11 +4207,13 @@ msgstr "" "الإشعارات: %3$s" #: lib/command.php:152 lib/command.php:399 lib/command.php:460 +#, fuzzy msgid "Notice with that id does not exist" -msgstr "" +msgstr "لا ملف بهذه الهويه." #: lib/command.php:168 lib/command.php:415 lib/command.php:476 #: lib/command.php:532 +#, fuzzy msgid "User has no last notice" msgstr "ليس للمستخدم إشعار أخير" @@ -4196,22 +4221,42 @@ msgstr "ليس للمستخدم إشعار أخير" 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:217 +#, fuzzy +msgid "You are already a member of that group" +msgstr "لست عضوا فى تلك المجموعه." + +#: lib/command.php:234 +#, fuzzy, php-format +msgid "Could not join user %s to group %s" +msgstr "تعذّر إنشاء المجموعه." + +#: lib/command.php:239 +#, fuzzy, php-format +msgid "%s joined group %s" +msgstr "%s انضم إلى مجموعه %s" + +#: lib/command.php:284 +#, fuzzy, php-format +msgid "Could not remove user %s to group %s" +msgstr "تعذّر إنشاء المجموعه." + +#: lib/command.php:289 +#, fuzzy, php-format +msgid "%s left group %s" +msgstr "%s انضم إلى مجموعه %s" #: lib/command.php:318 -#, php-format +#, fuzzy, php-format msgid "Fullname: %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" @@ -4221,25 +4266,32 @@ msgstr "الصفحه الرئيسية: %s" msgid "About: %s" msgstr "عن: %s" -#: lib/command.php:358 scripts/xmppdaemon.php:301 +#: lib/command.php:358 #, php-format msgid "Message too long - maximum is %d characters, you sent %d" msgstr "" +#: lib/command.php:376 +#, fuzzy, php-format +msgid "Direct message to %s sent" +msgstr "رساله مباشره %s" + #: lib/command.php:378 msgid "Error sending direct message." msgstr "" #: lib/command.php:422 +#, fuzzy msgid "Cannot repeat your own notice" -msgstr "" +msgstr "لا يمكنك تكرار ملحوظتك الخاصه." #: lib/command.php:427 +#, fuzzy msgid "Already repeated that notice" -msgstr "كرر بالفعل هذا الإشعار" +msgstr "كرر بالفعل هذه الملاحظه." #: lib/command.php:435 -#, php-format +#, fuzzy, php-format msgid "Notice from %s repeated" msgstr "الإشعار من %s مكرر" @@ -4253,7 +4305,7 @@ msgid "Notice too long - maximum is %d characters, you sent %d" msgstr "" #: lib/command.php:500 -#, php-format +#, fuzzy, php-format msgid "Reply to %s sent" msgstr "رُد على رساله %s" @@ -4303,21 +4355,16 @@ msgstr "" msgid "Login command is disabled" msgstr "" -#: lib/command.php:664 -#, php-format -msgid "Could not create login token for %s" -msgstr "لم يمكن إنشاء توكن الولوج ل%s" - -#: lib/command.php:669 +#: lib/command.php:661 #, php-format msgid "This link is useable only once, and is good for only 2 minutes: %s" msgstr "" -#: lib/command.php:685 +#: lib/command.php:677 msgid "You are not subscribed to anyone." msgstr "لست مُشتركًا بأى أحد." -#: lib/command.php:687 +#: lib/command.php:679 msgid "You are subscribed to this person:" msgid_plural "You are subscribed to these people:" msgstr[0] "لست مشتركًا بأحد." @@ -4327,11 +4374,11 @@ msgstr[3] "أنت مشترك بهؤلاء الأشخاص:" msgstr[4] "" msgstr[5] "" -#: lib/command.php:707 +#: lib/command.php:699 msgid "No one is subscribed to you." msgstr "لا أحد مشترك بك." -#: lib/command.php:709 +#: lib/command.php:701 msgid "This person is subscribed to you:" msgid_plural "These people are subscribed to you:" msgstr[0] "لا أحد مشترك بك." @@ -4341,11 +4388,11 @@ msgstr[3] "هؤلاء الأشخاص مشتركون بك:" msgstr[4] "" msgstr[5] "" -#: lib/command.php:729 +#: lib/command.php:721 msgid "You are not a member of any groups." msgstr "لست عضوًا فى أى مجموعه." -#: lib/command.php:731 +#: lib/command.php:723 msgid "You are a member of this group:" msgid_plural "You are a member of these groups:" msgstr[0] "لست عضوًا فى أى مجموعه." @@ -4355,7 +4402,7 @@ msgstr[3] "أنت عضو فى هذه المجموعات:" msgstr[4] "" msgstr[5] "" -#: lib/command.php:745 +#: lib/command.php:737 msgid "" "Commands:\n" "on - turn on notifications\n" @@ -4510,10 +4557,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\"" @@ -4672,21 +4715,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 @@ -4821,6 +4852,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 "" @@ -4852,7 +4904,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 @@ -4860,8 +4912,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 @@ -4870,7 +4923,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 @@ -4903,7 +4956,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 @@ -5020,6 +5083,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 "الاشتراكات" @@ -5189,10 +5257,6 @@ msgstr "" msgid "People Tagcloud as tagged" msgstr "" -#: lib/subscriptionlist.php:126 -msgid "(none)" -msgstr "(لا شيء)" - #: lib/tagcloudsection.php:56 msgid "None" msgstr "لا شيء" @@ -5253,47 +5317,47 @@ msgstr "رسالة" msgid "Moderate" msgstr "" -#: lib/util.php:837 +#: lib/util.php:884 msgid "a few seconds ago" msgstr "قبل لحظات قليلة" -#: lib/util.php:839 +#: lib/util.php:886 msgid "about a minute ago" msgstr "قبل دقيقه تقريبًا" -#: lib/util.php:841 +#: lib/util.php:888 #, php-format msgid "about %d minutes ago" msgstr "" -#: lib/util.php:843 +#: lib/util.php:890 msgid "about an hour ago" msgstr "قبل ساعه تقريبًا" -#: lib/util.php:845 +#: lib/util.php:892 #, php-format msgid "about %d hours ago" msgstr "" -#: lib/util.php:847 +#: lib/util.php:894 msgid "about a day ago" msgstr "قبل يوم تقريبا" -#: lib/util.php:849 +#: lib/util.php:896 #, php-format msgid "about %d days ago" msgstr "" -#: lib/util.php:851 +#: lib/util.php:898 msgid "about a month ago" msgstr "قبل شهر تقريبًا" -#: lib/util.php:853 +#: lib/util.php:900 #, php-format msgid "about %d months ago" msgstr "" -#: lib/util.php:855 +#: lib/util.php:902 msgid "about a year ago" msgstr "قبل سنه تقريبًا" @@ -5307,18 +5371,7 @@ msgstr "%s ليس لونًا صحيحًا!" 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." +#: scripts/xmppdaemon.php:301 +#, php-format +msgid "Message too long - maximum is %1$d characters, you sent %2$d." msgstr "" diff --git a/locale/bg/LC_MESSAGES/statusnet.po b/locale/bg/LC_MESSAGES/statusnet.po index cf881f17b..db950916b 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-05 22:10+0000\n" -"PO-Revision-Date: 2010-01-05 22:10:40+0000\n" +"POT-Creation-Date: 2010-01-11 23:25+0000\n" +"PO-Revision-Date: 2010-01-11 23:26:12+0000\n" "Language-Team: Bulgarian\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha (r60693); Translate extension (2010-01-04)\n" +"X-Generator: MediaWiki 1.16alpha (r60950); 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" @@ -39,7 +39,7 @@ msgstr "Няма такака страница." #: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79 #: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75 #: actions/favoritesrss.php:74 actions/foaf.php:40 actions/foaf.php:58 -#: actions/microsummary.php:62 actions/newmessage.php:116 +#: actions/microsummary.php:62 actions/newmessage.php:116 actions/otp.php:76 #: actions/remotesubscribe.php:145 actions/remotesubscribe.php:154 #: actions/replies.php:73 actions/repliesrss.php:38 #: actions/showfavorites.php:105 actions/userbyid.php:74 @@ -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 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 #, 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" @@ -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,11 +599,11 @@ 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/invite.php:56 actions/login.php:115 actions/makeadmin.php:66 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80 #: actions/othersettings.php:145 actions/passwordsettings.php:138 #: actions/profilesettings.php:194 actions/recoverpassword.php:337 @@ -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 +#: actions/joingroup.php:135 #, 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" +msgid "%1$s joined group %2$s" msgstr "%s се присъедини към групата %s" #: actions/leavegroup.php:60 @@ -1828,67 +1798,57 @@ msgstr "Не членувате в тази група." msgid "Could not find membership record." msgstr "Грешка при обновяване записа на потребител." -#: actions/leavegroup.php:127 lib/command.php:284 +#: actions/leavegroup.php:134 #, 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" +msgid "%1$s left group %2$s" msgstr "%s напусна групата %s" -#: actions/login.php:83 actions/register.php:137 +#: actions/login.php:80 actions/otp.php:62 actions/register.php:137 msgid "Already logged in." msgstr "Вече сте влезли." -#: actions/login.php:114 actions/login.php:124 -#, fuzzy -msgid "Invalid or expired token." -msgstr "Невалидно съдържание на бележка" - -#: actions/login.php:147 +#: actions/login.php:126 msgid "Incorrect username or password." msgstr "Грешно име или парола." -#: actions/login.php:153 +#: actions/login.php:132 actions/otp.php:120 #, fuzzy 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:188 actions/login.php:241 lib/action.php:460 #: lib/logingroupnav.php:79 msgid "Login" msgstr "Вход" -#: actions/login.php:247 +#: actions/login.php:227 msgid "Login to site" msgstr "" -#: actions/login.php:250 actions/profilesettings.php:106 -#: actions/register.php:423 actions/showgroup.php:236 actions/tagother.php:94 +#: actions/login.php:230 actions/profilesettings.php:106 +#: actions/register.php:424 actions/showgroup.php:236 actions/tagother.php:94 #: lib/groupeditform.php:152 lib/userprofile.php:131 msgid "Nickname" msgstr "Псевдоним" -#: actions/login.php:253 actions/register.php:428 +#: actions/login.php:233 actions/register.php:429 #: lib/accountsettingsaction.php:116 msgid "Password" msgstr "Парола" -#: actions/login.php:256 actions/register.php:477 +#: actions/login.php:236 actions/register.php:478 msgid "Remember me" msgstr "Запомни ме" -#: actions/login.php:257 actions/register.php:479 +#: actions/login.php:237 actions/register.php:480 msgid "Automatically login in the future; not for shared computers!" msgstr "Автоматично влизане занапред. Да не се ползва на общи компютри!" -#: actions/login.php:267 +#: actions/login.php:247 msgid "Lost or forgotten password?" msgstr "Загубена или забравена парола" -#: actions/login.php:286 +#: actions/login.php:266 msgid "" "For security reasons, please re-enter your user name and password before " "changing your settings." @@ -1896,7 +1856,7 @@ msgstr "" "За по-голяма сигурност, моля въведете отново потребителското си име и парола " "при промяна на настройките." -#: actions/login.php:290 +#: actions/login.php:270 #, fuzzy, php-format msgid "" "Login with your username and password. Don't have a username yet? [Register]" @@ -1910,19 +1870,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" @@ -1964,9 +1924,9 @@ msgstr "" msgid "Message sent" msgstr "Съобщението е изпратено" -#: actions/newmessage.php:185 lib/command.php:376 -#, php-format -msgid "Direct message to %s sent" +#: actions/newmessage.php:185 +#, 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 +1956,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 @@ -2053,8 +2013,8 @@ msgstr "вид съдържание " msgid "Only " msgstr "Само " -#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1031 -#: lib/api.php:1059 lib/api.php:1169 +#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1033 +#: lib/api.php:1061 lib/api.php:1171 msgid "Not a supported data format." msgstr "Неподдържан формат на данните" @@ -2099,10 +2059,30 @@ 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/otp.php:69 +#, fuzzy +msgid "No user ID specified." +msgstr "Не е указана група." + +#: actions/otp.php:83 +#, fuzzy +msgid "No login token specified." +msgstr "Не е указана бележка." + +#: actions/otp.php:90 +#, fuzzy +msgid "No login token requested." +msgstr "Сървърът не е върнал адрес на профила." + +#: actions/otp.php:95 +#, fuzzy +msgid "Invalid login token specified." +msgstr "Невалидно съдържание на бележка" + +#: actions/otp.php:104 +#, fuzzy +msgid "Login token expired." +msgstr "Влизане в сайта" #: actions/outbox.php:61 #, php-format @@ -2139,7 +2119,7 @@ msgid "6 or more characters" msgstr "6 или повече знака" #: actions/passwordsettings.php:112 actions/recoverpassword.php:239 -#: actions/register.php:432 actions/smssettings.php:134 +#: actions/register.php:433 actions/smssettings.php:134 msgid "Confirm" msgstr "Потвърждаване" @@ -2175,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 "Пътища" @@ -2208,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 "Сайт" @@ -2301,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 @@ -2331,9 +2312,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 +2322,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,42 +2342,42 @@ msgstr "Данни на профила" msgid "1-64 lowercase letters or numbers, no punctuation or spaces" msgstr "От 1 до 64 малки букви или цифри, без пунктоация и интервали" -#: actions/profilesettings.php:111 actions/register.php:447 +#: actions/profilesettings.php:111 actions/register.php:448 #: actions/showgroup.php:247 actions/tagother.php:104 #: lib/groupeditform.php:157 lib/userprofile.php:149 msgid "Full name" msgstr "Пълно име" -#: actions/profilesettings.php:115 actions/register.php:452 +#: actions/profilesettings.php:115 actions/register.php:453 #: lib/groupeditform.php:161 msgid "Homepage" msgstr "Лична страница" -#: actions/profilesettings.php:117 actions/register.php:454 +#: actions/profilesettings.php:117 actions/register.php:455 msgid "URL of your homepage, blog, or profile on another site" msgstr "Адрес на личната ви страница, блог или профил в друг сайт" -#: actions/profilesettings.php:122 actions/register.php:460 +#: actions/profilesettings.php:122 actions/register.php:461 #, php-format msgid "Describe yourself and your interests in %d chars" msgstr "Опишете себе си и интересите си в до %d букви" -#: actions/profilesettings.php:125 actions/register.php:463 +#: actions/profilesettings.php:125 actions/register.php:464 msgid "Describe yourself and your interests" msgstr "Опишете себе си и интересите си" -#: actions/profilesettings.php:127 actions/register.php:465 +#: actions/profilesettings.php:127 actions/register.php:466 msgid "Bio" msgstr "За мен" -#: actions/profilesettings.php:132 actions/register.php:470 +#: actions/profilesettings.php:132 actions/register.php:471 #: actions/showgroup.php:256 actions/tagother.php:112 #: actions/userauthorization.php:158 lib/groupeditform.php:177 #: lib/userprofile.php:164 msgid "Location" msgstr "Местоположение" -#: actions/profilesettings.php:134 actions/register.php:472 +#: actions/profilesettings.php:134 actions/register.php:473 msgid "Where you are, like \"City, State (or Region), Country\"" msgstr "Къде се намирате (град, община, държава и т.н.)" @@ -2460,20 +2441,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 "Настройките са запазени." @@ -2693,7 +2674,7 @@ msgstr "Грешка в настройките на потребителя." msgid "New password successfully saved. You are now logged in." msgstr "Новата парола е запазена. Влязохте успешно." -#: actions/register.php:85 actions/register.php:189 actions/register.php:404 +#: actions/register.php:85 actions/register.php:189 actions/register.php:405 msgid "Sorry, only invited people can register." msgstr "" @@ -2706,7 +2687,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:503 lib/action.php:457 #: lib/logingroupnav.php:85 msgid "Register" msgstr "Регистриране" @@ -2719,73 +2700,69 @@ 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 "Адресът на е-поща вече се използва." -#: actions/register.php:243 actions/register.php:264 +#: actions/register.php:243 actions/register.php:265 msgid "Invalid username or password." msgstr "Неправилно име или парола." -#: actions/register.php:342 +#: actions/register.php:343 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 +#: actions/register.php:425 msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required." msgstr "" "От 1 до 64 малки букви или цифри, без пунктоация и интервали. Задължително " "поле." -#: actions/register.php:429 +#: actions/register.php:430 msgid "6 or more characters. Required." msgstr "6 или повече знака. Задължително поле." -#: actions/register.php:433 +#: actions/register.php:434 msgid "Same as password above. Required." msgstr "Същото като паролата по-горе. Задължително поле." -#: actions/register.php:437 actions/register.php:441 +#: actions/register.php:438 actions/register.php:442 #: actions/siteadminpanel.php:270 lib/accountsettingsaction.php:120 msgid "Email" msgstr "Е-поща" -#: actions/register.php:438 actions/register.php:442 +#: actions/register.php:439 actions/register.php:443 msgid "Used only for updates, announcements, and password recovery" msgstr "Използва се само за промени, обяви или възстановяване на паролата" -#: actions/register.php:449 +#: actions/register.php:450 msgid "Longer name, preferably your \"real\" name" msgstr "По-дълго име, за предпочитане \"истинското\" ви име." -#: actions/register.php:493 +#: actions/register.php:494 msgid "My text and files are available under " msgstr "Текстовете и файловите ми са достъпни под " -#: actions/register.php:495 +#: actions/register.php:496 msgid "Creative Commons Attribution 3.0" msgstr "Криейтив Комънс Признание 3.0" -#: actions/register.php:496 +#: actions/register.php:497 #, fuzzy msgid "" " except this private data: password, email address, IM address, and phone " "number." msgstr " освен тези лични данни: парола, е-поща, месинджър, телефон." -#: actions/register.php:537 -#, php-format +#: actions/register.php:538 +#, 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 " @@ -2812,7 +2789,7 @@ msgstr "" "Благодарим, че се включихте в сайта и дано ползването на услугата ви носи " "само приятни мигове!" -#: actions/register.php:561 +#: actions/register.php:562 msgid "" "(You should receive a message by email momentarily, with instructions on how " "to confirm your email address.)" @@ -2909,11 +2886,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 +2904,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 +2918,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 +2937,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 +2986,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 +3034,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 +3100,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 +3127,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 +3139,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 +3182,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 +3369,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 +3400,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 +3495,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 +3532,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 +3568,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 +3651,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 +3658,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 +3767,7 @@ msgstr "" "Проверете тези детайли и се уверете, че искате да се абонирате за бележките " "на този потребител. Ако не искате абонамента, натиснете \"Cancel\" (Отказ)." -#: actions/userauthorization.php:188 +#: actions/userauthorization.php:188 actions/version.php:165 msgid "License" msgstr "Лиценз" @@ -3872,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 @@ -3905,10 +3856,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 +3871,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,23 +3886,95 @@ msgstr "%s не членува в никоя група." msgid "Try [searching for groups](%%action.groupsearch%%) and joining them." msgstr "" -#: classes/File.php:137 +#: 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:144 #, 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 "" -#: classes/File.php:147 +#: classes/File.php:154 #, php-format msgid "A file this large would exceed your user quota of %d bytes." msgstr "" -#: classes/File.php:154 +#: classes/File.php:161 #, php-format msgid "A file this large would exceed your monthly quota of %d bytes." msgstr "" +#: classes/Login_token.php:76 +#, fuzzy, php-format +msgid "Could not create login token for %s" +msgstr "Грешка при отбелязване като любима." + #: classes/Message.php:45 #, fuzzy msgid "You are banned from sending direct messages." @@ -4017,7 +4031,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" @@ -4066,140 +4080,140 @@ msgid "Other options" msgstr "Други настройки" #: lib/action.php:144 -#, php-format -msgid "%s - %s" -msgstr "%s - %s" +#, fuzzy, php-format +msgid "%1$s - %2$s" +msgstr "%1$s (%2$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 +4222,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 +4238,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 +4270,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 "Настройка на пътищата" @@ -4317,7 +4336,7 @@ msgstr "Паролата е записана." msgid "Command results" msgstr "Резултат от командата" -#: lib/channel.php:210 +#: lib/channel.php:210 lib/mailhandler.php:142 msgid "Command complete" msgstr "Командата е изпълнена" @@ -4339,7 +4358,7 @@ msgid "It does not make a lot of sense to nudge yourself!" msgstr "" #: lib/command.php:99 -#, php-format +#, fuzzy, php-format msgid "Nudge sent to %s" msgstr "Изпратено е побутване на %s" @@ -4355,11 +4374,13 @@ msgstr "" "Бележки: %3$s" #: lib/command.php:152 lib/command.php:399 lib/command.php:460 +#, fuzzy msgid "Notice with that id does not exist" -msgstr "" +msgstr "Не е открита бележка с такъв идентификатор." #: lib/command.php:168 lib/command.php:415 lib/command.php:476 #: lib/command.php:532 +#, fuzzy msgid "User has no last notice" msgstr "Потребителят няма последна бележка" @@ -4367,22 +4388,42 @@ msgstr "Потребителят няма последна бележка" 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:217 +#, fuzzy +msgid "You are already a member of that group" +msgstr "Вече членувате в тази група." + +#: lib/command.php:234 +#, fuzzy, php-format +msgid "Could not join user %s to group %s" +msgstr "Грешка при проследяване — потребителят не е намерен." + +#: lib/command.php:239 +#, fuzzy, php-format +msgid "%s joined group %s" +msgstr "%s се присъедини към групата %s" + +#: lib/command.php:284 +#, fuzzy, php-format +msgid "Could not remove user %s to group %s" +msgstr "Грешка при проследяване — потребителят не е намерен." + +#: lib/command.php:289 +#, fuzzy, php-format +msgid "%s left group %s" +msgstr "%s напусна групата %s" #: lib/command.php:318 -#, php-format +#, fuzzy, php-format msgid "Fullname: %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" @@ -4392,27 +4433,33 @@ msgstr "Домашна страница: %s" msgid "About: %s" msgstr "Относно: %s" -#: lib/command.php:358 scripts/xmppdaemon.php:301 +#: lib/command.php:358 #, fuzzy, php-format msgid "Message too long - maximum is %d characters, you sent %d" msgstr "" "Съобщението е твърде дълго. Най-много може да е 140 знака, а сте въвели %d." +#: lib/command.php:376 +#, fuzzy, php-format +msgid "Direct message to %s sent" +msgstr "Прякото съобщение до %s е изпратено." + #: lib/command.php:378 msgid "Error sending direct message." msgstr "Грешка при изпращане на прякото съобщение" #: lib/command.php:422 +#, fuzzy msgid "Cannot repeat your own notice" -msgstr "Не можете да повтаряте собствена бележка" +msgstr "Не можете да повтаряте собствени бележки." #: lib/command.php:427 #, fuzzy msgid "Already repeated that notice" -msgstr "Изтриване на бележката" +msgstr "Вече сте повторили тази бележка." #: lib/command.php:435 -#, php-format +#, fuzzy, php-format msgid "Notice from %s repeated" msgstr "Бележката от %s е повторена" @@ -4427,7 +4474,7 @@ msgstr "" "Съобщението е твърде дълго. Най-много може да е 140 знака, а сте въвели %d." #: lib/command.php:500 -#, php-format +#, fuzzy, php-format msgid "Reply to %s sent" msgstr "Отговорът до %s е изпратен" @@ -4436,6 +4483,7 @@ msgid "Error saving notice." msgstr "Грешка при записване на бележката." #: lib/command.php:556 +#, fuzzy msgid "Specify the name of the user to subscribe to" msgstr "Уточнете името на потребителя, за когото се абонирате." @@ -4445,6 +4493,7 @@ msgid "Subscribed to %s" msgstr "Абонирани сте за %s." #: lib/command.php:584 +#, fuzzy msgid "Specify the name of the user to unsubscribe from" msgstr "Уточнете името на потребителя, от когото се отписвате." @@ -4477,47 +4526,42 @@ msgstr "Грешка при включване на уведомлението." msgid "Login command is disabled" msgstr "" -#: lib/command.php:664 -#, fuzzy, php-format -msgid "Could not create login token for %s" -msgstr "Грешка при отбелязване като любима." - -#: lib/command.php:669 +#: lib/command.php:661 #, php-format msgid "This link is useable only once, and is good for only 2 minutes: %s" msgstr "" -#: lib/command.php:685 +#: lib/command.php:677 msgid "You are not subscribed to anyone." msgstr "Не сте абонирани за никого." -#: lib/command.php:687 +#: lib/command.php:679 msgid "You are subscribed to this person:" msgid_plural "You are subscribed to these people:" msgstr[0] "Вече сте абонирани за следните потребители:" msgstr[1] "Вече сте абонирани за следните потребители:" -#: lib/command.php:707 +#: lib/command.php:699 msgid "No one is subscribed to you." msgstr "Никой не е абониран за вас." -#: lib/command.php:709 +#: lib/command.php:701 msgid "This person is subscribed to you:" msgid_plural "These people are subscribed to you:" msgstr[0] "Грешка при абониране на друг потребител за вас." msgstr[1] "Грешка при абониране на друг потребител за вас." -#: lib/command.php:729 +#: lib/command.php:721 msgid "You are not a member of any groups." msgstr "Не членувате в нито една група." -#: lib/command.php:731 +#: lib/command.php:723 msgid "You are a member of this group:" msgid_plural "You are a member of these groups:" msgstr[0] "Не членувате в тази група." msgstr[1] "Не членувате в тази група." -#: lib/command.php:745 +#: lib/command.php:737 msgid "" "Commands:\n" "on - turn on notifications\n" @@ -4676,10 +4720,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\"" @@ -4850,21 +4890,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" @@ -5001,6 +5029,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 "" @@ -5032,7 +5081,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 @@ -5040,7 +5089,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 @@ -5050,7 +5100,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 @@ -5083,7 +5133,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 @@ -5202,6 +5262,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 "Абонаменти" @@ -5379,10 +5444,6 @@ msgstr "" msgid "People Tagcloud as tagged" msgstr "" -#: lib/subscriptionlist.php:126 -msgid "(none)" -msgstr "(няма)" - #: lib/tagcloudsection.php:56 msgid "None" msgstr "Без" @@ -5445,47 +5506,47 @@ msgstr "Съобщение" msgid "Moderate" msgstr "" -#: lib/util.php:837 +#: lib/util.php:884 msgid "a few seconds ago" msgstr "преди няколко секунди" -#: lib/util.php:839 +#: lib/util.php:886 msgid "about a minute ago" msgstr "преди около минута" -#: lib/util.php:841 +#: lib/util.php:888 #, php-format msgid "about %d minutes ago" msgstr "преди около %d минути" -#: lib/util.php:843 +#: lib/util.php:890 msgid "about an hour ago" msgstr "преди около час" -#: lib/util.php:845 +#: lib/util.php:892 #, php-format msgid "about %d hours ago" msgstr "преди около %d часа" -#: lib/util.php:847 +#: lib/util.php:894 msgid "about a day ago" msgstr "преди около ден" -#: lib/util.php:849 +#: lib/util.php:896 #, php-format msgid "about %d days ago" msgstr "преди около %d дни" -#: lib/util.php:851 +#: lib/util.php:898 msgid "about a month ago" msgstr "преди около месец" -#: lib/util.php:853 +#: lib/util.php:900 #, php-format msgid "about %d months ago" msgstr "преди около %d месеца" -#: lib/util.php:855 +#: lib/util.php:902 msgid "about a year ago" msgstr "преди около година" @@ -5499,18 +5560,8 @@ msgstr "%s не е допустим цвят!" 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 "Входящата поща не е разрешена." +#: scripts/xmppdaemon.php:301 +#, fuzzy, php-format +msgid "Message too long - maximum is %1$d characters, you sent %2$d." +msgstr "" +"Съобщението е твърде дълго. Най-много може да е 140 знака, а сте въвели %d." diff --git a/locale/ca/LC_MESSAGES/statusnet.po b/locale/ca/LC_MESSAGES/statusnet.po index 7022f4fad..eb6a6a3af 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-05 22:10+0000\n" -"PO-Revision-Date: 2010-01-05 22:10:44+0000\n" +"POT-Creation-Date: 2010-01-11 23:25+0000\n" +"PO-Revision-Date: 2010-01-11 23:26:17+0000\n" "Language-Team: Catalan\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha (r60693); Translate extension (2010-01-04)\n" +"X-Generator: MediaWiki 1.16alpha (r60950); 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" @@ -39,7 +39,7 @@ msgstr "No existeix la pàgina." #: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79 #: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75 #: actions/favoritesrss.php:74 actions/foaf.php:40 actions/foaf.php:58 -#: actions/microsummary.php:62 actions/newmessage.php:116 +#: actions/microsummary.php:62 actions/newmessage.php:116 actions/otp.php:76 #: actions/remotesubscribe.php:145 actions/remotesubscribe.php:154 #: actions/replies.php:73 actions/repliesrss.php:38 #: actions/showfavorites.php:105 actions/userbyid.php:74 @@ -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 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 +#, 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" @@ -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,11 +608,11 @@ 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/invite.php:56 actions/login.php:115 actions/makeadmin.php:66 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80 #: actions/othersettings.php:145 actions/passwordsettings.php:138 #: actions/profilesettings.php:194 actions/recoverpassword.php:337 @@ -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" +#: actions/joingroup.php:135 +#, fuzzy, php-format +msgid "%1$s joined group %2$s" msgstr "%s s'ha pogut afegir al grup %s" #: actions/leavegroup.php:60 @@ -1846,69 +1813,59 @@ 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" +#: actions/leavegroup.php:134 +#, 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 +#: actions/login.php:80 actions/otp.php:62 actions/register.php:137 msgid "Already logged in." msgstr "Ja estàs connectat." -#: actions/login.php:114 actions/login.php:124 -#, fuzzy -msgid "Invalid or expired token." -msgstr "El contingut de l'avís és invàlid" - -#: actions/login.php:147 +#: actions/login.php:126 msgid "Incorrect username or password." msgstr "Nom d'usuari o contrasenya incorrectes." -#: actions/login.php:153 +#: actions/login.php:132 actions/otp.php:120 #, fuzzy 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:188 actions/login.php:241 lib/action.php:460 #: lib/logingroupnav.php:79 msgid "Login" msgstr "Inici de sessió" -#: actions/login.php:247 +#: actions/login.php:227 msgid "Login to site" msgstr "Accedir al lloc" -#: actions/login.php:250 actions/profilesettings.php:106 -#: actions/register.php:423 actions/showgroup.php:236 actions/tagother.php:94 +#: actions/login.php:230 actions/profilesettings.php:106 +#: actions/register.php:424 actions/showgroup.php:236 actions/tagother.php:94 #: lib/groupeditform.php:152 lib/userprofile.php:131 msgid "Nickname" msgstr "Sobrenom" -#: actions/login.php:253 actions/register.php:428 +#: actions/login.php:233 actions/register.php:429 #: lib/accountsettingsaction.php:116 msgid "Password" msgstr "Contrasenya" -#: actions/login.php:256 actions/register.php:477 +#: actions/login.php:236 actions/register.php:478 msgid "Remember me" msgstr "Recorda'm" -#: actions/login.php:257 actions/register.php:479 +#: actions/login.php:237 actions/register.php:480 msgid "Automatically login in the future; not for shared computers!" msgstr "" "Iniciar sessió automàticament en el futur; no utilitzar en ordinadors " "compartits!" -#: actions/login.php:267 +#: actions/login.php:247 msgid "Lost or forgotten password?" msgstr "Contrasenya oblidada o perduda?" -#: actions/login.php:286 +#: actions/login.php:266 msgid "" "For security reasons, please re-enter your user name and password before " "changing your settings." @@ -1916,7 +1873,7 @@ msgstr "" "Per raons de seguretat, si us plau torna a escriure el teu nom d'usuari i " "contrasenya abans de canviar la teva configuració." -#: actions/login.php:290 +#: actions/login.php:270 #, fuzzy, php-format msgid "" "Login with your username and password. Don't have a username yet? [Register]" @@ -1931,18 +1888,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 @@ -1983,9 +1940,9 @@ msgstr "No t'enviïs missatges a tu mateix, simplement dir-te això." 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" +#: actions/newmessage.php:185 +#, 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 +1971,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 @@ -2075,8 +2032,8 @@ msgstr "tipus de contingut " msgid "Only " msgstr "Només " -#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1031 -#: lib/api.php:1059 lib/api.php:1169 +#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1033 +#: lib/api.php:1061 lib/api.php:1171 msgid "Not a supported data format." msgstr "Format de data no suportat." @@ -2121,10 +2078,30 @@ 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/otp.php:69 +#, fuzzy +msgid "No user ID specified." +msgstr "No s'ha especificat cap grup." + +#: actions/otp.php:83 +#, fuzzy +msgid "No login token specified." +msgstr "No s'ha especificat perfil." + +#: actions/otp.php:90 +#, fuzzy +msgid "No login token requested." +msgstr "No id en el perfil sol·licitat." + +#: actions/otp.php:95 +#, fuzzy +msgid "Invalid login token specified." +msgstr "El contingut de l'avís és invàlid" + +#: actions/otp.php:104 +#, fuzzy +msgid "Login token expired." +msgstr "Accedir al lloc" #: actions/outbox.php:61 #, php-format @@ -2162,7 +2139,7 @@ msgid "6 or more characters" msgstr "6 o més caràcters" #: actions/passwordsettings.php:112 actions/recoverpassword.php:239 -#: actions/register.php:432 actions/smssettings.php:134 +#: actions/register.php:433 actions/smssettings.php:134 msgid "Confirm" msgstr "Confirmar" @@ -2198,7 +2175,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 +2208,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 +2301,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 +2333,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 +2343,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 @@ -2388,43 +2366,43 @@ msgid "1-64 lowercase letters or numbers, no punctuation or spaces" msgstr "" "1-64 lletres en minúscula o números, sense signes de puntuació o espais" -#: actions/profilesettings.php:111 actions/register.php:447 +#: actions/profilesettings.php:111 actions/register.php:448 #: actions/showgroup.php:247 actions/tagother.php:104 #: lib/groupeditform.php:157 lib/userprofile.php:149 msgid "Full name" msgstr "Nom complet" -#: actions/profilesettings.php:115 actions/register.php:452 +#: actions/profilesettings.php:115 actions/register.php:453 #: lib/groupeditform.php:161 msgid "Homepage" msgstr "Pàgina personal" -#: actions/profilesettings.php:117 actions/register.php:454 +#: actions/profilesettings.php:117 actions/register.php:455 msgid "URL of your homepage, blog, or profile on another site" msgstr "URL del teu web, blog o perfil en un altre lloc" -#: actions/profilesettings.php:122 actions/register.php:460 +#: actions/profilesettings.php:122 actions/register.php:461 #, php-format msgid "Describe yourself and your interests in %d chars" msgstr "Descriviu qui sou i els vostres interessos en %d caràcters" -#: actions/profilesettings.php:125 actions/register.php:463 +#: actions/profilesettings.php:125 actions/register.php:464 #, fuzzy msgid "Describe yourself and your interests" msgstr "Explica'ns alguna cosa sobre tu " -#: actions/profilesettings.php:127 actions/register.php:465 +#: actions/profilesettings.php:127 actions/register.php:466 msgid "Bio" msgstr "Biografia" -#: actions/profilesettings.php:132 actions/register.php:470 +#: actions/profilesettings.php:132 actions/register.php:471 #: actions/showgroup.php:256 actions/tagother.php:112 #: actions/userauthorization.php:158 lib/groupeditform.php:177 #: lib/userprofile.php:164 msgid "Location" msgstr "Ubicació" -#: actions/profilesettings.php:134 actions/register.php:472 +#: actions/profilesettings.php:134 actions/register.php:473 msgid "Where you are, like \"City, State (or Region), Country\"" msgstr "On ets, per exemple \"Ciutat, Estat (o Regió), País\"" @@ -2490,20 +2468,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." @@ -2637,6 +2615,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. " @@ -2728,7 +2708,7 @@ msgstr "Error en configurar l'usuari." msgid "New password successfully saved. You are now logged in." msgstr "Nova contrasenya guardada correctament. Has iniciat una sessió." -#: actions/register.php:85 actions/register.php:189 actions/register.php:404 +#: actions/register.php:85 actions/register.php:189 actions/register.php:405 msgid "Sorry, only invited people can register." msgstr "Ho sentim, però només la gent convidada pot registrar-s'hi." @@ -2740,7 +2720,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:503 lib/action.php:457 #: lib/logingroupnav.php:85 msgid "Register" msgstr "Registre" @@ -2753,19 +2733,15 @@ 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." -#: actions/register.php:243 actions/register.php:264 +#: actions/register.php:243 actions/register.php:265 msgid "Invalid username or password." msgstr "Nom d'usuari o contrasenya invàlids." -#: actions/register.php:342 +#: actions/register.php:343 msgid "" "With this form you can create a new account. You can then post notices and " "link up to friends and colleagues. " @@ -2773,42 +2749,42 @@ msgstr "" "Amb aquest formulari, podeu crear un compte nou. Podeu enviar avisos i " "enllaçar a amics i col·legues. " -#: actions/register.php:424 +#: actions/register.php:425 msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required." msgstr "" "1-64 lletres en minúscula o números, sense puntuacions ni espais. Requerit." -#: actions/register.php:429 +#: actions/register.php:430 msgid "6 or more characters. Required." msgstr "6 o més caràcters. Requerit." -#: actions/register.php:433 +#: actions/register.php:434 msgid "Same as password above. Required." msgstr "Igual a la contrasenya de dalt. Requerit." -#: actions/register.php:437 actions/register.php:441 +#: actions/register.php:438 actions/register.php:442 #: actions/siteadminpanel.php:270 lib/accountsettingsaction.php:120 msgid "Email" msgstr "Correu electrònic" -#: actions/register.php:438 actions/register.php:442 +#: actions/register.php:439 actions/register.php:443 msgid "Used only for updates, announcements, and password recovery" msgstr "" "Utilitzat només per a actualitzacions, anuncis i recuperació de contrasenyes" -#: actions/register.php:449 +#: actions/register.php:450 msgid "Longer name, preferably your \"real\" name" msgstr "Nom llarg, preferiblement el teu nom \"real\"" -#: actions/register.php:493 +#: actions/register.php:494 msgid "My text and files are available under " msgstr "El meu text i els meus fitxers estan disponibles sota " -#: actions/register.php:495 +#: actions/register.php:496 msgid "Creative Commons Attribution 3.0" msgstr "Creative Commons Atribució 3.0" -#: actions/register.php:496 +#: actions/register.php:497 #, fuzzy msgid "" " except this private data: password, email address, IM address, and phone " @@ -2817,13 +2793,13 @@ msgstr "" "excepte les següents dades privades: contrasenya, adreça de correu " "electrònic, adreça de missatgeria instantània, número de telèfon." -#: actions/register.php:537 -#, php-format +#: actions/register.php:538 +#, 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 " @@ -2848,7 +2824,7 @@ msgstr "" "\n" "Gràcies per registrar-te i esperem que gaudeixis d'aquest servei." -#: actions/register.php:561 +#: actions/register.php:562 msgid "" "(You should receive a message by email momentarily, with instructions on how " "to confirm your email address.)" @@ -2873,9 +2849,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 +2926,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 +2942,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 +2960,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 +2979,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 +3028,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 +3076,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 +3145,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 +3171,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 +3186,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 +3231,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 +3289,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 +3420,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 +3452,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 +3546,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 +3585,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 +3621,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 +3709,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 +3821,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 +3877,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 +3910,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 +3926,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,23 +3940,95 @@ msgstr "%s no és membre de cap grup." msgid "Try [searching for groups](%%action.groupsearch%%) and joining them." msgstr "" -#: classes/File.php:137 +#: 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:144 #, 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 "" -#: classes/File.php:147 +#: classes/File.php:154 #, php-format msgid "A file this large would exceed your user quota of %d bytes." msgstr "" -#: classes/File.php:154 +#: classes/File.php:161 #, php-format msgid "A file this large would exceed your monthly quota of %d bytes." msgstr "" +#: classes/Login_token.php:76 +#, fuzzy, php-format +msgid "Could not create login token for %s" +msgstr "No s'han pogut crear els àlies." + #: classes/Message.php:45 #, fuzzy msgid "You are banned from sending direct messages." @@ -4070,7 +4085,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)" @@ -4118,137 +4133,137 @@ msgid "Other options" msgstr "Altres opcions" #: lib/action.php:144 -#, php-format -msgid "%s - %s" -msgstr "%s - %s" +#, fuzzy, php-format +msgid "%1$s - %2$s" +msgstr "%1$s (%2$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 +4272,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 +4288,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 +4320,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 +4361,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" @@ -4355,9 +4373,8 @@ msgid "Tags for this attachment" msgstr "Etiquetes de l'adjunció" #: lib/authenticationplugin.php:182 lib/authenticationplugin.php:187 -#, fuzzy msgid "Password changing failed" -msgstr "Contrasenya canviada." +msgstr "El canvi de contrasenya ha fallat" #: lib/authenticationplugin.php:197 #, fuzzy @@ -4368,7 +4385,7 @@ msgstr "Contrasenya canviada." 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" @@ -4403,11 +4420,13 @@ msgid "" msgstr "" #: lib/command.php:152 lib/command.php:399 lib/command.php:460 +#, fuzzy msgid "Notice with that id does not exist" -msgstr "" +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 +#, fuzzy msgid "User has no last notice" msgstr "L'usuari no té última nota" @@ -4415,22 +4434,42 @@ msgstr "L'usuari no té última nota" 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:217 +#, fuzzy +msgid "You are already a member of that group" +msgstr "Ja sou membre del grup." + +#: lib/command.php:234 +#, fuzzy, php-format +msgid "Could not join user %s to group %s" +msgstr "No s'ha pogut afegir l'usuari %s al grup %s." + +#: lib/command.php:239 +#, fuzzy, php-format +msgid "%s joined group %s" +msgstr "%s s'ha pogut afegir al grup %s" + +#: lib/command.php:284 +#, fuzzy, php-format +msgid "Could not remove user %s to group %s" +msgstr "No s'ha pogut eliminar l'usuari %s del grup %s" + +#: lib/command.php:289 +#, fuzzy, php-format +msgid "%s left group %s" +msgstr "%s ha abandonat el grup %s" #: lib/command.php:318 -#, php-format +#, fuzzy, php-format msgid "Fullname: %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" @@ -4440,11 +4479,16 @@ msgstr "Pàgina web: %s" msgid "About: %s" msgstr "Sobre tu: %s" -#: lib/command.php:358 scripts/xmppdaemon.php:301 +#: lib/command.php:358 #, fuzzy, php-format msgid "Message too long - maximum is %d characters, you sent %d" msgstr "Missatge massa llarg - màxim és 140 caràcters, tu has enviat %d" +#: lib/command.php:376 +#, fuzzy, php-format +msgid "Direct message to %s sent" +msgstr "Missatge directe per a %s enviat" + #: lib/command.php:378 msgid "Error sending direct message." msgstr "Error al enviar el missatge directe." @@ -4475,7 +4519,7 @@ msgid "Notice too long - maximum is %d characters, you sent %d" msgstr "Missatge massa llarg - màxim és 140 caràcters, tu has enviat %d" #: lib/command.php:500 -#, php-format +#, fuzzy, php-format msgid "Reply to %s sent" msgstr "S'ha enviat la resposta a %s" @@ -4485,6 +4529,7 @@ msgid "Error saving notice." msgstr "Problema en guardar l'avís." #: lib/command.php:556 +#, fuzzy msgid "Specify the name of the user to subscribe to" msgstr "Especifica el nom de l'usuari a que vols subscriure't" @@ -4494,6 +4539,7 @@ msgid "Subscribed to %s" msgstr "Subscrit a %s" #: lib/command.php:584 +#, 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" @@ -4526,49 +4572,44 @@ msgstr "No es poden posar en on les notificacions." msgid "Login command is disabled" msgstr "" -#: lib/command.php:664 -#, fuzzy, php-format -msgid "Could not create login token for %s" -msgstr "No s'han pogut crear els àlies." - -#: lib/command.php:669 +#: lib/command.php:661 #, php-format msgid "This link is useable only once, and is good for only 2 minutes: %s" msgstr "" -#: lib/command.php:685 +#: lib/command.php:677 #, fuzzy msgid "You are not subscribed to anyone." msgstr "No estàs subscrit a aquest perfil." -#: lib/command.php:687 +#: lib/command.php:679 msgid "You are subscribed to this person:" msgid_plural "You are subscribed to these people:" msgstr[0] "Ja estàs subscrit a aquests usuaris:" msgstr[1] "Ja estàs subscrit a aquests usuaris:" -#: lib/command.php:707 +#: lib/command.php:699 #, fuzzy msgid "No one is subscribed to you." msgstr "No pots subscriure a un altre a tu mateix." -#: lib/command.php:709 +#: lib/command.php:701 msgid "This person is subscribed to you:" msgid_plural "These people are subscribed to you:" msgstr[0] "No pots subscriure a un altre a tu mateix." msgstr[1] "No pots subscriure a un altre a tu mateix." -#: lib/command.php:729 +#: lib/command.php:721 msgid "You are not a member of any groups." msgstr "No sou membre de cap grup." -#: lib/command.php:731 +#: lib/command.php:723 msgid "You are a member of this group:" msgid_plural "You are a member of these groups:" msgstr[0] "No sou un membre del grup." msgstr[1] "No sou un membre del grup." -#: lib/command.php:745 +#: lib/command.php:737 msgid "" "Commands:\n" "on - turn on notifications\n" @@ -4726,10 +4767,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\"" @@ -4895,21 +4932,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" @@ -5054,6 +5079,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 "" @@ -5074,7 +5120,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." @@ -5085,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 @@ -5093,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 "No s'ha pogut recuperar la conversa pública." #: lib/mediafile.php:270 @@ -5103,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 @@ -5136,7 +5183,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 @@ -5166,14 +5223,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" @@ -5218,9 +5273,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." @@ -5259,6 +5313,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" @@ -5276,9 +5335,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" @@ -5294,9 +5352,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" @@ -5436,10 +5493,6 @@ msgstr "" msgid "People Tagcloud as tagged" msgstr "" -#: lib/subscriptionlist.php:126 -msgid "(none)" -msgstr "(cap)" - #: lib/tagcloudsection.php:56 msgid "None" msgstr "Cap" @@ -5501,47 +5554,47 @@ msgstr "Missatge" msgid "Moderate" msgstr "Modera" -#: lib/util.php:837 +#: lib/util.php:884 msgid "a few seconds ago" msgstr "fa pocs segons" -#: lib/util.php:839 +#: lib/util.php:886 msgid "about a minute ago" msgstr "fa un minut" -#: lib/util.php:841 +#: lib/util.php:888 #, php-format msgid "about %d minutes ago" msgstr "fa %d minuts" -#: lib/util.php:843 +#: lib/util.php:890 msgid "about an hour ago" msgstr "fa una hora" -#: lib/util.php:845 +#: lib/util.php:892 #, php-format msgid "about %d hours ago" msgstr "fa %d hores" -#: lib/util.php:847 +#: lib/util.php:894 msgid "about a day ago" msgstr "fa un dia" -#: lib/util.php:849 +#: lib/util.php:896 #, php-format msgid "about %d days ago" msgstr "fa %d dies" -#: lib/util.php:851 +#: lib/util.php:898 msgid "about a month ago" msgstr "fa un mes" -#: lib/util.php:853 +#: lib/util.php:900 #, php-format msgid "about %d months ago" msgstr "fa %d mesos" -#: lib/util.php:855 +#: lib/util.php:902 msgid "about a year ago" msgstr "fa un any" @@ -5555,18 +5608,7 @@ msgstr "%s no és un color vàlid!" 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." +#: scripts/xmppdaemon.php:301 +#, fuzzy, php-format +msgid "Message too long - maximum is %1$d characters, you sent %2$d." +msgstr "Missatge massa llarg - màxim és 140 caràcters, tu has enviat %d" diff --git a/locale/cs/LC_MESSAGES/statusnet.po b/locale/cs/LC_MESSAGES/statusnet.po index 73ffd3265..53b0f3b4c 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-05 22:10+0000\n" -"PO-Revision-Date: 2010-01-05 22:10:48+0000\n" +"POT-Creation-Date: 2010-01-11 23:25+0000\n" +"PO-Revision-Date: 2010-01-11 23:26:21+0000\n" "Language-Team: Czech\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha (r60693); Translate extension (2010-01-04)\n" +"X-Generator: MediaWiki 1.16alpha (r60950); 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" @@ -40,7 +40,7 @@ msgstr "Žádné takové oznámení." #: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79 #: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75 #: actions/favoritesrss.php:74 actions/foaf.php:40 actions/foaf.php:58 -#: actions/microsummary.php:62 actions/newmessage.php:116 +#: actions/microsummary.php:62 actions/newmessage.php:116 actions/otp.php:76 #: actions/remotesubscribe.php:145 actions/remotesubscribe.php:154 #: actions/replies.php:73 actions/repliesrss.php:38 #: actions/showfavorites.php:105 actions/userbyid.php:74 @@ -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 #, 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 #, 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" @@ -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,11 +609,11 @@ 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/invite.php:56 actions/login.php:115 actions/makeadmin.php:66 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80 #: actions/othersettings.php:145 actions/passwordsettings.php:138 #: actions/profilesettings.php:194 actions/recoverpassword.php:337 @@ -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 +#: actions/joingroup.php:135 #, php-format -msgid "%s joined group %s" +msgid "%1$s joined group %2$s" msgstr "" #: actions/leavegroup.php:60 @@ -1821,73 +1791,63 @@ msgstr "Neodeslal jste nám profil" msgid "Could not find membership record." msgstr "" -#: actions/leavegroup.php:127 lib/command.php:284 +#: actions/leavegroup.php:134 #, 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 "" +msgid "%1$s left group %2$s" +msgstr "%1 statusů na %2" -#: actions/login.php:83 actions/register.php:137 +#: actions/login.php:80 actions/otp.php:62 actions/register.php:137 msgid "Already logged in." msgstr "Již přihlášen" -#: actions/login.php:114 actions/login.php:124 -#, fuzzy -msgid "Invalid or expired token." -msgstr "Neplatný obsah sdělení" - -#: actions/login.php:147 +#: actions/login.php:126 msgid "Incorrect username or password." msgstr "Neplatné jméno nebo heslo" -#: actions/login.php:153 +#: actions/login.php:132 actions/otp.php:120 #, fuzzy 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:188 actions/login.php:241 lib/action.php:460 #: lib/logingroupnav.php:79 msgid "Login" msgstr "Přihlásit" -#: actions/login.php:247 +#: actions/login.php:227 msgid "Login to site" msgstr "" -#: actions/login.php:250 actions/profilesettings.php:106 -#: actions/register.php:423 actions/showgroup.php:236 actions/tagother.php:94 +#: actions/login.php:230 actions/profilesettings.php:106 +#: actions/register.php:424 actions/showgroup.php:236 actions/tagother.php:94 #: lib/groupeditform.php:152 lib/userprofile.php:131 msgid "Nickname" msgstr "Přezdívka" -#: actions/login.php:253 actions/register.php:428 +#: actions/login.php:233 actions/register.php:429 #: lib/accountsettingsaction.php:116 msgid "Password" msgstr "Heslo" -#: actions/login.php:256 actions/register.php:477 +#: actions/login.php:236 actions/register.php:478 msgid "Remember me" msgstr "Zapamatuj si mě" -#: actions/login.php:257 actions/register.php:479 +#: actions/login.php:237 actions/register.php:480 msgid "Automatically login in the future; not for shared computers!" msgstr "Příště automaticky přihlásit; ne pro počítače, které používá " -#: actions/login.php:267 +#: actions/login.php:247 msgid "Lost or forgotten password?" msgstr "Ztracené nebo zapomenuté heslo?" -#: actions/login.php:286 +#: actions/login.php:266 msgid "" "For security reasons, please re-enter your user name and password before " "changing your settings." msgstr "Z bezpečnostních důvodů, prosím zadejte znovu své jméno a heslo." -#: actions/login.php:290 +#: actions/login.php:270 #, fuzzy, php-format msgid "" "Login with your username and password. Don't have a username yet? [Register]" @@ -1902,19 +1862,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" @@ -1954,9 +1914,9 @@ msgstr "" msgid "Message sent" msgstr "" -#: actions/newmessage.php:185 lib/command.php:376 +#: actions/newmessage.php:185 #, 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 +1947,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 @@ -2045,8 +2005,8 @@ msgstr "Připojit" msgid "Only " msgstr "" -#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1031 -#: lib/api.php:1059 lib/api.php:1169 +#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1033 +#: lib/api.php:1061 lib/api.php:1171 msgid "Not a supported data format." msgstr "" @@ -2093,9 +2053,28 @@ 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" +#: actions/otp.php:69 +#, fuzzy +msgid "No user ID specified." +msgstr "Nové sdělení" + +#: actions/otp.php:83 +#, fuzzy +msgid "No login token specified." +msgstr "Nové sdělení" + +#: actions/otp.php:90 +#, fuzzy +msgid "No login token requested." +msgstr "Nebylo vráceno žádné URL profilu od servu." + +#: actions/otp.php:95 +#, fuzzy +msgid "Invalid login token specified." +msgstr "Neplatný obsah sdělení" + +#: actions/otp.php:104 +msgid "Login token expired." msgstr "" #: actions/outbox.php:61 @@ -2134,7 +2113,7 @@ msgid "6 or more characters" msgstr "6 a více znaků" #: actions/passwordsettings.php:112 actions/recoverpassword.php:239 -#: actions/register.php:432 actions/smssettings.php:134 +#: actions/register.php:433 actions/smssettings.php:134 msgid "Confirm" msgstr "Heslo znovu" @@ -2170,7 +2149,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 +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 msgid "Site" msgstr "" @@ -2303,8 +2282,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 +2314,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 +2324,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 @@ -2367,42 +2347,42 @@ msgstr "Neznámý profil" msgid "1-64 lowercase letters or numbers, no punctuation or spaces" msgstr "1-64 znaků nebo čísel, bez teček, čárek a mezer" -#: actions/profilesettings.php:111 actions/register.php:447 +#: actions/profilesettings.php:111 actions/register.php:448 #: actions/showgroup.php:247 actions/tagother.php:104 #: lib/groupeditform.php:157 lib/userprofile.php:149 msgid "Full name" msgstr "Celé jméno" -#: actions/profilesettings.php:115 actions/register.php:452 +#: actions/profilesettings.php:115 actions/register.php:453 #: lib/groupeditform.php:161 msgid "Homepage" msgstr "Moje stránky" -#: actions/profilesettings.php:117 actions/register.php:454 +#: actions/profilesettings.php:117 actions/register.php:455 msgid "URL of your homepage, blog, or profile on another site" msgstr "Adresa vašich stránek, blogu nebo profilu na jiných stránkách." -#: actions/profilesettings.php:122 actions/register.php:460 +#: actions/profilesettings.php:122 actions/register.php:461 #, fuzzy, php-format msgid "Describe yourself and your interests in %d chars" msgstr "Popiš sebe a své zájmy ve 140 znacích" -#: actions/profilesettings.php:125 actions/register.php:463 +#: actions/profilesettings.php:125 actions/register.php:464 msgid "Describe yourself and your interests" msgstr "Popište sebe a své zájmy" -#: actions/profilesettings.php:127 actions/register.php:465 +#: actions/profilesettings.php:127 actions/register.php:466 msgid "Bio" msgstr "O mě" -#: actions/profilesettings.php:132 actions/register.php:470 +#: actions/profilesettings.php:132 actions/register.php:471 #: actions/showgroup.php:256 actions/tagother.php:112 #: actions/userauthorization.php:158 lib/groupeditform.php:177 #: lib/userprofile.php:164 msgid "Location" msgstr "Umístění" -#: actions/profilesettings.php:134 actions/register.php:472 +#: actions/profilesettings.php:134 actions/register.php:473 msgid "Where you are, like \"City, State (or Region), Country\"" msgstr "Místo. Město, stát." @@ -2464,21 +2444,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" @@ -2701,7 +2681,7 @@ msgstr "Chyba nastavení uživatele" msgid "New password successfully saved. You are now logged in." msgstr "Nové heslo bylo uloženo. Nyní jste přihlášen." -#: actions/register.php:85 actions/register.php:189 actions/register.php:404 +#: actions/register.php:85 actions/register.php:189 actions/register.php:405 msgid "Sorry, only invited people can register." msgstr "" @@ -2714,7 +2694,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:503 lib/action.php:457 #: lib/logingroupnav.php:85 msgid "Register" msgstr "Registrovat" @@ -2727,58 +2707,54 @@ 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" -#: actions/register.php:243 actions/register.php:264 +#: actions/register.php:243 actions/register.php:265 msgid "Invalid username or password." msgstr "Neplatné jméno nebo heslo" -#: actions/register.php:342 +#: actions/register.php:343 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 +#: actions/register.php:425 msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required." msgstr "" -#: actions/register.php:429 +#: actions/register.php:430 msgid "6 or more characters. Required." msgstr "" -#: actions/register.php:433 +#: actions/register.php:434 msgid "Same as password above. Required." msgstr "" -#: actions/register.php:437 actions/register.php:441 +#: actions/register.php:438 actions/register.php:442 #: actions/siteadminpanel.php:270 lib/accountsettingsaction.php:120 msgid "Email" msgstr "Email" -#: actions/register.php:438 actions/register.php:442 +#: actions/register.php:439 actions/register.php:443 msgid "Used only for updates, announcements, and password recovery" msgstr "Použije se pouze pro aktualizace, oznámení a obnovu hesla." -#: actions/register.php:449 +#: actions/register.php:450 msgid "Longer name, preferably your \"real\" name" msgstr "" -#: actions/register.php:493 +#: actions/register.php:494 msgid "My text and files are available under " msgstr "Mé texty a soubory jsou k dispozici pod" -#: actions/register.php:495 +#: actions/register.php:496 msgid "Creative Commons Attribution 3.0" msgstr "" -#: actions/register.php:496 +#: actions/register.php:497 #, fuzzy msgid "" " except this private data: password, email address, IM address, and phone " @@ -2787,13 +2763,13 @@ msgstr "" " až na tyto privátní data: heslo, emailová adresa, IM adresa, telefonní " "číslo." -#: actions/register.php:537 +#: actions/register.php:538 #, 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 " @@ -2806,7 +2782,7 @@ msgid "" "Thanks for signing up and we hope you enjoy using this service." msgstr "" -#: actions/register.php:561 +#: actions/register.php:562 msgid "" "(You should receive a message by email momentarily, with instructions on how " "to confirm your email address.)" @@ -2906,11 +2882,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 +2900,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 +2914,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 +2933,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 +2982,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 +3032,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 +3100,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 +3127,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 +3139,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 +3184,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 +3377,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 +3408,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 +3498,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 +3536,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 +3572,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 +3659,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 +3666,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 +3775,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 +3833,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 +3866,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 +3881,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,23 +3895,95 @@ msgstr "Neodeslal jste nám profil" msgid "Try [searching for groups](%%action.groupsearch%%) and joining them." msgstr "" -#: classes/File.php:137 +#: 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:144 #, 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 "" -#: classes/File.php:147 +#: classes/File.php:154 #, php-format msgid "A file this large would exceed your user quota of %d bytes." msgstr "" -#: classes/File.php:154 +#: classes/File.php:161 #, php-format msgid "A file this large would exceed your monthly quota of %d bytes." msgstr "" +#: classes/Login_token.php:76 +#, fuzzy, php-format +msgid "Could not create login token for %s" +msgstr "Nelze uložin informace o obrázku" + #: classes/Message.php:45 msgid "You are banned from sending direct messages." msgstr "" @@ -4024,7 +4035,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 "" @@ -4075,143 +4086,143 @@ msgid "Other options" msgstr "" #: lib/action.php:144 -#, php-format -msgid "%s - %s" -msgstr "" +#, fuzzy, php-format +msgid "%1$s - %2$s" +msgstr "%1 statusů na %2" #: 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 +4231,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 +4247,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 +4282,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" @@ -4332,7 +4347,7 @@ msgstr "Heslo uloženo" msgid "Command results" msgstr "" -#: lib/channel.php:210 +#: lib/channel.php:210 lib/mailhandler.php:142 msgid "Command complete" msgstr "" @@ -4345,7 +4360,7 @@ msgid "Sorry, this command is not yet implemented." msgstr "" #: lib/command.php:88 -#, php-format +#, fuzzy, php-format msgid "Could not find a user with nickname %s" msgstr "Nelze aktualizovat uživatele" @@ -4354,9 +4369,9 @@ msgid "It does not make a lot of sense to nudge yourself!" msgstr "" #: lib/command.php:99 -#, php-format +#, fuzzy, php-format msgid "Nudge sent to %s" -msgstr "" +msgstr "Odpovědi na %s" #: lib/command.php:126 #, php-format @@ -4367,34 +4382,56 @@ msgid "" msgstr "" #: lib/command.php:152 lib/command.php:399 lib/command.php:460 +#, fuzzy msgid "Notice with that id does not exist" -msgstr "" +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 +#, fuzzy msgid "User has no last notice" -msgstr "" +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:217 +#, fuzzy +msgid "You are already a member of that group" +msgstr "Již jste přihlášen" + +#: lib/command.php:234 +#, fuzzy, php-format +msgid "Could not join user %s to group %s" +msgstr "Nelze přesměrovat na server: %s" + +#: lib/command.php:239 +#, fuzzy, php-format +msgid "%s joined group %s" +msgstr "%1 statusů na %2" + +#: lib/command.php:284 +#, fuzzy, php-format +msgid "Could not remove user %s to group %s" +msgstr "Nelze vytvořit OpenID z: %s" + +#: lib/command.php:289 +#, fuzzy, php-format +msgid "%s left group %s" +msgstr "%1 statusů na %2" #: lib/command.php:318 -#, php-format +#, fuzzy, php-format msgid "Fullname: %s" -msgstr "" +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 "" @@ -4404,18 +4441,24 @@ msgstr "" msgid "About: %s" msgstr "" -#: lib/command.php:358 scripts/xmppdaemon.php:301 +#: lib/command.php:358 #, php-format msgid "Message too long - maximum is %d characters, you sent %d" msgstr "" +#: lib/command.php:376 +#, php-format +msgid "Direct message to %s sent" +msgstr "" + #: lib/command.php:378 msgid "Error sending direct message." msgstr "" #: lib/command.php:422 +#, fuzzy msgid "Cannot repeat your own notice" -msgstr "" +msgstr "Nemůžete se registrovat, pokud nesouhlasíte s licencí." #: lib/command.php:427 #, fuzzy @@ -4489,53 +4532,48 @@ msgstr "" msgid "Login command is disabled" msgstr "" -#: lib/command.php:664 -#, fuzzy, php-format -msgid "Could not create login token for %s" -msgstr "Nelze uložin informace o obrázku" - -#: lib/command.php:669 +#: lib/command.php:661 #, php-format msgid "This link is useable only once, and is good for only 2 minutes: %s" msgstr "" -#: lib/command.php:685 +#: lib/command.php:677 #, fuzzy msgid "You are not subscribed to anyone." msgstr "Neodeslal jste nám profil" -#: lib/command.php:687 +#: lib/command.php:679 msgid "You are subscribed to this person:" msgid_plural "You are subscribed to these people:" msgstr[0] "Neodeslal jste nám profil" msgstr[1] "Neodeslal jste nám profil" msgstr[2] "" -#: lib/command.php:707 +#: lib/command.php:699 #, fuzzy msgid "No one is subscribed to you." msgstr "Vzdálený odběr" -#: lib/command.php:709 +#: lib/command.php:701 msgid "This person is subscribed to you:" msgid_plural "These people are subscribed to you:" msgstr[0] "Vzdálený odběr" msgstr[1] "Vzdálený odběr" msgstr[2] "" -#: lib/command.php:729 +#: lib/command.php:721 #, fuzzy msgid "You are not a member of any groups." msgstr "Neodeslal jste nám profil" -#: lib/command.php:731 +#: lib/command.php:723 msgid "You are a member of this group:" msgid_plural "You are a member of these groups:" msgstr[0] "Neodeslal jste nám profil" msgstr[1] "Neodeslal jste nám profil" msgstr[2] "" -#: lib/command.php:745 +#: lib/command.php:737 msgid "" "Commands:\n" "on - turn on notifications\n" @@ -4696,11 +4734,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 "" @@ -4871,22 +4904,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 @@ -5021,6 +5042,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 "" @@ -5052,7 +5094,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 +5103,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 @@ -5071,7 +5113,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 +5148,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 @@ -5228,6 +5280,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" @@ -5409,10 +5465,6 @@ msgstr "" msgid "People Tagcloud as tagged" msgstr "" -#: lib/subscriptionlist.php:126 -msgid "(none)" -msgstr "" - #: lib/tagcloudsection.php:56 msgid "None" msgstr "" @@ -5476,47 +5528,47 @@ msgstr "Zpráva" msgid "Moderate" msgstr "" -#: lib/util.php:837 +#: lib/util.php:884 msgid "a few seconds ago" msgstr "před pár sekundami" -#: lib/util.php:839 +#: lib/util.php:886 msgid "about a minute ago" msgstr "asi před minutou" -#: lib/util.php:841 +#: lib/util.php:888 #, php-format msgid "about %d minutes ago" msgstr "asi před %d minutami" -#: lib/util.php:843 +#: lib/util.php:890 msgid "about an hour ago" msgstr "asi před hodinou" -#: lib/util.php:845 +#: lib/util.php:892 #, php-format msgid "about %d hours ago" msgstr "asi před %d hodinami" -#: lib/util.php:847 +#: lib/util.php:894 msgid "about a day ago" msgstr "asi přede dnem" -#: lib/util.php:849 +#: lib/util.php:896 #, php-format msgid "about %d days ago" msgstr "před %d dny" -#: lib/util.php:851 +#: lib/util.php:898 msgid "about a month ago" msgstr "asi před měsícem" -#: lib/util.php:853 +#: lib/util.php:900 #, php-format msgid "about %d months ago" msgstr "asi před %d mesíci" -#: lib/util.php:855 +#: lib/util.php:902 msgid "about a year ago" msgstr "asi před rokem" @@ -5530,18 +5582,7 @@ msgstr "Stránka není platnou URL." 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." +#: scripts/xmppdaemon.php:301 +#, php-format +msgid "Message too long - maximum is %1$d characters, you sent %2$d." msgstr "" diff --git a/locale/de/LC_MESSAGES/statusnet.po b/locale/de/LC_MESSAGES/statusnet.po index 80498e5d1..152836338 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-05 22:10+0000\n" -"PO-Revision-Date: 2010-01-05 22:10:52+0000\n" +"POT-Creation-Date: 2010-01-11 23:25+0000\n" +"PO-Revision-Date: 2010-01-11 23:26:26+0000\n" "Language-Team: German\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha (r60693); Translate extension (2010-01-04)\n" +"X-Generator: MediaWiki 1.16alpha (r60950); 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" @@ -41,7 +42,7 @@ msgstr "Seite nicht vorhanden" #: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79 #: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75 #: actions/favoritesrss.php:74 actions/foaf.php:40 actions/foaf.php:58 -#: actions/microsummary.php:62 actions/newmessage.php:116 +#: actions/microsummary.php:62 actions/newmessage.php:116 actions/otp.php:76 #: actions/remotesubscribe.php:145 actions/remotesubscribe.php:154 #: actions/replies.php:73 actions/repliesrss.php:38 #: actions/showfavorites.php:105 actions/userbyid.php:74 @@ -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." @@ -227,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!" @@ -273,7 +269,7 @@ 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!" +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 @@ -281,7 +277,7 @@ msgid "Could not create favorite." msgstr "Konnte keinen Favoriten erstellen." #: actions/apifavoritedestroy.php:122 -msgid "That status is not a favorite!" +msgid "That status is not a favorite." msgstr "Diese Nachricht ist kein Favorit!" #: actions/apifavoritedestroy.php:134 actions/disfavor.php:87 @@ -290,7 +286,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 @@ -302,7 +298,7 @@ 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!" +msgid "You cannot unfollow yourself." msgstr "Du kannst dich nicht selbst entfolgen!" #: actions/apifriendshipsexists.php:94 @@ -390,7 +386,7 @@ msgstr "Alias kann nicht das gleiche wie der Spitznamen sein." msgid "Group not found!" msgstr "Gruppe nicht gefunden!" -#: actions/apigroupjoin.php:110 +#: actions/apigroupjoin.php:110 actions/joingroup.php:90 msgid "You are already a member of that group." msgstr "Du bist bereits Mitglied dieser Gruppe" @@ -398,18 +394,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 +#: actions/apigroupjoin.php:138 actions/joingroup.php:128 #, php-format -msgid "Could not join user %s to group %s." +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 @@ -417,11 +413,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,9 +437,8 @@ msgid "No such notice." msgstr "Unbekannte Nachricht." #: actions/apistatusesretweet.php:83 -#, fuzzy msgid "Cannot repeat your own notice." -msgstr "Konnte Benachrichtigung nicht aktivieren." +msgstr "Du kannst deine eigenen Nachrichten nicht wiederholen." #: actions/apistatusesretweet.php:91 msgid "Already repeated that notice." @@ -463,7 +453,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 "" @@ -485,13 +475,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 @@ -559,8 +549,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." @@ -584,8 +577,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" @@ -617,11 +610,11 @@ 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/invite.php:56 actions/login.php:115 actions/makeadmin.php:66 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80 #: actions/othersettings.php:145 actions/passwordsettings.php:138 #: actions/profilesettings.php:194 actions/recoverpassword.php:337 @@ -699,19 +692,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 @@ -719,8 +708,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 @@ -833,10 +822,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." @@ -860,7 +845,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 "" @@ -1000,7 +985,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 @@ -1025,7 +1011,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 @@ -1062,8 +1049,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\"" @@ -1140,9 +1128,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." @@ -1319,18 +1308,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." @@ -1342,7 +1324,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." @@ -1370,9 +1352,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 @@ -1387,8 +1369,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 @@ -1410,12 +1393,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." @@ -1432,6 +1409,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." @@ -1450,15 +1432,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" @@ -1557,7 +1539,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 @@ -1588,7 +1571,8 @@ msgstr "" "Freundesliste hinzugefügt?)" #: actions/imsettings.php:124 -msgid "IM Address" +#, fuzzy +msgid "IM address" msgstr "IM-Adresse" #: actions/imsettings.php:126 @@ -1652,11 +1636,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" @@ -1694,10 +1673,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 "" @@ -1744,7 +1723,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" @@ -1813,18 +1792,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" +#: actions/joingroup.php:135 +#, fuzzy, php-format +msgid "%1$s joined group %2$s" msgstr "%s ist der Gruppe %s beigetreten" #: actions/leavegroup.php:60 @@ -1839,66 +1809,57 @@ 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" +#: actions/leavegroup.php:134 +#, 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 +#: actions/login.php:80 actions/otp.php:62 actions/register.php:137 msgid "Already logged in." msgstr "Bereits angemeldet." -#: actions/login.php:114 actions/login.php:124 -msgid "Invalid or expired token." -msgstr "Token ungültig oder abgelaufen." - -#: actions/login.php:147 +#: actions/login.php:126 msgid "Incorrect username or password." msgstr "Falscher Benutzername oder Passwort." -#: actions/login.php:153 +#: actions/login.php:132 actions/otp.php:120 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:188 actions/login.php:241 lib/action.php:460 #: lib/logingroupnav.php:79 msgid "Login" msgstr "Anmelden" -#: actions/login.php:247 +#: actions/login.php:227 msgid "Login to site" msgstr "An Seite anmelden" -#: actions/login.php:250 actions/profilesettings.php:106 -#: actions/register.php:423 actions/showgroup.php:236 actions/tagother.php:94 +#: actions/login.php:230 actions/profilesettings.php:106 +#: actions/register.php:424 actions/showgroup.php:236 actions/tagother.php:94 #: lib/groupeditform.php:152 lib/userprofile.php:131 msgid "Nickname" msgstr "Nutzername" -#: actions/login.php:253 actions/register.php:428 +#: actions/login.php:233 actions/register.php:429 #: lib/accountsettingsaction.php:116 msgid "Password" msgstr "Passwort" -#: actions/login.php:256 actions/register.php:477 +#: actions/login.php:236 actions/register.php:478 msgid "Remember me" msgstr "Anmeldedaten merken" -#: actions/login.php:257 actions/register.php:479 +#: actions/login.php:237 actions/register.php:480 msgid "Automatically login in the future; not for shared computers!" msgstr "Automatisch anmelden; nicht bei gemeinsam genutzten PCs einsetzen!" -#: actions/login.php:267 +#: actions/login.php:247 msgid "Lost or forgotten password?" msgstr "Passwort vergessen?" -#: actions/login.php:286 +#: actions/login.php:266 msgid "" "For security reasons, please re-enter your user name and password before " "changing your settings." @@ -1906,7 +1867,7 @@ msgstr "" "Bitte gebe aus Sicherheitsgründen deinen Benutzernamen und dein Passwort " "ein, bevor die Änderungen an deinen Einstellungen übernommen werden." -#: actions/login.php:290 +#: actions/login.php:270 #, php-format msgid "" "Login with your username and password. Don't have a username yet? [Register]" @@ -1920,18 +1881,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 @@ -1973,9 +1934,9 @@ msgstr "" msgid "Message sent" msgstr "Nachricht gesendet" -#: actions/newmessage.php:185 lib/command.php:376 -#, php-format -msgid "Direct message to %s sent" +#: actions/newmessage.php:185 +#, 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 @@ -2005,8 +1966,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 @@ -2065,8 +2026,8 @@ msgstr "Content-Typ " msgid "Only " msgstr "" -#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1031 -#: lib/api.php:1059 lib/api.php:1169 +#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1033 +#: lib/api.php:1061 lib/api.php:1171 msgid "Not a supported data format." msgstr "Kein unterstütztes Datenformat." @@ -2110,10 +2071,30 @@ 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/otp.php:69 +#, fuzzy +msgid "No user ID specified." +msgstr "Keine Gruppe angegeben" + +#: actions/otp.php:83 +#, fuzzy +msgid "No login token specified." +msgstr "Kein Profil angegeben." + +#: actions/otp.php:90 +#, fuzzy +msgid "No login token requested." +msgstr "Keine Profil-ID in der Anfrage." + +#: actions/otp.php:95 +#, fuzzy +msgid "Invalid login token specified." +msgstr "Token ungültig oder abgelaufen." + +#: actions/otp.php:104 +#, fuzzy +msgid "Login token expired." +msgstr "An Seite anmelden" #: actions/outbox.php:61 #, php-format @@ -2150,7 +2131,7 @@ msgid "6 or more characters" msgstr "6 oder mehr Zeichen" #: actions/passwordsettings.php:112 actions/recoverpassword.php:239 -#: actions/register.php:432 actions/smssettings.php:134 +#: actions/register.php:433 actions/smssettings.php:134 msgid "Confirm" msgstr "Bestätigen" @@ -2186,7 +2167,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 "" @@ -2202,12 +2183,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 @@ -2219,13 +2200,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" @@ -2253,7 +2234,7 @@ msgstr "" #: actions/pathsadminpanel.php:245 msgid "Theme directory" -msgstr "" +msgstr "Theme-Verzeichnis" #: actions/pathsadminpanel.php:252 msgid "Avatars" @@ -2285,7 +2266,7 @@ msgstr "" #: actions/pathsadminpanel.php:286 msgid "Background directory" -msgstr "" +msgstr "Hintergrund Verzeichnis" #: actions/pathsadminpanel.php:293 msgid "SSL" @@ -2310,15 +2291,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" @@ -2344,8 +2326,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 @@ -2353,9 +2335,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" @@ -2376,43 +2360,43 @@ msgstr "Profilinformation" msgid "1-64 lowercase letters or numbers, no punctuation or spaces" msgstr "1-64 Kleinbuchstaben oder Ziffern, keine Sonder- oder Leerzeichen" -#: actions/profilesettings.php:111 actions/register.php:447 +#: actions/profilesettings.php:111 actions/register.php:448 #: actions/showgroup.php:247 actions/tagother.php:104 #: lib/groupeditform.php:157 lib/userprofile.php:149 msgid "Full name" msgstr "Vollständiger Name" -#: actions/profilesettings.php:115 actions/register.php:452 +#: actions/profilesettings.php:115 actions/register.php:453 #: lib/groupeditform.php:161 msgid "Homepage" msgstr "Homepage" -#: actions/profilesettings.php:117 actions/register.php:454 +#: actions/profilesettings.php:117 actions/register.php:455 msgid "URL of your homepage, blog, or profile on another site" msgstr "" "URL deiner Homepage, deines Blogs, oder deines Profils auf einer anderen Site" -#: actions/profilesettings.php:122 actions/register.php:460 +#: actions/profilesettings.php:122 actions/register.php:461 #, php-format msgid "Describe yourself and your interests in %d chars" msgstr "Beschreibe dich selbst und deine Interessen in %d Zeichen" -#: actions/profilesettings.php:125 actions/register.php:463 +#: actions/profilesettings.php:125 actions/register.php:464 msgid "Describe yourself and your interests" msgstr "Beschreibe dich selbst und deine Interessen" -#: actions/profilesettings.php:127 actions/register.php:465 +#: actions/profilesettings.php:127 actions/register.php:466 msgid "Bio" msgstr "Biografie" -#: actions/profilesettings.php:132 actions/register.php:470 +#: actions/profilesettings.php:132 actions/register.php:471 #: actions/showgroup.php:256 actions/tagother.php:112 #: actions/userauthorization.php:158 lib/groupeditform.php:177 #: lib/userprofile.php:164 msgid "Location" msgstr "Aufenthaltsort" -#: actions/profilesettings.php:134 actions/register.php:472 +#: actions/profilesettings.php:134 actions/register.php:473 msgid "Where you are, like \"City, State (or Region), Country\"" msgstr "Wo du bist, beispielsweise „Stadt, Gebiet, Land“" @@ -2478,20 +2462,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." @@ -2713,7 +2697,7 @@ msgstr "Fehler bei den Nutzereinstellungen." msgid "New password successfully saved. You are now logged in." msgstr "Neues Passwort erfolgreich gespeichert. Du bist jetzt angemeldet." -#: actions/register.php:85 actions/register.php:189 actions/register.php:404 +#: actions/register.php:85 actions/register.php:189 actions/register.php:405 msgid "Sorry, only invited people can register." msgstr "Es tut uns leid, zum Registrieren benötigst du eine Einladung." @@ -2725,7 +2709,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:503 lib/action.php:457 #: lib/logingroupnav.php:85 msgid "Register" msgstr "Registrieren" @@ -2739,62 +2723,58 @@ 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." -#: actions/register.php:243 actions/register.php:264 +#: actions/register.php:243 actions/register.php:265 msgid "Invalid username or password." msgstr "Benutzername oder Passwort falsch." -#: actions/register.php:342 +#: actions/register.php:343 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 +#: actions/register.php:425 msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required." msgstr "" "1-64 kleingeschriebene Buchstaben oder Zahlen, keine Satz- oder Leerzeichen. " "Pflicht." -#: actions/register.php:429 +#: actions/register.php:430 msgid "6 or more characters. Required." msgstr "6 oder mehr Buchstaben. Pflicht." -#: actions/register.php:433 +#: actions/register.php:434 msgid "Same as password above. Required." msgstr "Gleiches Passwort wie zuvor. Pflichteingabe." -#: actions/register.php:437 actions/register.php:441 +#: actions/register.php:438 actions/register.php:442 #: actions/siteadminpanel.php:270 lib/accountsettingsaction.php:120 msgid "Email" msgstr "E-Mail" -#: actions/register.php:438 actions/register.php:442 +#: actions/register.php:439 actions/register.php:443 msgid "Used only for updates, announcements, and password recovery" msgstr "" "Wird nur für Updates, wichtige Mitteilungen und zur " "Passwortwiederherstellung verwendet" -#: actions/register.php:449 +#: actions/register.php:450 msgid "Longer name, preferably your \"real\" name" msgstr "Längerer Name, bevorzugt dein „echter“ Name" -#: actions/register.php:493 +#: actions/register.php:494 msgid "My text and files are available under " msgstr "Meine Texte und Daten sind verfügbar unter" -#: actions/register.php:495 +#: actions/register.php:496 msgid "Creative Commons Attribution 3.0" msgstr "" -#: actions/register.php:496 +#: actions/register.php:497 msgid "" " except this private data: password, email address, IM address, and phone " "number." @@ -2802,13 +2782,13 @@ msgstr "" "außer folgende private Daten: Passwort, E-Mail-Adresse, IM-Adresse und " "Telefonnummer." -#: actions/register.php:537 -#, php-format +#: actions/register.php:538 +#, 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 " @@ -2835,7 +2815,7 @@ msgstr "" "\n" "Danke für deine Anmeldung, wir hoffen das dir der Service gefällt." -#: actions/register.php:561 +#: actions/register.php:562 msgid "" "(You should receive a message by email momentarily, with instructions on how " "to confirm your email address.)" @@ -2939,11 +2919,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)" @@ -2960,11 +2935,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 @@ -2974,11 +2951,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 @@ -2995,11 +2975,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." @@ -3049,11 +3024,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" @@ -3102,7 +3072,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)" @@ -3172,14 +3142,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 @@ -3203,9 +3168,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 "" @@ -3214,11 +3181,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 @@ -3264,12 +3234,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 @@ -3458,7 +3429,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 @@ -3487,7 +3459,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 @@ -3580,8 +3553,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 @@ -3621,8 +3594,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 @@ -3657,11 +3630,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)" @@ -3750,20 +3718,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" @@ -3870,7 +3837,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" @@ -3929,7 +3896,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 @@ -3962,11 +3929,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" @@ -3981,11 +3943,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" @@ -4000,23 +3957,95 @@ msgstr "%s ist in keiner Gruppe Mitglied." msgid "Try [searching for groups](%%action.groupsearch%%) and joining them." msgstr "" -#: classes/File.php:137 +#: 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:144 #, 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 "" -#: classes/File.php:147 +#: classes/File.php:154 #, php-format msgid "A file this large would exceed your user quota of %d bytes." msgstr "" -#: classes/File.php:154 +#: classes/File.php:161 #, php-format msgid "A file this large would exceed your monthly quota of %d bytes." msgstr "" +#: classes/Login_token.php:76 +#, fuzzy, php-format +msgid "Could not create login token for %s" +msgstr "Konnte keinen Favoriten erstellen." + #: classes/Message.php:45 #, fuzzy msgid "You are banned from sending direct messages." @@ -4073,7 +4102,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)" @@ -4121,139 +4150,139 @@ msgid "Other options" msgstr "Sonstige Optionen" #: lib/action.php:144 -#, php-format -msgid "%s - %s" -msgstr "%s - %s" +#, fuzzy, php-format +msgid "%1$s - %2$s" +msgstr "%1$s (%2$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." @@ -4262,12 +4291,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 %" @@ -4278,32 +4307,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." @@ -4312,29 +4341,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" @@ -4373,7 +4407,7 @@ msgstr "Passwort geändert" 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" @@ -4386,7 +4420,7 @@ msgid "Sorry, this command is not yet implemented." msgstr "Leider ist dieser Befehl noch nicht implementiert." #: lib/command.php:88 -#, php-format +#, fuzzy, php-format msgid "Could not find a user with nickname %s" msgstr "Die bestätigte E-Mail-Adresse konnte nicht gespeichert werden." @@ -4408,11 +4442,13 @@ msgid "" msgstr "" #: lib/command.php:152 lib/command.php:399 lib/command.php:460 +#, 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 +#, fuzzy msgid "User has no last notice" msgstr "Benutzer hat keine letzte Nachricht" @@ -4420,22 +4456,42 @@ msgstr "Benutzer hat keine letzte Nachricht" 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:217 +#, fuzzy +msgid "You are already a member of that group" +msgstr "Du bist bereits Mitglied dieser Gruppe" + +#: lib/command.php:234 +#, fuzzy, php-format +msgid "Could not join user %s to group %s" +msgstr "Konnte Benutzer %s nicht der Gruppe %s hinzufügen." + +#: lib/command.php:239 +#, fuzzy, php-format +msgid "%s joined group %s" +msgstr "%s ist der Gruppe %s beigetreten" + +#: lib/command.php:284 +#, fuzzy, php-format +msgid "Could not remove user %s to group %s" +msgstr "Konnte Benutzer %s aus der Gruppe %s nicht entfernen" + +#: lib/command.php:289 +#, fuzzy, php-format +msgid "%s left group %s" +msgstr "%s hat die Gruppe %s verlassen" #: lib/command.php:318 -#, php-format +#, fuzzy, php-format msgid "Fullname: %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" @@ -4445,11 +4501,16 @@ msgstr "Homepage: %s" msgid "About: %s" msgstr "Über: %s" -#: lib/command.php:358 scripts/xmppdaemon.php:301 -#, php-format +#: lib/command.php:358 +#, fuzzy, php-format msgid "Message too long - maximum is %d characters, you sent %d" msgstr "Nachricht zu lang - maximal %d Zeichen erlaubt, du hast %d gesendet" +#: lib/command.php:376 +#, fuzzy, php-format +msgid "Direct message to %s sent" +msgstr "Direkte Nachricht an %s abgeschickt" + #: lib/command.php:378 msgid "Error sending direct message." msgstr "Fehler beim Senden der Nachricht" @@ -4457,12 +4518,12 @@ msgstr "Fehler beim Senden der Nachricht" #: lib/command.php:422 #, fuzzy msgid "Cannot repeat your own notice" -msgstr "Konnte Benachrichtigung nicht aktivieren." +msgstr "Du kannst deine eigenen Nachrichten nicht wiederholen." #: lib/command.php:427 #, fuzzy msgid "Already repeated that notice" -msgstr "Nachricht löschen" +msgstr "Nachricht bereits wiederholt" #: lib/command.php:435 #, fuzzy, php-format @@ -4480,7 +4541,7 @@ msgid "Notice too long - maximum is %d characters, you sent %d" msgstr "Nachricht zu lange - maximal 140 Zeichen erlaubt, du hast %s gesendet" #: lib/command.php:500 -#, php-format +#, fuzzy, php-format msgid "Reply to %s sent" msgstr "Antwort an %s gesendet" @@ -4489,6 +4550,7 @@ msgid "Error saving notice." msgstr "Problem beim Speichern der Nachricht." #: lib/command.php:556 +#, fuzzy msgid "Specify the name of the user to subscribe to" msgstr "Gib den Namen des Benutzers an, den du abonnieren möchtest" @@ -4498,6 +4560,7 @@ msgid "Subscribed to %s" msgstr "%s abonniert" #: lib/command.php:584 +#, 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" @@ -4530,48 +4593,43 @@ msgstr "Konnte Benachrichtigung nicht aktivieren." msgid "Login command is disabled" msgstr "" -#: lib/command.php:664 -#, fuzzy, php-format -msgid "Could not create login token for %s" -msgstr "Konnte keinen Favoriten erstellen." - -#: lib/command.php:669 +#: lib/command.php:661 #, php-format msgid "This link is useable only once, and is good for only 2 minutes: %s" msgstr "" -#: lib/command.php:685 +#: lib/command.php:677 #, fuzzy msgid "You are not subscribed to anyone." msgstr "Du hast dieses Profil nicht abonniert." -#: lib/command.php:687 +#: lib/command.php:679 msgid "You are subscribed to this person:" msgid_plural "You are subscribed to these people:" msgstr[0] "Du hast diese Benutzer bereits abonniert:" msgstr[1] "Du hast diese Benutzer bereits abonniert:" -#: lib/command.php:707 +#: lib/command.php:699 msgid "No one is subscribed to you." msgstr "Niemand hat Dich abonniert." -#: lib/command.php:709 +#: lib/command.php:701 msgid "This person is subscribed to you:" msgid_plural "These people are subscribed to you:" msgstr[0] "Die Gegenseite konnte Dich nicht abonnieren." msgstr[1] "Die Gegenseite konnte Dich nicht abonnieren." -#: lib/command.php:729 +#: lib/command.php:721 msgid "You are not a member of any groups." msgstr "Du bist in keiner Gruppe Mitglied." -#: lib/command.php:731 +#: lib/command.php:723 msgid "You are a member of this group:" msgid_plural "You are a member of these groups:" msgstr[0] "Du bist kein Mitglied dieser Gruppe." msgstr[1] "Du bist kein Mitglied dieser Gruppe." -#: lib/command.php:745 +#: lib/command.php:737 msgid "" "Commands:\n" "on - turn on notifications\n" @@ -4735,10 +4793,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\"" @@ -4924,21 +4978,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" @@ -5112,6 +5154,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 "" @@ -5143,7 +5206,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 @@ -5151,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 "Konnte öffentlichen Stream nicht abrufen." #: lib/mediafile.php:270 @@ -5161,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 "" #: lib/messageform.php:120 @@ -5197,7 +5261,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 @@ -5319,6 +5393,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" @@ -5498,11 +5577,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" @@ -5565,47 +5639,47 @@ msgstr "Nachricht" msgid "Moderate" msgstr "" -#: lib/util.php:837 +#: lib/util.php:884 msgid "a few seconds ago" msgstr "vor wenigen Sekunden" -#: lib/util.php:839 +#: lib/util.php:886 msgid "about a minute ago" msgstr "vor einer Minute" -#: lib/util.php:841 +#: lib/util.php:888 #, php-format msgid "about %d minutes ago" msgstr "vor %d Minuten" -#: lib/util.php:843 +#: lib/util.php:890 msgid "about an hour ago" msgstr "vor einer Stunde" -#: lib/util.php:845 +#: lib/util.php:892 #, php-format msgid "about %d hours ago" msgstr "vor %d Stunden" -#: lib/util.php:847 +#: lib/util.php:894 msgid "about a day ago" msgstr "vor einem Tag" -#: lib/util.php:849 +#: lib/util.php:896 #, php-format msgid "about %d days ago" msgstr "vor %d Tagen" -#: lib/util.php:851 +#: lib/util.php:898 msgid "about a month ago" msgstr "vor einem Monat" -#: lib/util.php:853 +#: lib/util.php:900 #, php-format msgid "about %d months ago" msgstr "vor %d Monaten" -#: lib/util.php:855 +#: lib/util.php:902 msgid "about a year ago" msgstr "vor einem Jahr" @@ -5619,18 +5693,7 @@ msgstr "%s ist keine gültige Farbe!" 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." +#: scripts/xmppdaemon.php:301 +#, 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" diff --git a/locale/el/LC_MESSAGES/statusnet.po b/locale/el/LC_MESSAGES/statusnet.po index 33c1a818f..ea2ad34fa 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-05 22:10+0000\n" -"PO-Revision-Date: 2010-01-05 22:10:56+0000\n" +"POT-Creation-Date: 2010-01-11 23:25+0000\n" +"PO-Revision-Date: 2010-01-11 23:26:31+0000\n" "Language-Team: Greek\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha (r60693); Translate extension (2010-01-04)\n" +"X-Generator: MediaWiki 1.16alpha (r60950); 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" @@ -39,7 +39,7 @@ msgstr "Δεν υπάρχει τέτοιο σελίδα." #: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79 #: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75 #: actions/favoritesrss.php:74 actions/foaf.php:40 actions/foaf.php:58 -#: actions/microsummary.php:62 actions/newmessage.php:116 +#: actions/microsummary.php:62 actions/newmessage.php:116 actions/otp.php:76 #: actions/remotesubscribe.php:145 actions/remotesubscribe.php:154 #: actions/replies.php:73 actions/repliesrss.php:38 #: actions/showfavorites.php:105 actions/userbyid.php:74 @@ -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 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 #, 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" @@ -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,11 +598,11 @@ 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/invite.php:56 actions/login.php:115 actions/makeadmin.php:66 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80 #: actions/othersettings.php:145 actions/passwordsettings.php:138 #: actions/profilesettings.php:194 actions/recoverpassword.php:337 @@ -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 +#: actions/joingroup.php:135 #, 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,65 +1757,56 @@ 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 +#: actions/leavegroup.php:134 #, php-format -msgid "%s left group %s" +msgid "%1$s left group %2$s" msgstr "" -#: actions/login.php:83 actions/register.php:137 +#: actions/login.php:80 actions/otp.php:62 actions/register.php:137 msgid "Already logged in." msgstr "Ήδη συνδεδεμένος." -#: actions/login.php:114 actions/login.php:124 -msgid "Invalid or expired token." -msgstr "" - -#: actions/login.php:147 +#: actions/login.php:126 msgid "Incorrect username or password." msgstr "Λάθος όνομα χρήστη ή κωδικός" -#: actions/login.php:153 +#: actions/login.php:132 actions/otp.php:120 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:188 actions/login.php:241 lib/action.php:460 #: lib/logingroupnav.php:79 msgid "Login" msgstr "Σύνδεση" -#: actions/login.php:247 +#: actions/login.php:227 msgid "Login to site" msgstr "" -#: actions/login.php:250 actions/profilesettings.php:106 -#: actions/register.php:423 actions/showgroup.php:236 actions/tagother.php:94 +#: actions/login.php:230 actions/profilesettings.php:106 +#: actions/register.php:424 actions/showgroup.php:236 actions/tagother.php:94 #: lib/groupeditform.php:152 lib/userprofile.php:131 msgid "Nickname" msgstr "Ψευδώνυμο" -#: actions/login.php:253 actions/register.php:428 +#: actions/login.php:233 actions/register.php:429 #: lib/accountsettingsaction.php:116 msgid "Password" msgstr "Κωδικός" -#: actions/login.php:256 actions/register.php:477 +#: actions/login.php:236 actions/register.php:478 msgid "Remember me" msgstr "" -#: actions/login.php:257 actions/register.php:479 +#: actions/login.php:237 actions/register.php:480 msgid "Automatically login in the future; not for shared computers!" msgstr "Αυτόματη σύνδεση στο μέλλον. ΟΧΙ για κοινόχρηστους υπολογιστές!" -#: actions/login.php:267 +#: actions/login.php:247 msgid "Lost or forgotten password?" msgstr "Χάσατε ή ξεχάσατε τον κωδικό σας;" -#: actions/login.php:286 +#: actions/login.php:266 msgid "" "For security reasons, please re-enter your user name and password before " "changing your settings." @@ -1855,7 +1814,7 @@ msgstr "" "Για λόγους ασφαλείας, παρακαλώ εισάγετε ξανά το όνομα χρήστη και τον κωδικό " "σας, πριν αλλάξετε τις ρυθμίσεις σας." -#: actions/login.php:290 +#: actions/login.php:270 #, fuzzy, php-format msgid "" "Login with your username and password. Don't have a username yet? [Register]" @@ -1871,18 +1830,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" @@ -1922,9 +1881,9 @@ msgstr "" msgid "Message sent" msgstr "" -#: actions/newmessage.php:185 lib/command.php:376 +#: actions/newmessage.php:185 #, 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 +1911,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 @@ -2010,8 +1969,8 @@ msgstr "Σύνδεση" msgid "Only " msgstr "" -#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1031 -#: lib/api.php:1059 lib/api.php:1169 +#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1033 +#: lib/api.php:1061 lib/api.php:1171 msgid "Not a supported data format." msgstr "" @@ -2057,9 +2016,27 @@ 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" +#: actions/otp.php:69 +#, fuzzy +msgid "No user ID specified." +msgstr "Μήνυμα" + +#: actions/otp.php:83 +#, fuzzy +msgid "No login token specified." +msgstr "Μήνυμα" + +#: actions/otp.php:90 +msgid "No login token requested." +msgstr "" + +#: actions/otp.php:95 +#, fuzzy +msgid "Invalid login token specified." +msgstr "Μήνυμα" + +#: actions/otp.php:104 +msgid "Login token expired." msgstr "" #: actions/outbox.php:61 @@ -2098,7 +2075,7 @@ msgid "6 or more characters" msgstr "6 ή περισσότεροι χαρακτήρες" #: actions/passwordsettings.php:112 actions/recoverpassword.php:239 -#: actions/register.php:432 actions/smssettings.php:134 +#: actions/register.php:433 actions/smssettings.php:134 msgid "Confirm" msgstr "Επιβεβαίωση" @@ -2134,7 +2111,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 +2144,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 +2242,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 +2272,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 +2281,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 @@ -2323,43 +2301,43 @@ msgstr "" msgid "1-64 lowercase letters or numbers, no punctuation or spaces" msgstr "1-64 μικρά γράμματα ή αριθμοί, χωρίς σημεία στίξης ή κενά" -#: actions/profilesettings.php:111 actions/register.php:447 +#: actions/profilesettings.php:111 actions/register.php:448 #: actions/showgroup.php:247 actions/tagother.php:104 #: lib/groupeditform.php:157 lib/userprofile.php:149 msgid "Full name" msgstr "Ονοματεπώνυμο" -#: actions/profilesettings.php:115 actions/register.php:452 +#: actions/profilesettings.php:115 actions/register.php:453 #: lib/groupeditform.php:161 msgid "Homepage" msgstr "Αρχική σελίδα" -#: actions/profilesettings.php:117 actions/register.php:454 +#: actions/profilesettings.php:117 actions/register.php:455 msgid "URL of your homepage, blog, or profile on another site" msgstr "" -#: actions/profilesettings.php:122 actions/register.php:460 +#: actions/profilesettings.php:122 actions/register.php:461 #, fuzzy, php-format msgid "Describe yourself and your interests in %d chars" msgstr "Περιέγραψε τον εαυτό σου και τα ενδιαφέροντά σου σε 140 χαρακτήρες" -#: actions/profilesettings.php:125 actions/register.php:463 +#: actions/profilesettings.php:125 actions/register.php:464 #, fuzzy msgid "Describe yourself and your interests" msgstr "Περιέγραψε τον εαυτό σου και τα ενδιαφέροντά σου σε 140 χαρακτήρες" -#: actions/profilesettings.php:127 actions/register.php:465 +#: actions/profilesettings.php:127 actions/register.php:466 msgid "Bio" msgstr "Βιογραφικό" -#: actions/profilesettings.php:132 actions/register.php:470 +#: actions/profilesettings.php:132 actions/register.php:471 #: actions/showgroup.php:256 actions/tagother.php:112 #: actions/userauthorization.php:158 lib/groupeditform.php:177 #: lib/userprofile.php:164 msgid "Location" msgstr "Τοποθεσία" -#: actions/profilesettings.php:134 actions/register.php:472 +#: actions/profilesettings.php:134 actions/register.php:473 msgid "Where you are, like \"City, State (or Region), Country\"" msgstr "" @@ -2424,21 +2402,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 "" @@ -2658,7 +2636,7 @@ msgstr "" msgid "New password successfully saved. You are now logged in." msgstr "" -#: actions/register.php:85 actions/register.php:189 actions/register.php:404 +#: actions/register.php:85 actions/register.php:189 actions/register.php:405 msgid "Sorry, only invited people can register." msgstr "" @@ -2670,7 +2648,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:503 lib/action.php:457 #: lib/logingroupnav.php:85 msgid "Register" msgstr "" @@ -2683,58 +2661,54 @@ 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 υπάρχει ήδη." -#: actions/register.php:243 actions/register.php:264 +#: actions/register.php:243 actions/register.php:265 msgid "Invalid username or password." msgstr "" -#: actions/register.php:342 +#: actions/register.php:343 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 +#: actions/register.php:425 msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required." msgstr "1-64 μικρά γράμματα ή αριθμοί, χωρίς σημεία στίξης ή κενά. Απαραίτητο." -#: actions/register.php:429 +#: actions/register.php:430 msgid "6 or more characters. Required." msgstr "6 ή περισσότεροι χαρακτήρες. Απαραίτητο." -#: actions/register.php:433 +#: actions/register.php:434 msgid "Same as password above. Required." msgstr "" -#: actions/register.php:437 actions/register.php:441 +#: actions/register.php:438 actions/register.php:442 #: actions/siteadminpanel.php:270 lib/accountsettingsaction.php:120 msgid "Email" msgstr "Email" -#: actions/register.php:438 actions/register.php:442 +#: actions/register.php:439 actions/register.php:443 msgid "Used only for updates, announcements, and password recovery" msgstr "" -#: actions/register.php:449 +#: actions/register.php:450 msgid "Longer name, preferably your \"real\" name" msgstr "" -#: actions/register.php:493 +#: actions/register.php:494 msgid "My text and files are available under " msgstr "" -#: actions/register.php:495 +#: actions/register.php:496 msgid "Creative Commons Attribution 3.0" msgstr "" -#: actions/register.php:496 +#: actions/register.php:497 #, fuzzy msgid "" " except this private data: password, email address, IM address, and phone " @@ -2743,13 +2717,13 @@ msgstr "" "εκτός από τα εξής προσωπικά δεδομένα: κωδικός πρόσβασης, διεύθυνση email, " "διεύθυνση IM, τηλεφωνικό νούμερο." -#: actions/register.php:537 +#: actions/register.php:538 #, 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 " @@ -2777,7 +2751,7 @@ msgstr "" "Ευχαριστούμε που εγγράφηκες και ευχόμαστε να περάσεις καλά με την υπηρεσία " "μας." -#: actions/register.php:561 +#: actions/register.php:562 msgid "" "(You should receive a message by email momentarily, with instructions on how " "to confirm your email address.)" @@ -2874,11 +2848,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 +2866,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 +2880,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 +2897,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 +2946,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 +2995,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 +3062,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 +3089,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 +3101,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 +3145,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 +3333,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 +3364,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 +3453,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 +3490,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 +3526,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 +3607,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 +3719,7 @@ msgid "" "click “Reject”." msgstr "" -#: actions/userauthorization.php:188 +#: actions/userauthorization.php:188 actions/version.php:165 msgid "License" msgstr "" @@ -3822,7 +3769,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 +3802,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 +3816,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,23 +3830,94 @@ msgstr "" msgid "Try [searching for groups](%%action.groupsearch%%) and joining them." msgstr "" -#: classes/File.php:137 +#: 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:144 #, 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 "" -#: classes/File.php:147 +#: classes/File.php:154 #, php-format msgid "A file this large would exceed your user quota of %d bytes." msgstr "" -#: classes/File.php:154 +#: classes/File.php:161 #, php-format msgid "A file this large would exceed your monthly quota of %d bytes." msgstr "" +#: classes/Login_token.php:76 +#, fuzzy, php-format +msgid "Could not create login token for %s" +msgstr "Αδύνατη η αποθήκευση του προφίλ." + #: classes/Message.php:45 msgid "You are banned from sending direct messages." msgstr "" @@ -3958,7 +3967,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 "" @@ -4007,136 +4016,136 @@ msgstr "" #: lib/action.php:144 #, php-format -msgid "%s - %s" +msgid "%1$s - %2$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 +4154,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 +4168,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 +4200,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" @@ -4252,7 +4265,7 @@ msgstr "Ο κωδικός αποθηκεύτηκε." msgid "Command results" msgstr "" -#: lib/channel.php:210 +#: lib/channel.php:210 lib/mailhandler.php:142 msgid "Command complete" msgstr "" @@ -4299,22 +4312,42 @@ msgstr "" msgid "Notice marked as fave." msgstr "" -#: lib/command.php:315 -#, php-format -msgid "%1$s (%2$s)" -msgstr "" +#: lib/command.php:217 +#, fuzzy +msgid "You are already a member of that group" +msgstr "Ομάδες με τα περισσότερα μέλη" + +#: lib/command.php:234 +#, fuzzy, php-format +msgid "Could not join user %s to group %s" +msgstr "Αδύνατη η αποθήκευση των νέων πληροφοριών του προφίλ" + +#: lib/command.php:239 +#, fuzzy, php-format +msgid "%s joined group %s" +msgstr "ομάδες των χρηστών %s" + +#: lib/command.php:284 +#, fuzzy, php-format +msgid "Could not remove user %s to group %s" +msgstr "Αδύνατη η αποθήκευση του προφίλ." + +#: lib/command.php:289 +#, fuzzy, php-format +msgid "%s left group %s" +msgstr "ομάδες των χρηστών %s" #: lib/command.php:318 -#, php-format +#, fuzzy, php-format msgid "Fullname: %s" -msgstr "" +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 "" @@ -4324,18 +4357,24 @@ msgstr "" msgid "About: %s" msgstr "" -#: lib/command.php:358 scripts/xmppdaemon.php:301 +#: lib/command.php:358 #, php-format msgid "Message too long - maximum is %d characters, you sent %d" msgstr "" +#: lib/command.php:376 +#, php-format +msgid "Direct message to %s sent" +msgstr "" + #: lib/command.php:378 msgid "Error sending direct message." msgstr "" #: lib/command.php:422 +#, fuzzy msgid "Cannot repeat your own notice" -msgstr "" +msgstr "Αδυναμία διαγραφής αυτού του μηνύματος." #: lib/command.php:427 #, fuzzy @@ -4407,49 +4446,44 @@ msgstr "" msgid "Login command is disabled" msgstr "" -#: lib/command.php:664 -#, fuzzy, php-format -msgid "Could not create login token for %s" -msgstr "Αδύνατη η αποθήκευση του προφίλ." - -#: lib/command.php:669 +#: lib/command.php:661 #, php-format msgid "This link is useable only once, and is good for only 2 minutes: %s" msgstr "" -#: lib/command.php:685 +#: lib/command.php:677 #, fuzzy msgid "You are not subscribed to anyone." msgstr "Δεν επιτρέπεται να κάνεις συνδρομητές του λογαριασμού σου άλλους." -#: lib/command.php:687 +#: lib/command.php:679 msgid "You are subscribed to this person:" msgid_plural "You are subscribed to these people:" msgstr[0] "Δεν επιτρέπεται να κάνεις συνδρομητές του λογαριασμού σου άλλους." msgstr[1] "Δεν επιτρέπεται να κάνεις συνδρομητές του λογαριασμού σου άλλους." -#: lib/command.php:707 +#: lib/command.php:699 #, fuzzy msgid "No one is subscribed to you." msgstr "Δεν επιτρέπεται να κάνεις συνδρομητές του λογαριασμού σου άλλους." -#: lib/command.php:709 +#: lib/command.php:701 msgid "This person is subscribed to you:" msgid_plural "These people are subscribed to you:" msgstr[0] "Δεν επιτρέπεται να κάνεις συνδρομητές του λογαριασμού σου άλλους." msgstr[1] "Δεν επιτρέπεται να κάνεις συνδρομητές του λογαριασμού σου άλλους." -#: lib/command.php:729 +#: lib/command.php:721 msgid "You are not a member of any groups." msgstr "Δεν είστε μέλος καμίας ομάδας." -#: lib/command.php:731 +#: lib/command.php:723 msgid "You are a member of this group:" msgid_plural "You are a member of these groups:" msgstr[0] "Ομάδες με τα περισσότερα μέλη" msgstr[1] "Ομάδες με τα περισσότερα μέλη" -#: lib/command.php:745 +#: lib/command.php:737 msgid "" "Commands:\n" "on - turn on notifications\n" @@ -4606,10 +4640,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\"" @@ -4769,21 +4799,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" @@ -4920,6 +4938,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 "" @@ -4951,7 +4990,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 @@ -4960,7 +4999,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 @@ -4970,7 +5009,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 @@ -5003,7 +5042,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 @@ -5122,6 +5171,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 "" @@ -5297,10 +5350,6 @@ msgstr "" msgid "People Tagcloud as tagged" msgstr "" -#: lib/subscriptionlist.php:126 -msgid "(none)" -msgstr "(κανένα)" - #: lib/tagcloudsection.php:56 msgid "None" msgstr "Κανένα" @@ -5363,47 +5412,47 @@ msgstr "Μήνυμα" msgid "Moderate" msgstr "" -#: lib/util.php:837 +#: lib/util.php:884 msgid "a few seconds ago" msgstr "" -#: lib/util.php:839 +#: lib/util.php:886 msgid "about a minute ago" msgstr "" -#: lib/util.php:841 +#: lib/util.php:888 #, php-format msgid "about %d minutes ago" msgstr "" -#: lib/util.php:843 +#: lib/util.php:890 msgid "about an hour ago" msgstr "" -#: lib/util.php:845 +#: lib/util.php:892 #, php-format msgid "about %d hours ago" msgstr "" -#: lib/util.php:847 +#: lib/util.php:894 msgid "about a day ago" msgstr "" -#: lib/util.php:849 +#: lib/util.php:896 #, php-format msgid "about %d days ago" msgstr "" -#: lib/util.php:851 +#: lib/util.php:898 msgid "about a month ago" msgstr "" -#: lib/util.php:853 +#: lib/util.php:900 #, php-format msgid "about %d months ago" msgstr "" -#: lib/util.php:855 +#: lib/util.php:902 msgid "about a year ago" msgstr "" @@ -5417,18 +5466,7 @@ msgstr "%s δεν είναι ένα έγκυρο χρώμα!" 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." +#: scripts/xmppdaemon.php:301 +#, php-format +msgid "Message too long - maximum is %1$d characters, you sent %2$d." msgstr "" diff --git a/locale/en_GB/LC_MESSAGES/statusnet.po b/locale/en_GB/LC_MESSAGES/statusnet.po index 61660c2fd..61965f97c 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-05 22:10+0000\n" -"PO-Revision-Date: 2010-01-05 22:11:01+0000\n" +"POT-Creation-Date: 2010-01-11 23:25+0000\n" +"PO-Revision-Date: 2010-01-11 23:26:35+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 (r60693); Translate extension (2010-01-04)\n" +"X-Generator: MediaWiki 1.16alpha (r60950); 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" @@ -40,7 +40,7 @@ msgstr "No such page" #: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79 #: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75 #: actions/favoritesrss.php:74 actions/foaf.php:40 actions/foaf.php:58 -#: actions/microsummary.php:62 actions/newmessage.php:116 +#: actions/microsummary.php:62 actions/newmessage.php:116 actions/otp.php:76 #: actions/remotesubscribe.php:145 actions/remotesubscribe.php:154 #: actions/replies.php:73 actions/repliesrss.php:38 #: actions/showfavorites.php:105 actions/userbyid.php:74 @@ -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 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 +#, 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" @@ -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,11 +604,11 @@ 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/invite.php:56 actions/login.php:115 actions/makeadmin.php:66 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80 #: actions/othersettings.php:145 actions/passwordsettings.php:138 #: actions/profilesettings.php:194 actions/recoverpassword.php:337 @@ -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" +#: actions/joingroup.php:135 +#, fuzzy, php-format +msgid "%1$s joined group %2$s" msgstr "%s joined group %s" #: actions/leavegroup.php:60 @@ -1843,67 +1815,57 @@ 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" +#: actions/leavegroup.php:134 +#, fuzzy, php-format +msgid "%1$s left group %2$s" msgstr "%s left group %s" -#: actions/login.php:83 actions/register.php:137 +#: actions/login.php:80 actions/otp.php:62 actions/register.php:137 msgid "Already logged in." msgstr "Already logged in." -#: actions/login.php:114 actions/login.php:124 -#, fuzzy -msgid "Invalid or expired token." -msgstr "Invalid notice content" - -#: actions/login.php:147 +#: actions/login.php:126 msgid "Incorrect username or password." msgstr "Incorrect username or password." -#: actions/login.php:153 +#: actions/login.php:132 actions/otp.php:120 #, fuzzy 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:188 actions/login.php:241 lib/action.php:460 #: lib/logingroupnav.php:79 msgid "Login" msgstr "Login" -#: actions/login.php:247 +#: actions/login.php:227 msgid "Login to site" msgstr "Login to site" -#: actions/login.php:250 actions/profilesettings.php:106 -#: actions/register.php:423 actions/showgroup.php:236 actions/tagother.php:94 +#: actions/login.php:230 actions/profilesettings.php:106 +#: actions/register.php:424 actions/showgroup.php:236 actions/tagother.php:94 #: lib/groupeditform.php:152 lib/userprofile.php:131 msgid "Nickname" msgstr "Nickname" -#: actions/login.php:253 actions/register.php:428 +#: actions/login.php:233 actions/register.php:429 #: lib/accountsettingsaction.php:116 msgid "Password" msgstr "Password" -#: actions/login.php:256 actions/register.php:477 +#: actions/login.php:236 actions/register.php:478 msgid "Remember me" msgstr "Remember me" -#: actions/login.php:257 actions/register.php:479 +#: actions/login.php:237 actions/register.php:480 msgid "Automatically login in the future; not for shared computers!" msgstr "Automatically login in the future; not for shared computers!" -#: actions/login.php:267 +#: actions/login.php:247 msgid "Lost or forgotten password?" msgstr "Lost or forgotten password?" -#: actions/login.php:286 +#: actions/login.php:266 msgid "" "For security reasons, please re-enter your user name and password before " "changing your settings." @@ -1911,7 +1873,7 @@ msgstr "" "For security reasons, please re-enter your user name and password before " "changing your settings." -#: actions/login.php:290 +#: actions/login.php:270 #, php-format msgid "" "Login with your username and password. Don't have a username yet? [Register]" @@ -1925,19 +1887,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" @@ -1978,9 +1940,9 @@ msgstr "" msgid "Message sent" msgstr "Message sent" -#: actions/newmessage.php:185 lib/command.php:376 -#, php-format -msgid "Direct message to %s sent" +#: actions/newmessage.php:185 +#, 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 +1971,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 @@ -2069,8 +2031,8 @@ msgstr "Connect" msgid "Only " msgstr "" -#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1031 -#: lib/api.php:1059 lib/api.php:1169 +#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1033 +#: lib/api.php:1061 lib/api.php:1171 msgid "Not a supported data format." msgstr "Not a supported data format." @@ -2115,10 +2077,30 @@ 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/otp.php:69 +#, fuzzy +msgid "No user ID specified." +msgstr "No profile specified." + +#: actions/otp.php:83 +#, fuzzy +msgid "No login token specified." +msgstr "No profile specified." + +#: actions/otp.php:90 +#, fuzzy +msgid "No login token requested." +msgstr "No profile id in request." + +#: actions/otp.php:95 +#, fuzzy +msgid "Invalid login token specified." +msgstr "Invalid notice content" + +#: actions/otp.php:104 +#, fuzzy +msgid "Login token expired." +msgstr "Login to site" #: actions/outbox.php:61 #, php-format @@ -2154,7 +2136,7 @@ msgid "6 or more characters" msgstr "6 or more characters" #: actions/passwordsettings.php:112 actions/recoverpassword.php:239 -#: actions/register.php:432 actions/smssettings.php:134 +#: actions/register.php:433 actions/smssettings.php:134 msgid "Confirm" msgstr "Confirm" @@ -2190,7 +2172,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 +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 "Invite" @@ -2321,8 +2303,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 +2334,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 +2343,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 @@ -2382,42 +2365,42 @@ msgstr "Profile information" msgid "1-64 lowercase letters or numbers, no punctuation or spaces" msgstr "1-64 lowercase letters or numbers, no punctuation or spaces" -#: actions/profilesettings.php:111 actions/register.php:447 +#: actions/profilesettings.php:111 actions/register.php:448 #: actions/showgroup.php:247 actions/tagother.php:104 #: lib/groupeditform.php:157 lib/userprofile.php:149 msgid "Full name" msgstr "Full name" -#: actions/profilesettings.php:115 actions/register.php:452 +#: actions/profilesettings.php:115 actions/register.php:453 #: lib/groupeditform.php:161 msgid "Homepage" msgstr "Homepage" -#: actions/profilesettings.php:117 actions/register.php:454 +#: actions/profilesettings.php:117 actions/register.php:455 msgid "URL of your homepage, blog, or profile on another site" msgstr "URL of your homepage, blog, or profile on another site" -#: actions/profilesettings.php:122 actions/register.php:460 +#: actions/profilesettings.php:122 actions/register.php:461 #, php-format msgid "Describe yourself and your interests in %d chars" msgstr "Describe yourself and your interests in %d chars" -#: actions/profilesettings.php:125 actions/register.php:463 +#: actions/profilesettings.php:125 actions/register.php:464 msgid "Describe yourself and your interests" msgstr "Describe yourself and your interests" -#: actions/profilesettings.php:127 actions/register.php:465 +#: actions/profilesettings.php:127 actions/register.php:466 msgid "Bio" msgstr "Bio" -#: actions/profilesettings.php:132 actions/register.php:470 +#: actions/profilesettings.php:132 actions/register.php:471 #: actions/showgroup.php:256 actions/tagother.php:112 #: actions/userauthorization.php:158 lib/groupeditform.php:177 #: lib/userprofile.php:164 msgid "Location" msgstr "Location" -#: actions/profilesettings.php:134 actions/register.php:472 +#: actions/profilesettings.php:134 actions/register.php:473 msgid "Where you are, like \"City, State (or Region), Country\"" msgstr "Where you are, like \"City, State (or Region), Country\"" @@ -2481,20 +2464,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." @@ -2723,7 +2706,7 @@ msgstr "Error setting user." msgid "New password successfully saved. You are now logged in." msgstr "New password successfully saved. You are now logged in." -#: actions/register.php:85 actions/register.php:189 actions/register.php:404 +#: actions/register.php:85 actions/register.php:189 actions/register.php:405 msgid "Sorry, only invited people can register." msgstr "Sorry, only invited people can register." @@ -2736,7 +2719,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:503 lib/action.php:457 #: lib/logingroupnav.php:85 msgid "Register" msgstr "Register" @@ -2749,58 +2732,54 @@ 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." -#: actions/register.php:243 actions/register.php:264 +#: actions/register.php:243 actions/register.php:265 msgid "Invalid username or password." msgstr "Invalid username or password." -#: actions/register.php:342 +#: actions/register.php:343 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 +#: actions/register.php:425 msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required." msgstr "1-64 lowercase letters or numbers, no punctuation or spaces. Required." -#: actions/register.php:429 +#: actions/register.php:430 msgid "6 or more characters. Required." msgstr "6 or more characters. Required." -#: actions/register.php:433 +#: actions/register.php:434 msgid "Same as password above. Required." msgstr "Same as password above. Required." -#: actions/register.php:437 actions/register.php:441 +#: actions/register.php:438 actions/register.php:442 #: actions/siteadminpanel.php:270 lib/accountsettingsaction.php:120 msgid "Email" msgstr "E-mail" -#: actions/register.php:438 actions/register.php:442 +#: actions/register.php:439 actions/register.php:443 msgid "Used only for updates, announcements, and password recovery" msgstr "Used only for updates, announcements, and password recovery" -#: actions/register.php:449 +#: actions/register.php:450 msgid "Longer name, preferably your \"real\" name" msgstr "Longer name, preferably your \"real\" name" -#: actions/register.php:493 +#: actions/register.php:494 msgid "My text and files are available under " msgstr "My text and files are available under " -#: actions/register.php:495 +#: actions/register.php:496 msgid "Creative Commons Attribution 3.0" msgstr "" -#: actions/register.php:496 +#: actions/register.php:497 #, fuzzy msgid "" " except this private data: password, email address, IM address, and phone " @@ -2809,13 +2788,13 @@ msgstr "" " except this private data: password, e-mail address, IM address, phone " "number." -#: actions/register.php:537 -#, php-format +#: actions/register.php:538 +#, 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 " @@ -2842,7 +2821,7 @@ msgstr "" "\n" "Thanks for signing up and we hope you enjoy using this service." -#: actions/register.php:561 +#: actions/register.php:562 msgid "" "(You should receive a message by email momentarily, with instructions on how " "to confirm your email address.)" @@ -2945,11 +2924,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 +2940,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 +2955,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 +2976,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 +3025,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 +3073,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 +3142,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 +3168,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 +3180,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 +3233,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 +3420,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 +3451,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 +3547,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 +3584,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 +3620,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 +3706,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 +3822,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 +3879,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 +3912,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 +3927,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,23 +3942,94 @@ msgstr "You are not a member of that group." msgid "Try [searching for groups](%%action.groupsearch%%) and joining them." msgstr "" -#: classes/File.php:137 +#: 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:144 #, 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 "" -#: classes/File.php:147 +#: classes/File.php:154 #, php-format msgid "A file this large would exceed your user quota of %d bytes." msgstr "" -#: classes/File.php:154 +#: classes/File.php:161 #, php-format msgid "A file this large would exceed your monthly quota of %d bytes." msgstr "" +#: classes/Login_token.php:76 +#, fuzzy, php-format +msgid "Could not create login token for %s" +msgstr "Could not create aliases" + #: classes/Message.php:45 #, fuzzy msgid "You are banned from sending direct messages." @@ -4064,7 +4084,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)" @@ -4111,138 +4131,138 @@ msgid "Other options" msgstr "Other options" #: lib/action.php:144 -#, php-format -msgid "%s - %s" -msgstr "%s - %s" +#, fuzzy, php-format +msgid "%1$s - %2$s" +msgstr "%1$s (%2$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 +4271,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 +4287,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 +4320,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" @@ -4364,7 +4389,7 @@ msgstr "Password change" msgid "Command results" msgstr "Command results" -#: lib/channel.php:210 +#: lib/channel.php:210 lib/mailhandler.php:142 msgid "Command complete" msgstr "Command complete" @@ -4377,7 +4402,7 @@ msgid "Sorry, this command is not yet implemented." msgstr "Sorry, this command is not yet implemented." #: lib/command.php:88 -#, php-format +#, fuzzy, php-format msgid "Could not find a user with nickname %s" msgstr "Could not find a user with nickname %s" @@ -4386,7 +4411,7 @@ msgid "It does not make a lot of sense to nudge yourself!" msgstr "" #: lib/command.php:99 -#, php-format +#, fuzzy, php-format msgid "Nudge sent to %s" msgstr "Nudge sent to %s" @@ -4399,11 +4424,13 @@ msgid "" msgstr "" #: lib/command.php:152 lib/command.php:399 lib/command.php:460 +#, fuzzy msgid "Notice with that id does not exist" -msgstr "" +msgstr "No profile with that id." #: lib/command.php:168 lib/command.php:415 lib/command.php:476 #: lib/command.php:532 +#, fuzzy msgid "User has no last notice" msgstr "User has no last notice" @@ -4411,22 +4438,42 @@ msgstr "User has no last notice" 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:217 +#, fuzzy +msgid "You are already a member of that group" +msgstr "You are already a member of that group." + +#: lib/command.php:234 +#, fuzzy, php-format +msgid "Could not join user %s to group %s" +msgstr "Could not join user %s to group %s." + +#: lib/command.php:239 +#, fuzzy, php-format +msgid "%s joined group %s" +msgstr "%s joined group %s" + +#: lib/command.php:284 +#, fuzzy, php-format +msgid "Could not remove user %s to group %s" +msgstr "Could not remove user %s to group %s" + +#: lib/command.php:289 +#, fuzzy, php-format +msgid "%s left group %s" +msgstr "%s left group %s" #: lib/command.php:318 -#, php-format +#, fuzzy, php-format msgid "Fullname: %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" @@ -4436,11 +4483,16 @@ msgstr "Homepage: %s" msgid "About: %s" msgstr "About: %s" -#: lib/command.php:358 scripts/xmppdaemon.php:301 -#, php-format +#: lib/command.php:358 +#, fuzzy, php-format msgid "Message too long - maximum is %d characters, you sent %d" msgstr "Message too long - maximum is %d characters, you sent %d" +#: lib/command.php:376 +#, fuzzy, php-format +msgid "Direct message to %s sent" +msgstr "Direct message to %s sent" + #: lib/command.php:378 msgid "Error sending direct message." msgstr "Error sending direct message." @@ -4448,12 +4500,12 @@ msgstr "Error sending direct message." #: lib/command.php:422 #, fuzzy msgid "Cannot repeat your own notice" -msgstr "Can't turn on notification." +msgstr "Cannot repeat your own notice." #: lib/command.php:427 #, fuzzy msgid "Already repeated that notice" -msgstr "Delete this notice" +msgstr "Already repeated that notice." #: lib/command.php:435 #, fuzzy, php-format @@ -4466,12 +4518,12 @@ msgid "Error repeating notice." msgstr "Error saving notice." #: lib/command.php:491 -#, php-format +#, fuzzy, php-format msgid "Notice too long - maximum is %d characters, you sent %d" msgstr "Notice too long - maximum is %d characters, you sent %d" #: lib/command.php:500 -#, php-format +#, fuzzy, php-format msgid "Reply to %s sent" msgstr "Reply to %s sent" @@ -4480,6 +4532,7 @@ msgid "Error saving notice." msgstr "Error saving notice." #: lib/command.php:556 +#, fuzzy msgid "Specify the name of the user to subscribe to" msgstr "Specify the name of the user to subscribe to" @@ -4489,6 +4542,7 @@ msgid "Subscribed to %s" msgstr "Subscribed to %s" #: lib/command.php:584 +#, fuzzy msgid "Specify the name of the user to unsubscribe from" msgstr "Specify the name of the user to unsubscribe from" @@ -4521,50 +4575,45 @@ msgstr "Can't turn on notification." msgid "Login command is disabled" msgstr "" -#: lib/command.php:664 -#, fuzzy, php-format -msgid "Could not create login token for %s" -msgstr "Could not create aliases" - -#: lib/command.php:669 +#: lib/command.php:661 #, php-format msgid "This link is useable only once, and is good for only 2 minutes: %s" msgstr "" -#: lib/command.php:685 +#: lib/command.php:677 #, fuzzy msgid "You are not subscribed to anyone." msgstr "You are not subscribed to that profile." -#: lib/command.php:687 +#: lib/command.php:679 msgid "You are subscribed to this person:" msgid_plural "You are subscribed to these people:" msgstr[0] "You are already subscribed to these users:" msgstr[1] "You are already subscribed to these users:" -#: lib/command.php:707 +#: lib/command.php:699 #, fuzzy msgid "No one is subscribed to you." msgstr "Could not subscribe other to you." -#: lib/command.php:709 +#: lib/command.php:701 msgid "This person is subscribed to you:" msgid_plural "These people are subscribed to you:" msgstr[0] "Could not subscribe other to you." msgstr[1] "Could not subscribe other to you." -#: lib/command.php:729 +#: lib/command.php:721 #, fuzzy msgid "You are not a member of any groups." msgstr "You are not a member of that group." -#: lib/command.php:731 +#: lib/command.php:723 msgid "You are a member of this group:" msgid_plural "You are a member of these groups:" msgstr[0] "You are not a member of that group." msgstr[1] "You are not a member of that group." -#: lib/command.php:745 +#: lib/command.php:737 msgid "" "Commands:\n" "on - turn on notifications\n" @@ -4721,10 +4770,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\"" @@ -4894,21 +4939,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" @@ -5054,6 +5087,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 "" @@ -5085,7 +5139,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 @@ -5093,7 +5147,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 @@ -5103,7 +5158,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 @@ -5136,7 +5191,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 @@ -5256,6 +5321,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" @@ -5431,10 +5501,6 @@ msgstr "" msgid "People Tagcloud as tagged" msgstr "" -#: lib/subscriptionlist.php:126 -msgid "(none)" -msgstr "(none)" - #: lib/tagcloudsection.php:56 msgid "None" msgstr "None" @@ -5495,47 +5561,47 @@ msgstr "Message" msgid "Moderate" msgstr "" -#: lib/util.php:837 +#: lib/util.php:884 msgid "a few seconds ago" msgstr "a few seconds ago" -#: lib/util.php:839 +#: lib/util.php:886 msgid "about a minute ago" msgstr "about a minute ago" -#: lib/util.php:841 +#: lib/util.php:888 #, php-format msgid "about %d minutes ago" msgstr "about %d minutes ago" -#: lib/util.php:843 +#: lib/util.php:890 msgid "about an hour ago" msgstr "about an hour ago" -#: lib/util.php:845 +#: lib/util.php:892 #, php-format msgid "about %d hours ago" msgstr "about %d hours ago" -#: lib/util.php:847 +#: lib/util.php:894 msgid "about a day ago" msgstr "about a day ago" -#: lib/util.php:849 +#: lib/util.php:896 #, php-format msgid "about %d days ago" msgstr "about %d days ago" -#: lib/util.php:851 +#: lib/util.php:898 msgid "about a month ago" msgstr "about a month ago" -#: lib/util.php:853 +#: lib/util.php:900 #, php-format msgid "about %d months ago" msgstr "about %d months ago" -#: lib/util.php:855 +#: lib/util.php:902 msgid "about a year ago" msgstr "about a year ago" @@ -5549,18 +5615,7 @@ msgstr "%s is not a valid colour!" 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." +#: scripts/xmppdaemon.php:301 +#, 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" diff --git a/locale/es/LC_MESSAGES/statusnet.po b/locale/es/LC_MESSAGES/statusnet.po index 93320db27..acc7f4a30 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-05 22:10+0000\n" -"PO-Revision-Date: 2010-01-05 22:11:06+0000\n" +"POT-Creation-Date: 2010-01-11 23:25+0000\n" +"PO-Revision-Date: 2010-01-11 23:26:39+0000\n" "Language-Team: Spanish\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha (r60693); Translate extension (2010-01-04)\n" +"X-Generator: MediaWiki 1.16alpha (r60950); 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" @@ -41,7 +41,7 @@ msgstr "No existe tal página" #: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79 #: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75 #: actions/favoritesrss.php:74 actions/foaf.php:40 actions/foaf.php:58 -#: actions/microsummary.php:62 actions/newmessage.php:116 +#: actions/microsummary.php:62 actions/newmessage.php:116 actions/otp.php:76 #: actions/remotesubscribe.php:145 actions/remotesubscribe.php:154 #: actions/replies.php:73 actions/repliesrss.php:38 #: actions/showfavorites.php:105 actions/userbyid.php:74 @@ -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 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 #, 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" @@ -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,11 +606,11 @@ 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/invite.php:56 actions/login.php:115 actions/makeadmin.php:66 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80 #: actions/othersettings.php:145 actions/passwordsettings.php:138 #: actions/profilesettings.php:194 actions/recoverpassword.php:337 @@ -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 +#: actions/joingroup.php:135 #, 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" +msgid "%1$s joined group %2$s" msgstr "%s se unió a grupo %s" #: actions/leavegroup.php:60 @@ -1856,69 +1824,59 @@ 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 +#: actions/leavegroup.php:134 #, 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" +msgid "%1$s left group %2$s" msgstr "%s dejó grupo %s" -#: actions/login.php:83 actions/register.php:137 +#: actions/login.php:80 actions/otp.php:62 actions/register.php:137 msgid "Already logged in." msgstr "Ya estás conectado." -#: actions/login.php:114 actions/login.php:124 -#, fuzzy -msgid "Invalid or expired token." -msgstr "El contenido del aviso es inválido" - -#: actions/login.php:147 +#: actions/login.php:126 msgid "Incorrect username or password." msgstr "Nombre de usuario o contraseña incorrectos." -#: actions/login.php:153 +#: actions/login.php:132 actions/otp.php:120 #, fuzzy 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:188 actions/login.php:241 lib/action.php:460 #: lib/logingroupnav.php:79 msgid "Login" msgstr "Inicio de sesión" -#: actions/login.php:247 +#: actions/login.php:227 msgid "Login to site" msgstr "Ingresar a sitio" -#: actions/login.php:250 actions/profilesettings.php:106 -#: actions/register.php:423 actions/showgroup.php:236 actions/tagother.php:94 +#: actions/login.php:230 actions/profilesettings.php:106 +#: actions/register.php:424 actions/showgroup.php:236 actions/tagother.php:94 #: lib/groupeditform.php:152 lib/userprofile.php:131 msgid "Nickname" msgstr "Apodo" -#: actions/login.php:253 actions/register.php:428 +#: actions/login.php:233 actions/register.php:429 #: lib/accountsettingsaction.php:116 msgid "Password" msgstr "Contraseña" -#: actions/login.php:256 actions/register.php:477 +#: actions/login.php:236 actions/register.php:478 msgid "Remember me" msgstr "Recordarme" -#: actions/login.php:257 actions/register.php:479 +#: actions/login.php:237 actions/register.php:480 msgid "Automatically login in the future; not for shared computers!" msgstr "" "Iniciar sesión automáticamente en el futuro. ¡No usar en ordenadores " "compartidos! " -#: actions/login.php:267 +#: actions/login.php:247 msgid "Lost or forgotten password?" msgstr "¿Contraseña olvidada o perdida?" -#: actions/login.php:286 +#: actions/login.php:266 msgid "" "For security reasons, please re-enter your user name and password before " "changing your settings." @@ -1926,7 +1884,7 @@ msgstr "" "Por razones de seguridad, por favor vuelve a escribir tu nombre de usuario y " "contraseña antes de cambiar tu configuración." -#: actions/login.php:290 +#: actions/login.php:270 #, fuzzy, php-format msgid "" "Login with your username and password. Don't have a username yet? [Register]" @@ -1941,19 +1899,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" @@ -1994,9 +1952,9 @@ msgstr "No te auto envíes un mensaje; dícetelo a ti mismo." msgid "Message sent" msgstr "Mensaje" -#: actions/newmessage.php:185 lib/command.php:376 -#, php-format -msgid "Direct message to %s sent" +#: actions/newmessage.php:185 +#, 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 +1985,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 @@ -2088,8 +2046,8 @@ msgstr "Conectarse" msgid "Only " msgstr "" -#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1031 -#: lib/api.php:1059 lib/api.php:1169 +#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1033 +#: lib/api.php:1061 lib/api.php:1171 msgid "Not a supported data format." msgstr "No es un formato de dato soportado" @@ -2136,10 +2094,30 @@ 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/otp.php:69 +#, fuzzy +msgid "No user ID specified." +msgstr "Grupo no especificado." + +#: actions/otp.php:83 +#, fuzzy +msgid "No login token specified." +msgstr "No se especificó perfil." + +#: actions/otp.php:90 +#, fuzzy +msgid "No login token requested." +msgstr "Ningún perfil de Id en solicitud." + +#: actions/otp.php:95 +#, fuzzy +msgid "Invalid login token specified." +msgstr "El contenido del aviso es inválido" + +#: actions/otp.php:104 +#, fuzzy +msgid "Login token expired." +msgstr "Ingresar a sitio" #: actions/outbox.php:61 #, php-format @@ -2178,7 +2156,7 @@ msgid "6 or more characters" msgstr "6 o más caracteres" #: actions/passwordsettings.php:112 actions/recoverpassword.php:239 -#: actions/register.php:432 actions/smssettings.php:134 +#: actions/register.php:433 actions/smssettings.php:134 msgid "Confirm" msgstr "Confirmar" @@ -2214,7 +2192,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 +2225,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 +2327,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 +2359,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 +2369,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 @@ -2414,43 +2393,43 @@ msgid "1-64 lowercase letters or numbers, no punctuation or spaces" msgstr "" "1-64 letras en minúscula o números, sin signos de puntuación o espacios" -#: actions/profilesettings.php:111 actions/register.php:447 +#: actions/profilesettings.php:111 actions/register.php:448 #: actions/showgroup.php:247 actions/tagother.php:104 #: lib/groupeditform.php:157 lib/userprofile.php:149 msgid "Full name" msgstr "Nombre completo" -#: actions/profilesettings.php:115 actions/register.php:452 +#: actions/profilesettings.php:115 actions/register.php:453 #: lib/groupeditform.php:161 msgid "Homepage" msgstr "Página de inicio" -#: actions/profilesettings.php:117 actions/register.php:454 +#: actions/profilesettings.php:117 actions/register.php:455 msgid "URL of your homepage, blog, or profile on another site" msgstr "El URL de tu página de inicio, blog o perfil en otro sitio" -#: actions/profilesettings.php:122 actions/register.php:460 +#: actions/profilesettings.php:122 actions/register.php:461 #, fuzzy, php-format msgid "Describe yourself and your interests in %d chars" msgstr "Cuéntanos algo sobre ti y tus intereses en 140 caracteres" -#: actions/profilesettings.php:125 actions/register.php:463 +#: actions/profilesettings.php:125 actions/register.php:464 #, fuzzy msgid "Describe yourself and your interests" msgstr "Descríbete y cuenta de tus " -#: actions/profilesettings.php:127 actions/register.php:465 +#: actions/profilesettings.php:127 actions/register.php:466 msgid "Bio" msgstr "Biografía" -#: actions/profilesettings.php:132 actions/register.php:470 +#: actions/profilesettings.php:132 actions/register.php:471 #: actions/showgroup.php:256 actions/tagother.php:112 #: actions/userauthorization.php:158 lib/groupeditform.php:177 #: lib/userprofile.php:164 msgid "Location" msgstr "Ubicación" -#: actions/profilesettings.php:134 actions/register.php:472 +#: actions/profilesettings.php:134 actions/register.php:473 msgid "Where you are, like \"City, State (or Region), Country\"" msgstr "Dónde estás, por ejemplo \"Ciudad, Estado (o Región), País\"" @@ -2514,21 +2493,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." @@ -2757,7 +2736,7 @@ msgstr "Error al configurar el usuario." msgid "New password successfully saved. You are now logged in." msgstr "Nueva contraseña guardada correctamente. Has iniciado una sesión." -#: actions/register.php:85 actions/register.php:189 actions/register.php:404 +#: actions/register.php:85 actions/register.php:189 actions/register.php:405 msgid "Sorry, only invited people can register." msgstr "Disculpa, sólo personas invitadas pueden registrarse." @@ -2770,7 +2749,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:503 lib/action.php:457 #: lib/logingroupnav.php:85 msgid "Register" msgstr "Registrarse" @@ -2783,61 +2762,57 @@ 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." -#: actions/register.php:243 actions/register.php:264 +#: actions/register.php:243 actions/register.php:265 msgid "Invalid username or password." msgstr "Usuario o contraseña inválidos." -#: actions/register.php:342 +#: actions/register.php:343 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 +#: actions/register.php:425 msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required." msgstr "" "1-64 letras en minúscula o números, sin signos de puntuación o espacios. " "Requerido." -#: actions/register.php:429 +#: actions/register.php:430 msgid "6 or more characters. Required." msgstr "6 o más caracters. Requerido." -#: actions/register.php:433 +#: actions/register.php:434 msgid "Same as password above. Required." msgstr "Igual a la contraseña de arriba. Requerida" -#: actions/register.php:437 actions/register.php:441 +#: actions/register.php:438 actions/register.php:442 #: actions/siteadminpanel.php:270 lib/accountsettingsaction.php:120 msgid "Email" msgstr "Correo electrónico" -#: actions/register.php:438 actions/register.php:442 +#: actions/register.php:439 actions/register.php:443 msgid "Used only for updates, announcements, and password recovery" msgstr "" "Se usa sólo para actualizaciones, anuncios y recuperación de contraseñas" -#: actions/register.php:449 +#: actions/register.php:450 msgid "Longer name, preferably your \"real\" name" msgstr "Nombre más largo, preferiblemente tu nombre \"real\"" -#: actions/register.php:493 +#: actions/register.php:494 msgid "My text and files are available under " msgstr "Mi texto y archivos están disponibles bajo" -#: actions/register.php:495 +#: actions/register.php:496 msgid "Creative Commons Attribution 3.0" msgstr "" -#: actions/register.php:496 +#: actions/register.php:497 #, fuzzy msgid "" " except this private data: password, email address, IM address, and phone " @@ -2846,13 +2821,13 @@ msgstr "" "excepto los siguientes datos privados: contraseña, dirección de correo " "electrónico, dirección de mensajería instantánea, número de teléfono." -#: actions/register.php:537 -#, php-format +#: actions/register.php:538 +#, 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 " @@ -2879,7 +2854,7 @@ msgstr "" "\n" "Gracias por suscribirte y esperamos que disfrutes el uso de este servicio." -#: actions/register.php:561 +#: actions/register.php:562 msgid "" "(You should receive a message by email momentarily, with instructions on how " "to confirm your email address.)" @@ -2984,11 +2959,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 +2977,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 +2991,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 +3010,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 +3059,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 +3110,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 +3180,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 +3207,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 +3219,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 +3267,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 +3463,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 +3494,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 +3593,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 +3631,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 +3667,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 +3756,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 +3872,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 +3930,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 +3963,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 +3978,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,23 +3993,94 @@ msgstr "No eres miembro de ese grupo" msgid "Try [searching for groups](%%action.groupsearch%%) and joining them." msgstr "" -#: classes/File.php:137 +#: 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:144 #, 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 "" -#: classes/File.php:147 +#: classes/File.php:154 #, php-format msgid "A file this large would exceed your user quota of %d bytes." msgstr "" -#: classes/File.php:154 +#: classes/File.php:161 #, php-format msgid "A file this large would exceed your monthly quota of %d bytes." msgstr "" +#: classes/Login_token.php:76 +#, fuzzy, php-format +msgid "Could not create login token for %s" +msgstr "No se pudo crear favorito." + #: classes/Message.php:45 #, fuzzy msgid "You are banned from sending direct messages." @@ -4127,7 +4138,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" @@ -4175,137 +4186,137 @@ msgid "Other options" msgstr "Otras opciones" #: lib/action.php:144 -#, php-format -msgid "%s - %s" -msgstr "%s - %s" +#, fuzzy, php-format +msgid "%1$s - %2$s" +msgstr "%1$s (%2$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 +4325,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 +4341,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 +4374,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" @@ -4427,7 +4443,7 @@ msgstr "Cambio de contraseña " 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" @@ -4450,7 +4466,7 @@ msgid "It does not make a lot of sense to nudge yourself!" msgstr "" #: lib/command.php:99 -#, php-format +#, fuzzy, php-format msgid "Nudge sent to %s" msgstr "zumbido enviado a %s" @@ -4463,11 +4479,13 @@ msgid "" msgstr "" #: lib/command.php:152 lib/command.php:399 lib/command.php:460 +#, fuzzy msgid "Notice with that id does not exist" -msgstr "" +msgstr "Ningún perfil con ese ID." #: lib/command.php:168 lib/command.php:415 lib/command.php:476 #: lib/command.php:532 +#, fuzzy msgid "User has no last notice" msgstr "Usuario no tiene último aviso" @@ -4475,22 +4493,42 @@ msgstr "Usuario no tiene último aviso" 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:217 +#, fuzzy +msgid "You are already a member of that group" +msgstr "Ya eres miembro de ese grupo" + +#: 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" + +#: lib/command.php:239 +#, fuzzy, php-format +msgid "%s joined group %s" +msgstr "%s se unió a grupo %s" + +#: 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" + +#: lib/command.php:289 +#, fuzzy, php-format +msgid "%s left group %s" +msgstr "%s dejó grupo %s" #: lib/command.php:318 -#, php-format +#, fuzzy, php-format msgid "Fullname: %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" @@ -4500,11 +4538,16 @@ msgstr "Página de inicio: %s" msgid "About: %s" msgstr "Sobre: %s" -#: lib/command.php:358 scripts/xmppdaemon.php:301 +#: lib/command.php:358 #, fuzzy, php-format msgid "Message too long - maximum is %d characters, you sent %d" msgstr "Mensaje muy largo - máximo 140 caracteres, enviaste %d" +#: lib/command.php:376 +#, fuzzy, php-format +msgid "Direct message to %s sent" +msgstr "Se envió mensaje directo a %s" + #: lib/command.php:378 msgid "Error sending direct message." msgstr "Error al enviar mensaje directo." @@ -4545,6 +4588,7 @@ msgid "Error saving notice." msgstr "Hubo un problema al guardar el aviso." #: lib/command.php:556 +#, fuzzy msgid "Specify the name of the user to subscribe to" msgstr "Especificar el nombre del usuario a suscribir" @@ -4554,6 +4598,7 @@ msgid "Subscribed to %s" msgstr "Suscrito a %s" #: lib/command.php:584 +#, fuzzy msgid "Specify the name of the user to unsubscribe from" msgstr "Especificar el nombre del usuario para desuscribirse de" @@ -4586,47 +4631,42 @@ msgstr "No se puede activar notificación." msgid "Login command is disabled" msgstr "" -#: lib/command.php:664 -#, fuzzy, php-format -msgid "Could not create login token for %s" -msgstr "No se pudo crear favorito." - -#: lib/command.php:669 +#: lib/command.php:661 #, php-format msgid "This link is useable only once, and is good for only 2 minutes: %s" msgstr "" -#: lib/command.php:685 +#: lib/command.php:677 msgid "You are not subscribed to anyone." msgstr "No estás suscrito a nadie." -#: lib/command.php:687 +#: lib/command.php:679 msgid "You are subscribed to this person:" msgid_plural "You are subscribed to these people:" msgstr[0] "Ya estás suscrito a estos usuarios:" msgstr[1] "Ya estás suscrito a estos usuarios:" -#: lib/command.php:707 +#: lib/command.php:699 msgid "No one is subscribed to you." msgstr "Nadie está suscrito a ti." -#: lib/command.php:709 +#: lib/command.php:701 msgid "This person is subscribed to you:" msgid_plural "These people are subscribed to you:" msgstr[0] "No se pudo suscribir otro a ti." msgstr[1] "No se pudo suscribir otro a ti." -#: lib/command.php:729 +#: lib/command.php:721 msgid "You are not a member of any groups." msgstr "No eres miembro de ningún grupo" -#: lib/command.php:731 +#: lib/command.php:723 msgid "You are a member of this group:" msgid_plural "You are a member of these groups:" msgstr[0] "No eres miembro de este grupo." msgstr[1] "No eres miembro de este grupo." -#: lib/command.php:745 +#: lib/command.php:737 msgid "" "Commands:\n" "on - turn on notifications\n" @@ -4784,10 +4824,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\"" @@ -4954,21 +4990,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" @@ -5113,6 +5137,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 "" @@ -5144,7 +5189,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 @@ -5152,7 +5197,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 @@ -5162,7 +5208,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 @@ -5197,7 +5243,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 @@ -5316,6 +5372,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" @@ -5496,10 +5557,6 @@ msgstr "" msgid "People Tagcloud as tagged" msgstr "" -#: lib/subscriptionlist.php:126 -msgid "(none)" -msgstr "(ninguno)" - #: lib/tagcloudsection.php:56 msgid "None" msgstr "Ninguno" @@ -5562,47 +5619,47 @@ msgstr "Mensaje" msgid "Moderate" msgstr "Moderar" -#: lib/util.php:837 +#: lib/util.php:884 msgid "a few seconds ago" msgstr "hace unos segundos" -#: lib/util.php:839 +#: lib/util.php:886 msgid "about a minute ago" msgstr "hace un minuto" -#: lib/util.php:841 +#: lib/util.php:888 #, php-format msgid "about %d minutes ago" msgstr "hace %d minutos" -#: lib/util.php:843 +#: lib/util.php:890 msgid "about an hour ago" msgstr "hace una hora" -#: lib/util.php:845 +#: lib/util.php:892 #, php-format msgid "about %d hours ago" msgstr "hace %d horas" -#: lib/util.php:847 +#: lib/util.php:894 msgid "about a day ago" msgstr "hace un día" -#: lib/util.php:849 +#: lib/util.php:896 #, php-format msgid "about %d days ago" msgstr "hace %d días" -#: lib/util.php:851 +#: lib/util.php:898 msgid "about a month ago" msgstr "hace un mes" -#: lib/util.php:853 +#: lib/util.php:900 #, php-format msgid "about %d months ago" msgstr "hace %d meses" -#: lib/util.php:855 +#: lib/util.php:902 msgid "about a year ago" msgstr "hace un año" @@ -5616,18 +5673,7 @@ msgstr "" 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" +#: scripts/xmppdaemon.php:301 +#, fuzzy, php-format +msgid "Message too long - maximum is %1$d characters, you sent %2$d." +msgstr "Mensaje muy largo - máximo 140 caracteres, enviaste %d" diff --git a/locale/fa/LC_MESSAGES/statusnet.po b/locale/fa/LC_MESSAGES/statusnet.po index bce137a35..4cd62b0f6 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-05 22:10+0000\n" -"PO-Revision-Date: 2010-01-05 22:11:18+0000\n" +"POT-Creation-Date: 2010-01-11 23:25+0000\n" +"PO-Revision-Date: 2010-01-11 23:26:49+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 (r60693); Translate extension (2010-01-04)\n" +"X-Generator: MediaWiki 1.16alpha (r60950); 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 @@ -42,7 +42,7 @@ msgstr "چنین صفحهای وجود ندارد" #: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79 #: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75 #: actions/favoritesrss.php:74 actions/foaf.php:40 actions/foaf.php:58 -#: actions/microsummary.php:62 actions/newmessage.php:116 +#: actions/microsummary.php:62 actions/newmessage.php:116 actions/otp.php:76 #: actions/remotesubscribe.php:145 actions/remotesubscribe.php:154 #: actions/replies.php:73 actions/repliesrss.php:38 #: actions/showfavorites.php:105 actions/userbyid.php:74 @@ -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 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 +#, 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" @@ -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,11 +601,11 @@ 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/invite.php:56 actions/login.php:115 actions/makeadmin.php:66 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80 #: actions/othersettings.php:145 actions/passwordsettings.php:138 #: actions/profilesettings.php:194 actions/recoverpassword.php:337 @@ -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" +#: actions/joingroup.php:135 +#, fuzzy, php-format +msgid "%1$s joined group %2$s" msgstr "ملحق شدن به گروه" #: actions/leavegroup.php:60 @@ -1792,65 +1766,56 @@ 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" +#: actions/leavegroup.php:134 +#, fuzzy, php-format +msgid "%1$s left group %2$s" msgstr "%s گروه %s را ترک کرد." -#: actions/login.php:83 actions/register.php:137 +#: actions/login.php:80 actions/otp.php:62 actions/register.php:137 msgid "Already logged in." msgstr "قبلا وارد شده" -#: actions/login.php:114 actions/login.php:124 -msgid "Invalid or expired token." -msgstr "علامت بی اعتبار یا منقضی." - -#: actions/login.php:147 +#: actions/login.php:126 msgid "Incorrect username or password." msgstr "نام کاربری یا رمز عبور نادرست." -#: actions/login.php:153 +#: actions/login.php:132 actions/otp.php:120 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:188 actions/login.php:241 lib/action.php:460 #: lib/logingroupnav.php:79 msgid "Login" msgstr "ورود" -#: actions/login.php:247 +#: actions/login.php:227 msgid "Login to site" msgstr "ورود به وبگاه" -#: actions/login.php:250 actions/profilesettings.php:106 -#: actions/register.php:423 actions/showgroup.php:236 actions/tagother.php:94 +#: actions/login.php:230 actions/profilesettings.php:106 +#: actions/register.php:424 actions/showgroup.php:236 actions/tagother.php:94 #: lib/groupeditform.php:152 lib/userprofile.php:131 msgid "Nickname" msgstr "نام کاربری" -#: actions/login.php:253 actions/register.php:428 +#: actions/login.php:233 actions/register.php:429 #: lib/accountsettingsaction.php:116 msgid "Password" msgstr "گذرواژه" -#: actions/login.php:256 actions/register.php:477 +#: actions/login.php:236 actions/register.php:478 msgid "Remember me" msgstr "مرا به یاد بسپار" -#: actions/login.php:257 actions/register.php:479 +#: actions/login.php:237 actions/register.php:480 msgid "Automatically login in the future; not for shared computers!" msgstr "وارد شدن خودکار. نه برای کامپیوترهای مشترک!" -#: actions/login.php:267 +#: actions/login.php:247 msgid "Lost or forgotten password?" msgstr "رمز عبور خود را گم یا فراموش کرده اید؟" -#: actions/login.php:286 +#: actions/login.php:266 msgid "" "For security reasons, please re-enter your user name and password before " "changing your settings." @@ -1858,7 +1823,7 @@ msgstr "" "به دلایل امنیتی، لطفا نام کاربری و رمز عبور خود را قبل از تغییر تنظیمات " "دوباره وارد نمایید." -#: actions/login.php:290 +#: actions/login.php:270 #, php-format msgid "" "Login with your username and password. Don't have a username yet? [Register]" @@ -1872,18 +1837,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 @@ -1924,9 +1889,9 @@ msgstr "یک پیام را به خودتان نفرستید؛ در عوض آن msgid "Message sent" msgstr "پیام فرستادهشد" -#: actions/newmessage.php:185 lib/command.php:376 -#, php-format -msgid "Direct message to %s sent" +#: actions/newmessage.php:185 +#, 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 +1920,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 @@ -2019,8 +1984,8 @@ msgstr "نوع محتوا " msgid "Only " msgstr " فقط" -#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1031 -#: lib/api.php:1059 lib/api.php:1169 +#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1033 +#: lib/api.php:1061 lib/api.php:1171 msgid "Not a supported data format." msgstr "یک قالب دادهٔ پشتیبانیشده نیست." @@ -2064,10 +2029,29 @@ 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/otp.php:69 +#, fuzzy +msgid "No user ID specified." +msgstr "گروهی مشخص نشده است." + +#: actions/otp.php:83 +#, fuzzy +msgid "No login token specified." +msgstr "خبری مشخص نشده." + +#: actions/otp.php:90 +msgid "No login token requested." +msgstr "" + +#: actions/otp.php:95 +#, fuzzy +msgid "Invalid login token specified." +msgstr "علامت بی اعتبار یا منقضی." + +#: actions/otp.php:104 +#, fuzzy +msgid "Login token expired." +msgstr "ورود به وبگاه" #: actions/outbox.php:61 #, php-format @@ -2105,7 +2089,7 @@ msgid "6 or more characters" msgstr "۶ نویسه یا بیشتر" #: actions/passwordsettings.php:112 actions/recoverpassword.php:239 -#: actions/register.php:432 actions/smssettings.php:134 +#: actions/register.php:433 actions/smssettings.php:134 msgid "Confirm" msgstr "تایید" @@ -2141,7 +2125,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 +2158,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 +2251,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 +2282,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 +2292,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 @@ -2329,42 +2314,42 @@ msgstr "اطلاعات شناسنامه" msgid "1-64 lowercase letters or numbers, no punctuation or spaces" msgstr "۱-۶۴ کاراکتر کوچک یا اعداد، بدون نقطه گذاری یا فاصله" -#: actions/profilesettings.php:111 actions/register.php:447 +#: actions/profilesettings.php:111 actions/register.php:448 #: actions/showgroup.php:247 actions/tagother.php:104 #: lib/groupeditform.php:157 lib/userprofile.php:149 msgid "Full name" msgstr "نامکامل" -#: actions/profilesettings.php:115 actions/register.php:452 +#: actions/profilesettings.php:115 actions/register.php:453 #: lib/groupeditform.php:161 msgid "Homepage" msgstr "صفحهٔ خانگی" -#: actions/profilesettings.php:117 actions/register.php:454 +#: actions/profilesettings.php:117 actions/register.php:455 msgid "URL of your homepage, blog, or profile on another site" msgstr "نشانی اینترنتی صفحهٔ خانگی، وبلاگ یا مشخصات کاربریتان در یک وبگاه دیگر" -#: actions/profilesettings.php:122 actions/register.php:460 +#: actions/profilesettings.php:122 actions/register.php:461 #, php-format msgid "Describe yourself and your interests in %d chars" msgstr "" -#: actions/profilesettings.php:125 actions/register.php:463 +#: actions/profilesettings.php:125 actions/register.php:464 msgid "Describe yourself and your interests" msgstr "خودتان و علایقتان را توصیف کنید." -#: actions/profilesettings.php:127 actions/register.php:465 +#: actions/profilesettings.php:127 actions/register.php:466 msgid "Bio" msgstr "شرححال" -#: actions/profilesettings.php:132 actions/register.php:470 +#: actions/profilesettings.php:132 actions/register.php:471 #: actions/showgroup.php:256 actions/tagother.php:112 #: actions/userauthorization.php:158 lib/groupeditform.php:177 #: lib/userprofile.php:164 msgid "Location" msgstr "موقعیت" -#: actions/profilesettings.php:134 actions/register.php:472 +#: actions/profilesettings.php:134 actions/register.php:473 msgid "Where you are, like \"City, State (or Region), Country\"" msgstr "" @@ -2426,20 +2411,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 "تنظیمات ذخیره شد." @@ -2660,7 +2644,7 @@ msgstr "" msgid "New password successfully saved. You are now logged in." msgstr "کلمه ی عبور جدید با موفقیت ذخیره شد. شما الان وارد شده اید." -#: actions/register.php:85 actions/register.php:189 actions/register.php:404 +#: actions/register.php:85 actions/register.php:189 actions/register.php:405 msgid "Sorry, only invited people can register." msgstr "با عرض معذرت، تنها افراد دعوت شده می توانند ثبت نام کنند." @@ -2672,7 +2656,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:503 lib/action.php:457 #: lib/logingroupnav.php:85 msgid "Register" msgstr "ثبت نام" @@ -2685,58 +2669,54 @@ 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 "آدرس ایمیل از قبل وجود دارد." -#: actions/register.php:243 actions/register.php:264 +#: actions/register.php:243 actions/register.php:265 msgid "Invalid username or password." msgstr "نام کاربری یا کلمه ی عبور نا معتبر." -#: actions/register.php:342 +#: actions/register.php:343 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 +#: actions/register.php:425 msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required." msgstr "۱-۶۴ حرف کوچک یا اعداد، بدون نشانه گذاری یا فاصله نیاز است." -#: actions/register.php:429 +#: actions/register.php:430 msgid "6 or more characters. Required." msgstr "۶ کاراکتر یا بیشتر نیاز است." -#: actions/register.php:433 +#: actions/register.php:434 msgid "Same as password above. Required." msgstr "" -#: actions/register.php:437 actions/register.php:441 +#: actions/register.php:438 actions/register.php:442 #: actions/siteadminpanel.php:270 lib/accountsettingsaction.php:120 msgid "Email" msgstr "پست الکترونیکی" -#: actions/register.php:438 actions/register.php:442 +#: actions/register.php:439 actions/register.php:443 msgid "Used only for updates, announcements, and password recovery" msgstr "" -#: actions/register.php:449 +#: actions/register.php:450 msgid "Longer name, preferably your \"real\" name" msgstr "نام بلند تر، به طور بهتر نام واقعیتان" -#: actions/register.php:493 +#: actions/register.php:494 msgid "My text and files are available under " msgstr "" -#: actions/register.php:495 +#: actions/register.php:496 msgid "Creative Commons Attribution 3.0" msgstr "" -#: actions/register.php:496 +#: actions/register.php:497 msgid "" " except this private data: password, email address, IM address, and phone " "number." @@ -2744,13 +2724,13 @@ msgstr "" "به استثنای این داده ی محرمانه : کلمه ی عبور، آدرس ایمیل، آدرس IM، و شماره " "تلفن." -#: actions/register.php:537 +#: actions/register.php:538 #, 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 " @@ -2763,7 +2743,7 @@ msgid "" "Thanks for signing up and we hope you enjoy using this service." msgstr "" -#: actions/register.php:561 +#: actions/register.php:562 msgid "" "(You should receive a message by email momentarily, with instructions on how " "to confirm your email address.)" @@ -2854,11 +2834,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 +2850,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 +2864,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 +2885,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 +2934,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 +2982,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 +3048,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 +3074,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 +3087,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 +3134,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 +3322,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 +3352,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 +3439,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 +3476,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 +3512,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 +3591,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 +3699,7 @@ msgid "" "click “Reject”." msgstr "" -#: actions/userauthorization.php:188 +#: actions/userauthorization.php:188 actions/version.php:165 msgid "License" msgstr "لیسانس" @@ -3789,7 +3748,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 +3781,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 +3795,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,23 +3809,95 @@ msgstr "" msgid "Try [searching for groups](%%action.groupsearch%%) and joining them." msgstr "" -#: classes/File.php:137 +#: 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:144 #, 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 "" -#: classes/File.php:147 +#: classes/File.php:154 #, php-format msgid "A file this large would exceed your user quota of %d bytes." msgstr "" -#: classes/File.php:154 +#: classes/File.php:161 #, php-format msgid "A file this large would exceed your monthly quota of %d bytes." msgstr "" +#: classes/Login_token.php:76 +#, fuzzy, php-format +msgid "Could not create login token for %s" +msgstr "نمیتوان نامهای مستعار را ساخت." + #: classes/Message.php:45 msgid "You are banned from sending direct messages." msgstr "شما از فرستادن پیام مستقیم مردود شده اید." @@ -3929,7 +3951,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 "" @@ -3976,148 +3998,148 @@ msgid "Other options" msgstr "انتخابات دیگر" #: lib/action.php:144 -#, php-format -msgid "%s - %s" -msgstr "" +#, fuzzy, php-format +msgid "%1$s - %2$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." "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 +4147,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 +4179,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 "" @@ -4215,7 +4242,7 @@ msgstr "تغییر گذرواژه" msgid "Command results" msgstr "نتیجه دستور" -#: lib/channel.php:210 +#: lib/channel.php:210 lib/mailhandler.php:142 msgid "Command complete" msgstr "دستور انجام شد" @@ -4228,7 +4255,7 @@ msgid "Sorry, this command is not yet implemented." msgstr "متاسفانه این دستور هنوز اجرا نشده." #: lib/command.php:88 -#, php-format +#, fuzzy, php-format msgid "Could not find a user with nickname %s" msgstr "پیدا نشد %s کاریری یا نام مستعار" @@ -4237,9 +4264,9 @@ msgid "It does not make a lot of sense to nudge yourself!" msgstr "" #: lib/command.php:99 -#, php-format +#, fuzzy, php-format msgid "Nudge sent to %s" -msgstr "" +msgstr "فرتادن اژیر" #: lib/command.php:126 #, php-format @@ -4253,11 +4280,13 @@ msgstr "" "خبر : %3$s" #: lib/command.php:152 lib/command.php:399 lib/command.php:460 +#, 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 +#, fuzzy msgid "User has no last notice" msgstr "کاربر آگهی آخر ندارد" @@ -4265,22 +4294,42 @@ msgstr "کاربر آگهی آخر ندارد" msgid "Notice marked as fave." msgstr "" -#: lib/command.php:315 -#, php-format -msgid "%1$s (%2$s)" -msgstr "" +#: lib/command.php:217 +#, fuzzy +msgid "You are already a member of that group" +msgstr "شما از پیش یک عضو این گروه هستید." + +#: lib/command.php:234 +#, fuzzy, php-format +msgid "Could not join user %s to group %s" +msgstr "عضویت %s در گروه %s نا موفق بود." + +#: lib/command.php:239 +#, fuzzy, php-format +msgid "%s joined group %s" +msgstr "ملحق شدن به گروه" + +#: lib/command.php:284 +#, fuzzy, php-format +msgid "Could not remove user %s to group %s" +msgstr "خارج شدن %s از گروه %s نا موفق بود" + +#: lib/command.php:289 +#, fuzzy, php-format +msgid "%s left group %s" +msgstr "%s گروه %s را ترک کرد." #: lib/command.php:318 -#, php-format +#, fuzzy, php-format msgid "Fullname: %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" @@ -4290,43 +4339,52 @@ msgstr "صفحه خانگی : %s" msgid "About: %s" msgstr "درباره ی : %s" -#: lib/command.php:358 scripts/xmppdaemon.php:301 -#, php-format +#: lib/command.php:358 +#, fuzzy, php-format msgid "Message too long - maximum is %d characters, you sent %d" msgstr "" "پیغام بسیار طولانی است - بیشترین اندازه امکان پذیر %d کاراکتر است , شما %d " "تا فرستادید" +#: lib/command.php:376 +#, fuzzy, php-format +msgid "Direct message to %s sent" +msgstr "پیام مستقیم به %s فرستاده شد." + #: lib/command.php:378 msgid "Error sending direct message." msgstr "خطا در فرستادن پیام مستقیم." #: lib/command.php:422 +#, fuzzy msgid "Cannot repeat your own notice" -msgstr "نمی توان آگهی خودتان را تکرار کرد" +msgstr "نمی توانید خبر خود را تکرار کنید." #: lib/command.php:427 +#, fuzzy msgid "Already repeated that notice" -msgstr "آن آگهی قبلا تکرار شده است." +msgstr "ابن خبر قبلا فرستاده شده" #: lib/command.php:435 -#, php-format +#, fuzzy, php-format msgid "Notice from %s repeated" -msgstr "" +msgstr "آگهی تکرار شد" #: lib/command.php:437 msgid "Error repeating notice." msgstr "خطا هنگام تکرار آگهی." #: lib/command.php:491 -#, php-format +#, fuzzy, php-format msgid "Notice too long - maximum is %d characters, you sent %d" msgstr "" +"پیغام بسیار طولانی است - بیشترین اندازه امکان پذیر %d کاراکتر است , شما %d " +"تا فرستادید" #: lib/command.php:500 -#, php-format +#, fuzzy, php-format msgid "Reply to %s sent" -msgstr "" +msgstr "به این آگهی جواب دهید" #: lib/command.php:502 msgid "Error saving notice." @@ -4371,47 +4429,43 @@ msgid "Can't turn on notification." msgstr "ناتوان در روشن کردن آگاه سازی." #: lib/command.php:650 +#, fuzzy msgid "Login command is disabled" msgstr "فرمان ورود از کار افتاده است" -#: lib/command.php:664 -#, php-format -msgid "Could not create login token for %s" -msgstr "" - -#: lib/command.php:669 +#: lib/command.php:661 #, php-format msgid "This link is useable only once, and is good for only 2 minutes: %s" msgstr "" -#: lib/command.php:685 +#: lib/command.php:677 msgid "You are not subscribed to anyone." msgstr "شما توسط هیچ کس تصویب نشده اید ." -#: lib/command.php:687 +#: lib/command.php:679 msgid "You are subscribed to this person:" msgid_plural "You are subscribed to these people:" msgstr[0] "هم اکنون شما این کاربران را دنبال میکنید: " -#: lib/command.php:707 +#: lib/command.php:699 msgid "No one is subscribed to you." msgstr "هیچکس شما را تایید نکرده ." -#: lib/command.php:709 +#: lib/command.php:701 msgid "This person is subscribed to you:" msgid_plural "These people are subscribed to you:" msgstr[0] "هیچکس شما را تایید نکرده ." -#: lib/command.php:729 +#: lib/command.php:721 msgid "You are not a member of any groups." msgstr "شما در هیچ گروهی عضو نیستید ." -#: lib/command.php:731 +#: lib/command.php:723 msgid "You are a member of this group:" msgid_plural "You are a member of these groups:" msgstr[0] "شما یک عضو این گروه نیستید." -#: lib/command.php:745 +#: lib/command.php:737 msgid "" "Commands:\n" "on - turn on notifications\n" @@ -4566,10 +4620,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\"" @@ -4729,22 +4779,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 @@ -4884,6 +4922,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 "" @@ -4916,7 +4975,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 @@ -4924,8 +4983,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 @@ -4934,7 +4994,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 @@ -4967,7 +5027,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 @@ -5084,6 +5154,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 "اشتراکها" @@ -5254,10 +5328,6 @@ msgstr "" msgid "People Tagcloud as tagged" msgstr "" -#: lib/subscriptionlist.php:126 -msgid "(none)" -msgstr "(هیج)" - #: lib/tagcloudsection.php:56 msgid "None" msgstr "هیچ" @@ -5318,47 +5388,47 @@ msgstr "پیام" msgid "Moderate" msgstr "" -#: lib/util.php:837 +#: lib/util.php:884 msgid "a few seconds ago" msgstr "چند ثانیه پیش" -#: lib/util.php:839 +#: lib/util.php:886 msgid "about a minute ago" msgstr "حدود یک دقیقه پیش" -#: lib/util.php:841 +#: lib/util.php:888 #, php-format msgid "about %d minutes ago" msgstr "حدود %d دقیقه پیش" -#: lib/util.php:843 +#: lib/util.php:890 msgid "about an hour ago" msgstr "حدود یک ساعت پیش" -#: lib/util.php:845 +#: lib/util.php:892 #, php-format msgid "about %d hours ago" msgstr "حدود %d ساعت پیش" -#: lib/util.php:847 +#: lib/util.php:894 msgid "about a day ago" msgstr "حدود یک روز پیش" -#: lib/util.php:849 +#: lib/util.php:896 #, php-format msgid "about %d days ago" msgstr "حدود %d روز پیش" -#: lib/util.php:851 +#: lib/util.php:898 msgid "about a month ago" msgstr "حدود یک ماه پیش" -#: lib/util.php:853 +#: lib/util.php:900 #, php-format msgid "about %d months ago" msgstr "حدود %d ماه پیش" -#: lib/util.php:855 +#: lib/util.php:902 msgid "about a year ago" msgstr "حدود یک سال پیش" @@ -5372,18 +5442,9 @@ msgstr "%s یک رنگ صحیح نیست!" 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 "با عرض پوزش، اجازهی ورودی پست الکترونیک وجود ندارد" +#: scripts/xmppdaemon.php:301 +#, fuzzy, php-format +msgid "Message too long - maximum is %1$d characters, you sent %2$d." +msgstr "" +"پیغام بسیار طولانی است - بیشترین اندازه امکان پذیر %d کاراکتر است , شما %d " +"تا فرستادید" diff --git a/locale/fi/LC_MESSAGES/statusnet.po b/locale/fi/LC_MESSAGES/statusnet.po index ece1dfee1..5bbcb949f 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-05 22:10+0000\n" -"PO-Revision-Date: 2010-01-05 22:11:14+0000\n" +"POT-Creation-Date: 2010-01-11 23:25+0000\n" +"PO-Revision-Date: 2010-01-11 23:26:45+0000\n" "Language-Team: Finnish\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha (r60693); Translate extension (2010-01-04)\n" +"X-Generator: MediaWiki 1.16alpha (r60950); 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" @@ -40,7 +40,7 @@ msgstr "Sivua ei ole." #: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79 #: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75 #: actions/favoritesrss.php:74 actions/foaf.php:40 actions/foaf.php:58 -#: actions/microsummary.php:62 actions/newmessage.php:116 +#: actions/microsummary.php:62 actions/newmessage.php:116 actions/otp.php:76 #: actions/remotesubscribe.php:145 actions/remotesubscribe.php:154 #: actions/replies.php:73 actions/repliesrss.php:38 #: actions/showfavorites.php:105 actions/userbyid.php:74 @@ -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 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 +#, 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" @@ -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,11 +611,11 @@ 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/invite.php:56 actions/login.php:115 actions/makeadmin.php:66 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80 #: actions/othersettings.php:145 actions/passwordsettings.php:138 #: actions/profilesettings.php:194 actions/recoverpassword.php:337 @@ -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" +#: actions/joingroup.php:135 +#, fuzzy, php-format +msgid "%1$s joined group %2$s" msgstr "%s liittyi ryhmään %s" #: actions/leavegroup.php:60 @@ -1846,69 +1819,59 @@ 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" +#: actions/leavegroup.php:134 +#, fuzzy, php-format +msgid "%1$s left group %2$s" msgstr "%s erosi ryhmästä %s" -#: actions/login.php:83 actions/register.php:137 +#: actions/login.php:80 actions/otp.php:62 actions/register.php:137 msgid "Already logged in." msgstr "Olet jo kirjautunut sisään." -#: actions/login.php:114 actions/login.php:124 -#, fuzzy -msgid "Invalid or expired token." -msgstr "Päivityksen sisältö ei kelpaa" - -#: actions/login.php:147 +#: actions/login.php:126 msgid "Incorrect username or password." msgstr "Väärä käyttäjätunnus tai salasana" -#: actions/login.php:153 +#: actions/login.php:132 actions/otp.php:120 #, fuzzy 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:188 actions/login.php:241 lib/action.php:460 #: lib/logingroupnav.php:79 msgid "Login" msgstr "Kirjaudu sisään" -#: actions/login.php:247 +#: actions/login.php:227 msgid "Login to site" msgstr "Kirjaudu sisään" -#: actions/login.php:250 actions/profilesettings.php:106 -#: actions/register.php:423 actions/showgroup.php:236 actions/tagother.php:94 +#: actions/login.php:230 actions/profilesettings.php:106 +#: actions/register.php:424 actions/showgroup.php:236 actions/tagother.php:94 #: lib/groupeditform.php:152 lib/userprofile.php:131 msgid "Nickname" msgstr "Tunnus" -#: actions/login.php:253 actions/register.php:428 +#: actions/login.php:233 actions/register.php:429 #: lib/accountsettingsaction.php:116 msgid "Password" msgstr "Salasana" -#: actions/login.php:256 actions/register.php:477 +#: actions/login.php:236 actions/register.php:478 msgid "Remember me" msgstr "Muista minut" -#: actions/login.php:257 actions/register.php:479 +#: actions/login.php:237 actions/register.php:480 msgid "Automatically login in the future; not for shared computers!" msgstr "" "Kirjaudu sisään automaattisesti tulevaisuudessa; ei tietokoneille joilla " "useampi käyttäjä!" -#: actions/login.php:267 +#: actions/login.php:247 msgid "Lost or forgotten password?" msgstr "Oletko hukannut tai unohtanut salasanasi?" -#: actions/login.php:286 +#: actions/login.php:266 msgid "" "For security reasons, please re-enter your user name and password before " "changing your settings." @@ -1916,7 +1879,7 @@ msgstr "" "Syötä turvallisuussyistä käyttäjätunnuksesi ja salasanasi uudelleen ennen " "asetuksiesi muuttamista." -#: actions/login.php:290 +#: actions/login.php:270 #, fuzzy, php-format msgid "" "Login with your username and password. Don't have a username yet? [Register]" @@ -1931,18 +1894,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 @@ -1983,9 +1946,9 @@ msgstr "Älä lähetä viestiä itsellesi, vaan kuiskaa se vain hiljaa itsellesi msgid "Message sent" msgstr "Viesti lähetetty" -#: actions/newmessage.php:185 lib/command.php:376 -#, php-format -msgid "Direct message to %s sent" +#: actions/newmessage.php:185 +#, 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 +1978,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 @@ -2077,8 +2040,8 @@ msgstr "Yhdistä" msgid "Only " msgstr "Vain " -#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1031 -#: lib/api.php:1059 lib/api.php:1169 +#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1033 +#: lib/api.php:1061 lib/api.php:1171 msgid "Not a supported data format." msgstr "Tuo ei ole tuettu tietomuoto." @@ -2123,10 +2086,30 @@ 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/otp.php:69 +#, fuzzy +msgid "No user ID specified." +msgstr "Ryhmää ei ole määritelty." + +#: actions/otp.php:83 +#, fuzzy +msgid "No login token specified." +msgstr "Profiilia ei ole määritelty." + +#: actions/otp.php:90 +#, fuzzy +msgid "No login token requested." +msgstr "Ei profiili id:tä kyselyssä." + +#: actions/otp.php:95 +#, fuzzy +msgid "Invalid login token specified." +msgstr "Päivityksen sisältö ei kelpaa" + +#: actions/otp.php:104 +#, fuzzy +msgid "Login token expired." +msgstr "Kirjaudu sisään" #: actions/outbox.php:61 #, php-format @@ -2162,7 +2145,7 @@ msgid "6 or more characters" msgstr "6 tai useampia merkkejä" #: actions/passwordsettings.php:112 actions/recoverpassword.php:239 -#: actions/register.php:432 actions/smssettings.php:134 +#: actions/register.php:433 actions/smssettings.php:134 msgid "Confirm" msgstr "Vahvista" @@ -2198,7 +2181,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 +2214,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 +2317,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 +2350,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 +2360,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 @@ -2400,42 +2384,42 @@ msgstr "" "1-64 pientä kirjainta tai numeroa, ei ääkkösiä eikä välimerkkejä tai " "välilyöntejä" -#: actions/profilesettings.php:111 actions/register.php:447 +#: actions/profilesettings.php:111 actions/register.php:448 #: actions/showgroup.php:247 actions/tagother.php:104 #: lib/groupeditform.php:157 lib/userprofile.php:149 msgid "Full name" msgstr "Koko nimi" -#: actions/profilesettings.php:115 actions/register.php:452 +#: actions/profilesettings.php:115 actions/register.php:453 #: lib/groupeditform.php:161 msgid "Homepage" msgstr "Kotisivu" -#: actions/profilesettings.php:117 actions/register.php:454 +#: actions/profilesettings.php:117 actions/register.php:455 msgid "URL of your homepage, blog, or profile on another site" msgstr "Kotisivusi, blogisi tai toisella sivustolla olevan profiilisi osoite." -#: actions/profilesettings.php:122 actions/register.php:460 +#: actions/profilesettings.php:122 actions/register.php:461 #, php-format msgid "Describe yourself and your interests in %d chars" msgstr "Kuvaile itseäsi ja kiinnostuksen kohteitasi %d merkillä" -#: actions/profilesettings.php:125 actions/register.php:463 +#: actions/profilesettings.php:125 actions/register.php:464 msgid "Describe yourself and your interests" msgstr "Kuvaile itseäsi ja kiinnostuksen kohteitasi" -#: actions/profilesettings.php:127 actions/register.php:465 +#: actions/profilesettings.php:127 actions/register.php:466 msgid "Bio" msgstr "Tietoja" -#: actions/profilesettings.php:132 actions/register.php:470 +#: actions/profilesettings.php:132 actions/register.php:471 #: actions/showgroup.php:256 actions/tagother.php:112 #: actions/userauthorization.php:158 lib/groupeditform.php:177 #: lib/userprofile.php:164 msgid "Location" msgstr "Kotipaikka" -#: actions/profilesettings.php:134 actions/register.php:472 +#: actions/profilesettings.php:134 actions/register.php:473 msgid "Where you are, like \"City, State (or Region), Country\"" msgstr "Olinpaikka kuten \"Kaupunki, Maakunta (tai Lääni), Maa\"" @@ -2501,20 +2485,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." @@ -2739,7 +2723,7 @@ msgid "New password successfully saved. You are now logged in." msgstr "" "Uusi salasana tallennettiin onnistuneesti. Olet nyt kirjautunut sisään." -#: actions/register.php:85 actions/register.php:189 actions/register.php:404 +#: actions/register.php:85 actions/register.php:189 actions/register.php:405 msgid "Sorry, only invited people can register." msgstr "Valitettavasti vain kutsutut ihmiset voivat rekisteröityä." @@ -2751,7 +2735,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:503 lib/action.php:457 #: lib/logingroupnav.php:85 msgid "Register" msgstr "Rekisteröidy" @@ -2764,64 +2748,60 @@ 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ä." -#: actions/register.php:243 actions/register.php:264 +#: actions/register.php:243 actions/register.php:265 msgid "Invalid username or password." msgstr "Käyttäjätunnus tai salasana ei kelpaa." -#: actions/register.php:342 +#: actions/register.php:343 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 +#: actions/register.php:425 msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required." msgstr "" "1-64 pientä kirjainta tai numeroa, ei ääkkösiä eikä välimerkkejä tai " "välilyöntejä. Pakollinen." -#: actions/register.php:429 +#: actions/register.php:430 msgid "6 or more characters. Required." msgstr "6 tai useampia merkkejä. Pakollinen." -#: actions/register.php:433 +#: actions/register.php:434 msgid "Same as password above. Required." msgstr "Sama kuin ylläoleva salasana. Pakollinen." -#: actions/register.php:437 actions/register.php:441 +#: actions/register.php:438 actions/register.php:442 #: actions/siteadminpanel.php:270 lib/accountsettingsaction.php:120 msgid "Email" msgstr "Sähköposti" -#: actions/register.php:438 actions/register.php:442 +#: actions/register.php:439 actions/register.php:443 msgid "Used only for updates, announcements, and password recovery" msgstr "" "Käytetään ainoastaan päivityksien lähettämiseen, ilmoitusasioihin ja " "salasanan uudelleen käyttöönottoon." -#: actions/register.php:449 +#: actions/register.php:450 msgid "Longer name, preferably your \"real\" name" msgstr "Pitempi nimi, mieluiten oikea nimesi" -#: actions/register.php:493 +#: actions/register.php:494 msgid "My text and files are available under " msgstr "" "Minun tekstini ja tiedostoni ovat käytettävissä seuraavan lisenssin " "mukaisesti " -#: actions/register.php:495 +#: actions/register.php:496 msgid "Creative Commons Attribution 3.0" msgstr "" -#: actions/register.php:496 +#: actions/register.php:497 msgid "" " except this private data: password, email address, IM address, and phone " "number." @@ -2829,13 +2809,13 @@ msgstr "" "poislukien yksityinen tieto: salasana, sähköpostiosoite, IM-osoite, " "puhelinnumero." -#: actions/register.php:537 -#, php-format +#: actions/register.php:538 +#, 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 " @@ -2862,7 +2842,7 @@ msgstr "" "\n" "Kiitokset rekisteröitymisestäsi ja toivomme että pidät palvelustamme." -#: actions/register.php:561 +#: actions/register.php:562 msgid "" "(You should receive a message by email momentarily, with instructions on how " "to confirm your email address.)" @@ -2967,11 +2947,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 +2963,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 +2979,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 +3002,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 +3051,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 +3099,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 +3167,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 +3193,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 +3206,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 +3258,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 +3454,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 +3485,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 +3577,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 +3614,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 +3650,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 +3739,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 +3858,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 +3915,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 +3948,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 +3963,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,23 +3977,94 @@ msgstr "Sinä et kuulu tähän ryhmään." msgid "Try [searching for groups](%%action.groupsearch%%) and joining them." msgstr "" -#: classes/File.php:137 +#: 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:144 #, 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 "" -#: classes/File.php:147 +#: classes/File.php:154 #, php-format msgid "A file this large would exceed your user quota of %d bytes." msgstr "" -#: classes/File.php:154 +#: classes/File.php:161 #, php-format msgid "A file this large would exceed your monthly quota of %d bytes." msgstr "" +#: classes/Login_token.php:76 +#, fuzzy, php-format +msgid "Could not create login token for %s" +msgstr "Ei voitu lisätä aliasta." + #: classes/Message.php:45 #, fuzzy msgid "You are banned from sending direct messages." @@ -4099,7 +4120,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)" @@ -4147,139 +4168,139 @@ msgid "Other options" msgstr "Muita asetuksia" #: lib/action.php:144 -#, php-format -msgid "%s - %s" -msgstr "%s - %s" +#, fuzzy, php-format +msgid "%1$s - %2$s" +msgstr "%1$s (%2$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 +4309,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 +4325,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 +4359,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" @@ -4403,7 +4429,7 @@ msgstr "Salasanan vaihto" msgid "Command results" msgstr "Komennon tulos" -#: lib/channel.php:210 +#: lib/channel.php:210 lib/mailhandler.php:142 msgid "Command complete" msgstr "Komento suoritettu" @@ -4438,11 +4464,13 @@ msgid "" msgstr "" #: lib/command.php:152 lib/command.php:399 lib/command.php:460 +#, fuzzy msgid "Notice with that id does not exist" -msgstr "" +msgstr "Ei profiilia tuolla id:llä." #: lib/command.php:168 lib/command.php:415 lib/command.php:476 #: lib/command.php:532 +#, fuzzy msgid "User has no last notice" msgstr "Käyttäjällä ei ole viimeistä päivitystä" @@ -4450,22 +4478,42 @@ msgstr "Käyttäjällä ei ole viimeistä päivitystä" 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:217 +#, fuzzy +msgid "You are already a member of that group" +msgstr "Sinä kuulut jo tähän ryhmään." + +#: lib/command.php:234 +#, fuzzy, php-format +msgid "Could not join user %s to group %s" +msgstr "Käyttäjä %s ei voinut liittyä ryhmään %s." + +#: lib/command.php:239 +#, fuzzy, php-format +msgid "%s joined group %s" +msgstr "%s liittyi ryhmään %s" + +#: lib/command.php:284 +#, fuzzy, php-format +msgid "Could not remove user %s to group %s" +msgstr "Ei voitu poistaa käyttäjää %s ryhmästä %s" + +#: lib/command.php:289 +#, fuzzy, php-format +msgid "%s left group %s" +msgstr "%s erosi ryhmästä %s" #: lib/command.php:318 -#, php-format +#, fuzzy, php-format msgid "Fullname: %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" @@ -4475,11 +4523,16 @@ msgstr "Kotisivu: %s" msgid "About: %s" msgstr "Tietoa: %s" -#: lib/command.php:358 scripts/xmppdaemon.php:301 +#: lib/command.php:358 #, fuzzy, php-format msgid "Message too long - maximum is %d characters, you sent %d" msgstr "Viesti oli liian pitkä - maksimikoko on 140 merkkiä, lähetit %d" +#: lib/command.php:376 +#, fuzzy, php-format +msgid "Direct message to %s sent" +msgstr "Suora viesti käyttäjälle %s lähetetty" + #: lib/command.php:378 msgid "Error sending direct message." msgstr "Tapahtui virhe suoran viestin lähetyksessä." @@ -4520,6 +4573,7 @@ msgid "Error saving notice." msgstr "Ongelma päivityksen tallentamisessa." #: lib/command.php:556 +#, fuzzy msgid "Specify the name of the user to subscribe to" msgstr "Anna käyttäjätunnus, jonka päivitykset haluat tilata" @@ -4529,6 +4583,7 @@ msgid "Subscribed to %s" msgstr "Käyttäjän %s päivitykset tilattu" #: lib/command.php:584 +#, fuzzy msgid "Specify the name of the user to unsubscribe from" msgstr "Anna käyttäjätunnus, jonka päivityksien tilauksen haluat lopettaa" @@ -4561,50 +4616,45 @@ msgstr "Ilmoituksia ei voi pistää päälle." msgid "Login command is disabled" msgstr "" -#: lib/command.php:664 -#, fuzzy, php-format -msgid "Could not create login token for %s" -msgstr "Ei voitu lisätä aliasta." - -#: lib/command.php:669 +#: lib/command.php:661 #, php-format msgid "This link is useable only once, and is good for only 2 minutes: %s" msgstr "" -#: lib/command.php:685 +#: lib/command.php:677 #, fuzzy msgid "You are not subscribed to anyone." msgstr "Et ole tilannut tämän käyttäjän päivityksiä." -#: lib/command.php:687 +#: lib/command.php:679 msgid "You are subscribed to this person:" msgid_plural "You are subscribed to these people:" msgstr[0] "Olet jos tilannut seuraavien käyttäjien päivitykset:" msgstr[1] "Olet jos tilannut seuraavien käyttäjien päivitykset:" -#: lib/command.php:707 +#: lib/command.php:699 #, fuzzy msgid "No one is subscribed to you." msgstr "Toista ei voitu asettaa tilaamaan sinua." -#: lib/command.php:709 +#: lib/command.php:701 msgid "This person is subscribed to you:" msgid_plural "These people are subscribed to you:" msgstr[0] "Toista ei voitu asettaa tilaamaan sinua." msgstr[1] "Toista ei voitu asettaa tilaamaan sinua." -#: lib/command.php:729 +#: lib/command.php:721 #, fuzzy msgid "You are not a member of any groups." msgstr "Sinä et kuulu tähän ryhmään." -#: lib/command.php:731 +#: lib/command.php:723 msgid "You are a member of this group:" msgid_plural "You are a member of these groups:" msgstr[0] "Sinä et kuulu tähän ryhmään." msgstr[1] "Sinä et kuulu tähän ryhmään." -#: lib/command.php:745 +#: lib/command.php:737 msgid "" "Commands:\n" "on - turn on notifications\n" @@ -4765,10 +4815,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\"" @@ -4940,21 +4986,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" @@ -5100,6 +5134,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 "" @@ -5131,7 +5186,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 @@ -5139,7 +5194,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 @@ -5149,7 +5205,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 @@ -5182,7 +5238,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 @@ -5305,6 +5371,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" @@ -5486,10 +5557,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" @@ -5554,47 +5621,47 @@ msgstr "Viesti" msgid "Moderate" msgstr "" -#: lib/util.php:837 +#: lib/util.php:884 msgid "a few seconds ago" msgstr "muutama sekunti sitten" -#: lib/util.php:839 +#: lib/util.php:886 msgid "about a minute ago" msgstr "noin minuutti sitten" -#: lib/util.php:841 +#: lib/util.php:888 #, php-format msgid "about %d minutes ago" msgstr "noin %d minuuttia sitten" -#: lib/util.php:843 +#: lib/util.php:890 msgid "about an hour ago" msgstr "noin tunti sitten" -#: lib/util.php:845 +#: lib/util.php:892 #, php-format msgid "about %d hours ago" msgstr "noin %d tuntia sitten" -#: lib/util.php:847 +#: lib/util.php:894 msgid "about a day ago" msgstr "noin päivä sitten" -#: lib/util.php:849 +#: lib/util.php:896 #, php-format msgid "about %d days ago" msgstr "noin %d päivää sitten" -#: lib/util.php:851 +#: lib/util.php:898 msgid "about a month ago" msgstr "noin kuukausi sitten" -#: lib/util.php:853 +#: lib/util.php:900 #, php-format msgid "about %d months ago" msgstr "noin %d kuukautta sitten" -#: lib/util.php:855 +#: lib/util.php:902 msgid "about a year ago" msgstr "noin vuosi sitten" @@ -5608,18 +5675,7 @@ msgstr "Kotisivun verkko-osoite ei ole toimiva." 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." +#: scripts/xmppdaemon.php:301 +#, fuzzy, php-format +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" diff --git a/locale/fr/LC_MESSAGES/statusnet.po b/locale/fr/LC_MESSAGES/statusnet.po index 0dda77224..2fa90cfd1 100644 --- a/locale/fr/LC_MESSAGES/statusnet.po +++ b/locale/fr/LC_MESSAGES/statusnet.po @@ -1,6 +1,5 @@ # Translation of StatusNet to French # -# Author@translatewiki.net: Brion # Author@translatewiki.net: IAlex # Author@translatewiki.net: Isoph # Author@translatewiki.net: Jean-Frédéric @@ -13,12 +12,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-01-05 22:10+0000\n" -"PO-Revision-Date: 2010-01-05 22:11:23+0000\n" +"POT-Creation-Date: 2010-01-11 23:25+0000\n" +"PO-Revision-Date: 2010-01-11 23:26:54+0000\n" "Language-Team: French\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha (r60693); Translate extension (2010-01-04)\n" +"X-Generator: MediaWiki 1.16alpha (r60950); 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" @@ -43,7 +42,7 @@ msgstr "Page non trouvée" #: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79 #: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75 #: actions/favoritesrss.php:74 actions/foaf.php:40 actions/foaf.php:58 -#: actions/microsummary.php:62 actions/newmessage.php:116 +#: actions/microsummary.php:62 actions/newmessage.php:116 actions/otp.php:76 #: actions/remotesubscribe.php:145 actions/remotesubscribe.php:154 #: actions/replies.php:73 actions/repliesrss.php:38 #: actions/showfavorites.php:105 actions/userbyid.php:74 @@ -55,11 +54,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 +96,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 +127,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 !" @@ -185,13 +196,16 @@ msgid "" "The server was unable to handle that much POST data (%s bytes) due to its " "current configuration." msgstr "" -"Le serveur n'a pas pu gérer autant de données de POST (%s octets) en raison " +"Le serveur n’a pas pu gérer autant de données de POST (%s octets) en raison " "de sa configuration actuelle." #: 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 "Impossible de sauvegarder les parmètres de la conception." @@ -220,37 +234,17 @@ msgstr "Messages direct depuis %s" #: actions/apidirectmessage.php:93 #, php-format msgid "All the direct messages sent from %s" -msgstr "Tous les messages envoyés par %s" +msgstr "Tous les messages directs envoyés par %s" #: actions/apidirectmessage.php:101 #, php-format msgid "Direct messages to %s" -msgstr "Messages envoyés à %s" +msgstr "Messages directs envoyés à %s" #: actions/apidirectmessage.php:105 #, php-format 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 !" +msgstr "Tous les messages directs envoyés à %s" #: actions/apidirectmessagenew.php:126 msgid "No message text!" @@ -277,16 +271,16 @@ 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!" -msgstr "Cet avis a déjà été ajouté à vos favoris !" +msgid "This status is already a favorite." +msgstr "Cet avis est déjà un favori." #: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:176 msgid "Could not create favorite." msgstr "Impossible de créer le favori." #: actions/apifavoritedestroy.php:122 -msgid "That status is not a favorite!" -msgstr "Cet avis n’est pas un favori !" +msgid "That status is not a favorite." +msgstr "Cet avis n’est pas un favori." #: actions/apifavoritedestroy.php:134 actions/disfavor.php:87 msgid "Could not delete favorite." @@ -306,8 +300,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!" -msgstr "Vous ne pouvez pas ne plus vous suivre vous-même !" +msgid "You cannot unfollow yourself." +msgstr "Vous ne pouvez pas ne plus vous suivre vous-même." #: actions/apifriendshipsexists.php:94 msgid "Two user ids or screen_names must be supplied." @@ -393,7 +387,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 msgid "You are already a member of that group." msgstr "Vous êtes déjà membre de ce groupe." @@ -401,30 +395,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 #, 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" @@ -465,7 +454,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 +476,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 statuts favoris de %2$s / %2$s." #: actions/apitimelinegroup.php:109 actions/apitimelineuser.php:118 #: actions/grouprss.php:131 actions/userrss.php:90 @@ -560,8 +549,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 +578,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,11 +611,11 @@ 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/invite.php:56 actions/login.php:115 actions/makeadmin.php:66 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80 #: actions/othersettings.php:145 actions/passwordsettings.php:138 #: actions/profilesettings.php:194 actions/recoverpassword.php:337 @@ -705,19 +697,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 +714,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." @@ -735,7 +723,7 @@ msgstr "Une liste des utilisateurs dont l’inscription à ce groupe est bloqué #: actions/blockedfromgroup.php:281 msgid "Unblock user from group" -msgstr "Débloquer l’utilisateur du groupe" +msgstr "Débloquer l’utilisateur de ce groupe" #: actions/blockedfromgroup.php:313 lib/unblockform.php:69 msgid "Unblock" @@ -839,12 +827,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 +852,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,8 +992,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" -msgstr "Seuls les administrateurs d’un groupe peuvent le modifier." +msgid "You must be an admin to edit the group." +msgstr "Vous devez être administrateur pour modifier le groupe." #: actions/editgroup.php:154 msgid "Use this form to edit the group." @@ -1035,7 +1017,7 @@ msgid "Options saved." msgstr "Vos options ont été enregistrées." #: actions/emailsettings.php:60 -msgid "Email Settings" +msgid "Email settings" msgstr "Paramètres du courriel" #: actions/emailsettings.php:71 @@ -1072,8 +1054,8 @@ msgid "Cancel" msgstr "Annuler" #: actions/emailsettings.php:121 -msgid "Email Address" -msgstr "Adresse de courriel" +msgid "Email address" +msgstr "Adresse électronique" #: actions/emailsettings.php:123 msgid "Email address, like \"UserName@example.org\"" @@ -1148,9 +1130,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." @@ -1198,7 +1181,7 @@ msgstr "L’adresse a été supprimée." #: actions/emailsettings.php:446 actions/smssettings.php:518 msgid "No incoming email address." -msgstr "Aucune adresse pour le courriel entrant." +msgstr "Aucune adresse de courriel entrant." #: actions/emailsettings.php:456 actions/emailsettings.php:478 #: actions/smssettings.php:528 actions/smssettings.php:552 @@ -1211,7 +1194,7 @@ msgstr "L’adresse de courriel entrant a été supprimée." #: actions/emailsettings.php:481 actions/smssettings.php:555 msgid "New incoming email address added." -msgstr "Nouvelle adresse courriel ajoutée." +msgstr "Nouvelle adresse de courriel entrant ajoutée." #: actions/favor.php:79 msgid "This notice is already a favorite!" @@ -1282,11 +1265,11 @@ msgstr "Utilisateurs en vedette - page %d" #: actions/featured.php:99 #, php-format msgid "A selection of some great users on %s" -msgstr "Une sélection d'utilisateurs à ne pas manquer dans %s" +msgstr "Une sélection d’utilisateurs à ne pas manquer dans %s" #: actions/file.php:34 msgid "No notice ID." -msgstr "Aucun identifiant d'avis." +msgstr "Aucun identifiant d’avis." #: actions/file.php:38 msgid "No notice." @@ -1332,18 +1315,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 +1331,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 +1359,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 +1380,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 +1405,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 +1421,10 @@ msgstr "" "Vous pouvez choisir un logo pour votre groupe. La taille maximale du fichier " "est de %s." +#: actions/grouplogo.php:178 +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 +1444,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 +1556,7 @@ msgid "Error removing the block." msgstr "Erreur lors de l’annulation du blocage." #: actions/imsettings.php:59 -msgid "IM Settings" +msgid "IM settings" msgstr "Paramètres de messagerie instantanée" #: actions/imsettings.php:70 @@ -1614,7 +1588,7 @@ msgstr "" "votre liste de contacts ?)" #: actions/imsettings.php:124 -msgid "IM Address" +msgid "IM address" msgstr "Adresse de messagerie instantanée" #: actions/imsettings.php:126 @@ -1623,7 +1597,7 @@ msgid "" "Jabber or GTalk address, like \"UserName@example.org\". First, make sure to " "add %s to your buddy list in your IM client or on GTalk." msgstr "" -"Adresse Jabber ou GTalk (ex : nom@example.org). Assurez-vous d’ajouter %s à " +"Adresse Jabber ou GTalk (ex : nom@exemple.org). Assurez-vous d’ajouter %s à " "votre liste d’amis dans votre logiciel de messagerie instantanée ou dans " "GTalk." @@ -1679,11 +1653,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 +1691,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 +1737,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 +1809,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 +#: actions/joingroup.php:135 #, 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,69 +1826,60 @@ 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 +#: actions/leavegroup.php:134 #, 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 +#: actions/login.php:80 actions/otp.php:62 actions/register.php:137 msgid "Already logged in." msgstr "Déjà connecté." -#: actions/login.php:114 actions/login.php:124 -msgid "Invalid or expired token." -msgstr "Jeton invalide ou expiré." - -#: actions/login.php:147 +#: actions/login.php:126 msgid "Incorrect username or password." msgstr "Identifiant ou mot de passe incorrect." -#: actions/login.php:153 +#: actions/login.php:132 actions/otp.php:120 msgid "Error setting user. You are probably not authorized." msgstr "" -"Erreur lors de la mise en place de l'utilisateur. Vous n'y êtes probablement " +"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:188 actions/login.php:241 lib/action.php:460 #: lib/logingroupnav.php:79 msgid "Login" msgstr "Ouvrir une session" -#: actions/login.php:247 +#: actions/login.php:227 msgid "Login to site" msgstr "Ouverture de session" -#: actions/login.php:250 actions/profilesettings.php:106 -#: actions/register.php:423 actions/showgroup.php:236 actions/tagother.php:94 +#: actions/login.php:230 actions/profilesettings.php:106 +#: actions/register.php:424 actions/showgroup.php:236 actions/tagother.php:94 #: lib/groupeditform.php:152 lib/userprofile.php:131 msgid "Nickname" msgstr "Pseudo" -#: actions/login.php:253 actions/register.php:428 +#: actions/login.php:233 actions/register.php:429 #: lib/accountsettingsaction.php:116 msgid "Password" msgstr "Mot de passe" -#: actions/login.php:256 actions/register.php:477 +#: actions/login.php:236 actions/register.php:478 msgid "Remember me" msgstr "Se souvenir de moi" -#: actions/login.php:257 actions/register.php:479 +#: actions/login.php:237 actions/register.php:480 msgid "Automatically login in the future; not for shared computers!" msgstr "" "Ouvrir automatiquement ma session à l’avenir (déconseillé pour les " "ordinateurs publics ou partagés)" -#: actions/login.php:267 +#: actions/login.php:247 msgid "Lost or forgotten password?" msgstr "Mot de passe perdu ?" -#: actions/login.php:286 +#: actions/login.php:266 msgid "" "For security reasons, please re-enter your user name and password before " "changing your settings." @@ -1936,14 +1887,14 @@ msgstr "" "Pour des raisons de sécurité, veuillez entrer à nouveau votre identifiant et " "votre mot de passe afin d’enregistrer vos préférences." -#: actions/login.php:290 +#: actions/login.php:270 #, php-format msgid "" "Login with your username and password. Don't have a username yet? [Register]" "(%%action.register%%) a new account." msgstr "" -"Ouvrez une session avec votre identifiant et votre mot de passe. Vous n'avez " -"pas encore d'identifiant ? [Créez-vous](%%action.register%%) un nouveau " +"Ouvrez une session avec votre identifiant et votre mot de passe. Vous n’avez " +"pas encore d’identifiant ? [Créez-vous](%%action.register%%) un nouveau " "compte." #: actions/makeadmin.php:91 @@ -1953,20 +1904,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" +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’obtenir 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" +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" @@ -2007,10 +1958,10 @@ msgstr "" msgid "Message sent" msgstr "Message envoyé" -#: actions/newmessage.php:185 lib/command.php:376 +#: actions/newmessage.php:185 #, php-format -msgid "Direct message to %s sent" -msgstr "Votre message a été envoyé à %s" +msgid "Direct message to %s sent." +msgstr "Message direct envoyé à %s." #: actions/newmessage.php:210 actions/newnotice.php:245 lib/channel.php:170 msgid "Ajax Error" @@ -2039,8 +1990,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 +2027,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" @@ -2103,8 +2054,8 @@ msgstr "type de contenu " msgid "Only " msgstr "Seulement " -#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1031 -#: lib/api.php:1059 lib/api.php:1169 +#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1033 +#: lib/api.php:1061 lib/api.php:1171 msgid "Not a supported data format." msgstr "Format de données non supporté." @@ -2148,10 +2099,30 @@ 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/otp.php:69 +#, fuzzy +msgid "No user ID specified." +msgstr "Aucun groupe n’a été spécifié." + +#: actions/otp.php:83 +#, fuzzy +msgid "No login token specified." +msgstr "Aucun avis n’a été spécifié." + +#: actions/otp.php:90 +#, fuzzy +msgid "No login token requested." +msgstr "Aucune identité de profil dans la requête." + +#: actions/otp.php:95 +#, fuzzy +msgid "Invalid login token specified." +msgstr "Jeton invalide ou expiré." + +#: actions/otp.php:104 +#, fuzzy +msgid "Login token expired." +msgstr "Ouverture de session" #: actions/outbox.php:61 #, php-format @@ -2188,7 +2159,7 @@ msgid "6 or more characters" msgstr "6 caractères ou plus" #: actions/passwordsettings.php:112 actions/recoverpassword.php:239 -#: actions/register.php:432 actions/smssettings.php:134 +#: actions/register.php:433 actions/smssettings.php:134 msgid "Confirm" msgstr "Confirmer" @@ -2224,7 +2195,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 +2228,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" @@ -2299,7 +2270,7 @@ msgstr "Avatars" #: actions/pathsadminpanel.php:257 msgid "Avatar server" -msgstr "Serveur d'avatar" +msgstr "Serveur d’avatar" #: actions/pathsadminpanel.php:261 msgid "Avatar path" @@ -2350,7 +2321,7 @@ msgid "When to use SSL" msgstr "Quand utiliser SSL" #: actions/pathsadminpanel.php:308 -msgid "SSL Server" +msgid "SSL server" msgstr "Serveur SSL" #: actions/pathsadminpanel.php:309 @@ -2359,8 +2330,7 @@ msgstr "Serveur vers lequel rediriger les requêtes SSL" #: actions/pathsadminpanel.php:325 msgid "Save paths" -msgstr "" -"Impossible de définir l'utilisateur. Vous n'êtes probablement pas autorisé." +msgstr "Enregistrer les chemins." #: actions/peoplesearch.php:52 #, php-format @@ -2383,18 +2353,19 @@ 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" -msgstr "Contenu invalide" +msgstr "Contenu de l’avis 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" @@ -2415,42 +2386,42 @@ msgstr "Information de profil" msgid "1-64 lowercase letters or numbers, no punctuation or spaces" msgstr "1 à 64 lettres minuscules ou chiffres, sans ponctuation ni espaces" -#: actions/profilesettings.php:111 actions/register.php:447 +#: actions/profilesettings.php:111 actions/register.php:448 #: actions/showgroup.php:247 actions/tagother.php:104 #: lib/groupeditform.php:157 lib/userprofile.php:149 msgid "Full name" msgstr "Nom complet" -#: actions/profilesettings.php:115 actions/register.php:452 +#: actions/profilesettings.php:115 actions/register.php:453 #: lib/groupeditform.php:161 msgid "Homepage" msgstr "Site personnel" -#: actions/profilesettings.php:117 actions/register.php:454 +#: actions/profilesettings.php:117 actions/register.php:455 msgid "URL of your homepage, blog, or profile on another site" msgstr "Adresse de votre site Web, blogue, ou profil dans un autre site" -#: actions/profilesettings.php:122 actions/register.php:460 +#: actions/profilesettings.php:122 actions/register.php:461 #, php-format msgid "Describe yourself and your interests in %d chars" msgstr "Décrivez vous et vos intérêts en %d caractères" -#: actions/profilesettings.php:125 actions/register.php:463 +#: actions/profilesettings.php:125 actions/register.php:464 msgid "Describe yourself and your interests" msgstr "Décrivez vous et vos interêts" -#: actions/profilesettings.php:127 actions/register.php:465 +#: actions/profilesettings.php:127 actions/register.php:466 msgid "Bio" msgstr "Bio" -#: actions/profilesettings.php:132 actions/register.php:470 +#: actions/profilesettings.php:132 actions/register.php:471 #: actions/showgroup.php:256 actions/tagother.php:112 #: actions/userauthorization.php:158 lib/groupeditform.php:177 #: lib/userprofile.php:164 msgid "Location" msgstr "Emplacement" -#: actions/profilesettings.php:134 actions/register.php:472 +#: actions/profilesettings.php:134 actions/register.php:473 msgid "Where you are, like \"City, State (or Region), Country\"" msgstr "Indiquez votre emplacement, ex.: « Ville, État (ou région), Pays »" @@ -2516,19 +2487,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." @@ -2568,7 +2539,7 @@ msgid "" "This is the public timeline for %%site.name%% but no one has posted anything " "yet." msgstr "" -"Ceci est la chronologie publique de %%site.name%% mais personne n'a encore " +"Ceci est la chronologie publique de %%site.name%% mais personne n’a encore " "rien posté." #: actions/public.php:182 @@ -2620,7 +2591,7 @@ msgstr "Dernières marques les plus populaires sur %s " #, php-format msgid "No one has posted a notice with a [hashtag](%%doc.tags%%) yet." msgstr "" -"Personne n'a encore posté d’avis avec une [marque (hashtag)](%%doc.tags%%)." +"Personne n’a encore posté d’avis avec une [marque (hashtag)](%%doc.tags%%)." #: actions/publictagcloud.php:72 msgid "Be the first to post one!" @@ -2767,7 +2738,7 @@ msgid "New password successfully saved. You are now logged in." msgstr "" "Nouveau mot de passe créé avec succès. Votre session est maintenant ouverte." -#: actions/register.php:85 actions/register.php:189 actions/register.php:404 +#: actions/register.php:85 actions/register.php:189 actions/register.php:405 msgid "Sorry, only invited people can register." msgstr "Désolé ! Seules les personnes invitées peuvent s’inscrire." @@ -2779,7 +2750,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:503 lib/action.php:457 #: lib/logingroupnav.php:85 msgid "Register" msgstr "Créer un compte" @@ -2792,19 +2763,15 @@ 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." -#: actions/register.php:243 actions/register.php:264 +#: actions/register.php:243 actions/register.php:265 msgid "Invalid username or password." msgstr "Identifiant ou mot de passe incorrect." -#: actions/register.php:342 +#: actions/register.php:343 msgid "" "With this form you can create a new account. You can then post notices and " "link up to friends and colleagues. " @@ -2812,43 +2779,43 @@ msgstr "" "Avec ce formulaire vous pouvez créer un nouveau compte. Vous pourrez ensuite " "poster des avis and et vous relier à des amis et collègues. " -#: actions/register.php:424 +#: actions/register.php:425 msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required." msgstr "" "1 à 64 lettres minuscules ou chiffres, sans ponctuation ni espaces. Requis." -#: actions/register.php:429 +#: actions/register.php:430 msgid "6 or more characters. Required." msgstr "6 caractères ou plus. Requis." -#: actions/register.php:433 +#: actions/register.php:434 msgid "Same as password above. Required." msgstr "Identique au mot de passe ci-dessus. Requis." -#: actions/register.php:437 actions/register.php:441 +#: actions/register.php:438 actions/register.php:442 #: actions/siteadminpanel.php:270 lib/accountsettingsaction.php:120 msgid "Email" msgstr "Courriel" -#: actions/register.php:438 actions/register.php:442 +#: actions/register.php:439 actions/register.php:443 msgid "Used only for updates, announcements, and password recovery" msgstr "" "Utilisé uniquement pour les mises à jour, les notifications, et la " "récupération de mot de passe" -#: actions/register.php:449 +#: actions/register.php:450 msgid "Longer name, preferably your \"real\" name" msgstr "Nom plus long, votre \"vrai\" nom de préférence" -#: actions/register.php:493 +#: actions/register.php:494 msgid "My text and files are available under " msgstr "Mes textes et mes fichiers sont disponibles sous" -#: actions/register.php:495 +#: actions/register.php:496 msgid "Creative Commons Attribution 3.0" msgstr "Creative Commons Paternité 3.0" -#: actions/register.php:496 +#: actions/register.php:497 msgid "" " except this private data: password, email address, IM address, and phone " "number." @@ -2856,13 +2823,13 @@ msgstr "" " à l’exception de ces données personnelles : mot de passe, adresse e-mail, " "adresse de messagerie instantanée, numéro de téléphone." -#: actions/register.php:537 +#: actions/register.php:538 #, 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,23 +2841,23 @@ 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" "Merci pour votre inscription ! Nous vous souhaitons d’apprécier notre " "service." -#: actions/register.php:561 +#: actions/register.php:562 msgid "" "(You should receive a message by email momentarily, with instructions on how " "to confirm your email address.)" @@ -2986,11 +2953,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 +2971,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 +2990,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 @@ -3046,12 +3009,7 @@ msgstr "" #: actions/sandbox.php:72 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" +msgstr "L’utilisateur est déjà dans le bac à sable." #: actions/showfavorites.php:132 msgid "Could not retrieve favorite notices." @@ -3110,11 +3068,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 +3116,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)" @@ -3188,7 +3141,7 @@ msgid "" "their life and interests. [Join now](%%%%action.register%%%%) to become part " "of this group and many more! ([Read more](%%%%doc.help%%%%))" msgstr "" -"**%s** est un groupe d'utilisateurs sur %%%%site.name%%%%, un service de " +"**%s** est un groupe d’utilisateurs sur %%%%site.name%%%%, un service de " "[microblogging](http://fr.wikipedia.org/wiki/Microblog) basé sur le logiciel " "libre [StatusNet](http://status.net/). Ses membres partagent des courts " "messages sur leur vie et leurs intérêts. [Inscrivez-vous maintenant](%%%%" @@ -3241,15 +3194,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 +3221,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 +3236,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,21 +3289,21 @@ 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" -msgstr "Vous devez avoir une adresse de courriel de contact valide." +msgid "You must have a valid contact email address." +msgstr "Vous devez avoir une adresse électronique de contact valide." #: actions/siteadminpanel.php:172 #, php-format -msgid "Unknown language \"%s\"" -msgstr "Langue « %s » inconnue" +msgid "Unknown language \"%s\"." +msgstr "Langue « %s » inconnue." #: actions/siteadminpanel.php:179 msgid "Invalid snapshot report URL." -msgstr "URL de rapport d'instantanés invalide." +msgstr "URL de rapport d’instantanés invalide." #: actions/siteadminpanel.php:185 msgid "Invalid snapshot run value." -msgstr "Valeur de lancement d'instantanés invalide." +msgstr "Valeur de lancement d’instantanés invalide." #: actions/siteadminpanel.php:191 msgid "Snapshot frequency must be a number." @@ -3366,7 +3315,7 @@ msgstr "La limite minimale de texte est de 140 caractères." #: actions/siteadminpanel.php:203 msgid "Dupe limit must 1 or more seconds." -msgstr "La limite de doublon doit être d'une seconde ou plus." +msgstr "La limite de doublon doit être d’une seconde ou plus." #: actions/siteadminpanel.php:253 msgid "General" @@ -3426,7 +3375,7 @@ msgstr "Serveur" #: actions/siteadminpanel.php:306 msgid "Site's server hostname." -msgstr "Nom d'hôte du serveur du site." +msgstr "Nom d’hôte du serveur du site." #: actions/siteadminpanel.php:310 msgid "Fancy URLs" @@ -3454,7 +3403,7 @@ msgstr "Sur invitation uniquement" #: actions/siteadminpanel.php:329 msgid "Make registration invitation only." -msgstr "Rendre l'inscription sur invitation seulement." +msgstr "Rendre l’inscription sur invitation seulement." #: actions/siteadminpanel.php:333 msgid "Closed" @@ -3527,7 +3476,7 @@ msgid "Save site settings" msgstr "Sauvegarder les paramètres du site" #: actions/smssettings.php:58 -msgid "SMS Settings" +msgid "SMS settings" msgstr "Paramètres SMS" #: actions/smssettings.php:69 @@ -3558,8 +3507,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" -msgstr "Numéro SMS" +msgid "SMS phone number" +msgstr "Numéro de téléphone pour les SMS" #: actions/smssettings.php:140 msgid "Phone number, no punctuation or spaces, with area code" @@ -3652,8 +3601,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 +3642,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 +3683,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)" @@ -3756,7 +3700,7 @@ msgstr "Flux des avis pour la marque %s (Atom)" #: actions/tagother.php:39 msgid "No ID argument." -msgstr "Aucun argument d'identifiant." +msgstr "Aucun argument d’identifiant." #: actions/tagother.php:65 #, php-format @@ -3809,36 +3753,33 @@ msgstr "Méthode API en construction." #: actions/unblock.php:59 msgid "You haven't blocked that user." -msgstr "Vous n'avez pas bloqué cet utilisateur." +msgstr "Vous n’avez pas bloqué cet utilisateur." #: actions/unsandbox.php:72 msgid "User is not sandboxed." -msgstr "L'utilisateur ne se trouve pas dans le bac à sable." +msgstr "L’utilisateur ne se trouve pas dans le bac à sable." #: actions/unsilence.php:72 msgid "User is not silenced." -msgstr "L'utilisateur n'est pas réduit au silence." +msgstr "L’utilisateur n’est pas réduit au silence." #: actions/unsubscribe.php:77 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" @@ -3858,7 +3799,7 @@ msgstr "Texte de bienvenue invalide. La taille maximale est de 255 caractères." #: actions/useradminpanel.php:165 #, php-format msgid "Invalid default subscripton: '%1$s' is not user." -msgstr "Abonnement par défaut invalide : « %1$s » n'est pas un utilisateur." +msgstr "Abonnement par défaut invalide : « %1$s » n’est pas un utilisateur." #: actions/useradminpanel.php:218 lib/accountsettingsaction.php:108 #: lib/personalgroupnav.php:109 @@ -3871,7 +3812,7 @@ msgstr "Limite de bio" #: actions/useradminpanel.php:223 msgid "Maximum length of a profile bio in characters." -msgstr "Longueur maximale de la bio d'un profil en caractères." +msgstr "Longueur maximale de la bio d’un profil en caractères." #: actions/useradminpanel.php:231 msgid "New users" @@ -3905,7 +3846,7 @@ msgstr "Invitations activées" #: actions/useradminpanel.php:258 msgid "Whether to allow users to invite new users." msgstr "" -"S'il faut autoriser les utilisateurs à inviter de nouveaux utilisateurs." +"S’il faut autoriser les utilisateurs à inviter de nouveaux utilisateurs." #: actions/useradminpanel.php:265 msgid "Sessions" @@ -3917,7 +3858,7 @@ msgstr "Gérer les sessions" #: actions/useradminpanel.php:272 msgid "Whether to handle sessions ourselves." -msgstr "S'il faut gérer les sessions nous-même." +msgstr "S’il faut gérer les sessions nous-même." #: actions/useradminpanel.php:276 msgid "Session debugging" @@ -3941,7 +3882,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 +3937,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 +3971,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 +3987,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,7 +4003,82 @@ msgstr "" "Essayez de [rechercher un groupe](%%action.groupsearch%%) et de vous y " "inscrire." -#: classes/File.php:137 +#: 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:144 #, php-format msgid "" "No file may be larger than %d bytes and the file you sent was %d bytes. Try " @@ -4080,19 +4087,24 @@ msgstr "" "Un fichier ne peut pas être plus gros que %d octets et le fichier que vous " "avez envoyé pesait %d octets. Essayez d’importer une version moins grosse." -#: classes/File.php:147 +#: classes/File.php:154 #, php-format msgid "A file this large would exceed your user quota of %d bytes." msgstr "Un fichier aussi gros dépasserai votre quota utilisateur de %d octets." -#: classes/File.php:154 +#: classes/File.php:161 #, php-format msgid "A file this large would exceed your monthly quota of %d bytes." msgstr "Un fichier aussi gros dépasserai votre quota mensuel de %d octets." +#: classes/Login_token.php:76 +#, fuzzy, php-format +msgid "Could not create login token for %s" +msgstr "Impossible de créer le jeton d’ouverture de session pour %s." + #: classes/Message.php:45 msgid "You are banned from sending direct messages." -msgstr "Il vous est interdit d'envoyer des messages directs." +msgstr "Il vous est interdit d’envoyer des messages directs." #: classes/Message.php:61 msgid "Could not insert message." @@ -4143,7 +4155,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" @@ -4151,7 +4163,7 @@ msgstr "RT @%1$s %2$s" #: classes/User.php:368 #, php-format msgid "Welcome to %1$s, @%2$s!" -msgstr "Bienvenu à %1$s, @%2$s !" +msgstr "Bienvenue à %1$s, @%2$s !" #: classes/User_group.php:380 msgid "Could not create group." @@ -4190,136 +4202,136 @@ msgid "Other options" msgstr "Autres options " #: lib/action.php:144 -#, php-format -msgid "%s - %s" -msgstr "%s - %s" +#, fuzzy, php-format +msgid "%1$s - %2$s" +msgstr "%1$s (%2$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 +4340,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 +4356,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 +4388,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" @@ -4421,20 +4437,18 @@ msgid "Tags for this attachment" msgstr "Marques de cette pièce jointe" #: lib/authenticationplugin.php:182 lib/authenticationplugin.php:187 -#, fuzzy msgid "Password changing failed" -msgstr "Modification du mot de passe" +msgstr "La modification du mot de passe a échoué" #: lib/authenticationplugin.php:197 -#, fuzzy msgid "Password changing is not allowed" -msgstr "Modification du mot de passe" +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" @@ -4447,18 +4461,18 @@ msgid "Sorry, this command is not yet implemented." msgstr "Désolé, cette commande n’a pas encore été implémentée." #: lib/command.php:88 -#, php-format +#, fuzzy, php-format msgid "Could not find a user with nickname %s" -msgstr "Impossible de trouver un utilisateur avec le pseudo %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!" msgstr "Ça n’a pas de sens de se faire un clin d’œil à soi-même !" #: lib/command.php:99 -#, php-format +#, fuzzy, php-format msgid "Nudge sent to %s" -msgstr "Coup de code envoyé à %s" +msgstr "Clin d’œil envoyé à %s." #: lib/command.php:126 #, php-format @@ -4472,34 +4486,56 @@ msgstr "" "Messages : %3$s" #: lib/command.php:152 lib/command.php:399 lib/command.php:460 +#, fuzzy msgid "Notice with that id does not exist" -msgstr "Aucun avis avec cet identifiant n’existe" +msgstr "Aucun avis avec cet identifiant n’existe." #: lib/command.php:168 lib/command.php:415 lib/command.php:476 #: lib/command.php:532 +#, fuzzy msgid "User has no last notice" -msgstr "Aucun avis récent pour cet utilisateur" +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 -#, php-format -msgid "%1$s (%2$s)" -msgstr "%1$s (%2$s)" +#: lib/command.php:217 +#, fuzzy +msgid "You are already a member of that group" +msgstr "Vous êtes déjà membre de ce groupe." + +#: lib/command.php:234 +#, fuzzy, php-format +msgid "Could not join user %s to group %s" +msgstr "Impossible de joindre l’utilisateur %1$s au groupe %2$s." + +#: lib/command.php:239 +#, fuzzy, php-format +msgid "%s joined group %s" +msgstr "%1$s a rejoint le groupe %2$s" + +#: lib/command.php:284 +#, fuzzy, php-format +msgid "Could not remove user %s to group %s" +msgstr "Impossible de retirer l’utilisateur %1$s du groupe %2$s." + +#: lib/command.php:289 +#, fuzzy, php-format +msgid "%s left group %s" +msgstr "%1$s a quitté le groupe %2$s" #: lib/command.php:318 -#, php-format +#, fuzzy, php-format msgid "Fullname: %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" @@ -4509,53 +4545,61 @@ msgstr "Site Web : %s" msgid "About: %s" msgstr "À propos : %s" -#: lib/command.php:358 scripts/xmppdaemon.php:301 -#, php-format +#: lib/command.php:358 +#, fuzzy, php-format msgid "Message too long - maximum is %d characters, you sent %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:376 +#, fuzzy, php-format +msgid "Direct message to %s sent" +msgstr "Message direct envoyé à %s." #: lib/command.php:378 msgid "Error sending direct message." msgstr "Une erreur est survenue pendant l’envoi de votre message." #: lib/command.php:422 +#, fuzzy msgid "Cannot repeat your own notice" -msgstr "Impossible de reprendre votre propre avis" +msgstr "Vous ne pouvez pas reprendre votre propre avis." #: lib/command.php:427 +#, fuzzy msgid "Already repeated that notice" -msgstr "Avis déjà repris" +msgstr "Vous avez déjà repris cet avis." #: lib/command.php:435 -#, php-format +#, fuzzy, php-format msgid "Notice from %s repeated" -msgstr "Avis de %s repris" +msgstr "Avis de %s repris." #: lib/command.php:437 msgid "Error repeating notice." -msgstr "Erreur lors de la reprise de l'avis." +msgstr "Erreur lors de la reprise de l’avis." #: lib/command.php:491 -#, php-format +#, fuzzy, php-format msgid "Notice too long - maximum is %d characters, you sent %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 +#, fuzzy, php-format msgid "Reply to %s sent" -msgstr "Réponse à %s envoyée" +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 +#, fuzzy msgid "Specify the name of the user to subscribe to" -msgstr "Indiquez le nom de l’utilisateur auquel vous souhaitez vous abonner" +msgstr "Indiquez le nom de l’utilisateur auquel vous souhaitez vous abonner." #: lib/command.php:563 #, php-format @@ -4563,8 +4607,10 @@ msgid "Subscribed to %s" msgstr "Abonné à %s" #: lib/command.php:584 +#, fuzzy msgid "Specify the name of the user to unsubscribe from" -msgstr "Indiquez le nom de l’utilisateur duquel vous souhaitez vous désabonner" +msgstr "" +"Indiquez le nom de l’utilisateur duquel vous souhaitez vous désabonner." #: lib/command.php:591 #, php-format @@ -4592,52 +4638,48 @@ msgid "Can't turn on notification." msgstr "Impossible d’activer les avertissements." #: lib/command.php:650 +#, fuzzy 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" +msgstr "La commande d’ouverture de session est désactivée." -#: lib/command.php:669 -#, php-format +#: lib/command.php:661 +#, fuzzy, php-format 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 +#: lib/command.php:677 msgid "You are not subscribed to anyone." msgstr "Vous n'êtes pas abonné(e) à personne." -#: lib/command.php:687 +#: lib/command.php:679 msgid "You are subscribed to this person:" msgid_plural "You are subscribed to these people:" msgstr[0] "Vous êtes abonné à cette personne :" msgstr[1] "Vous êtes abonné à ces personnes :" -#: lib/command.php:707 +#: lib/command.php:699 msgid "No one is subscribed to you." -msgstr "Personne ne s'est abonné à vous." +msgstr "Personne ne s’est abonné à vous." -#: lib/command.php:709 +#: lib/command.php:701 msgid "This person is subscribed to you:" msgid_plural "These people are subscribed to you:" msgstr[0] "Cette personne est abonnée à vous :" msgstr[1] "Ces personnes sont abonnées à vous :" -#: lib/command.php:729 +#: lib/command.php:721 msgid "You are not a member of any groups." -msgstr "Vous n'êtes pas membre d'aucun groupe." +msgstr "Vous n’êtes membre d’aucun groupe." -#: lib/command.php:731 +#: lib/command.php:723 msgid "You are a member of this group:" msgid_plural "You are a member of these groups:" msgstr[0] "Vous êtes membre de ce groupe :" msgstr[1] "Vous êtes membre de ces groupes :" -#: lib/command.php:745 +#: lib/command.php:737 msgid "" "Commands:\n" "on - turn on notifications\n" @@ -4688,12 +4730,12 @@ msgstr "" "leave <nickname> - se désabonner de l’utilisateur\n" "d <nickname> <text> - message direct à l’utilisateur\n" "get <nickname> - obtenir le dernier avis de l’utilisateur\n" -"whois <nickname> - obtenir le profil de l'utilisateur\n" +"whois <nickname> - obtenir le profil de l’utilisateur\n" "fav <nickname> - ajouter de dernier avis de l’utilisateur comme favori\n" "fav #<notice_id> - ajouter l’avis correspondant à l’identifiant comme " "favori\n" -"repeat #<notice_id> - reprendre l'avis correspondant à l'identifiant\n" -"repeat <nickname> - reprendre le dernier avis de l'utilisateur\n" +"repeat #<notice_id> - reprendre l’avis correspondant à l’identifiant\n" +"repeat <nickname> - reprendre le dernier avis de l’utilisateur\n" "reply #<notice_id> - répondre à l’avis correspondant à l’identifiant\n" "reply <nickname> - répondre au dernier avis de l’utilisateur\n" "join <group> - rejoindre le groupe\n" @@ -4707,7 +4749,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" @@ -4718,7 +4760,7 @@ msgstr "" #: lib/common.php:199 msgid "No configuration file found. " -msgstr "Aucun fichier de configuration n'a été trouvé. " +msgstr "Aucun fichier de configuration n’a été trouvé. " #: lib/common.php:200 msgid "I looked for configuration files in the following places: " @@ -4833,10 +4875,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\"" @@ -5023,24 +5061,10 @@ 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" -msgstr "" -"Bio : %s\n" -"\n" +msgid "Bio: %s" +msgstr "Bio : %s" #: lib/mail.php:286 #, php-format @@ -5175,7 +5199,7 @@ msgstr "" "%1$s (@%7$s) vient de marquer votre message de %2$s comme un de ses " "favoris.\n" "\n" -"L'URL de votre message est :\n" +"L’URL de votre message est :\n" "\n" "%3$s\n" "\n" @@ -5237,6 +5261,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 "" @@ -5272,7 +5317,7 @@ 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!" +msgid "File exceeds user's quota." msgstr "Le fichier dépasse le quota de l’utilisateur." #: lib/mediafile.php:196 lib/mediafile.php:233 @@ -5280,8 +5325,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!" -msgstr "Impossible de déterminer le mime-type du fichier !" +msgid "Could not determine file's MIME type." +msgstr "Impossible de déterminer le type MIME du fichier." #: lib/mediafile.php:270 #, php-format @@ -5290,7 +5335,7 @@ msgstr " Essayez d’utiliser un autre %s format." #: 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 n’est pas un type de fichier supporté sur ce serveur." #: lib/messageform.php:120 @@ -5323,8 +5368,18 @@ msgid "Attach a file" msgstr "Attacher un fichier" #: lib/noticeform.php:212 -msgid "Share your location" -msgstr "Partager votre localisation" +#, fuzzy +msgid "Share my location" +msgstr "Partager ma localisation." + +#: lib/noticeform.php:214 +#, fuzzy +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 @@ -5440,6 +5495,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" @@ -5474,7 +5533,7 @@ msgstr "Aucun argument de retour." #: lib/profileformaction.php:137 msgid "Unimplemented method." -msgstr "Méthode non- implémentée." +msgstr "Méthode non implémentée." #: lib/publicgroupnav.php:78 msgid "Public" @@ -5609,10 +5668,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" @@ -5673,47 +5728,47 @@ msgstr "Message" msgid "Moderate" msgstr "Modérer" -#: lib/util.php:837 +#: lib/util.php:884 msgid "a few seconds ago" msgstr "il y a quelques secondes" -#: lib/util.php:839 +#: lib/util.php:886 msgid "about a minute ago" msgstr "il y a 1 minute" -#: lib/util.php:841 +#: lib/util.php:888 #, php-format msgid "about %d minutes ago" msgstr "il y a %d minutes" -#: lib/util.php:843 +#: lib/util.php:890 msgid "about an hour ago" msgstr "il y a 1 heure" -#: lib/util.php:845 +#: lib/util.php:892 #, php-format msgid "about %d hours ago" msgstr "il y a %d heures" -#: lib/util.php:847 +#: lib/util.php:894 msgid "about a day ago" msgstr "il y a 1 jour" -#: lib/util.php:849 +#: lib/util.php:896 #, php-format msgid "about %d days ago" msgstr "il y a %d jours" -#: lib/util.php:851 +#: lib/util.php:898 msgid "about a month ago" msgstr "il y a 1 mois" -#: lib/util.php:853 +#: lib/util.php:900 #, php-format msgid "about %d months ago" msgstr "il y a %d mois" -#: lib/util.php:855 +#: lib/util.php:902 msgid "about a year ago" msgstr "il y a environ 1 an" @@ -5728,18 +5783,9 @@ 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." +#: scripts/xmppdaemon.php:301 +#, php-format +msgid "Message too long - maximum is %1$d characters, you sent %2$d." +msgstr "" +"Message trop long ! La taille maximale est de %1$d caractères ; vous en avez " +"entré %2$d." diff --git a/locale/ga/LC_MESSAGES/statusnet.po b/locale/ga/LC_MESSAGES/statusnet.po index 00e8c6b89..8b9658e48 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-05 22:10+0000\n" -"PO-Revision-Date: 2010-01-05 22:11:28+0000\n" +"POT-Creation-Date: 2010-01-11 23:25+0000\n" +"PO-Revision-Date: 2010-01-11 23:26:58+0000\n" "Language-Team: Irish\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha (r60693); Translate extension (2010-01-04)\n" +"X-Generator: MediaWiki 1.16alpha (r60950); 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" @@ -40,7 +40,7 @@ msgstr "Non existe a etiqueta." #: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79 #: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75 #: actions/favoritesrss.php:74 actions/foaf.php:40 actions/foaf.php:58 -#: actions/microsummary.php:62 actions/newmessage.php:116 +#: actions/microsummary.php:62 actions/newmessage.php:116 actions/otp.php:76 #: actions/remotesubscribe.php:145 actions/remotesubscribe.php:154 #: actions/replies.php:73 actions/repliesrss.php:38 #: actions/showfavorites.php:105 actions/userbyid.php:74 @@ -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 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 #, 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" @@ -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,11 +614,11 @@ 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/invite.php:56 actions/login.php:115 actions/makeadmin.php:66 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80 #: actions/othersettings.php:145 actions/passwordsettings.php:138 #: actions/profilesettings.php:194 actions/recoverpassword.php:337 @@ -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 +#: actions/joingroup.php:135 #, 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,67 +1853,57 @@ 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 +#: actions/leavegroup.php:134 #, 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 "" +msgid "%1$s left group %2$s" +msgstr "%s / Favoritos dende %s" -#: actions/login.php:83 actions/register.php:137 +#: actions/login.php:80 actions/otp.php:62 actions/register.php:137 msgid "Already logged in." msgstr "Sesión xa iniciada" -#: actions/login.php:114 actions/login.php:124 -#, fuzzy -msgid "Invalid or expired token." -msgstr "Contido do chío inválido" - -#: actions/login.php:147 +#: actions/login.php:126 msgid "Incorrect username or password." msgstr "Usuario ou contrasinal incorrectos." -#: actions/login.php:153 +#: actions/login.php:132 actions/otp.php:120 #, fuzzy 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:188 actions/login.php:241 lib/action.php:460 #: lib/logingroupnav.php:79 msgid "Login" msgstr "Inicio de sesión" -#: actions/login.php:247 +#: actions/login.php:227 msgid "Login to site" msgstr "" -#: actions/login.php:250 actions/profilesettings.php:106 -#: actions/register.php:423 actions/showgroup.php:236 actions/tagother.php:94 +#: actions/login.php:230 actions/profilesettings.php:106 +#: actions/register.php:424 actions/showgroup.php:236 actions/tagother.php:94 #: lib/groupeditform.php:152 lib/userprofile.php:131 msgid "Nickname" msgstr "Alcume" -#: actions/login.php:253 actions/register.php:428 +#: actions/login.php:233 actions/register.php:429 #: lib/accountsettingsaction.php:116 msgid "Password" msgstr "Contrasinal" -#: actions/login.php:256 actions/register.php:477 +#: actions/login.php:236 actions/register.php:478 msgid "Remember me" msgstr "Lembrarme" -#: actions/login.php:257 actions/register.php:479 +#: actions/login.php:237 actions/register.php:480 msgid "Automatically login in the future; not for shared computers!" msgstr "Endiante acceder automáticamente, coidado en equipos compartidos!" -#: actions/login.php:267 +#: actions/login.php:247 msgid "Lost or forgotten password?" msgstr "¿Perdeches a contrasinal?" -#: actions/login.php:286 +#: actions/login.php:266 msgid "" "For security reasons, please re-enter your user name and password before " "changing your settings." @@ -1956,7 +1911,7 @@ msgstr "" "Por razóns de seguranza, por favor re-insire o teu nome de usuario e " "contrasinal antes de cambiar as túas preferenzas." -#: actions/login.php:290 +#: actions/login.php:270 #, fuzzy, php-format msgid "" "Login with your username and password. Don't have a username yet? [Register]" @@ -1971,19 +1926,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" @@ -2026,9 +1981,9 @@ msgstr "" 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" +#: actions/newmessage.php:185 +#, 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 +2013,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 @@ -2118,8 +2073,8 @@ msgstr "Conectar" msgid "Only " msgstr "" -#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1031 -#: lib/api.php:1059 lib/api.php:1169 +#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1033 +#: lib/api.php:1061 lib/api.php:1171 msgid "Not a supported data format." msgstr "Non é un formato de datos soportado." @@ -2164,10 +2119,29 @@ 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/otp.php:69 +#, fuzzy +msgid "No user ID specified." +msgstr "Non se especificou ningún perfil." + +#: actions/otp.php:83 +#, fuzzy +msgid "No login token specified." +msgstr "Non se especificou ningún perfil." + +#: actions/otp.php:90 +#, fuzzy +msgid "No login token requested." +msgstr "Non hai identificador de perfil na peticion." + +#: actions/otp.php:95 +#, fuzzy +msgid "Invalid login token specified." +msgstr "Contido do chío inválido" + +#: actions/otp.php:104 +msgid "Login token expired." +msgstr "" #: actions/outbox.php:61 #, php-format @@ -2206,7 +2180,7 @@ msgid "6 or more characters" msgstr "6 ou máis caracteres" #: actions/passwordsettings.php:112 actions/recoverpassword.php:239 -#: actions/register.php:432 actions/smssettings.php:134 +#: actions/register.php:433 actions/smssettings.php:134 msgid "Confirm" msgstr "Confirmar" @@ -2242,7 +2216,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 +2249,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 +2351,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 +2383,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 +2393,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 @@ -2442,43 +2417,43 @@ msgid "1-64 lowercase letters or numbers, no punctuation or spaces" msgstr "" "De 1 a 64 letras minúsculas ou númeors, nin espazos nin signos de puntuación" -#: actions/profilesettings.php:111 actions/register.php:447 +#: actions/profilesettings.php:111 actions/register.php:448 #: actions/showgroup.php:247 actions/tagother.php:104 #: lib/groupeditform.php:157 lib/userprofile.php:149 msgid "Full name" msgstr "Nome completo" -#: actions/profilesettings.php:115 actions/register.php:452 +#: actions/profilesettings.php:115 actions/register.php:453 #: lib/groupeditform.php:161 msgid "Homepage" msgstr "Páxina persoal" -#: actions/profilesettings.php:117 actions/register.php:454 +#: actions/profilesettings.php:117 actions/register.php:455 msgid "URL of your homepage, blog, or profile on another site" msgstr "Enderezo da túa páxina persoal, blogue, ou perfil noutro sitio" -#: actions/profilesettings.php:122 actions/register.php:460 +#: actions/profilesettings.php:122 actions/register.php:461 #, fuzzy, php-format msgid "Describe yourself and your interests in %d chars" msgstr "Contanos un pouco de ti e dos teus intereses en 140 caractéres." -#: actions/profilesettings.php:125 actions/register.php:463 +#: actions/profilesettings.php:125 actions/register.php:464 #, fuzzy msgid "Describe yourself and your interests" msgstr "Contanos un pouco de ti e dos teus intereses en 140 caractéres." -#: actions/profilesettings.php:127 actions/register.php:465 +#: actions/profilesettings.php:127 actions/register.php:466 msgid "Bio" msgstr "Bio" -#: actions/profilesettings.php:132 actions/register.php:470 +#: actions/profilesettings.php:132 actions/register.php:471 #: actions/showgroup.php:256 actions/tagother.php:112 #: actions/userauthorization.php:158 lib/groupeditform.php:177 #: lib/userprofile.php:164 msgid "Location" msgstr "Localización" -#: actions/profilesettings.php:134 actions/register.php:472 +#: actions/profilesettings.php:134 actions/register.php:473 msgid "Where you are, like \"City, State (or Region), Country\"" msgstr "¿Onde estas, coma \"Cidade, Provincia, País\"" @@ -2544,20 +2519,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." @@ -2788,7 +2763,7 @@ msgstr "Acounteceu un erro configurando o usuario." msgid "New password successfully saved. You are now logged in." msgstr "A nova contrasinal gardouse correctamente. Xa estas logueado." -#: actions/register.php:85 actions/register.php:189 actions/register.php:404 +#: actions/register.php:85 actions/register.php:189 actions/register.php:405 msgid "Sorry, only invited people can register." msgstr "Desculpa, só se pode rexistrar a xente con invitación." @@ -2801,7 +2776,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:503 lib/action.php:457 #: lib/logingroupnav.php:85 msgid "Register" msgstr "Rexistrar" @@ -2814,19 +2789,15 @@ 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." -#: actions/register.php:243 actions/register.php:264 +#: actions/register.php:243 actions/register.php:265 msgid "Invalid username or password." msgstr "Usuario ou contrasinal inválidos." -#: actions/register.php:342 +#: actions/register.php:343 #, fuzzy msgid "" "With this form you can create a new account. You can then post notices and " @@ -2836,43 +2807,43 @@ msgstr "" "chíos, e suscribirte a amigos. (Tes unha conta [OpenID](http://openid.net/)? " "Proba o noso [Rexistro OpenID](%%action.openidlogin%%)!)" -#: actions/register.php:424 +#: actions/register.php:425 msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required." msgstr "" "De 1 a 64 letras minúsculas ou números, nin espazos nin signos de " "puntuación. Requerido." -#: actions/register.php:429 +#: actions/register.php:430 msgid "6 or more characters. Required." msgstr "6 ou máis caracteres. Requerido." -#: actions/register.php:433 +#: actions/register.php:434 msgid "Same as password above. Required." msgstr "A mesma contrasinal que arriba. Requerido." -#: actions/register.php:437 actions/register.php:441 +#: actions/register.php:438 actions/register.php:442 #: actions/siteadminpanel.php:270 lib/accountsettingsaction.php:120 msgid "Email" msgstr "Correo Electrónico" -#: actions/register.php:438 actions/register.php:442 +#: actions/register.php:439 actions/register.php:443 msgid "Used only for updates, announcements, and password recovery" msgstr "" "Empregado só para actualizacións, novidades, e recuperación de contrasinais" -#: actions/register.php:449 +#: actions/register.php:450 msgid "Longer name, preferably your \"real\" name" msgstr "Nome máis longo, preferiblemente o teu nome \"real\"" -#: actions/register.php:493 +#: actions/register.php:494 msgid "My text and files are available under " msgstr "O meu texto e arquivos están dispoñibles baixo licenza " -#: actions/register.php:495 +#: actions/register.php:496 msgid "Creative Commons Attribution 3.0" msgstr "" -#: actions/register.php:496 +#: actions/register.php:497 #, fuzzy msgid "" " except this private data: password, email address, IM address, and phone " @@ -2881,13 +2852,13 @@ msgstr "" " agás esta informción privada: contrasinal, dirección de correo electrónico, " "dirección IM, número de teléfono." -#: actions/register.php:537 -#, php-format +#: actions/register.php:538 +#, 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 " @@ -2913,7 +2884,7 @@ msgstr "" "\n" "Grazas por rexistrarte e esperamos que laretexes moito." -#: actions/register.php:561 +#: actions/register.php:562 msgid "" "(You should receive a message by email momentarily, with instructions on how " "to confirm your email address.)" @@ -3018,11 +2989,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 +3007,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 +3021,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 +3040,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 +3089,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 +3141,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 +3218,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 +3245,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 +3257,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 +3311,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 +3506,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 +3536,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 +3630,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 +3668,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 +3703,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 +3794,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 +3913,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 +3972,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 +4005,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 +4020,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,23 +4034,95 @@ msgstr "%1s non é unha orixe fiable." msgid "Try [searching for groups](%%action.groupsearch%%) and joining them." msgstr "" -#: classes/File.php:137 +#: 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:144 #, 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 "" -#: classes/File.php:147 +#: classes/File.php:154 #, php-format msgid "A file this large would exceed your user quota of %d bytes." msgstr "" -#: classes/File.php:154 +#: classes/File.php:161 #, php-format msgid "A file this large would exceed your monthly quota of %d bytes." msgstr "" +#: classes/Login_token.php:76 +#, fuzzy, php-format +msgid "Could not create login token for %s" +msgstr "Non se puido crear o favorito." + #: classes/Message.php:45 #, fuzzy msgid "You are banned from sending direct messages." @@ -4172,7 +4179,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)" @@ -4224,146 +4231,146 @@ msgstr "Outras opcions" #: lib/action.php:144 #, fuzzy, php-format -msgid "%s - %s" -msgstr "%s (%s)" +msgid "%1$s - %2$s" +msgstr "%1$s (%2$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 +4379,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 +4395,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 +4433,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" @@ -4491,7 +4503,7 @@ msgstr "Contrasinal gardada." 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" @@ -4529,11 +4541,13 @@ msgstr "" "Chíos: %3$s" #: lib/command.php:152 lib/command.php:399 lib/command.php:460 +#, fuzzy msgid "Notice with that id does not exist" -msgstr "" +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 +#, fuzzy msgid "User has no last notice" msgstr "O usuario non ten último chio." @@ -4541,22 +4555,42 @@ msgstr "O usuario non ten último chio." 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:217 +#, fuzzy +msgid "You are already a member of that group" +msgstr "Xa estas suscrito a estes usuarios:" + +#: 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." + +#: lib/command.php:239 +#, fuzzy, php-format +msgid "%s joined group %s" +msgstr "%s / Favoritos dende %s" + +#: 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." + +#: lib/command.php:289 +#, fuzzy, php-format +msgid "%s left group %s" +msgstr "%s / Favoritos dende %s" #: lib/command.php:318 -#, php-format +#, fuzzy, php-format msgid "Fullname: %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" @@ -4566,11 +4600,16 @@ msgstr "Páxina persoal: %s" msgid "About: %s" msgstr "Sobre: %s" -#: lib/command.php:358 scripts/xmppdaemon.php:301 +#: lib/command.php:358 #, fuzzy, php-format msgid "Message too long - maximum is %d characters, you sent %d" msgstr "Mensaxe demasiado longa - o máximo é 140 caracteres, ti enviaches %d " +#: lib/command.php:376 +#, fuzzy, php-format +msgid "Direct message to %s sent" +msgstr "Mensaxe directo a %s enviado" + #: lib/command.php:378 msgid "Error sending direct message." msgstr "Erro ó enviar a mensaxe directa." @@ -4601,7 +4640,7 @@ msgid "Notice too long - maximum is %d characters, you sent %d" msgstr "Mensaxe demasiado longa - o máximo é 140 caracteres, ti enviaches %d " #: lib/command.php:500 -#, php-format +#, fuzzy, php-format msgid "Reply to %s sent" msgstr "Non se pode eliminar este chíos." @@ -4611,6 +4650,7 @@ msgid "Error saving notice." msgstr "Aconteceu un erro ó gardar o chío." #: lib/command.php:556 +#, fuzzy msgid "Specify the name of the user to subscribe to" msgstr "Especifica o nome do usuario ó que queres suscribirte" @@ -4620,6 +4660,7 @@ msgid "Subscribed to %s" msgstr "Suscrito a %s" #: lib/command.php:584 +#, fuzzy msgid "Specify the name of the user to unsubscribe from" msgstr "Especifica o nome de usuario ó que queres deixar de seguir" @@ -4652,22 +4693,17 @@ msgstr "Non se pode activar a notificación." msgid "Login command is disabled" msgstr "" -#: lib/command.php:664 -#, fuzzy, php-format -msgid "Could not create login token for %s" -msgstr "Non se puido crear o favorito." - -#: lib/command.php:669 +#: lib/command.php:661 #, php-format msgid "This link is useable only once, and is good for only 2 minutes: %s" msgstr "" -#: lib/command.php:685 +#: lib/command.php:677 #, fuzzy msgid "You are not subscribed to anyone." msgstr "Non estás suscrito a ese perfil" -#: lib/command.php:687 +#: lib/command.php:679 msgid "You are subscribed to this person:" msgid_plural "You are subscribed to these people:" msgstr[0] "Xa estas suscrito a estes usuarios:" @@ -4676,12 +4712,12 @@ msgstr[2] "" msgstr[3] "" msgstr[4] "" -#: lib/command.php:707 +#: lib/command.php:699 #, fuzzy msgid "No one is subscribed to you." msgstr "Outro usuario non se puido suscribir a ti." -#: lib/command.php:709 +#: lib/command.php:701 msgid "This person is subscribed to you:" msgid_plural "These people are subscribed to you:" msgstr[0] "Outro usuario non se puido suscribir a ti." @@ -4690,12 +4726,12 @@ msgstr[2] "" msgstr[3] "" msgstr[4] "" -#: lib/command.php:729 +#: lib/command.php:721 #, fuzzy msgid "You are not a member of any groups." msgstr "Non estás suscrito a ese perfil" -#: lib/command.php:731 +#: lib/command.php:723 msgid "You are a member of this group:" msgid_plural "You are a member of these groups:" msgstr[0] "Non estás suscrito a ese perfil" @@ -4704,7 +4740,7 @@ msgstr[2] "" msgstr[3] "" msgstr[4] "" -#: lib/command.php:745 +#: lib/command.php:737 #, fuzzy msgid "" "Commands:\n" @@ -4894,11 +4930,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 "" @@ -5084,23 +5115,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" @@ -5278,6 +5297,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 "" @@ -5309,7 +5349,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 @@ -5317,7 +5357,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 @@ -5327,7 +5368,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 @@ -5363,7 +5404,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 @@ -5491,6 +5542,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" @@ -5676,10 +5732,6 @@ msgstr "" msgid "People Tagcloud as tagged" msgstr "" -#: lib/subscriptionlist.php:126 -msgid "(none)" -msgstr "(nada)" - #: lib/tagcloudsection.php:56 #, fuzzy msgid "None" @@ -5749,47 +5801,47 @@ msgstr "Nova mensaxe" msgid "Moderate" msgstr "" -#: lib/util.php:837 +#: lib/util.php:884 msgid "a few seconds ago" msgstr "fai uns segundos" -#: lib/util.php:839 +#: lib/util.php:886 msgid "about a minute ago" msgstr "fai un minuto" -#: lib/util.php:841 +#: lib/util.php:888 #, php-format msgid "about %d minutes ago" msgstr "fai %d minutos" -#: lib/util.php:843 +#: lib/util.php:890 msgid "about an hour ago" msgstr "fai unha hora" -#: lib/util.php:845 +#: lib/util.php:892 #, php-format msgid "about %d hours ago" msgstr "fai %d horas" -#: lib/util.php:847 +#: lib/util.php:894 msgid "about a day ago" msgstr "fai un día" -#: lib/util.php:849 +#: lib/util.php:896 #, php-format msgid "about %d days ago" msgstr "fai %d días" -#: lib/util.php:851 +#: lib/util.php:898 msgid "about a month ago" msgstr "fai un mes" -#: lib/util.php:853 +#: lib/util.php:900 #, php-format msgid "about %d months ago" msgstr "fai %d meses" -#: lib/util.php:855 +#: lib/util.php:902 msgid "about a year ago" msgstr "fai un ano" @@ -5803,18 +5855,7 @@ msgstr "%1s non é unha orixe fiable." 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." +#: scripts/xmppdaemon.php:301 +#, fuzzy, php-format +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 " diff --git a/locale/he/LC_MESSAGES/statusnet.po b/locale/he/LC_MESSAGES/statusnet.po index 97c2dc823..6d8f61d8e 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-05 22:10+0000\n" -"PO-Revision-Date: 2010-01-05 22:11:31+0000\n" +"POT-Creation-Date: 2010-01-11 23:25+0000\n" +"PO-Revision-Date: 2010-01-11 23:27:03+0000\n" "Language-Team: Hebrew\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha (r60693); Translate extension (2010-01-04)\n" +"X-Generator: MediaWiki 1.16alpha (r60950); 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" @@ -38,7 +38,7 @@ msgstr "אין הודעה כזו." #: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79 #: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75 #: actions/favoritesrss.php:74 actions/foaf.php:40 actions/foaf.php:58 -#: actions/microsummary.php:62 actions/newmessage.php:116 +#: actions/microsummary.php:62 actions/newmessage.php:116 actions/otp.php:76 #: actions/remotesubscribe.php:145 actions/remotesubscribe.php:154 #: actions/replies.php:73 actions/repliesrss.php:38 #: actions/showfavorites.php:105 actions/userbyid.php:74 @@ -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 #, 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 #, 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" @@ -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,11 +608,11 @@ 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/invite.php:56 actions/login.php:115 actions/makeadmin.php:66 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80 #: actions/othersettings.php:145 actions/passwordsettings.php:138 #: actions/profilesettings.php:194 actions/recoverpassword.php:337 @@ -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 +#: actions/joingroup.php:135 #, php-format -msgid "%s joined group %s" +msgid "%1$s joined group %2$s" msgstr "" #: actions/leavegroup.php:60 @@ -1832,73 +1800,63 @@ msgstr "לא שלחנו אלינו את הפרופיל הזה" msgid "Could not find membership record." msgstr "" -#: actions/leavegroup.php:127 lib/command.php:284 +#: actions/leavegroup.php:134 #, 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 "" +msgid "%1$s left group %2$s" +msgstr "הסטטוס של %1$s ב-%2$s " -#: actions/login.php:83 actions/register.php:137 +#: actions/login.php:80 actions/otp.php:62 actions/register.php:137 msgid "Already logged in." msgstr "כבר מחובר." -#: actions/login.php:114 actions/login.php:124 -#, fuzzy -msgid "Invalid or expired token." -msgstr "תוכן ההודעה לא חוקי" - -#: actions/login.php:147 +#: actions/login.php:126 msgid "Incorrect username or password." msgstr "שם משתמש או סיסמה לא נכונים." -#: actions/login.php:153 +#: actions/login.php:132 actions/otp.php:120 #, fuzzy 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:188 actions/login.php:241 lib/action.php:460 #: lib/logingroupnav.php:79 msgid "Login" msgstr "היכנס" -#: actions/login.php:247 +#: actions/login.php:227 msgid "Login to site" msgstr "" -#: actions/login.php:250 actions/profilesettings.php:106 -#: actions/register.php:423 actions/showgroup.php:236 actions/tagother.php:94 +#: actions/login.php:230 actions/profilesettings.php:106 +#: actions/register.php:424 actions/showgroup.php:236 actions/tagother.php:94 #: lib/groupeditform.php:152 lib/userprofile.php:131 msgid "Nickname" msgstr "כינוי" -#: actions/login.php:253 actions/register.php:428 +#: actions/login.php:233 actions/register.php:429 #: lib/accountsettingsaction.php:116 msgid "Password" msgstr "סיסמה" -#: actions/login.php:256 actions/register.php:477 +#: actions/login.php:236 actions/register.php:478 msgid "Remember me" msgstr "זכור אותי" -#: actions/login.php:257 actions/register.php:479 +#: actions/login.php:237 actions/register.php:480 msgid "Automatically login in the future; not for shared computers!" msgstr "בעתיד התחבר אוטומטית; לא לשימוש במחשבים ציבוריים!" -#: actions/login.php:267 +#: actions/login.php:247 msgid "Lost or forgotten password?" msgstr "שכחת או איבדת את הסיסמה?" -#: actions/login.php:286 +#: actions/login.php:266 msgid "" "For security reasons, please re-enter your user name and password before " "changing your settings." msgstr "לצרכי אבטחה, הכנס מחדש את שם המשתמש והסיסמה לפני שתשנה את ההגדרות." -#: actions/login.php:290 +#: actions/login.php:270 #, fuzzy, php-format msgid "" "Login with your username and password. Don't have a username yet? [Register]" @@ -1912,19 +1870,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" @@ -1965,9 +1923,9 @@ msgstr "" msgid "Message sent" msgstr "הודעה חדשה" -#: actions/newmessage.php:185 lib/command.php:376 +#: actions/newmessage.php:185 #, 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 +1956,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 @@ -2056,8 +2014,8 @@ msgstr "התחבר" msgid "Only " msgstr "" -#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1031 -#: lib/api.php:1059 lib/api.php:1169 +#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1033 +#: lib/api.php:1061 lib/api.php:1171 msgid "Not a supported data format." msgstr "" @@ -2104,9 +2062,28 @@ 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" +#: actions/otp.php:69 +#, fuzzy +msgid "No user ID specified." +msgstr "הודעה חדשה" + +#: actions/otp.php:83 +#, fuzzy +msgid "No login token specified." +msgstr "הודעה חדשה" + +#: actions/otp.php:90 +#, fuzzy +msgid "No login token requested." +msgstr "השרת לא החזיר כתובת פרופיל" + +#: actions/otp.php:95 +#, fuzzy +msgid "Invalid login token specified." +msgstr "תוכן ההודעה לא חוקי" + +#: actions/otp.php:104 +msgid "Login token expired." msgstr "" #: actions/outbox.php:61 @@ -2145,7 +2122,7 @@ msgid "6 or more characters" msgstr "לפחות 6 אותיות" #: actions/passwordsettings.php:112 actions/recoverpassword.php:239 -#: actions/register.php:432 actions/smssettings.php:134 +#: actions/register.php:433 actions/smssettings.php:134 msgid "Confirm" msgstr "אשר" @@ -2181,7 +2158,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 +2191,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 +2292,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 +2324,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 +2334,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 @@ -2377,43 +2355,43 @@ msgstr "פרופיל לא מוכר" msgid "1-64 lowercase letters or numbers, no punctuation or spaces" msgstr "1 עד 64 אותיות אנגליות קטנות או מספרים, ללא סימני פיסוק או רווחים." -#: actions/profilesettings.php:111 actions/register.php:447 +#: actions/profilesettings.php:111 actions/register.php:448 #: actions/showgroup.php:247 actions/tagother.php:104 #: lib/groupeditform.php:157 lib/userprofile.php:149 msgid "Full name" msgstr "שם מלא" -#: actions/profilesettings.php:115 actions/register.php:452 +#: actions/profilesettings.php:115 actions/register.php:453 #: lib/groupeditform.php:161 msgid "Homepage" msgstr "אתר בית" -#: actions/profilesettings.php:117 actions/register.php:454 +#: actions/profilesettings.php:117 actions/register.php:455 msgid "URL of your homepage, blog, or profile on another site" msgstr "הכתובת של אתר הבית שלך, בלוג, או פרופיל באתר אחר " -#: actions/profilesettings.php:122 actions/register.php:460 +#: actions/profilesettings.php:122 actions/register.php:461 #, fuzzy, php-format msgid "Describe yourself and your interests in %d chars" msgstr "תאר את עצמך ואת נושאי העניין שלך ב-140 אותיות" -#: actions/profilesettings.php:125 actions/register.php:463 +#: actions/profilesettings.php:125 actions/register.php:464 #, fuzzy msgid "Describe yourself and your interests" msgstr "תאר את עצמך ואת נושאי העניין שלך ב-140 אותיות" -#: actions/profilesettings.php:127 actions/register.php:465 +#: actions/profilesettings.php:127 actions/register.php:466 msgid "Bio" msgstr "ביוגרפיה" -#: actions/profilesettings.php:132 actions/register.php:470 +#: actions/profilesettings.php:132 actions/register.php:471 #: actions/showgroup.php:256 actions/tagother.php:112 #: actions/userauthorization.php:158 lib/groupeditform.php:177 #: lib/userprofile.php:164 msgid "Location" msgstr "מיקום" -#: actions/profilesettings.php:134 actions/register.php:472 +#: actions/profilesettings.php:134 actions/register.php:473 msgid "Where you are, like \"City, State (or Region), Country\"" msgstr "מיקומך, למשל \"עיר, מדינה או מחוז, ארץ\"" @@ -2475,21 +2453,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 "ההגדרות נשמרו." @@ -2710,7 +2688,7 @@ msgstr "שגיאה ביצירת שם המשתמש." msgid "New password successfully saved. You are now logged in." msgstr "הסיסמה החדשה נשמרה בהצלחה. אתה מחובר למערכת." -#: actions/register.php:85 actions/register.php:189 actions/register.php:404 +#: actions/register.php:85 actions/register.php:189 actions/register.php:405 msgid "Sorry, only invited people can register." msgstr "" @@ -2723,7 +2701,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:503 lib/action.php:457 #: lib/logingroupnav.php:85 msgid "Register" msgstr "הירשם" @@ -2736,70 +2714,66 @@ 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 "" -#: actions/register.php:243 actions/register.php:264 +#: actions/register.php:243 actions/register.php:265 msgid "Invalid username or password." msgstr "שם המשתמש או הסיסמה לא חוקיים" -#: actions/register.php:342 +#: actions/register.php:343 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 +#: actions/register.php:425 msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required." msgstr "" -#: actions/register.php:429 +#: actions/register.php:430 msgid "6 or more characters. Required." msgstr " לפחות 6 אותיות. שדה חובה." -#: actions/register.php:433 +#: actions/register.php:434 msgid "Same as password above. Required." msgstr "" -#: actions/register.php:437 actions/register.php:441 +#: actions/register.php:438 actions/register.php:442 #: actions/siteadminpanel.php:270 lib/accountsettingsaction.php:120 msgid "Email" msgstr "" -#: actions/register.php:438 actions/register.php:442 +#: actions/register.php:439 actions/register.php:443 msgid "Used only for updates, announcements, and password recovery" msgstr "לשימוש רק במקרים של עידכונים, הודעות מערכת, ושיחזורי סיסמאות" -#: actions/register.php:449 +#: actions/register.php:450 msgid "Longer name, preferably your \"real\" name" msgstr "" -#: actions/register.php:493 +#: actions/register.php:494 msgid "My text and files are available under " msgstr "הטקסטים והקבצים שלי מופצים תחת רשיון" -#: actions/register.php:495 +#: actions/register.php:496 msgid "Creative Commons Attribution 3.0" msgstr "" -#: actions/register.php:496 +#: actions/register.php:497 msgid "" " except this private data: password, email address, IM address, and phone " "number." msgstr "" -#: actions/register.php:537 +#: actions/register.php:538 #, 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 " @@ -2812,7 +2786,7 @@ msgid "" "Thanks for signing up and we hope you enjoy using this service." msgstr "" -#: actions/register.php:561 +#: actions/register.php:562 msgid "" "(You should receive a message by email momentarily, with instructions on how " "to confirm your email address.)" @@ -2912,11 +2886,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 +2904,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 +2918,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 +2937,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 +2986,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 +3037,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 +3105,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 +3132,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 +3144,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 +3188,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 +3380,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 +3411,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 +3500,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 +3538,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 +3574,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 +3661,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 +3668,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 +3777,7 @@ msgstr "" "בדוק את הפרטים כדי לוודא שברצונך להירשם כמנוי להודעות משתמש זה. אם אינך רוצה " "להירשם, לחץ \"בטל\"." -#: actions/userauthorization.php:188 +#: actions/userauthorization.php:188 actions/version.php:165 msgid "License" msgstr "" @@ -3888,7 +3834,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 +3867,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 +3882,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,23 +3896,95 @@ msgstr "לא שלחנו אלינו את הפרופיל הזה" msgid "Try [searching for groups](%%action.groupsearch%%) and joining them." msgstr "" -#: classes/File.php:137 +#: 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:144 #, 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 "" -#: classes/File.php:147 +#: classes/File.php:154 #, php-format msgid "A file this large would exceed your user quota of %d bytes." msgstr "" -#: classes/File.php:154 +#: classes/File.php:161 #, php-format msgid "A file this large would exceed your monthly quota of %d bytes." msgstr "" +#: classes/Login_token.php:76 +#, fuzzy, php-format +msgid "Could not create login token for %s" +msgstr "שמירת מידע התמונה נכשל" + #: classes/Message.php:45 msgid "You are banned from sending direct messages." msgstr "" @@ -4028,7 +4036,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 "" @@ -4079,144 +4087,144 @@ msgid "Other options" msgstr "" #: lib/action.php:144 -#, php-format -msgid "%s - %s" -msgstr "" +#, fuzzy, php-format +msgid "%1$s - %2$s" +msgstr "הסטטוס של %1$s ב-%2$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 #, 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 +4233,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 +4249,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 +4284,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 "הרשמות" @@ -4337,7 +4349,7 @@ msgstr "הסיסמה נשמרה." msgid "Command results" msgstr "" -#: lib/channel.php:210 +#: lib/channel.php:210 lib/mailhandler.php:142 msgid "Command complete" msgstr "" @@ -4350,7 +4362,7 @@ msgid "Sorry, this command is not yet implemented." msgstr "" #: lib/command.php:88 -#, php-format +#, fuzzy, php-format msgid "Could not find a user with nickname %s" msgstr "עידכון המשתמש נכשל." @@ -4359,9 +4371,9 @@ msgid "It does not make a lot of sense to nudge yourself!" msgstr "" #: lib/command.php:99 -#, php-format +#, fuzzy, php-format msgid "Nudge sent to %s" -msgstr "" +msgstr "תגובת עבור %s" #: lib/command.php:126 #, php-format @@ -4372,34 +4384,56 @@ msgid "" msgstr "" #: lib/command.php:152 lib/command.php:399 lib/command.php:460 +#, fuzzy msgid "Notice with that id does not exist" -msgstr "" +msgstr "אין פרופיל תואם לפרופיל המרוחק " #: lib/command.php:168 lib/command.php:415 lib/command.php:476 #: lib/command.php:532 +#, fuzzy msgid "User has no last notice" -msgstr "" +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:217 +#, fuzzy +msgid "You are already a member of that group" +msgstr "כבר נכנסת למערכת!" + +#: lib/command.php:234 +#, fuzzy, php-format +msgid "Could not join user %s to group %s" +msgstr "נכשלה ההפניה לשרת: %s" + +#: lib/command.php:239 +#, fuzzy, php-format +msgid "%s joined group %s" +msgstr "הסטטוס של %1$s ב-%2$s " + +#: lib/command.php:284 +#, fuzzy, php-format +msgid "Could not remove user %s to group %s" +msgstr "נכשלה יצירת OpenID מתוך: %s" + +#: lib/command.php:289 +#, fuzzy, php-format +msgid "%s left group %s" +msgstr "הסטטוס של %1$s ב-%2$s " #: lib/command.php:318 -#, php-format +#, fuzzy, php-format msgid "Fullname: %s" -msgstr "" +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 "" @@ -4409,22 +4443,29 @@ msgstr "" msgid "About: %s" msgstr "אודות: %s" -#: lib/command.php:358 scripts/xmppdaemon.php:301 +#: lib/command.php:358 #, php-format msgid "Message too long - maximum is %d characters, you sent %d" msgstr "" +#: lib/command.php:376 +#, php-format +msgid "Direct message to %s sent" +msgstr "" + #: lib/command.php:378 msgid "Error sending direct message." msgstr "" #: lib/command.php:422 +#, fuzzy msgid "Cannot repeat your own notice" -msgstr "" +msgstr "לא ניתן להירשם ללא הסכמה לרשיון" #: lib/command.php:427 +#, fuzzy msgid "Already repeated that notice" -msgstr "" +msgstr "כבר נכנסת למערכת!" #: lib/command.php:435 #, fuzzy, php-format @@ -4493,50 +4534,45 @@ msgstr "" msgid "Login command is disabled" msgstr "" -#: lib/command.php:664 -#, fuzzy, php-format -msgid "Could not create login token for %s" -msgstr "שמירת מידע התמונה נכשל" - -#: lib/command.php:669 +#: lib/command.php:661 #, php-format msgid "This link is useable only once, and is good for only 2 minutes: %s" msgstr "" -#: lib/command.php:685 +#: lib/command.php:677 #, fuzzy msgid "You are not subscribed to anyone." msgstr "לא שלחנו אלינו את הפרופיל הזה" -#: lib/command.php:687 +#: lib/command.php:679 msgid "You are subscribed to this person:" msgid_plural "You are subscribed to these people:" msgstr[0] "לא שלחנו אלינו את הפרופיל הזה" msgstr[1] "לא שלחנו אלינו את הפרופיל הזה" -#: lib/command.php:707 +#: lib/command.php:699 #, fuzzy msgid "No one is subscribed to you." msgstr "הרשמה מרוחקת" -#: lib/command.php:709 +#: lib/command.php:701 msgid "This person is subscribed to you:" msgid_plural "These people are subscribed to you:" msgstr[0] "הרשמה מרוחקת" msgstr[1] "הרשמה מרוחקת" -#: lib/command.php:729 +#: lib/command.php:721 #, fuzzy msgid "You are not a member of any groups." msgstr "לא שלחנו אלינו את הפרופיל הזה" -#: lib/command.php:731 +#: lib/command.php:723 msgid "You are a member of this group:" msgid_plural "You are a member of these groups:" msgstr[0] "לא שלחנו אלינו את הפרופיל הזה" msgstr[1] "לא שלחנו אלינו את הפרופיל הזה" -#: lib/command.php:745 +#: lib/command.php:737 msgid "" "Commands:\n" "on - turn on notifications\n" @@ -4697,11 +4733,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 "" @@ -4873,22 +4904,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 @@ -5022,6 +5041,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 "" @@ -5053,7 +5093,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 @@ -5062,7 +5102,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 @@ -5072,7 +5112,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 @@ -5107,7 +5147,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 @@ -5230,6 +5280,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 "הרשמות" @@ -5413,10 +5467,6 @@ msgstr "" msgid "People Tagcloud as tagged" msgstr "" -#: lib/subscriptionlist.php:126 -msgid "(none)" -msgstr "" - #: lib/tagcloudsection.php:56 #, fuzzy msgid "None" @@ -5483,47 +5533,47 @@ msgstr "הודעה חדשה" msgid "Moderate" msgstr "" -#: lib/util.php:837 +#: lib/util.php:884 msgid "a few seconds ago" msgstr "לפני מספר שניות" -#: lib/util.php:839 +#: lib/util.php:886 msgid "about a minute ago" msgstr "לפני כדקה" -#: lib/util.php:841 +#: lib/util.php:888 #, php-format msgid "about %d minutes ago" msgstr "לפני כ-%d דקות" -#: lib/util.php:843 +#: lib/util.php:890 msgid "about an hour ago" msgstr "לפני כשעה" -#: lib/util.php:845 +#: lib/util.php:892 #, php-format msgid "about %d hours ago" msgstr "לפני כ-%d שעות" -#: lib/util.php:847 +#: lib/util.php:894 msgid "about a day ago" msgstr "לפני כיום" -#: lib/util.php:849 +#: lib/util.php:896 #, php-format msgid "about %d days ago" msgstr "לפני כ-%d ימים" -#: lib/util.php:851 +#: lib/util.php:898 msgid "about a month ago" msgstr "לפני כחודש" -#: lib/util.php:853 +#: lib/util.php:900 #, php-format msgid "about %d months ago" msgstr "לפני כ-%d חודשים" -#: lib/util.php:855 +#: lib/util.php:902 msgid "about a year ago" msgstr "לפני כשנה" @@ -5537,18 +5587,7 @@ msgstr "לאתר הבית יש כתובת לא חוקית." 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." +#: scripts/xmppdaemon.php:301 +#, php-format +msgid "Message too long - maximum is %1$d characters, you sent %2$d." msgstr "" diff --git a/locale/hsb/LC_MESSAGES/statusnet.po b/locale/hsb/LC_MESSAGES/statusnet.po index e12652087..01be59de2 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-05 22:10+0000\n" -"PO-Revision-Date: 2010-01-05 22:11:35+0000\n" +"POT-Creation-Date: 2010-01-11 23:25+0000\n" +"PO-Revision-Date: 2010-01-11 23:27:07+0000\n" "Language-Team: Dutch\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha (r60693); Translate extension (2010-01-04)\n" +"X-Generator: MediaWiki 1.16alpha (r60950); 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" @@ -40,7 +40,7 @@ msgstr "Strona njeeksistuje" #: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79 #: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75 #: actions/favoritesrss.php:74 actions/foaf.php:40 actions/foaf.php:58 -#: actions/microsummary.php:62 actions/newmessage.php:116 +#: actions/microsummary.php:62 actions/newmessage.php:116 actions/otp.php:76 #: actions/remotesubscribe.php:145 actions/remotesubscribe.php:154 #: actions/replies.php:73 actions/repliesrss.php:38 #: actions/showfavorites.php:105 actions/userbyid.php:74 @@ -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,16 +254,16 @@ msgid "No status found with that ID." msgstr "Status z tym ID njenamakany." #: actions/apifavoritecreate.php:119 -msgid "This status is already a favorite!" -msgstr "Tutón status je hižo faworit!" +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 msgid "Could not create favorite." msgstr "" #: actions/apifavoritedestroy.php:122 -msgid "That status is not a favorite!" -msgstr "Tón status faworit njeje!" +msgid "That status is not a favorite." +msgstr "Tón status faworit njeje." #: actions/apifavoritedestroy.php:134 actions/disfavor.php:87 msgid "Could not delete favorite." @@ -288,8 +283,8 @@ msgid "Could not unfollow user: User not found." msgstr "" #: actions/apifriendshipsdestroy.php:120 -msgid "You cannot unfollow yourself!" -msgstr "" +msgid "You cannot unfollow yourself." +msgstr "Njemóžeš slědowanje swójskich aktiwitow blokować." #: actions/apifriendshipsexists.php:94 msgid "Two user ids or screen_names must be supplied." @@ -373,7 +368,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 msgid "You are already a member of that group." msgstr "Sy hižo čłon teje skupiny." @@ -381,30 +376,25 @@ msgstr "Sy hižo čłon teje skupiny." msgid "You have been blocked from that group by the admin." msgstr "" -#: actions/apigroupjoin.php:138 +#: actions/apigroupjoin.php:138 actions/joingroup.php:128 #, php-format -msgid "Could not join user %s to group %s." -msgstr "" +msgid "Could not join user %1$s to group %2$s." +msgstr "Njebě móžno wužiwarja %1$s skupinje %2%s přidać." #: actions/apigroupleave.php:114 msgid "You are not a member of this group." msgstr "Njejsy čłon tuteje skupiny." -#: actions/apigroupleave.php:124 +#: actions/apigroupleave.php:124 actions/leavegroup.php:127 #, php-format -msgid "Could not remove user %s to group %s." -msgstr "" +msgid "Could not remove user %1$s from group %2$s." +msgstr "Njebě móžno wužiwarja %1$s ze skupiny %2$s wotstronić." #: 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" @@ -445,7 +435,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 +455,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 +528,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 +556,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,11 +589,11 @@ 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/invite.php:56 actions/login.php:115 actions/makeadmin.php:66 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80 #: actions/othersettings.php:145 actions/passwordsettings.php:138 #: actions/profilesettings.php:194 actions/recoverpassword.php:337 @@ -677,19 +670,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 @@ -698,8 +687,8 @@ msgstr "" #: actions/blockedfromgroup.php:93 #, php-format -msgid "%s blocked profiles, page %d" -msgstr "" +msgid "%1$s blocked profiles, page %2$d" +msgstr "%1$s zablokowa profile, stronu %2$d" #: actions/blockedfromgroup.php:108 msgid "A list of the users blocked from joining this group." @@ -809,10 +798,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 +821,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 +960,7 @@ 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" +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 +985,7 @@ msgid "Options saved." msgstr "Opcije składowane." #: actions/emailsettings.php:60 -msgid "Email Settings" +msgid "Email settings" msgstr "E-mejlowe nastajenja" #: actions/emailsettings.php:71 @@ -1035,7 +1020,7 @@ msgid "Cancel" msgstr "Přetorhnyć" #: actions/emailsettings.php:121 -msgid "Email Address" +msgid "Email address" msgstr "E-mejlowa adresa" #: actions/emailsettings.php:123 @@ -1109,9 +1094,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 +1271,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 +1287,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 +1315,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 +1332,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 +1355,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 +1371,10 @@ msgstr "" "Móžeš logowy wobraz za swoju skupinu nahrać. Maksimalna datajowa wulkosć je %" "s." +#: actions/grouplogo.php:178 +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 "" @@ -1417,14 +1394,14 @@ msgstr "" #: actions/groupmembers.php:96 #, php-format -msgid "%s group members, page %d" -msgstr "" +msgid "%1$s group members, page %2$d" +msgstr "%1$s skupinskich čłonow, strona %2$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 +1493,7 @@ msgid "Error removing the block." msgstr "" #: actions/imsettings.php:59 -msgid "IM Settings" +msgid "IM settings" msgstr "IM-nastajenja" #: actions/imsettings.php:70 @@ -1542,7 +1519,7 @@ msgid "" msgstr "" #: actions/imsettings.php:124 -msgid "IM Address" +msgid "IM address" msgstr "IM-adresa" #: actions/imsettings.php:126 @@ -1599,11 +1576,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 +1611,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 +1654,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 +1698,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 +#: actions/joingroup.php:135 #, 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,71 +1715,62 @@ 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 +#: actions/leavegroup.php:134 #, php-format -msgid "%s left group %s" +msgid "%1$s left group %2$s" msgstr "" -#: actions/login.php:83 actions/register.php:137 +#: actions/login.php:80 actions/otp.php:62 actions/register.php:137 msgid "Already logged in." msgstr "Hižo přizjewjeny." -#: actions/login.php:114 actions/login.php:124 -msgid "Invalid or expired token." -msgstr "" - -#: actions/login.php:147 +#: actions/login.php:126 msgid "Incorrect username or password." msgstr "Wopačne wužiwarske mjeno abo hesło." -#: actions/login.php:153 +#: actions/login.php:132 actions/otp.php:120 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:188 actions/login.php:241 lib/action.php:460 #: lib/logingroupnav.php:79 msgid "Login" msgstr "Přizjewić" -#: actions/login.php:247 +#: actions/login.php:227 msgid "Login to site" msgstr "Při sydle přizjewić" -#: actions/login.php:250 actions/profilesettings.php:106 -#: actions/register.php:423 actions/showgroup.php:236 actions/tagother.php:94 +#: actions/login.php:230 actions/profilesettings.php:106 +#: actions/register.php:424 actions/showgroup.php:236 actions/tagother.php:94 #: lib/groupeditform.php:152 lib/userprofile.php:131 msgid "Nickname" msgstr "Přimjeno" -#: actions/login.php:253 actions/register.php:428 +#: actions/login.php:233 actions/register.php:429 #: lib/accountsettingsaction.php:116 msgid "Password" msgstr "Hesło" -#: actions/login.php:256 actions/register.php:477 +#: actions/login.php:236 actions/register.php:478 msgid "Remember me" msgstr "Składować" -#: actions/login.php:257 actions/register.php:479 +#: actions/login.php:237 actions/register.php:480 msgid "Automatically login in the future; not for shared computers!" msgstr "" -#: actions/login.php:267 +#: actions/login.php:247 msgid "Lost or forgotten password?" msgstr "Hesło zhubjene abo zabyte?" -#: actions/login.php:286 +#: actions/login.php:266 msgid "" "For security reasons, please re-enter your user name and password before " "changing your settings." msgstr "" -#: actions/login.php:290 +#: actions/login.php:270 #, php-format msgid "" "Login with your username and password. Don't have a username yet? [Register]" @@ -1829,18 +1783,18 @@ 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\"." -msgstr "%s je hižo administrator za skupinu \"%s\"." +msgid "%1$s is already an admin for group \"%2$s\"." +msgstr "%1$s je hižo administrator za skupinu \"%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 "Přistup na datowu sadźbu čłona %1$S w skupinje %2$s móžno njeje." #: 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 "Njeje móžno %1$S k administratorej w skupinje %2$s činić." #: actions/microsummary.php:69 msgid "No current status" @@ -1880,10 +1834,10 @@ msgstr "" msgid "Message sent" msgstr "Powěsć pósłana" -#: actions/newmessage.php:185 lib/command.php:376 +#: actions/newmessage.php:185 #, php-format -msgid "Direct message to %s sent" -msgstr "" +msgid "Direct message to %s sent." +msgstr "Direktna powěsć do %s pósłana." #: actions/newmessage.php:210 actions/newnotice.php:245 lib/channel.php:170 msgid "Ajax Error" @@ -1910,7 +1864,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 @@ -1967,8 +1921,8 @@ msgstr "" msgid "Only " msgstr "Jenož " -#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1031 -#: lib/api.php:1059 lib/api.php:1169 +#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1033 +#: lib/api.php:1061 lib/api.php:1171 msgid "Not a supported data format." msgstr "Njeje podpěrany datowy format." @@ -2012,11 +1966,30 @@ msgstr "" msgid "URL shortening service is too long (max 50 chars)." msgstr "" -#: actions/outbox.php:58 -#, php-format -msgid "Outbox for %s - page %d" +#: actions/otp.php:69 +#, fuzzy +msgid "No user ID specified." +msgstr "Žana skupina podata." + +#: actions/otp.php:83 +#, fuzzy +msgid "No login token specified." +msgstr "Žana zdźělenka podata." + +#: actions/otp.php:90 +msgid "No login token requested." msgstr "" +#: actions/otp.php:95 +#, fuzzy +msgid "Invalid login token specified." +msgstr "Žana zdźělenka podata." + +#: actions/otp.php:104 +#, fuzzy +msgid "Login token expired." +msgstr "Při sydle přizjewić" + #: actions/outbox.php:61 #, php-format msgid "Outbox for %s" @@ -2051,7 +2024,7 @@ msgid "6 or more characters" msgstr "6 abo wjace znamješkow" #: actions/passwordsettings.php:112 actions/recoverpassword.php:239 -#: actions/register.php:432 actions/smssettings.php:134 +#: actions/register.php:433 actions/smssettings.php:134 msgid "Confirm" msgstr "Wobkrućić" @@ -2087,7 +2060,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 +2093,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 +2186,7 @@ msgid "When to use SSL" msgstr "" #: actions/pathsadminpanel.php:308 -msgid "SSL Server" +msgid "SSL server" msgstr "SSL-serwer" #: actions/pathsadminpanel.php:309 @@ -2242,7 +2215,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 +2224,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 @@ -2271,42 +2244,42 @@ msgstr "Profilowe informacije" msgid "1-64 lowercase letters or numbers, no punctuation or spaces" msgstr "" -#: actions/profilesettings.php:111 actions/register.php:447 +#: actions/profilesettings.php:111 actions/register.php:448 #: actions/showgroup.php:247 actions/tagother.php:104 #: lib/groupeditform.php:157 lib/userprofile.php:149 msgid "Full name" msgstr "Dospołne mjeno" -#: actions/profilesettings.php:115 actions/register.php:452 +#: actions/profilesettings.php:115 actions/register.php:453 #: lib/groupeditform.php:161 msgid "Homepage" msgstr "Startowa strona" -#: actions/profilesettings.php:117 actions/register.php:454 +#: actions/profilesettings.php:117 actions/register.php:455 msgid "URL of your homepage, blog, or profile on another site" msgstr "" -#: actions/profilesettings.php:122 actions/register.php:460 +#: actions/profilesettings.php:122 actions/register.php:461 #, php-format msgid "Describe yourself and your interests in %d chars" msgstr "" -#: actions/profilesettings.php:125 actions/register.php:463 +#: actions/profilesettings.php:125 actions/register.php:464 msgid "Describe yourself and your interests" msgstr "" -#: actions/profilesettings.php:127 actions/register.php:465 +#: actions/profilesettings.php:127 actions/register.php:466 msgid "Bio" msgstr "Biografija" -#: actions/profilesettings.php:132 actions/register.php:470 +#: actions/profilesettings.php:132 actions/register.php:471 #: actions/showgroup.php:256 actions/tagother.php:112 #: actions/userauthorization.php:158 lib/groupeditform.php:177 #: lib/userprofile.php:164 msgid "Location" msgstr "Městno" -#: actions/profilesettings.php:134 actions/register.php:472 +#: actions/profilesettings.php:134 actions/register.php:473 msgid "Where you are, like \"City, State (or Region), Country\"" msgstr "" @@ -2368,19 +2341,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." @@ -2598,7 +2571,7 @@ msgstr "" msgid "New password successfully saved. You are now logged in." msgstr "" -#: actions/register.php:85 actions/register.php:189 actions/register.php:404 +#: actions/register.php:85 actions/register.php:189 actions/register.php:405 msgid "Sorry, only invited people can register." msgstr "Wodaj, jenož přeprošeni ludźo móžeja so registrować." @@ -2610,7 +2583,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:503 lib/action.php:457 #: lib/logingroupnav.php:85 msgid "Register" msgstr "Registrować" @@ -2623,70 +2596,66 @@ 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." -#: actions/register.php:243 actions/register.php:264 +#: actions/register.php:243 actions/register.php:265 msgid "Invalid username or password." msgstr "Njepłaćiwe wužiwarske mjeno abo hesło." -#: actions/register.php:342 +#: actions/register.php:343 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 +#: actions/register.php:425 msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required." msgstr "" -#: actions/register.php:429 +#: actions/register.php:430 msgid "6 or more characters. Required." msgstr "6 abo wjace znamješkow. Trěbne." -#: actions/register.php:433 +#: actions/register.php:434 msgid "Same as password above. Required." msgstr "Jenake kaž hesło horjeka. Trěbne." -#: actions/register.php:437 actions/register.php:441 +#: actions/register.php:438 actions/register.php:442 #: actions/siteadminpanel.php:270 lib/accountsettingsaction.php:120 msgid "Email" msgstr "E-mejl" -#: actions/register.php:438 actions/register.php:442 +#: actions/register.php:439 actions/register.php:443 msgid "Used only for updates, announcements, and password recovery" msgstr "" -#: actions/register.php:449 +#: actions/register.php:450 msgid "Longer name, preferably your \"real\" name" msgstr "Dlěše mjeno, wosebje twoje \"woprawdźite\" mjeno" -#: actions/register.php:493 +#: actions/register.php:494 msgid "My text and files are available under " msgstr "Mój tekst a moje dataje steja k dispoziciji pod " -#: actions/register.php:495 +#: actions/register.php:496 msgid "Creative Commons Attribution 3.0" msgstr "Creative Commons Attribution 3.0" -#: actions/register.php:496 +#: actions/register.php:497 msgid "" " except this private data: password, email address, IM address, and phone " "number." msgstr "" -#: actions/register.php:537 +#: actions/register.php:538 #, 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 " @@ -2699,7 +2668,7 @@ msgid "" "Thanks for signing up and we hope you enjoy using this service." msgstr "" -#: actions/register.php:561 +#: actions/register.php:562 msgid "" "(You should receive a message by email momentarily, with instructions on how " "to confirm your email address.)" @@ -2788,11 +2757,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 +2775,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 +2789,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 +2806,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 +2855,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 +2903,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 +2969,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 "" +msgid "Notice feed for %1$s tagged %2$s (RSS 1.0)" +msgstr "Powěsćowy kanal za %1$s je %2$s (RSS 1.0) markěrował" #: actions/showstream.php:129 #, php-format @@ -3047,7 +2996,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 +3008,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,13 +3051,13 @@ msgid "Site name must have non-zero length." msgstr "" #: actions/siteadminpanel.php:154 -msgid "You must have a valid contact email address" -msgstr "" +msgid "You must have a valid contact email address." +msgstr "Dyrbiš płaćiwu kontaktowu e-mejlowu adresu měć." #: actions/siteadminpanel.php:172 #, php-format -msgid "Unknown language \"%s\"" -msgstr "Njeznata rěč \"%s\"" +msgid "Unknown language \"%s\"." +msgstr "Njeznata rěč \"%s\"." #: actions/siteadminpanel.php:179 msgid "Invalid snapshot report URL." @@ -3287,8 +3236,8 @@ msgid "Save site settings" msgstr "Sydłowe nastajenja składować" #: actions/smssettings.php:58 -msgid "SMS Settings" -msgstr "" +msgid "SMS settings" +msgstr "SMS-nastajenja" #: actions/smssettings.php:69 #, php-format @@ -3316,8 +3265,8 @@ msgid "Enter the code you received on your phone." msgstr "" #: actions/smssettings.php:138 -msgid "SMS Phone number" -msgstr "" +msgid "SMS phone number" +msgstr "SMS telefonowe čisło" #: actions/smssettings.php:140 msgid "Phone number, no punctuation or spaces, with area code" @@ -3401,8 +3350,8 @@ msgstr "%s abonentow" #: actions/subscribers.php:52 #, php-format -msgid "%s subscribers, page %d" -msgstr "%s abonentow, strona %d" +msgid "%1$s subscribers, page %2$d" +msgstr "%1$s abonentow, strona %2$d" #: actions/subscribers.php:63 msgid "These are the people who listen to your notices." @@ -3438,8 +3387,8 @@ msgstr "%s abonementow" #: actions/subscriptions.php:54 #, php-format -msgid "%s subscriptions, page %d" -msgstr "%s abonementow, strona %d" +msgid "%1$s subscriptions, page %2$d" +msgstr "%1$s abonementow, strona %2$d" #: actions/subscriptions.php:65 msgid "These are the people whose notices you listen to." @@ -3473,11 +3422,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 +3501,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 +3609,7 @@ msgid "" "click “Reject”." msgstr "" -#: actions/userauthorization.php:188 +#: actions/userauthorization.php:188 actions/version.php:165 msgid "License" msgstr "Licenca" @@ -3717,7 +3658,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 +3691,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 +3705,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,23 +3719,91 @@ msgstr "" msgid "Try [searching for groups](%%action.groupsearch%%) and joining them." msgstr "" -#: classes/File.php:137 +#: 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 "" + +#: 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 "" + +#: 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 "Mjeno" + +#: actions/version.php:196 lib/action.php:741 +msgid "Version" +msgstr "Wersija" + +#: actions/version.php:197 +msgid "Author(s)" +msgstr "Awtorojo" + +#: actions/version.php:198 lib/groupeditform.php:172 +msgid "Description" +msgstr "Wopisanje" + +#: classes/File.php:144 #, 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 "" -#: classes/File.php:147 +#: classes/File.php:154 #, php-format msgid "A file this large would exceed your user quota of %d bytes." msgstr "" -#: classes/File.php:154 +#: classes/File.php:161 #, php-format msgid "A file this large would exceed your monthly quota of %d bytes." msgstr "" +#: classes/Login_token.php:76 +#, fuzzy, php-format +msgid "Could not create login token for %s" +msgstr "Njebě móžno, přizjewjenske znamješko za %s wutworić." + #: classes/Message.php:45 msgid "You are banned from sending direct messages." msgstr "" @@ -3853,7 +3853,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 "" @@ -3900,148 +3900,148 @@ msgid "Other options" msgstr "Druhe opcije" #: lib/action.php:144 -#, php-format -msgid "%s - %s" -msgstr "%s - %s" +#, fuzzy, php-format +msgid "%1$s - %2$s" +msgstr "%1$s (%2$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 +4049,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 +4081,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 "Změny na tutym woknje njejsu dowolene." + +#: 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 "" @@ -4126,20 +4130,18 @@ msgid "Tags for this attachment" msgstr "" #: lib/authenticationplugin.php:182 lib/authenticationplugin.php:187 -#, fuzzy msgid "Password changing failed" -msgstr "Hesło změnjene" +msgstr "Změnjenje hesła je so njeporadźiło" #: lib/authenticationplugin.php:197 -#, fuzzy msgid "Password changing is not allowed" -msgstr "Hesło změnjene" +msgstr "Změnjenje hesła njeje dowolene" #: 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 "" @@ -4174,34 +4176,56 @@ msgid "" msgstr "" #: lib/command.php:152 lib/command.php:399 lib/command.php:460 +#, fuzzy msgid "Notice with that id does not exist" -msgstr "" +msgstr "Zdźělenka z tym ID njeeksistuje." #: lib/command.php:168 lib/command.php:415 lib/command.php:476 #: lib/command.php:532 +#, fuzzy msgid "User has no last notice" -msgstr "" +msgstr "Wužiwar nima poslednju powěsć." #: 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:217 +#, fuzzy +msgid "You are already a member of that group" +msgstr "Sy hižo čłon teje skupiny." + +#: lib/command.php:234 +#, fuzzy, php-format +msgid "Could not join user %s to group %s" +msgstr "Njebě móžno wužiwarja %1$s skupinje %2%s přidać." + +#: lib/command.php:239 +#, fuzzy, php-format +msgid "%s joined group %s" +msgstr "Wužiwarske skupiny" + +#: lib/command.php:284 +#, fuzzy, php-format +msgid "Could not remove user %s to group %s" +msgstr "Njebě móžno wužiwarja %1$s do skupiny $2$s přesunyć." + +#: lib/command.php:289 +#, fuzzy, php-format +msgid "%s left group %s" +msgstr "Wužiwarske skupiny" #: lib/command.php:318 -#, php-format +#, fuzzy, php-format msgid "Fullname: %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 "" @@ -4211,27 +4235,34 @@ msgstr "" msgid "About: %s" msgstr "Wo: %s" -#: lib/command.php:358 scripts/xmppdaemon.php:301 +#: lib/command.php:358 #, php-format msgid "Message too long - maximum is %d characters, you sent %d" msgstr "" +#: lib/command.php:376 +#, fuzzy, php-format +msgid "Direct message to %s sent" +msgstr "Direktna powěsć do %s pósłana." + #: lib/command.php:378 msgid "Error sending direct message." msgstr "" #: lib/command.php:422 +#, fuzzy msgid "Cannot repeat your own notice" -msgstr "" +msgstr "Njemóžno twoju zdźělenku wospjetować." #: lib/command.php:427 +#, fuzzy msgid "Already repeated that notice" -msgstr "Tuta zdźělenka bu hižo wospjetowana" +msgstr "Tuta zdźělenka bu hižo wospjetowana." #: lib/command.php:435 -#, php-format +#, fuzzy, php-format msgid "Notice from %s repeated" -msgstr "Zdźělenka wot %s wospjetowana" +msgstr "Powěsć wot %s wospjetowana." #: lib/command.php:437 msgid "Error repeating notice." @@ -4243,9 +4274,9 @@ msgid "Notice too long - maximum is %d characters, you sent %d" msgstr "" #: lib/command.php:500 -#, php-format +#, fuzzy, php-format msgid "Reply to %s sent" -msgstr "" +msgstr "Wotmołwa na %s pósłana." #: lib/command.php:502 msgid "Error saving notice." @@ -4293,21 +4324,16 @@ msgstr "" msgid "Login command is disabled" msgstr "" -#: lib/command.php:664 -#, 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 +#: lib/command.php:661 #, php-format msgid "This link is useable only once, and is good for only 2 minutes: %s" msgstr "" -#: lib/command.php:685 +#: lib/command.php:677 msgid "You are not subscribed to anyone." msgstr "" -#: lib/command.php:687 +#: lib/command.php:679 msgid "You are subscribed to this person:" msgid_plural "You are subscribed to these people:" msgstr[0] "Sy tutu wosobu abonował:" @@ -4315,11 +4341,11 @@ msgstr[1] "Sy tutej wosobje abonował:" msgstr[2] "Sy tute wosoby abonował:" msgstr[3] "Sy tute wosoby abonował:" -#: lib/command.php:707 +#: lib/command.php:699 msgid "No one is subscribed to you." msgstr "" -#: lib/command.php:709 +#: lib/command.php:701 msgid "This person is subscribed to you:" msgid_plural "These people are subscribed to you:" msgstr[0] "Tuta wosoba je će abonowała:" @@ -4327,11 +4353,11 @@ msgstr[1] "Tutej wosobje stej će abonowałoj:" msgstr[2] "Tute wosoby su će abonowali:" msgstr[3] "Tute wosoby su će abonowali:" -#: lib/command.php:729 +#: lib/command.php:721 msgid "You are not a member of any groups." msgstr "" -#: lib/command.php:731 +#: lib/command.php:723 msgid "You are a member of this group:" msgid_plural "You are a member of these groups:" msgstr[0] "Sy čłon tuteje skupiny:" @@ -4339,7 +4365,7 @@ msgstr[1] "Sy čłon tuteju skupinow:" msgstr[2] "Sy čłon tutych skupinow:" msgstr[3] "Sy čłon tutych skupinow:" -#: lib/command.php:745 +#: lib/command.php:737 msgid "" "Commands:\n" "on - turn on notifications\n" @@ -4494,10 +4520,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\"" @@ -4656,24 +4678,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 "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" -msgstr "" -"Biografija: %s\n" -"\n" +msgid "Bio: %s" +msgstr "Biografija: %s" #: lib/mail.php:286 #, php-format @@ -4807,6 +4815,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 +#, php-format +msgid "Unsupported message type: %s" +msgstr "Njepodpěrany powěsćowy typ: %s" + #: lib/mediafile.php:98 lib/mediafile.php:123 msgid "There was a database error while saving your file. Please try again." msgstr "" @@ -4838,7 +4867,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 @@ -4846,7 +4875,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 @@ -4856,7 +4885,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 njeje podpěrany datajowy typ na tutym serwerje." #: lib/messageform.php:120 @@ -4889,7 +4918,17 @@ msgid "Attach a file" msgstr "Dataju připowěsnyć" #: lib/noticeform.php:212 -msgid "Share your location" +#, fuzzy +msgid "Share my location" +msgstr "Městno dźělić." + +#: lib/noticeform.php:214 +#, fuzzy +msgid "Do not share my location" +msgstr "Městno njedźělić." + +#: lib/noticeform.php:215 +msgid "Hide this info" msgstr "" #: lib/noticelist.php:428 @@ -5006,6 +5045,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" @@ -5175,10 +5219,6 @@ msgstr "" msgid "People Tagcloud as tagged" msgstr "" -#: lib/subscriptionlist.php:126 -msgid "(none)" -msgstr "(žadyn)" - #: lib/tagcloudsection.php:56 msgid "None" msgstr "Žadyn" @@ -5239,47 +5279,47 @@ msgstr "Powěsć" msgid "Moderate" msgstr "" -#: lib/util.php:837 +#: lib/util.php:884 msgid "a few seconds ago" msgstr "před něšto sekundami" -#: lib/util.php:839 +#: lib/util.php:886 msgid "about a minute ago" msgstr "před něhdźe jednej mjeńšinu" -#: lib/util.php:841 +#: lib/util.php:888 #, php-format msgid "about %d minutes ago" msgstr "před %d mjeńšinami" -#: lib/util.php:843 +#: lib/util.php:890 msgid "about an hour ago" msgstr "před něhdźe jednej hodźinu" -#: lib/util.php:845 +#: lib/util.php:892 #, php-format msgid "about %d hours ago" msgstr "před něhdźe %d hodźinami" -#: lib/util.php:847 +#: lib/util.php:894 msgid "about a day ago" msgstr "před něhdźe jednym dnjom" -#: lib/util.php:849 +#: lib/util.php:896 #, php-format msgid "about %d days ago" msgstr "před něhdźe %d dnjemi" -#: lib/util.php:851 +#: lib/util.php:898 msgid "about a month ago" msgstr "před něhdźe jednym měsacom" -#: lib/util.php:853 +#: lib/util.php:900 #, php-format msgid "about %d months ago" msgstr "před něhdźe %d měsacami" -#: lib/util.php:855 +#: lib/util.php:902 msgid "about a year ago" msgstr "před něhdźe jednym lětom" @@ -5295,18 +5335,7 @@ 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." +#: scripts/xmppdaemon.php:301 +#, php-format +msgid "Message too long - maximum is %1$d characters, you sent %2$d." 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 adb2fb764..a845bae26 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-05 22:10+0000\n" -"PO-Revision-Date: 2010-01-05 22:11:39+0000\n" +"POT-Creation-Date: 2010-01-11 23:25+0000\n" +"PO-Revision-Date: 2010-01-11 23:27:11+0000\n" "Language-Team: Interlingua\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha (r60693); Translate extension (2010-01-04)\n" +"X-Generator: MediaWiki 1.16alpha (r60950); 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" @@ -38,7 +38,7 @@ msgstr "Pagina non existe" #: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79 #: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75 #: actions/favoritesrss.php:74 actions/foaf.php:40 actions/foaf.php:58 -#: actions/microsummary.php:62 actions/newmessage.php:116 +#: actions/microsummary.php:62 actions/newmessage.php:116 actions/otp.php:76 #: actions/remotesubscribe.php:145 actions/remotesubscribe.php:154 #: actions/replies.php:73 actions/repliesrss.php:38 #: actions/showfavorites.php:105 actions/userbyid.php:74 @@ -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 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 +#, 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" @@ -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,11 +605,11 @@ 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/invite.php:56 actions/login.php:115 actions/makeadmin.php:66 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80 #: actions/othersettings.php:145 actions/passwordsettings.php:138 #: actions/profilesettings.php:194 actions/recoverpassword.php:337 @@ -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" +#: actions/joingroup.php:135 +#, fuzzy, php-format +msgid "%1$s joined group %2$s" msgstr "%s se faceva membro del gruppo %s" #: actions/leavegroup.php:60 @@ -1842,68 +1814,59 @@ 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" +#: actions/leavegroup.php:134 +#, fuzzy, php-format +msgid "%1$s left group %2$s" msgstr "%s quitava le gruppo %s" -#: actions/login.php:83 actions/register.php:137 +#: actions/login.php:80 actions/otp.php:62 actions/register.php:137 msgid "Already logged in." msgstr "Tu es ja identificate." -#: actions/login.php:114 actions/login.php:124 -msgid "Invalid or expired token." -msgstr "Indicio invalide o expirate." - -#: actions/login.php:147 +#: actions/login.php:126 msgid "Incorrect username or password." msgstr "Nomine de usator o contrasigno incorrecte." -#: actions/login.php:153 +#: actions/login.php:132 actions/otp.php:120 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:188 actions/login.php:241 lib/action.php:460 #: lib/logingroupnav.php:79 msgid "Login" msgstr "Aperir session" -#: actions/login.php:247 +#: actions/login.php:227 msgid "Login to site" msgstr "Identificar te a iste sito" -#: actions/login.php:250 actions/profilesettings.php:106 -#: actions/register.php:423 actions/showgroup.php:236 actions/tagother.php:94 +#: actions/login.php:230 actions/profilesettings.php:106 +#: actions/register.php:424 actions/showgroup.php:236 actions/tagother.php:94 #: lib/groupeditform.php:152 lib/userprofile.php:131 msgid "Nickname" msgstr "Pseudonymo" -#: actions/login.php:253 actions/register.php:428 +#: actions/login.php:233 actions/register.php:429 #: lib/accountsettingsaction.php:116 msgid "Password" msgstr "Contrasigno" -#: actions/login.php:256 actions/register.php:477 +#: actions/login.php:236 actions/register.php:478 msgid "Remember me" msgstr "Memorar me" -#: actions/login.php:257 actions/register.php:479 +#: actions/login.php:237 actions/register.php:480 msgid "Automatically login in the future; not for shared computers!" msgstr "" "Aperir session automaticamente in le futuro; non pro computatores usate in " "commun!" -#: actions/login.php:267 +#: actions/login.php:247 msgid "Lost or forgotten password?" msgstr "Contrasigno perdite o oblidate?" -#: actions/login.php:286 +#: actions/login.php:266 msgid "" "For security reasons, please re-enter your user name and password before " "changing your settings." @@ -1911,7 +1874,7 @@ msgstr "" "Pro motivos de securitate, per favor re-entra tu nomine de usator e " "contrasigno ante de cambiar tu configurationes." -#: actions/login.php:290 +#: actions/login.php:270 #, php-format msgid "" "Login with your username and password. Don't have a username yet? [Register]" @@ -1925,18 +1888,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 @@ -1979,9 +1942,9 @@ msgstr "" msgid "Message sent" msgstr "Message inviate" -#: actions/newmessage.php:185 lib/command.php:376 -#, php-format -msgid "Direct message to %s sent" +#: actions/newmessage.php:185 +#, 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 +1973,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 @@ -2075,8 +2038,8 @@ msgstr "typo de contento " msgid "Only " msgstr "Solmente " -#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1031 -#: lib/api.php:1059 lib/api.php:1169 +#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1033 +#: lib/api.php:1061 lib/api.php:1171 msgid "Not a supported data format." msgstr "Formato de datos non supportate." @@ -2120,10 +2083,29 @@ 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/otp.php:69 +#, fuzzy +msgid "No user ID specified." +msgstr "Nulle gruppo specificate." + +#: actions/otp.php:83 +#, fuzzy +msgid "No login token specified." +msgstr "Nulle nota specificate." + +#: actions/otp.php:90 +msgid "No login token requested." +msgstr "" + +#: actions/otp.php:95 +#, fuzzy +msgid "Invalid login token specified." +msgstr "Indicio invalide o expirate." + +#: actions/otp.php:104 +#, fuzzy +msgid "Login token expired." +msgstr "Identificar te a iste sito" #: actions/outbox.php:61 #, php-format @@ -2160,7 +2142,7 @@ msgid "6 or more characters" msgstr "6 o plus characteres" #: actions/passwordsettings.php:112 actions/recoverpassword.php:239 -#: actions/register.php:432 actions/smssettings.php:134 +#: actions/register.php:433 actions/smssettings.php:134 msgid "Confirm" msgstr "Confirmar" @@ -2196,7 +2178,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 +2211,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 +2304,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 +2335,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 +2344,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'." @@ -2385,42 +2368,42 @@ msgstr "Information de profilo" msgid "1-64 lowercase letters or numbers, no punctuation or spaces" msgstr "1-64 minusculas o numeros, sin punctuation o spatios" -#: actions/profilesettings.php:111 actions/register.php:447 +#: actions/profilesettings.php:111 actions/register.php:448 #: actions/showgroup.php:247 actions/tagother.php:104 #: lib/groupeditform.php:157 lib/userprofile.php:149 msgid "Full name" msgstr "Nomine complete" -#: actions/profilesettings.php:115 actions/register.php:452 +#: actions/profilesettings.php:115 actions/register.php:453 #: lib/groupeditform.php:161 msgid "Homepage" msgstr "Pagina personal" -#: actions/profilesettings.php:117 actions/register.php:454 +#: actions/profilesettings.php:117 actions/register.php:455 msgid "URL of your homepage, blog, or profile on another site" msgstr "URL de tu pagina personal, blog o profilo in un altere sito" -#: actions/profilesettings.php:122 actions/register.php:460 +#: actions/profilesettings.php:122 actions/register.php:461 #, php-format msgid "Describe yourself and your interests in %d chars" msgstr "Describe te e tu interesses in %d characteres" -#: actions/profilesettings.php:125 actions/register.php:463 +#: actions/profilesettings.php:125 actions/register.php:464 msgid "Describe yourself and your interests" msgstr "Describe te e tu interesses" -#: actions/profilesettings.php:127 actions/register.php:465 +#: actions/profilesettings.php:127 actions/register.php:466 msgid "Bio" msgstr "Bio" -#: actions/profilesettings.php:132 actions/register.php:470 +#: actions/profilesettings.php:132 actions/register.php:471 #: actions/showgroup.php:256 actions/tagother.php:112 #: actions/userauthorization.php:158 lib/groupeditform.php:177 #: lib/userprofile.php:164 msgid "Location" msgstr "Loco" -#: actions/profilesettings.php:134 actions/register.php:472 +#: actions/profilesettings.php:134 actions/register.php:473 msgid "Where you are, like \"City, State (or Region), Country\"" msgstr "Ubi tu es, como \"Citate, Stato (o Region), Pais\"" @@ -2485,19 +2468,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." @@ -2731,7 +2714,7 @@ msgstr "Error durante le configuration del usator." msgid "New password successfully saved. You are now logged in." msgstr "Nove contrasigno salveguardate con successo. Tu session es ora aperte." -#: actions/register.php:85 actions/register.php:189 actions/register.php:404 +#: actions/register.php:85 actions/register.php:189 actions/register.php:405 msgid "Sorry, only invited people can register." msgstr "Pardono, solmente le personas invitate pote registrar se." @@ -2743,7 +2726,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:503 lib/action.php:457 #: lib/logingroupnav.php:85 msgid "Register" msgstr "Crear un conto" @@ -2757,19 +2740,15 @@ 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." -#: actions/register.php:243 actions/register.php:264 +#: actions/register.php:243 actions/register.php:265 msgid "Invalid username or password." msgstr "Nomine de usator o contrasigno invalide." -#: actions/register.php:342 +#: actions/register.php:343 msgid "" "With this form you can create a new account. You can then post notices and " "link up to friends and colleagues. " @@ -2777,42 +2756,42 @@ msgstr "" "Con iste formulario tu pote crear un nove conto. Postea, tu pote publicar " "notas e mitter te in contacto con amicos e collegas. " -#: actions/register.php:424 +#: actions/register.php:425 msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required." msgstr "1-64 minusculas o numeros, sin punctuation o spatios. Requisite." -#: actions/register.php:429 +#: actions/register.php:430 msgid "6 or more characters. Required." msgstr "6 o plus characteres. Requisite." -#: actions/register.php:433 +#: actions/register.php:434 msgid "Same as password above. Required." msgstr "Identic al contrasigno hic supra. Requisite." -#: actions/register.php:437 actions/register.php:441 +#: actions/register.php:438 actions/register.php:442 #: actions/siteadminpanel.php:270 lib/accountsettingsaction.php:120 msgid "Email" msgstr "E-mail" -#: actions/register.php:438 actions/register.php:442 +#: actions/register.php:439 actions/register.php:443 msgid "Used only for updates, announcements, and password recovery" msgstr "" "Usate solmente pro actualisationes, notificationes e recuperation de " "contrasigno" -#: actions/register.php:449 +#: actions/register.php:450 msgid "Longer name, preferably your \"real\" name" msgstr "Nomine plus longe, preferibilemente tu nomine \"real\"" -#: actions/register.php:493 +#: actions/register.php:494 msgid "My text and files are available under " msgstr "Mi texto e files es disponibile sub " -#: actions/register.php:495 +#: actions/register.php:496 msgid "Creative Commons Attribution 3.0" msgstr "Creative Commons Attribution 3.0" -#: actions/register.php:496 +#: actions/register.php:497 msgid "" " except this private data: password, email address, IM address, and phone " "number." @@ -2820,13 +2799,13 @@ msgstr "" " excepte iste datos private: contrasigno, adresse de e-mail, adresse de " "messageria instantanee, numero de telephono." -#: actions/register.php:537 -#, php-format +#: actions/register.php:538 +#, 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 " @@ -2852,7 +2831,7 @@ msgstr "" "\n" "Gratias pro inscriber te, e nos spera que iste servicio te place." -#: actions/register.php:561 +#: actions/register.php:562 msgid "" "(You should receive a message by email momentarily, with instructions on how " "to confirm your email address.)" @@ -2949,11 +2928,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 +2944,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 +2962,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 +2983,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 +3040,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 +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 "(Nulle)" @@ -3199,14 +3163,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 +3189,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 +3202,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 +3257,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 +3445,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 +3475,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 +3567,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 +3606,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 +3642,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 +3721,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 +3830,7 @@ msgid "" "click “Reject”." msgstr "" -#: actions/userauthorization.php:188 +#: actions/userauthorization.php:188 actions/version.php:165 msgid "License" msgstr "" @@ -3924,7 +3879,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 +3912,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 +3926,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,23 +3940,94 @@ msgstr "" msgid "Try [searching for groups](%%action.groupsearch%%) and joining them." msgstr "" -#: classes/File.php:137 +#: 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:144 #, 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 "" -#: classes/File.php:147 +#: classes/File.php:154 #, php-format msgid "A file this large would exceed your user quota of %d bytes." msgstr "" -#: classes/File.php:154 +#: classes/File.php:161 #, php-format msgid "A file this large would exceed your monthly quota of %d bytes." msgstr "" +#: classes/Login_token.php:76 +#, fuzzy, php-format +msgid "Could not create login token for %s" +msgstr "Non poteva crear aliases." + #: classes/Message.php:45 msgid "You are banned from sending direct messages." msgstr "" @@ -4060,7 +4077,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 "" @@ -4107,148 +4124,148 @@ msgid "Other options" msgstr "" #: lib/action.php:144 -#, php-format -msgid "%s - %s" -msgstr "" +#, fuzzy, php-format +msgid "%1$s - %2$s" +msgstr "%s quitava le gruppo %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." "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 +4273,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 +4305,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 "" @@ -4346,7 +4368,7 @@ msgstr "Cambio del contrasigno" msgid "Command results" msgstr "" -#: lib/channel.php:210 +#: lib/channel.php:210 lib/mailhandler.php:142 msgid "Command complete" msgstr "" @@ -4359,18 +4381,18 @@ msgid "Sorry, this command is not yet implemented." msgstr "" #: lib/command.php:88 -#, php-format +#, fuzzy, php-format msgid "Could not find a user with nickname %s" -msgstr "" +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 +#, fuzzy, php-format msgid "Nudge sent to %s" -msgstr "" +msgstr "Pulsata inviate" #: lib/command.php:126 #, php-format @@ -4381,34 +4403,56 @@ msgid "" msgstr "" #: lib/command.php:152 lib/command.php:399 lib/command.php:460 +#, fuzzy msgid "Notice with that id does not exist" -msgstr "" +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 +#, fuzzy msgid "User has no last notice" -msgstr "" +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:217 +#, fuzzy +msgid "You are already a member of that group" +msgstr "Tu es ja membro de iste gruppo." + +#: lib/command.php:234 +#, fuzzy, php-format +msgid "Could not join user %s to group %s" +msgstr "Non poteva inscriber le usator %s in le gruppo %s." + +#: lib/command.php:239 +#, fuzzy, php-format +msgid "%s joined group %s" +msgstr "%s se faceva membro del gruppo %s" + +#: lib/command.php:284 +#, fuzzy, php-format +msgid "Could not remove user %s to group %s" +msgstr "Non poteva remover le usator %s del gruppo %s" + +#: lib/command.php:289 +#, fuzzy, php-format +msgid "%s left group %s" +msgstr "%s quitava le gruppo %s" #: lib/command.php:318 -#, php-format +#, fuzzy, php-format msgid "Fullname: %s" -msgstr "" +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 "" @@ -4418,27 +4462,34 @@ msgstr "" msgid "About: %s" msgstr "" -#: lib/command.php:358 scripts/xmppdaemon.php:301 +#: lib/command.php:358 #, php-format msgid "Message too long - maximum is %d characters, you sent %d" msgstr "" +#: lib/command.php:376 +#, fuzzy, php-format +msgid "Direct message to %s sent" +msgstr "Message directe a %s inviate" + #: lib/command.php:378 msgid "Error sending direct message." msgstr "" #: lib/command.php:422 +#, fuzzy msgid "Cannot repeat your own notice" -msgstr "Non pote repeter tu proprie nota" +msgstr "Non pote repeter tu proprie nota." #: lib/command.php:427 +#, fuzzy msgid "Already repeated that notice" -msgstr "Iste nota ha ja essite repetite" +msgstr "Iste nota ha ja essite repetite." #: lib/command.php:435 -#, php-format +#, fuzzy, php-format msgid "Notice from %s repeated" -msgstr "" +msgstr "Nota delite." #: lib/command.php:437 msgid "Error repeating notice." @@ -4450,9 +4501,9 @@ msgid "Notice too long - maximum is %d characters, you sent %d" msgstr "" #: lib/command.php:500 -#, php-format +#, fuzzy, php-format msgid "Reply to %s sent" -msgstr "" +msgstr "Responsas a %s" #: lib/command.php:502 msgid "Error saving notice." @@ -4500,47 +4551,42 @@ msgstr "" msgid "Login command is disabled" msgstr "" -#: lib/command.php:664 -#, php-format -msgid "Could not create login token for %s" -msgstr "" - -#: lib/command.php:669 +#: lib/command.php:661 #, php-format msgid "This link is useable only once, and is good for only 2 minutes: %s" msgstr "" -#: lib/command.php:685 +#: lib/command.php:677 msgid "You are not subscribed to anyone." msgstr "" -#: lib/command.php:687 +#: lib/command.php:679 msgid "You are subscribed to this person:" msgid_plural "You are subscribed to these people:" msgstr[0] "" msgstr[1] "" -#: lib/command.php:707 +#: lib/command.php:699 msgid "No one is subscribed to you." msgstr "" -#: lib/command.php:709 +#: lib/command.php:701 msgid "This person is subscribed to you:" msgid_plural "These people are subscribed to you:" msgstr[0] "" msgstr[1] "" -#: lib/command.php:729 +#: lib/command.php:721 msgid "You are not a member of any groups." msgstr "" -#: lib/command.php:731 +#: lib/command.php:723 msgid "You are a member of this group:" msgid_plural "You are a member of these groups:" msgstr[0] "" msgstr[1] "" -#: lib/command.php:745 +#: lib/command.php:737 msgid "" "Commands:\n" "on - turn on notifications\n" @@ -4695,10 +4741,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\"" @@ -4857,22 +4899,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 @@ -5006,6 +5036,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 "" @@ -5037,7 +5088,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 @@ -5045,8 +5096,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 @@ -5055,7 +5107,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 @@ -5088,7 +5140,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 @@ -5206,6 +5268,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 "" @@ -5376,10 +5443,6 @@ msgstr "" msgid "People Tagcloud as tagged" msgstr "" -#: lib/subscriptionlist.php:126 -msgid "(none)" -msgstr "" - #: lib/tagcloudsection.php:56 msgid "None" msgstr "" @@ -5440,47 +5503,47 @@ msgstr "" msgid "Moderate" msgstr "" -#: lib/util.php:837 +#: lib/util.php:884 msgid "a few seconds ago" msgstr "" -#: lib/util.php:839 +#: lib/util.php:886 msgid "about a minute ago" msgstr "" -#: lib/util.php:841 +#: lib/util.php:888 #, php-format msgid "about %d minutes ago" msgstr "" -#: lib/util.php:843 +#: lib/util.php:890 msgid "about an hour ago" msgstr "" -#: lib/util.php:845 +#: lib/util.php:892 #, php-format msgid "about %d hours ago" msgstr "" -#: lib/util.php:847 +#: lib/util.php:894 msgid "about a day ago" msgstr "" -#: lib/util.php:849 +#: lib/util.php:896 #, php-format msgid "about %d days ago" msgstr "" -#: lib/util.php:851 +#: lib/util.php:898 msgid "about a month ago" msgstr "" -#: lib/util.php:853 +#: lib/util.php:900 #, php-format msgid "about %d months ago" msgstr "" -#: lib/util.php:855 +#: lib/util.php:902 msgid "about a year ago" msgstr "" @@ -5494,18 +5557,7 @@ msgstr "" 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." +#: scripts/xmppdaemon.php:301 +#, php-format +msgid "Message too long - maximum is %1$d characters, you sent %2$d." msgstr "" diff --git a/locale/is/LC_MESSAGES/statusnet.po b/locale/is/LC_MESSAGES/statusnet.po index 3092d2e99..b524a7f8f 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-05 22:10+0000\n" -"PO-Revision-Date: 2010-01-05 22:11:42+0000\n" +"POT-Creation-Date: 2010-01-11 23:25+0000\n" +"PO-Revision-Date: 2010-01-11 23:27:15+0000\n" "Language-Team: Icelandic\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha (r60693); Translate extension (2010-01-04)\n" +"X-Generator: MediaWiki 1.16alpha (r60950); 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" @@ -41,7 +41,7 @@ msgstr "Ekkert þannig merki." #: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79 #: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75 #: actions/favoritesrss.php:74 actions/foaf.php:40 actions/foaf.php:58 -#: actions/microsummary.php:62 actions/newmessage.php:116 +#: actions/microsummary.php:62 actions/newmessage.php:116 actions/otp.php:76 #: actions/remotesubscribe.php:145 actions/remotesubscribe.php:154 #: actions/replies.php:73 actions/repliesrss.php:38 #: actions/showfavorites.php:105 actions/userbyid.php:74 @@ -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 #, 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 #, 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" @@ -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,11 +605,11 @@ 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/invite.php:56 actions/login.php:115 actions/makeadmin.php:66 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80 #: actions/othersettings.php:145 actions/passwordsettings.php:138 #: actions/profilesettings.php:194 actions/recoverpassword.php:337 @@ -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" +#: actions/joingroup.php:135 +#, fuzzy, php-format +msgid "%1$s joined group %2$s" msgstr "%s bætti sér í hópinn %s" #: actions/leavegroup.php:60 @@ -1834,69 +1807,59 @@ 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" +#: actions/leavegroup.php:134 +#, 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 +#: actions/login.php:80 actions/otp.php:62 actions/register.php:137 msgid "Already logged in." msgstr "Þú hefur nú þegar skráð þig inn." -#: actions/login.php:114 actions/login.php:124 -#, fuzzy -msgid "Invalid or expired token." -msgstr "Ótækt bablinnihald" - -#: actions/login.php:147 +#: actions/login.php:126 msgid "Incorrect username or password." msgstr "Rangt notendanafn eða lykilorð." -#: actions/login.php:153 +#: actions/login.php:132 actions/otp.php:120 #, fuzzy 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:188 actions/login.php:241 lib/action.php:460 #: lib/logingroupnav.php:79 msgid "Login" msgstr "Innskráning" -#: actions/login.php:247 +#: actions/login.php:227 msgid "Login to site" msgstr "Skrá þig inn á síðuna" -#: actions/login.php:250 actions/profilesettings.php:106 -#: actions/register.php:423 actions/showgroup.php:236 actions/tagother.php:94 +#: actions/login.php:230 actions/profilesettings.php:106 +#: actions/register.php:424 actions/showgroup.php:236 actions/tagother.php:94 #: lib/groupeditform.php:152 lib/userprofile.php:131 msgid "Nickname" msgstr "Stuttnefni" -#: actions/login.php:253 actions/register.php:428 +#: actions/login.php:233 actions/register.php:429 #: lib/accountsettingsaction.php:116 msgid "Password" msgstr "Lykilorð" -#: actions/login.php:256 actions/register.php:477 +#: actions/login.php:236 actions/register.php:478 msgid "Remember me" msgstr "Muna eftir mér" -#: actions/login.php:257 actions/register.php:479 +#: actions/login.php:237 actions/register.php:480 msgid "Automatically login in the future; not for shared computers!" msgstr "" "Sjálfvirk innskráning í framtíðinni. Ekki nota þetta á tölvu sem aðrir deila " "með þér!" -#: actions/login.php:267 +#: actions/login.php:247 msgid "Lost or forgotten password?" msgstr "Tapað eða gleymt lykilorð?" -#: actions/login.php:286 +#: actions/login.php:266 msgid "" "For security reasons, please re-enter your user name and password before " "changing your settings." @@ -1904,7 +1867,7 @@ msgstr "" "Af öryggisástæðum, vinsamlegast sláðu aftur inn notendanafnið þitt og " "lykilorð áður en þú breytir stillingunum þínum." -#: actions/login.php:290 +#: actions/login.php:270 #, fuzzy, php-format msgid "" "Login with your username and password. Don't have a username yet? [Register]" @@ -1920,18 +1883,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" @@ -1973,9 +1936,9 @@ msgstr "" msgid "Message sent" msgstr "" -#: actions/newmessage.php:185 lib/command.php:376 -#, php-format -msgid "Direct message to %s sent" +#: actions/newmessage.php:185 +#, 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 +1967,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 @@ -2064,8 +2027,8 @@ msgstr "" msgid "Only " msgstr "" -#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1031 -#: lib/api.php:1059 lib/api.php:1169 +#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1033 +#: lib/api.php:1061 lib/api.php:1171 msgid "Not a supported data format." msgstr "Enginn stuðningur við gagnasnið." @@ -2110,10 +2073,30 @@ 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/otp.php:69 +#, fuzzy +msgid "No user ID specified." +msgstr "Engin persónuleg síða tilgreind" + +#: actions/otp.php:83 +#, fuzzy +msgid "No login token specified." +msgstr "Engin persónuleg síða tilgreind" + +#: actions/otp.php:90 +#, fuzzy +msgid "No login token requested." +msgstr "Ekkert einkenni persónulegrar síðu í beiðni." + +#: actions/otp.php:95 +#, fuzzy +msgid "Invalid login token specified." +msgstr "Ótækt bablinnihald" + +#: actions/otp.php:104 +#, fuzzy +msgid "Login token expired." +msgstr "Skrá þig inn á síðuna" #: actions/outbox.php:61 #, php-format @@ -2150,7 +2133,7 @@ msgid "6 or more characters" msgstr "6 eða fleiri tákn" #: actions/passwordsettings.php:112 actions/recoverpassword.php:239 -#: actions/register.php:432 actions/smssettings.php:134 +#: actions/register.php:433 actions/smssettings.php:134 msgid "Confirm" msgstr "Staðfesta" @@ -2186,7 +2169,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 +2202,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 +2303,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 +2335,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 +2345,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 @@ -2383,45 +2367,45 @@ msgstr "Upplýsingar á persónulegri síðu" msgid "1-64 lowercase letters or numbers, no punctuation or spaces" msgstr "1-64 lágstafir eða tölustafir, engin greinarmerki eða bil" -#: actions/profilesettings.php:111 actions/register.php:447 +#: actions/profilesettings.php:111 actions/register.php:448 #: actions/showgroup.php:247 actions/tagother.php:104 #: lib/groupeditform.php:157 lib/userprofile.php:149 msgid "Full name" msgstr "Fullt nafn" -#: actions/profilesettings.php:115 actions/register.php:452 +#: actions/profilesettings.php:115 actions/register.php:453 #: lib/groupeditform.php:161 msgid "Homepage" msgstr "Heimasíða" -#: actions/profilesettings.php:117 actions/register.php:454 +#: actions/profilesettings.php:117 actions/register.php:455 msgid "URL of your homepage, blog, or profile on another site" msgstr "" "Veffang heimasíðunnar þinnar, bloggsins þíns eða persónulegrar síðu á öðru " "vefsvæði" -#: actions/profilesettings.php:122 actions/register.php:460 +#: actions/profilesettings.php:122 actions/register.php:461 #, fuzzy, php-format msgid "Describe yourself and your interests in %d chars" msgstr "Lýstu þér og áhugamálum þínum í 140 táknum" -#: actions/profilesettings.php:125 actions/register.php:463 +#: actions/profilesettings.php:125 actions/register.php:464 #, fuzzy msgid "Describe yourself and your interests" msgstr "Lýstu þér og þínum " -#: actions/profilesettings.php:127 actions/register.php:465 +#: actions/profilesettings.php:127 actions/register.php:466 msgid "Bio" msgstr "Lýsing" -#: actions/profilesettings.php:132 actions/register.php:470 +#: actions/profilesettings.php:132 actions/register.php:471 #: actions/showgroup.php:256 actions/tagother.php:112 #: actions/userauthorization.php:158 lib/groupeditform.php:177 #: lib/userprofile.php:164 msgid "Location" msgstr "Staðsetning" -#: actions/profilesettings.php:134 actions/register.php:472 +#: actions/profilesettings.php:134 actions/register.php:473 msgid "Where you are, like \"City, State (or Region), Country\"" msgstr "Staðsetning þín, eins og \"borg, sýsla, land\"" @@ -2487,20 +2471,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." @@ -2721,7 +2705,7 @@ msgstr "Villa kom upp í stillingu notanda." msgid "New password successfully saved. You are now logged in." msgstr "Tókst að vista nýtt lykilorð. Þú ert núna innskráð(ur)" -#: actions/register.php:85 actions/register.php:189 actions/register.php:404 +#: actions/register.php:85 actions/register.php:189 actions/register.php:405 msgid "Sorry, only invited people can register." msgstr "Afsakið en aðeins fólki sem er boðið getur nýskráð sig." @@ -2733,7 +2717,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:503 lib/action.php:457 #: lib/logingroupnav.php:85 msgid "Register" msgstr "Nýskrá" @@ -2746,72 +2730,68 @@ 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áð." -#: actions/register.php:243 actions/register.php:264 +#: actions/register.php:243 actions/register.php:265 msgid "Invalid username or password." msgstr "Ótækt notendanafn eða lykilorð." -#: actions/register.php:342 +#: actions/register.php:343 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 +#: actions/register.php:425 msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required." msgstr "" "1-64 lágstafir eða tölustafir, engin greinarmerki eða bil. Nauðsynlegt." -#: actions/register.php:429 +#: actions/register.php:430 msgid "6 or more characters. Required." msgstr "6 eða fleiri tákn. Nauðsynlegt" -#: actions/register.php:433 +#: actions/register.php:434 msgid "Same as password above. Required." msgstr "Sama og lykilorðið hér fyrir ofan. Nauðsynlegt." -#: actions/register.php:437 actions/register.php:441 +#: actions/register.php:438 actions/register.php:442 #: actions/siteadminpanel.php:270 lib/accountsettingsaction.php:120 msgid "Email" msgstr "Tölvupóstur" -#: actions/register.php:438 actions/register.php:442 +#: actions/register.php:439 actions/register.php:443 msgid "Used only for updates, announcements, and password recovery" msgstr "" "Aðeins notað fyrir uppfærslur, tilkynningar og endurheimtingu lykilorða." -#: actions/register.php:449 +#: actions/register.php:450 msgid "Longer name, preferably your \"real\" name" msgstr "Lengra nafn, ákjósalegast að það sé \"rétta\" nafnið þitt" -#: actions/register.php:493 +#: actions/register.php:494 msgid "My text and files are available under " msgstr "Textinn og skrárnar mínar eru aðgengilegar undir " -#: actions/register.php:495 +#: actions/register.php:496 msgid "Creative Commons Attribution 3.0" msgstr "" -#: actions/register.php:496 +#: actions/register.php:497 msgid "" " except this private data: password, email address, IM address, and phone " "number." msgstr "" -#: actions/register.php:537 -#, php-format +#: actions/register.php:538 +#, 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 " @@ -2838,7 +2818,7 @@ msgstr "" "\n" "Takk fyrir að skrá þig og við vonum að þú njótir þjónustunnar." -#: actions/register.php:561 +#: actions/register.php:562 msgid "" "(You should receive a message by email momentarily, with instructions on how " "to confirm your email address.)" @@ -2943,11 +2923,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 +2941,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 +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 @@ -2998,11 +2973,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 +3022,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 +3070,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 +3137,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 +3164,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 +3176,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 +3221,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 +3416,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 +3447,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 +3537,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 +3574,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 +3610,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 +3699,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 +3818,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 +3874,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 +3907,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 +3921,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,23 +3935,94 @@ msgstr "" msgid "Try [searching for groups](%%action.groupsearch%%) and joining them." msgstr "" -#: classes/File.php:137 +#: 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:144 #, 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 "" -#: classes/File.php:147 +#: classes/File.php:154 #, php-format msgid "A file this large would exceed your user quota of %d bytes." msgstr "" -#: classes/File.php:154 +#: classes/File.php:161 #, php-format msgid "A file this large would exceed your monthly quota of %d bytes." msgstr "" +#: classes/Login_token.php:76 +#, fuzzy, php-format +msgid "Could not create login token for %s" +msgstr "Gat ekki búið til uppáhald." + #: classes/Message.php:45 #, fuzzy msgid "You are banned from sending direct messages." @@ -4060,7 +4075,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)" @@ -4107,140 +4122,140 @@ msgid "Other options" msgstr "Aðrir valkostir" #: lib/action.php:144 -#, php-format -msgid "%s - %s" -msgstr "%s - %s" +#, fuzzy, php-format +msgid "%1$s - %2$s" +msgstr "%1$s (%2$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 +4264,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 +4280,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 +4314,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" @@ -4362,7 +4382,7 @@ msgstr "Lykilorðabreyting" 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" @@ -4397,11 +4417,13 @@ msgid "" msgstr "" #: lib/command.php:152 lib/command.php:399 lib/command.php:460 +#, fuzzy msgid "Notice with that id does not exist" -msgstr "" +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 +#, fuzzy msgid "User has no last notice" msgstr "Notandi hefur ekkert nýtt babl" @@ -4409,22 +4431,42 @@ msgstr "Notandi hefur ekkert nýtt babl" 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:217 +#, fuzzy +msgid "You are already a member of that group" +msgstr "Þú ert nú þegar meðlimur í þessum hópi" + +#: lib/command.php:234 +#, fuzzy, php-format +msgid "Could not join user %s to group %s" +msgstr "Gat ekki bætt notandanum %s í hópinn %s" + +#: lib/command.php:239 +#, fuzzy, php-format +msgid "%s joined group %s" +msgstr "%s bætti sér í hópinn %s" + +#: lib/command.php:284 +#, fuzzy, php-format +msgid "Could not remove user %s to group %s" +msgstr "Gat ekki fjarlægt notandann %s úr hópnum %s" + +#: lib/command.php:289 +#, fuzzy, php-format +msgid "%s left group %s" +msgstr "%s gekk úr hópnum %s" #: lib/command.php:318 -#, php-format +#, fuzzy, php-format msgid "Fullname: %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" @@ -4434,11 +4476,16 @@ msgstr "Heimasíða: %s" msgid "About: %s" msgstr "Um: %s" -#: lib/command.php:358 scripts/xmppdaemon.php:301 +#: lib/command.php:358 #, fuzzy, php-format msgid "Message too long - maximum is %d characters, you sent %d" msgstr "Skilaboð eru of löng - 140 tákn eru í mesta lagi leyfð en þú sendir %d" +#: lib/command.php:376 +#, fuzzy, php-format +msgid "Direct message to %s sent" +msgstr "Bein skilaboð send til %s" + #: lib/command.php:378 msgid "Error sending direct message." msgstr "Villa kom upp við að senda bein skilaboð" @@ -4479,6 +4526,7 @@ msgid "Error saving notice." msgstr "Vandamál komu upp við að vista babl." #: lib/command.php:556 +#, fuzzy msgid "Specify the name of the user to subscribe to" msgstr "Tilgreindu nafn notandans sem þú vilt gerast áskrifandi að" @@ -4488,6 +4536,7 @@ msgid "Subscribed to %s" msgstr "Nú ert þú áskrifandi að %s" #: lib/command.php:584 +#, fuzzy msgid "Specify the name of the user to unsubscribe from" msgstr "Tilgreindu nafn notandans sem þú vilt hætta sem áskrifandi að" @@ -4520,50 +4569,45 @@ msgstr "Get ekki kveikt á tilkynningum." msgid "Login command is disabled" msgstr "" -#: lib/command.php:664 -#, fuzzy, php-format -msgid "Could not create login token for %s" -msgstr "Gat ekki búið til uppáhald." - -#: lib/command.php:669 +#: lib/command.php:661 #, php-format msgid "This link is useable only once, and is good for only 2 minutes: %s" msgstr "" -#: lib/command.php:685 +#: lib/command.php:677 #, fuzzy msgid "You are not subscribed to anyone." msgstr "Þú ert ekki áskrifandi." -#: lib/command.php:687 +#: lib/command.php:679 msgid "You are subscribed to this person:" msgid_plural "You are subscribed to these people:" msgstr[0] "Þú ert nú þegar í áskrift að þessum notendum:" msgstr[1] "Þú ert nú þegar í áskrift að þessum notendum:" -#: lib/command.php:707 +#: lib/command.php:699 #, fuzzy msgid "No one is subscribed to you." msgstr "Gat ekki leyft öðrum að gerast áskrifandi að þér." -#: lib/command.php:709 +#: lib/command.php:701 msgid "This person is subscribed to you:" msgid_plural "These people are subscribed to you:" msgstr[0] "Gat ekki leyft öðrum að gerast áskrifandi að þér." msgstr[1] "Gat ekki leyft öðrum að gerast áskrifandi að þér." -#: lib/command.php:729 +#: lib/command.php:721 #, fuzzy msgid "You are not a member of any groups." msgstr "Þú ert ekki meðlimur í þessum hópi." -#: lib/command.php:731 +#: lib/command.php:723 msgid "You are a member of this group:" msgid_plural "You are a member of these groups:" msgstr[0] "Þú ert ekki meðlimur í þessum hópi." msgstr[1] "Þú ert ekki meðlimur í þessum hópi." -#: lib/command.php:745 +#: lib/command.php:737 msgid "" "Commands:\n" "on - turn on notifications\n" @@ -4723,10 +4767,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\"" @@ -4886,21 +4926,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" @@ -5046,6 +5074,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 "" @@ -5077,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 @@ -5086,7 +5135,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 @@ -5096,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 @@ -5129,7 +5178,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 @@ -5251,6 +5310,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" @@ -5429,10 +5493,6 @@ msgstr "" msgid "People Tagcloud as tagged" msgstr "" -#: lib/subscriptionlist.php:126 -msgid "(none)" -msgstr "(ekkert)" - #: lib/tagcloudsection.php:56 msgid "None" msgstr "Ekkert" @@ -5495,47 +5555,47 @@ msgstr "Skilaboð" msgid "Moderate" msgstr "" -#: lib/util.php:837 +#: lib/util.php:884 msgid "a few seconds ago" msgstr "fyrir nokkrum sekúndum" -#: lib/util.php:839 +#: lib/util.php:886 msgid "about a minute ago" msgstr "fyrir um einni mínútu síðan" -#: lib/util.php:841 +#: lib/util.php:888 #, php-format msgid "about %d minutes ago" msgstr "fyrir um %d mínútum síðan" -#: lib/util.php:843 +#: lib/util.php:890 msgid "about an hour ago" msgstr "fyrir um einum klukkutíma síðan" -#: lib/util.php:845 +#: lib/util.php:892 #, php-format msgid "about %d hours ago" msgstr "fyrir um %d klukkutímum síðan" -#: lib/util.php:847 +#: lib/util.php:894 msgid "about a day ago" msgstr "fyrir um einum degi síðan" -#: lib/util.php:849 +#: lib/util.php:896 #, php-format msgid "about %d days ago" msgstr "fyrir um %d dögum síðan" -#: lib/util.php:851 +#: lib/util.php:898 msgid "about a month ago" msgstr "fyrir um einum mánuði síðan" -#: lib/util.php:853 +#: lib/util.php:900 #, php-format msgid "about %d months ago" msgstr "fyrir um %d mánuðum síðan" -#: lib/util.php:855 +#: lib/util.php:902 msgid "about a year ago" msgstr "fyrir um einu ári síðan" @@ -5549,18 +5609,7 @@ msgstr "" 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." +#: scripts/xmppdaemon.php:301 +#, fuzzy, php-format +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" diff --git a/locale/it/LC_MESSAGES/statusnet.po b/locale/it/LC_MESSAGES/statusnet.po index 5c025c4c0..9f4e3e734 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-05 22:10+0000\n" -"PO-Revision-Date: 2010-01-05 22:11:47+0000\n" +"POT-Creation-Date: 2010-01-11 23:25+0000\n" +"PO-Revision-Date: 2010-01-11 23:27:19+0000\n" "Language-Team: Italian\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha (r60693); Translate extension (2010-01-04)\n" +"X-Generator: MediaWiki 1.16alpha (r60950); 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" @@ -39,7 +39,7 @@ msgstr "Pagina inesistente." #: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79 #: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75 #: actions/favoritesrss.php:74 actions/foaf.php:40 actions/foaf.php:58 -#: actions/microsummary.php:62 actions/newmessage.php:116 +#: actions/microsummary.php:62 actions/newmessage.php:116 actions/otp.php:76 #: actions/remotesubscribe.php:145 actions/remotesubscribe.php:154 #: actions/replies.php:73 actions/repliesrss.php:38 #: actions/showfavorites.php:105 actions/userbyid.php:74 @@ -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 @@ -98,11 +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 "" -"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,16 @@ 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!" +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!" +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 +295,8 @@ 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!" +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 +382,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 msgid "You are already a member of that group." msgstr "Fai già parte di quel gruppo." @@ -394,30 +390,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 +#: actions/apigroupjoin.php:138 actions/joingroup.php:128 #, php-format -msgid "Could not join user %s to group %s." -msgstr "Impossibile iscrivere l'utente %s al gruppo %s." +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 +#: actions/apigroupleave.php:124 actions/leavegroup.php:127 #, php-format -msgid "Could not remove user %s to group %s." -msgstr "Impossibile rimuovere l'utente %s dal gruppo %s." +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" @@ -458,7 +449,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." @@ -479,13 +470,13 @@ msgstr "Formato non supportato." #: actions/apitimelinefavorites.php:108 #, php-format -msgid "%s / Favorites from %s" -msgstr "%s / Preferiti da %s" +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" +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 +543,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 +571,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,11 +604,11 @@ 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/invite.php:56 actions/login.php:115 actions/makeadmin.php:66 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80 #: actions/othersettings.php:145 actions/passwordsettings.php:138 #: actions/profilesettings.php:194 actions/recoverpassword.php:337 @@ -695,19 +689,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 @@ -716,8 +706,8 @@ msgstr "Profili bloccati di %s" #: actions/blockedfromgroup.php:93 #, php-format -msgid "%s blocked profiles, page %d" -msgstr "Profili bloccati di %s, pagina %d" +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 +819,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 +844,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 +984,8 @@ 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" +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 +1009,7 @@ msgid "Options saved." msgstr "Opzioni salvate." #: actions/emailsettings.php:60 -msgid "Email Settings" +msgid "Email settings" msgstr "Impostazioni email" #: actions/emailsettings.php:71 @@ -1062,8 +1047,8 @@ msgid "Cancel" msgstr "Annulla" #: actions/emailsettings.php:121 -msgid "Email Address" -msgstr "Indirizzo email" +msgid "Email address" +msgstr "Indirizzi email" #: actions/emailsettings.php:123 msgid "Email address, like \"UserName@example.org\"" @@ -1139,9 +1124,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 +1225,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 +1310,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 +1326,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." @@ -1375,12 +1354,13 @@ msgstr "Blocca l'utente dal gruppo" #: 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 "" -"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 +1374,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 +1399,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 +1415,10 @@ msgstr "" "Puoi caricare un'immagine per il logo del tuo gruppo. La dimensione massima " "del file è di %s." +#: actions/grouplogo.php:178 +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." @@ -1460,14 +1438,14 @@ msgstr "Membri del gruppo %s" #: actions/groupmembers.php:96 #, php-format -msgid "%s group members, page %d" -msgstr "Membri del gruppo %s, pagina %d" +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 +1548,7 @@ msgid "Error removing the block." msgstr "Errore nel rimuovere il blocco." #: actions/imsettings.php:59 -msgid "IM Settings" +msgid "IM settings" msgstr "Impostazioni messaggistica istantanea" #: actions/imsettings.php:70 @@ -1602,7 +1580,7 @@ msgstr "" "elenco contatti?" #: actions/imsettings.php:124 -msgid "IM Address" +msgid "IM address" msgstr "Indirizzo di messaggistica istantanea" #: actions/imsettings.php:126 @@ -1664,11 +1642,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 +1679,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 +1724,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 +1794,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 +#: actions/joingroup.php:135 #, php-format -msgid "%s joined group %s" -msgstr "%s fa ora parte del gruppo %s" +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,65 +1811,56 @@ 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 +#: actions/leavegroup.php:134 #, php-format -msgid "%s left group %s" -msgstr "%s ha lasciato il gruppo %s" +msgid "%1$s left group %2$s" +msgstr "%1$s ha lasciato il gruppo %2$s" -#: actions/login.php:83 actions/register.php:137 +#: actions/login.php:80 actions/otp.php:62 actions/register.php:137 msgid "Already logged in." msgstr "Accesso già effettuato." -#: actions/login.php:114 actions/login.php:124 -msgid "Invalid or expired token." -msgstr "Token non valido o scaduto." - -#: actions/login.php:147 +#: actions/login.php:126 msgid "Incorrect username or password." msgstr "Nome utente o password non corretto." -#: actions/login.php:153 +#: actions/login.php:132 actions/otp.php:120 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:188 actions/login.php:241 lib/action.php:460 #: lib/logingroupnav.php:79 msgid "Login" msgstr "Accedi" -#: actions/login.php:247 +#: actions/login.php:227 msgid "Login to site" msgstr "Accedi al sito" -#: actions/login.php:250 actions/profilesettings.php:106 -#: actions/register.php:423 actions/showgroup.php:236 actions/tagother.php:94 +#: actions/login.php:230 actions/profilesettings.php:106 +#: actions/register.php:424 actions/showgroup.php:236 actions/tagother.php:94 #: lib/groupeditform.php:152 lib/userprofile.php:131 msgid "Nickname" msgstr "Soprannome" -#: actions/login.php:253 actions/register.php:428 +#: actions/login.php:233 actions/register.php:429 #: lib/accountsettingsaction.php:116 msgid "Password" msgstr "Password" -#: actions/login.php:256 actions/register.php:477 +#: actions/login.php:236 actions/register.php:478 msgid "Remember me" msgstr "Ricordami" -#: actions/login.php:257 actions/register.php:479 +#: actions/login.php:237 actions/register.php:480 msgid "Automatically login in the future; not for shared computers!" msgstr "Accedi automaticamente in futuro; non per computer condivisi!" -#: actions/login.php:267 +#: actions/login.php:247 msgid "Lost or forgotten password?" msgstr "Password persa o dimenticata?" -#: actions/login.php:286 +#: actions/login.php:266 msgid "" "For security reasons, please re-enter your user name and password before " "changing your settings." @@ -1913,7 +1868,7 @@ msgstr "" "Per motivi di sicurezza, è necessario che tu inserisca il tuo nome utente e " "la tua password prima di modificare le impostazioni." -#: actions/login.php:290 +#: actions/login.php:270 #, php-format msgid "" "Login with your username and password. Don't have a username yet? [Register]" @@ -1929,18 +1884,18 @@ msgstr "" #: actions/makeadmin.php:95 #, php-format -msgid "%s is already an admin for group \"%s\"." -msgstr "%s è già amministratore per il gruppo \"%s\"." +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" +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" +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" @@ -1980,10 +1935,10 @@ msgstr "Non inviarti un messaggio, piuttosto ripetilo a voce dolcemente." msgid "Message sent" msgstr "Messaggio inviato" -#: actions/newmessage.php:185 lib/command.php:376 +#: actions/newmessage.php:185 #, php-format -msgid "Direct message to %s sent" -msgstr "Messaggio diretto a %s inviato" +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 +1966,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 @@ -2075,8 +2030,8 @@ msgstr "tipo di contenuto " msgid "Only " msgstr "Solo " -#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1031 -#: lib/api.php:1059 lib/api.php:1169 +#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1033 +#: lib/api.php:1061 lib/api.php:1171 msgid "Not a supported data format." msgstr "Non è un formato di dati supportato." @@ -2120,10 +2075,30 @@ 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/otp.php:69 +#, fuzzy +msgid "No user ID specified." +msgstr "Nessun gruppo specificato." + +#: actions/otp.php:83 +#, fuzzy +msgid "No login token specified." +msgstr "Nessun messaggio specificato." + +#: actions/otp.php:90 +#, fuzzy +msgid "No login token requested." +msgstr "Nessun ID di profilo nella richiesta." + +#: actions/otp.php:95 +#, fuzzy +msgid "Invalid login token specified." +msgstr "Token non valido o scaduto." + +#: actions/otp.php:104 +#, fuzzy +msgid "Login token expired." +msgstr "Accedi al sito" #: actions/outbox.php:61 #, php-format @@ -2161,7 +2136,7 @@ msgid "6 or more characters" msgstr "6 o più caratteri" #: actions/passwordsettings.php:112 actions/recoverpassword.php:239 -#: actions/register.php:432 actions/smssettings.php:134 +#: actions/register.php:433 actions/smssettings.php:134 msgid "Confirm" msgstr "Conferma" @@ -2197,7 +2172,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 +2205,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 +2298,7 @@ msgid "When to use SSL" msgstr "Quando usare SSL" #: actions/pathsadminpanel.php:308 -msgid "SSL Server" +msgid "SSL server" msgstr "Server SSL" #: actions/pathsadminpanel.php:309 @@ -2354,8 +2329,8 @@ 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" +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" @@ -2363,10 +2338,10 @@ msgstr "Contenuto del messaggio non valido" #: 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 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" @@ -2388,48 +2363,48 @@ msgid "1-64 lowercase letters or numbers, no punctuation or spaces" msgstr "" "1-64 lettere minuscole o numeri, senza spazi o simboli di punteggiatura" -#: actions/profilesettings.php:111 actions/register.php:447 +#: actions/profilesettings.php:111 actions/register.php:448 #: actions/showgroup.php:247 actions/tagother.php:104 #: lib/groupeditform.php:157 lib/userprofile.php:149 msgid "Full name" msgstr "Nome" -#: actions/profilesettings.php:115 actions/register.php:452 +#: actions/profilesettings.php:115 actions/register.php:453 #: lib/groupeditform.php:161 msgid "Homepage" msgstr "Pagina web" -#: actions/profilesettings.php:117 actions/register.php:454 +#: actions/profilesettings.php:117 actions/register.php:455 msgid "URL of your homepage, blog, or profile on another site" msgstr "URL della tua pagina web, blog o profilo su un altro sito" -#: actions/profilesettings.php:122 actions/register.php:460 +#: actions/profilesettings.php:122 actions/register.php:461 #, php-format msgid "Describe yourself and your interests in %d chars" msgstr "Descriviti assieme ai tuoi interessi in %d caratteri" -#: actions/profilesettings.php:125 actions/register.php:463 +#: actions/profilesettings.php:125 actions/register.php:464 msgid "Describe yourself and your interests" msgstr "Descrivi te e i tuoi interessi" -#: actions/profilesettings.php:127 actions/register.php:465 +#: actions/profilesettings.php:127 actions/register.php:466 msgid "Bio" msgstr "Biografia" -#: actions/profilesettings.php:132 actions/register.php:470 +#: actions/profilesettings.php:132 actions/register.php:471 #: actions/showgroup.php:256 actions/tagother.php:112 #: actions/userauthorization.php:158 lib/groupeditform.php:177 #: lib/userprofile.php:164 msgid "Location" msgstr "Ubicazione" -#: actions/profilesettings.php:134 actions/register.php:472 +#: actions/profilesettings.php:134 actions/register.php:473 msgid "Where you are, like \"City, State (or Region), Country\"" 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 +2463,19 @@ msgstr "Etichetta non valida: \"%s\"" msgid "Couldn't update user for autosubscribe." msgstr "Impossibile aggiornare l'utente per auto-abbonarsi." -#: actions/profilesettings.php:354 -#, fuzzy +#: actions/profilesettings.php:359 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." @@ -2733,7 +2707,7 @@ msgstr "Errore nell'impostare l'utente." msgid "New password successfully saved. You are now logged in." msgstr "Nuova password salvata con successo. Hai effettuato l'accesso." -#: actions/register.php:85 actions/register.php:189 actions/register.php:404 +#: actions/register.php:85 actions/register.php:189 actions/register.php:405 msgid "Sorry, only invited people can register." msgstr "Solo le persone invitate possono registrarsi." @@ -2745,7 +2719,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:503 lib/action.php:457 #: lib/logingroupnav.php:85 msgid "Register" msgstr "Registra" @@ -2758,19 +2732,15 @@ 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." -#: actions/register.php:243 actions/register.php:264 +#: actions/register.php:243 actions/register.php:265 msgid "Invalid username or password." msgstr "Nome utente o password non valido." -#: actions/register.php:342 +#: actions/register.php:343 msgid "" "With this form you can create a new account. You can then post notices and " "link up to friends and colleagues. " @@ -2779,41 +2749,41 @@ msgstr "" "successivamente inviare messaggi e metterti in contatto con i tuoi amici e " "colleghi. " -#: actions/register.php:424 +#: actions/register.php:425 msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required." msgstr "" "1-64 lettere minuscole o numeri, niente punteggiatura o spazi; richiesto" -#: actions/register.php:429 +#: actions/register.php:430 msgid "6 or more characters. Required." msgstr "6 o più caratteri; richiesta" -#: actions/register.php:433 +#: actions/register.php:434 msgid "Same as password above. Required." msgstr "Stessa password di sopra; richiesta" -#: actions/register.php:437 actions/register.php:441 +#: actions/register.php:438 actions/register.php:442 #: actions/siteadminpanel.php:270 lib/accountsettingsaction.php:120 msgid "Email" msgstr "Email" -#: actions/register.php:438 actions/register.php:442 +#: actions/register.php:439 actions/register.php:443 msgid "Used only for updates, announcements, and password recovery" msgstr "Usata solo per aggiornamenti, annunci e recupero password" -#: actions/register.php:449 +#: actions/register.php:450 msgid "Longer name, preferably your \"real\" name" msgstr "Nome completo, preferibilmente il tuo \"vero\" nome" -#: actions/register.php:493 +#: actions/register.php:494 msgid "My text and files are available under " msgstr "I miei testi e file sono disponibili nei termini della licenza " -#: actions/register.php:495 +#: actions/register.php:496 msgid "Creative Commons Attribution 3.0" msgstr "Creative Commons Attribution 3.0" -#: actions/register.php:496 +#: actions/register.php:497 msgid "" " except this private data: password, email address, IM address, and phone " "number." @@ -2821,13 +2791,13 @@ msgstr "" " a eccezione di questi dati personali: password, indirizzo email, indirizzo " "messaggistica istantanea e numero di telefono." -#: actions/register.php:537 +#: actions/register.php:538 #, 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 +2809,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 " @@ -2854,7 +2825,7 @@ msgstr "" "Grazie per la tua iscrizione e speriamo tu possa divertiti usando questo " "servizio." -#: actions/register.php:561 +#: actions/register.php:562 msgid "" "(You should receive a message by email momentarily, with instructions on how " "to confirm your email address.)" @@ -2951,11 +2922,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)" @@ -2974,11 +2940,11 @@ msgstr "Feed delle risposte di %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 "" -"Questa è l'attività delle risposte a %s, ma %s non ha ricevuto ancora alcun " -"messaggio." +"Questa è l'attività delle risposte a %1$s, ma %2$s non ha ricevuto ancora " +"alcun messaggio." #: actions/replies.php:203 #, php-format @@ -2992,10 +2958,10 @@ 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 "" -"Puoi provare a [richiamare %s](../%s) o [scrivere qualche cosa alla sua " +"Puoi provare a [richiamare %1$s](../%2$s) o [scrivere qualche cosa alla sua " "attenzione](%%%%action.newnotice%%%%?status_textarea=%s)." #: actions/repliesrss.php:72 @@ -3011,11 +2977,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 +3033,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 +3081,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,15 +3156,10 @@ 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)" -msgstr "Feed dei messaggi per %s etichettati con %s (RSS 1.0)" +msgid "Notice feed for %1$s tagged %2$s (RSS 1.0)" +msgstr "Feed dei messaggi per %1$s etichettati con %2$s (RSS 1.0)" #: actions/showstream.php:129 #, php-format @@ -3232,8 +3183,8 @@ msgstr "FOAF per %s" #: actions/showstream.php:191 #, php-format -msgid "This is the timeline for %s but %s hasn't posted anything yet." -msgstr "Questa è l'attività di %s, ma %s non ha ancora scritto nulla." +msgid "This is the timeline for %1$s but %2$s hasn't posted anything yet." +msgstr "Questa è l'attività di %1$s, ma %2$s non ha ancora scritto nulla." #: actions/showstream.php:196 msgid "" @@ -3246,11 +3197,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 "" -"Puoi provare a richiamare %s o [scrivere qualche cosa che attiri la sua " -"attenzione](%%%%action.newnotice%%%%?status_textarea=%s)." +"Puoi provare a richiamare %1$s o [scrivere qualche cosa che attiri la sua " +"attenzione](%%%%action.newnotice%%%%?status_textarea=%2$s)." #: actions/showstream.php:234 #, php-format @@ -3299,12 +3250,12 @@ 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" +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 +3439,7 @@ msgid "Save site settings" msgstr "Salva impostazioni" #: actions/smssettings.php:58 -msgid "SMS Settings" +msgid "SMS settings" msgstr "Impostazioni SMS" #: actions/smssettings.php:69 @@ -3517,7 +3468,7 @@ 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" +msgid "SMS phone number" msgstr "Numero di telefono per SMS" #: actions/smssettings.php:140 @@ -3609,8 +3560,8 @@ msgstr "Abbonati a %s" #: actions/subscribers.php:52 #, php-format -msgid "%s subscribers, page %d" -msgstr "Abbonati a %s, pagina %d" +msgid "%1$s subscribers, page %2$d" +msgstr "Abbonati a %1$s, pagina %2$d" #: actions/subscribers.php:63 msgid "These are the people who listen to your notices." @@ -3650,8 +3601,8 @@ msgstr "Abbonamenti di %s" #: actions/subscriptions.php:54 #, php-format -msgid "%s subscriptions, page %d" -msgstr "Abbonamenti di %s, pagina %d" +msgid "%1$s subscriptions, page %2$d" +msgstr "Abbonamenti di %1$s, pagina %2$d" #: actions/subscriptions.php:65 msgid "These are the people whose notices you listen to." @@ -3690,11 +3641,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 +3726,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’." +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." +"La licenza \"%1$s\" dello stream di chi ascolti non è compatibile con la " +"licenza \"%2$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 +3839,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" @@ -3951,7 +3894,7 @@ msgstr "" #: actions/userauthorization.php:296 #, php-format -msgid "Listener URI ‘%s’ not found here" +msgid "Listener URI ‘%s’ not found here." msgstr "URL \"%s\" dell'ascoltatore non trovato qui." #: actions/userauthorization.php:301 @@ -3984,10 +3927,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 +3943,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,7 +3957,82 @@ 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." -#: classes/File.php:137 +#: 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 "" +"Questo sito esegue il software %1$s versione %2$s, Copyright 2008-2010 " +"StatusNet, Inc. e collaboratori." + +#: actions/version.php:157 +msgid "StatusNet" +msgstr "StatusNet" + +#: actions/version.php:161 +msgid "Contributors" +msgstr "Collaboratori" + +#: 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 è software libero: è possibile redistribuirlo o modificarlo nei " +"termini della GNU Affero General Public License, come pubblicata dalla Free " +"Software Foundation, versione 3 o (a scelta) una qualsiasi versione " +"successiva. " + +#: 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 "" +"Questo programma è distribuito nella speranza che possa essere utile, ma " +"SENZA ALCUNA GARANZIA, senza anche la garanzia implicita di COMMERCIABILITÀ " +"o di UTILIZZABILITÀ PER UN PARTICOLARE SCOPO. Per maggiori informazioni " +"consultare la GNU Affero General Public License. " + +#: 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 "" +"Una copia della GNU Affero General Plublic License dovrebbe essere " +"disponibile assieme a questo programma. Se così non fosse, consultare %s." + +#: actions/version.php:189 +msgid "Plugins" +msgstr "Plugin" + +#: actions/version.php:195 +msgid "Name" +msgstr "Nome" + +#: actions/version.php:196 lib/action.php:741 +msgid "Version" +msgstr "Versione" + +#: actions/version.php:197 +msgid "Author(s)" +msgstr "Autori" + +#: actions/version.php:198 lib/groupeditform.php:172 +msgid "Description" +msgstr "Descrizione" + +#: classes/File.php:144 #, php-format msgid "" "No file may be larger than %d bytes and the file you sent was %d bytes. Try " @@ -4032,18 +4041,23 @@ msgstr "" "Nessun file può superare %d byte e il file inviato era di %d byte. Prova a " "caricarne una versione più piccola." -#: classes/File.php:147 +#: classes/File.php:154 #, php-format msgid "A file this large would exceed your user quota of %d bytes." msgstr "" "Un file di questa dimensione supererebbe la tua quota utente di %d byte." -#: classes/File.php:154 +#: classes/File.php:161 #, php-format msgid "A file this large would exceed your monthly quota of %d bytes." msgstr "" "Un file di questa dimensione supererebbe la tua quota mensile di %d byte." +#: classes/Login_token.php:76 +#, fuzzy, php-format +msgid "Could not create login token for %s" +msgstr "Impossibile creare il token di accesso per %s." + #: classes/Message.php:45 msgid "You are banned from sending direct messages." msgstr "Ti è proibito inviare messaggi diretti." @@ -4097,7 +4111,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" @@ -4144,136 +4158,136 @@ msgid "Other options" msgstr "Altre opzioni" #: lib/action.php:144 -#, php-format -msgid "%s - %s" -msgstr "%s - %s" +#, fuzzy, php-format +msgid "%1$s - %2$s" +msgstr "%1$s (%2$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 +4296,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 +4312,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 +4344,31 @@ 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 +msgid "Changes to that panel are not allowed." +msgstr "Le modifiche al pannello non sono consentite." + +#: 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" @@ -4375,20 +4393,18 @@ 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 password" +msgstr "Modifica della password non riuscita" #: lib/authenticationplugin.php:197 -#, fuzzy msgid "Password changing is not allowed" -msgstr "Modifica password" +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" @@ -4401,18 +4417,18 @@ msgid "Sorry, this command is not yet implemented." msgstr "Questo comando non è ancora implementato." #: lib/command.php:88 -#, php-format +#, fuzzy, php-format msgid "Could not find a user with nickname %s" -msgstr "Impossibile trovare un utente col soprannome %s" +msgstr "Impossibile trovare un utente col soprannome %s." #: lib/command.php:92 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 +#, fuzzy, php-format msgid "Nudge sent to %s" -msgstr "Richiamo inviato a %s" +msgstr "Richiamo inviato a %s." #: lib/command.php:126 #, php-format @@ -4426,34 +4442,56 @@ msgstr "" "Messaggi: %3$s" #: lib/command.php:152 lib/command.php:399 lib/command.php:460 +#, fuzzy msgid "Notice with that id does not exist" -msgstr "Un messaggio con quel ID non esiste" +msgstr "Un messaggio con quel ID non esiste." #: lib/command.php:168 lib/command.php:415 lib/command.php:476 #: lib/command.php:532 +#, fuzzy msgid "User has no last notice" -msgstr "L'utente non ha un ultimo messaggio" +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:217 +#, fuzzy +msgid "You are already a member of that group" +msgstr "Fai già parte di quel gruppo." + +#: lib/command.php:234 +#, fuzzy, php-format +msgid "Could not join user %s to group %s" +msgstr "Impossibile iscrivere l'utente %1$s al gruppo %2$s." + +#: lib/command.php:239 +#, fuzzy, php-format +msgid "%s joined group %s" +msgstr "%1$s fa ora parte del gruppo %2$s" + +#: lib/command.php:284 +#, fuzzy, php-format +msgid "Could not remove user %s to group %s" +msgstr "Impossibile rimuovere l'utente %1$s dal gruppo %2$s" + +#: lib/command.php:289 +#, fuzzy, php-format +msgid "%s left group %s" +msgstr "%1$s ha lasciato il gruppo %2$s" #: lib/command.php:318 -#, php-format +#, fuzzy, php-format msgid "Fullname: %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" +msgstr "Posizione: %s" -#: lib/command.php:324 +#: lib/command.php:324 lib/mail.php:256 #, php-format msgid "Homepage: %s" msgstr "Pagina web: %s" @@ -4463,49 +4501,57 @@ msgstr "Pagina web: %s" msgid "About: %s" msgstr "Informazioni: %s" -#: lib/command.php:358 scripts/xmppdaemon.php:301 -#, php-format +#: lib/command.php:358 +#, fuzzy, php-format msgid "Message too long - maximum is %d characters, you sent %d" -msgstr "Messaggio troppo lungo: massimo %d caratteri, inviati %d" +msgstr "Messaggio troppo lungo: massimo %1$d caratteri, inviati %2$d." + +#: lib/command.php:376 +#, fuzzy, php-format +msgid "Direct message to %s sent" +msgstr "Messaggio diretto a %s inviato." #: lib/command.php:378 msgid "Error sending direct message." msgstr "Errore nell'inviare il messaggio diretto." #: lib/command.php:422 +#, fuzzy msgid "Cannot repeat your own notice" -msgstr "Impossibile ripetere un proprio messaggio" +msgstr "Non puoi ripetere un tuo messaggio." #: lib/command.php:427 +#, fuzzy msgid "Already repeated that notice" -msgstr "Hai già ripetuto quel messaggio" +msgstr "Hai già ripetuto quel messaggio." #: lib/command.php:435 -#, php-format +#, fuzzy, php-format msgid "Notice from %s repeated" -msgstr "Messaggio da %s ripetuto" +msgstr "Messaggio da %s ripetuto." #: lib/command.php:437 msgid "Error repeating notice." msgstr "Errore nel ripetere il messaggio." #: lib/command.php:491 -#, php-format +#, fuzzy, php-format msgid "Notice too long - maximum is %d characters, you sent %d" -msgstr "Messaggio troppo lungo: massimo %d caratteri, inviati %d" +msgstr "Messaggio troppo lungo: massimo %1$d caratteri, inviati %2$d." #: lib/command.php:500 -#, php-format +#, fuzzy, php-format msgid "Reply to %s sent" -msgstr "Risposta a %s inviata" +msgstr "Risposta a %s inviata." #: lib/command.php:502 msgid "Error saving notice." msgstr "Errore nel salvare il messaggio." #: lib/command.php:556 +#, fuzzy msgid "Specify the name of the user to subscribe to" -msgstr "Specifica il nome dell'utente a cui abbonarti" +msgstr "Specifica il nome dell'utente a cui abbonarti." #: lib/command.php:563 #, php-format @@ -4513,8 +4559,9 @@ msgid "Subscribed to %s" msgstr "Abbonati a %s" #: lib/command.php:584 +#, fuzzy msgid "Specify the name of the user to unsubscribe from" -msgstr "Specifica il nome dell'utente da cui annullare l'abbonamento" +msgstr "Specifica il nome dell'utente da cui annullare l'abbonamento." #: lib/command.php:591 #, php-format @@ -4542,52 +4589,48 @@ msgid "Can't turn on notification." msgstr "Impossibile attivare le notifiche." #: lib/command.php:650 +#, 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" -msgstr "Impossibile creare il token di accesso per %s" +msgstr "Il comando di accesso è disabilitato." -#: lib/command.php:669 -#, php-format +#: lib/command.php:661 +#, 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" +"minuti: %s." -#: lib/command.php:685 +#: lib/command.php:677 msgid "You are not subscribed to anyone." msgstr "Il tuo abbonamento è stato annullato." -#: lib/command.php:687 +#: lib/command.php:679 msgid "You are subscribed to this person:" msgid_plural "You are subscribed to these people:" msgstr[0] "Persona di cui hai già un abbonamento:" msgstr[1] "Persone di cui hai già un abbonamento:" -#: lib/command.php:707 +#: lib/command.php:699 msgid "No one is subscribed to you." msgstr "Nessuno è abbonato ai tuoi messaggi." -#: lib/command.php:709 +#: lib/command.php:701 msgid "This person is subscribed to you:" msgid_plural "These people are subscribed to you:" msgstr[0] "Questa persona è abbonata ai tuoi messaggi:" msgstr[1] "Queste persone sono abbonate ai tuoi messaggi:" -#: lib/command.php:729 +#: lib/command.php:721 msgid "You are not a member of any groups." msgstr "Non fai parte di alcun gruppo." -#: lib/command.php:731 +#: lib/command.php:723 msgid "You are a member of this group:" msgid_plural "You are a member of these groups:" msgstr[0] "Non fai parte di questo gruppo:" msgstr[1] "Non fai parte di questi gruppi:" -#: lib/command.php:745 +#: lib/command.php:737 msgid "" "Commands:\n" "on - turn on notifications\n" @@ -4785,10 +4828,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\"" @@ -4971,24 +5010,10 @@ 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" -msgstr "" -"Biografia: %s\n" -"\n" +msgid "Bio: %s" +msgstr "Biografia: %s" #: lib/mail.php:286 #, php-format @@ -5185,6 +5210,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 +#, php-format +msgid "Unsupported message type: %s" +msgstr "Tipo di messaggio non supportato: %s" + #: lib/mediafile.php:98 lib/mediafile.php:123 msgid "There was a database error while saving your file. Please try again." msgstr "" @@ -5219,7 +5265,7 @@ 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!" +msgid "File exceeds user's quota." msgstr "Il file supera la quota dell'utente." #: lib/mediafile.php:196 lib/mediafile.php:233 @@ -5227,7 +5273,7 @@ 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!" +msgid "Could not determine file's MIME type." msgstr "Impossibile determinare il tipo MIME del file." #: lib/mediafile.php:270 @@ -5237,8 +5283,8 @@ 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." -msgstr "%s non è un tipo di file supportato da questo server." +msgid "%s is not a supported file type on this server." +msgstr "%s non è un tipo di file supportato su server." #: lib/messageform.php:120 msgid "Send a direct notice" @@ -5270,8 +5316,18 @@ msgid "Attach a file" msgstr "Allega un file" #: lib/noticeform.php:212 -msgid "Share your location" -msgstr "" +#, fuzzy +msgid "Share my location" +msgstr "Condividi la mia posizione" + +#: lib/noticeform.php:214 +#, fuzzy +msgid "Do not share my location" +msgstr "Non condividere la mia posizione" + +#: lib/noticeform.php:215 +msgid "Hide this info" +msgstr "Nascondi info" #: lib/noticelist.php:428 #, php-format @@ -5387,6 +5443,10 @@ msgstr "I tuoi messaggi inviati" msgid "Tags in %s's notices" msgstr "Etichette nei messaggi di %s" +#: lib/plugin.php:114 +msgid "Unknown" +msgstr "Sconosciuto" + #: lib/profileaction.php:109 lib/profileaction.php:192 lib/subgroupnav.php:82 msgid "Subscriptions" msgstr "Abbonamenti" @@ -5444,9 +5504,8 @@ msgid "Popular" 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" @@ -5557,10 +5616,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" @@ -5621,47 +5676,47 @@ msgstr "Messaggio" msgid "Moderate" msgstr "Modera" -#: lib/util.php:837 +#: lib/util.php:884 msgid "a few seconds ago" msgstr "pochi secondi fa" -#: lib/util.php:839 +#: lib/util.php:886 msgid "about a minute ago" msgstr "circa un minuto fa" -#: lib/util.php:841 +#: lib/util.php:888 #, php-format msgid "about %d minutes ago" msgstr "circa %d minuti fa" -#: lib/util.php:843 +#: lib/util.php:890 msgid "about an hour ago" msgstr "circa un'ora fa" -#: lib/util.php:845 +#: lib/util.php:892 #, php-format msgid "about %d hours ago" msgstr "circa %d ore fa" -#: lib/util.php:847 +#: lib/util.php:894 msgid "about a day ago" msgstr "circa un giorno fa" -#: lib/util.php:849 +#: lib/util.php:896 #, php-format msgid "about %d days ago" msgstr "circa %d giorni fa" -#: lib/util.php:851 +#: lib/util.php:898 msgid "about a month ago" msgstr "circa un mese fa" -#: lib/util.php:853 +#: lib/util.php:900 #, php-format msgid "about %d months ago" msgstr "circa %d mesi fa" -#: lib/util.php:855 +#: lib/util.php:902 msgid "about a year ago" msgstr "circa un anno fa" @@ -5675,18 +5730,7 @@ msgstr "%s non è un colore valido." 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." +#: scripts/xmppdaemon.php:301 +#, php-format +msgid "Message too long - maximum is %1$d characters, you sent %2$d." +msgstr "Messaggio troppo lungo: massimo %1$d caratteri, inviati %2$d." diff --git a/locale/ja/LC_MESSAGES/statusnet.po b/locale/ja/LC_MESSAGES/statusnet.po index 9e4fe43c7..367e59916 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-05 22:10+0000\n" -"PO-Revision-Date: 2010-01-05 22:11:50+0000\n" +"POT-Creation-Date: 2010-01-11 23:25+0000\n" +"PO-Revision-Date: 2010-01-11 23:27:23+0000\n" "Language-Team: Japanese\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha (r60693); Translate extension (2010-01-04)\n" +"X-Generator: MediaWiki 1.16alpha (r60950); 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" @@ -41,7 +41,7 @@ msgstr "そのようなページはありません。" #: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79 #: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75 #: actions/favoritesrss.php:74 actions/foaf.php:40 actions/foaf.php:58 -#: actions/microsummary.php:62 actions/newmessage.php:116 +#: actions/microsummary.php:62 actions/newmessage.php:116 actions/otp.php:76 #: actions/remotesubscribe.php:145 actions/remotesubscribe.php:154 #: actions/replies.php:73 actions/repliesrss.php:38 #: actions/showfavorites.php:105 actions/userbyid.php:74 @@ -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 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 +#, 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" @@ -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,11 +605,11 @@ 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/invite.php:56 actions/login.php:115 actions/makeadmin.php:66 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80 #: actions/othersettings.php:145 actions/passwordsettings.php:138 #: actions/profilesettings.php:194 actions/recoverpassword.php:337 @@ -694,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 @@ -714,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 @@ -828,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 "利用者を削除できません" @@ -857,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 "デザイン" @@ -997,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 @@ -1022,7 +1011,8 @@ msgid "Options saved." msgstr "オプションが保存されました。" #: actions/emailsettings.php:60 -msgid "Email Settings" +#, fuzzy +msgid "Email settings" msgstr "メール設定" #: actions/emailsettings.php:71 @@ -1059,7 +1049,8 @@ msgid "Cancel" msgstr "中止" #: actions/emailsettings.php:121 -msgid "Email Address" +#, fuzzy +msgid "Email address" msgstr "メールアドレス" #: actions/emailsettings.php:123 @@ -1136,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." @@ -1322,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 "ファイルを読み込めません。" @@ -1345,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 "そのＩＤのプロファイルがありません。" @@ -1371,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 からブロックしますか? 彼らはグループから削除さ" "れる、投稿できない、グループをフォローできなくなります。" @@ -1392,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." @@ -1417,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 "デザイン設定が保存されました。" @@ -1439,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 "ロゴとなるイメージの正方形を選択。" @@ -1457,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 "管理者" @@ -1568,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 @@ -1598,7 +1583,8 @@ msgstr "" "たメッセージを確認してください。(%s を友人リストに追加しましたか？)" #: actions/imsettings.php:124 -msgid "IM Address" +#, fuzzy +msgid "IM address" msgstr "IMアドレス" #: actions/imsettings.php:126 @@ -1661,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" @@ -1702,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 "" @@ -1748,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 "送る" @@ -1818,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" +#: actions/joingroup.php:135 +#, fuzzy, php-format +msgid "%1$s joined group %2$s" msgstr "%s はグループ %s に参加しました" #: actions/leavegroup.php:60 @@ -1844,65 +1816,56 @@ 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" +#: actions/leavegroup.php:134 +#, fuzzy, php-format +msgid "%1$s left group %2$s" msgstr "%s はグループ %s に残りました。" -#: actions/login.php:83 actions/register.php:137 +#: actions/login.php:80 actions/otp.php:62 actions/register.php:137 msgid "Already logged in." msgstr "既にログインしています。" -#: actions/login.php:114 actions/login.php:124 -msgid "Invalid or expired token." -msgstr "不正または期限切れのトークン" - -#: actions/login.php:147 +#: actions/login.php:126 msgid "Incorrect username or password." msgstr "ユーザ名またはパスワードが間違っています。" -#: actions/login.php:153 +#: actions/login.php:132 actions/otp.php:120 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:188 actions/login.php:241 lib/action.php:460 #: lib/logingroupnav.php:79 msgid "Login" msgstr "ログイン" -#: actions/login.php:247 +#: actions/login.php:227 msgid "Login to site" msgstr "サイトへログイン" -#: actions/login.php:250 actions/profilesettings.php:106 -#: actions/register.php:423 actions/showgroup.php:236 actions/tagother.php:94 +#: actions/login.php:230 actions/profilesettings.php:106 +#: actions/register.php:424 actions/showgroup.php:236 actions/tagother.php:94 #: lib/groupeditform.php:152 lib/userprofile.php:131 msgid "Nickname" msgstr "ニックネーム" -#: actions/login.php:253 actions/register.php:428 +#: actions/login.php:233 actions/register.php:429 #: lib/accountsettingsaction.php:116 msgid "Password" msgstr "パスワード" -#: actions/login.php:256 actions/register.php:477 +#: actions/login.php:236 actions/register.php:478 msgid "Remember me" msgstr "ログイン状態を保持" -#: actions/login.php:257 actions/register.php:479 +#: actions/login.php:237 actions/register.php:480 msgid "Automatically login in the future; not for shared computers!" msgstr "以降は自動的にログインする。共用コンピューターでは避けましょう！" -#: actions/login.php:267 +#: actions/login.php:247 msgid "Lost or forgotten password?" msgstr "パスワードを紛失、忘れた？" -#: actions/login.php:286 +#: actions/login.php:266 msgid "" "For security reasons, please re-enter your user name and password before " "changing your settings." @@ -1910,7 +1873,7 @@ msgstr "" "セキュリティー上の理由により、設定を変更する前にユーザ名とパスワードを入力し" "て下さい。" -#: actions/login.php:290 +#: actions/login.php:270 #, php-format msgid "" "Login with your username and password. Don't have a username yet? [Register]" @@ -1924,18 +1887,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 @@ -1977,9 +1940,9 @@ msgstr "" msgid "Message sent" msgstr "メッセージを送りました" -#: actions/newmessage.php:185 lib/command.php:376 -#, php-format -msgid "Direct message to %s sent" +#: actions/newmessage.php:185 +#, fuzzy, php-format +msgid "Direct message to %s sent." msgstr "ダイレクトメッセージを %s に送りました" #: actions/newmessage.php:210 actions/newnotice.php:245 lib/channel.php:170 @@ -2007,8 +1970,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 @@ -2071,8 +2034,8 @@ msgstr "内容種別 " msgid "Only " msgstr "だけ " -#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1031 -#: lib/api.php:1059 lib/api.php:1169 +#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1033 +#: lib/api.php:1061 lib/api.php:1171 msgid "Not a supported data format." msgstr "サポートされていないデータ形式。" @@ -2116,10 +2079,30 @@ 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/otp.php:69 +#, fuzzy +msgid "No user ID specified." +msgstr "グループ記述がありません。" + +#: actions/otp.php:83 +#, fuzzy +msgid "No login token specified." +msgstr "つぶやきがありません。" + +#: actions/otp.php:90 +#, fuzzy +msgid "No login token requested." +msgstr "リクエスト内にプロファイルIDがありません。" + +#: actions/otp.php:95 +#, fuzzy +msgid "Invalid login token specified." +msgstr "不正または期限切れのトークン" + +#: actions/otp.php:104 +#, fuzzy +msgid "Login token expired." +msgstr "サイトへログイン" #: actions/outbox.php:61 #, php-format @@ -2157,7 +2140,7 @@ msgid "6 or more characters" msgstr "6文字以上" #: actions/passwordsettings.php:112 actions/recoverpassword.php:239 -#: actions/register.php:432 actions/smssettings.php:134 +#: actions/register.php:433 actions/smssettings.php:134 msgid "Confirm" msgstr "パスワード確認" @@ -2193,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 "パス" @@ -2226,7 +2209,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 "サイト" @@ -2319,7 +2302,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 @@ -2349,8 +2333,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 @@ -2358,8 +2342,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 @@ -2381,42 +2365,42 @@ msgstr "プロファイル情報" msgid "1-64 lowercase letters or numbers, no punctuation or spaces" msgstr "1-64文字の、小文字アルファベットか数字で、スペースや句読点は除く" -#: actions/profilesettings.php:111 actions/register.php:447 +#: actions/profilesettings.php:111 actions/register.php:448 #: actions/showgroup.php:247 actions/tagother.php:104 #: lib/groupeditform.php:157 lib/userprofile.php:149 msgid "Full name" msgstr "フルネーム" -#: actions/profilesettings.php:115 actions/register.php:452 +#: actions/profilesettings.php:115 actions/register.php:453 #: lib/groupeditform.php:161 msgid "Homepage" msgstr "ホームページ" -#: actions/profilesettings.php:117 actions/register.php:454 +#: actions/profilesettings.php:117 actions/register.php:455 msgid "URL of your homepage, blog, or profile on another site" msgstr "ホームページ、ブログ、プロファイル、その他サイトの URL" -#: actions/profilesettings.php:122 actions/register.php:460 +#: actions/profilesettings.php:122 actions/register.php:461 #, php-format msgid "Describe yourself and your interests in %d chars" msgstr "%d字以内で自分自身と自分の興味について書いてください" -#: actions/profilesettings.php:125 actions/register.php:463 +#: actions/profilesettings.php:125 actions/register.php:464 msgid "Describe yourself and your interests" msgstr "自分自身と自分の興味について書いてください" -#: actions/profilesettings.php:127 actions/register.php:465 +#: actions/profilesettings.php:127 actions/register.php:466 msgid "Bio" msgstr "自己紹介" -#: actions/profilesettings.php:132 actions/register.php:470 +#: actions/profilesettings.php:132 actions/register.php:471 #: actions/showgroup.php:256 actions/tagother.php:112 #: actions/userauthorization.php:158 lib/groupeditform.php:177 #: lib/userprofile.php:164 msgid "Location" msgstr "場所" -#: actions/profilesettings.php:134 actions/register.php:472 +#: actions/profilesettings.php:134 actions/register.php:473 msgid "Where you are, like \"City, State (or Region), Country\"" msgstr "自分のいる場所。例：「都市, 都道府県 (または地域), 国」" @@ -2480,20 +2464,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 "設定が保存されました。" @@ -2727,7 +2711,7 @@ msgstr "ユーザ設定エラー" msgid "New password successfully saved. You are now logged in." msgstr "新しいパスワードの保存に成功しました。ログインしています。" -#: actions/register.php:85 actions/register.php:189 actions/register.php:404 +#: actions/register.php:85 actions/register.php:189 actions/register.php:405 msgid "Sorry, only invited people can register." msgstr "すみません、招待された人々だけが登録できます。" @@ -2739,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:503 lib/action.php:457 #: lib/logingroupnav.php:85 msgid "Register" msgstr "登録" @@ -2752,19 +2736,15 @@ 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 "メールアドレスが既に存在します。" -#: actions/register.php:243 actions/register.php:264 +#: actions/register.php:243 actions/register.php:265 msgid "Invalid username or password." msgstr "不正なユーザ名またはパスワード。" -#: actions/register.php:342 +#: actions/register.php:343 msgid "" "With this form you can create a new account. You can then post notices and " "link up to friends and colleagues. " @@ -2772,53 +2752,53 @@ msgstr "" "このフォームで新しいアカウントを作成できます。 次につぶやきを投稿して、友人や" "同僚にリンクできます。 " -#: actions/register.php:424 +#: actions/register.php:425 msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required." msgstr "" "1-64文字の、小文字アルファベットか数字で、スペースや句読点は除く。必須です。" -#: actions/register.php:429 +#: actions/register.php:430 msgid "6 or more characters. Required." msgstr "6文字以上。必須です。" -#: actions/register.php:433 +#: actions/register.php:434 msgid "Same as password above. Required." msgstr "上のパスワードと同じです。 必須。" -#: actions/register.php:437 actions/register.php:441 +#: actions/register.php:438 actions/register.php:442 #: actions/siteadminpanel.php:270 lib/accountsettingsaction.php:120 msgid "Email" msgstr "メール" -#: actions/register.php:438 actions/register.php:442 +#: actions/register.php:439 actions/register.php:443 msgid "Used only for updates, announcements, and password recovery" msgstr "更新、アナウンス、パスワードリカバリーでのみ使用されます。" -#: actions/register.php:449 +#: actions/register.php:450 msgid "Longer name, preferably your \"real\" name" msgstr "長い名前" -#: actions/register.php:493 +#: actions/register.php:494 msgid "My text and files are available under " msgstr "次の下でテキスト及びファイルを利用可能 " -#: actions/register.php:495 +#: actions/register.php:496 msgid "Creative Commons Attribution 3.0" msgstr "" -#: actions/register.php:496 +#: actions/register.php:497 msgid "" " except this private data: password, email address, IM address, and phone " "number." msgstr "個人情報を除く: パスワード、メールアドレス、IMアドレス、電話番号" -#: actions/register.php:537 -#, php-format +#: actions/register.php:538 +#, 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 " @@ -2845,7 +2825,7 @@ msgstr "" "参加してくださりありがとうございます。私たちはあなたがこのサービスを楽しんで" "使われることを願っています。" -#: actions/register.php:561 +#: actions/register.php:562 msgid "" "(You should receive a message by email momentarily, with instructions on how " "to confirm your email address.)" @@ -2943,11 +2923,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)" @@ -2964,10 +2939,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 はまだつぶやきを受け" "取っていません。" @@ -2982,10 +2957,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)してください。" @@ -3003,11 +2978,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 "お気に入りのつぶやきを検索できません。" @@ -3065,11 +3035,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 "グループプロファイル" @@ -3118,7 +3083,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 "(なし)" @@ -3193,14 +3158,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 @@ -3224,8 +3184,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 @@ -3237,10 +3197,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) しようとすることができます。" @@ -3292,12 +3252,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 @@ -3482,7 +3443,8 @@ msgid "Save site settings" msgstr "サイト設定の保存" #: actions/smssettings.php:58 -msgid "SMS Settings" +#, fuzzy +msgid "SMS settings" msgstr "SMS 設定" #: actions/smssettings.php:69 @@ -3512,7 +3474,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 +3566,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 @@ -3644,8 +3607,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 @@ -3686,11 +3649,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 #, php-format msgid "Notice feed for tag %s (RSS 1.0)" @@ -3773,22 +3731,19 @@ 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 "利用者" @@ -3888,7 +3843,7 @@ msgstr "" "ユーザのつぶやきをフォローするには詳細を確認して下さい。だれかのつぶやきを" "フォローするために尋ねない場合は、\"Reject\" をクリックして下さい。" -#: actions/userauthorization.php:188 +#: actions/userauthorization.php:188 actions/version.php:165 msgid "License" msgstr "ライセンス" @@ -3942,8 +3897,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 @@ -3976,10 +3931,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 "プロファイルデザイン" @@ -3997,11 +3948,6 @@ msgstr "" msgid "Enjoy your hotdog!" msgstr "あなたのhotdogを楽しんでください!" -#: actions/usergroups.php:64 -#, php-format -msgid "%s groups, page %d" -msgstr "%s グループ, %d ページ" - #: actions/usergroups.php:130 msgid "Search for more groups" msgstr "もっとグループを検索" @@ -4016,7 +3962,74 @@ msgstr "%s はどのグループのメンバーでもありません。" msgid "Try [searching for groups](%%action.groupsearch%%) and joining them." msgstr "[グループを探して](%%action.groupsearch%%)それに加入してください。" -#: classes/File.php:137 +#: 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:144 #, php-format msgid "" "No file may be larger than %d bytes and the file you sent was %d bytes. Try " @@ -4026,18 +4039,23 @@ msgstr "" "ファイルは %d バイトでした。より小さいバージョンをアップロードするようにして" "ください。" -#: classes/File.php:147 +#: classes/File.php:154 #, php-format msgid "A file this large would exceed your user quota of %d bytes." msgstr "" "これほど大きいファイルはあなたの%dバイトのユーザ割当てを超えているでしょう。" -#: classes/File.php:154 +#: classes/File.php:161 #, php-format msgid "A file this large would exceed your monthly quota of %d bytes." msgstr "" "これほど大きいファイルはあなたの%dバイトの毎月の割当てを超えているでしょう。" +#: classes/Login_token.php:76 +#, fuzzy, php-format +msgid "Could not create login token for %s" +msgstr "%s 用のログイン・トークンを作成できませんでした" + #: classes/Message.php:45 msgid "You are banned from sending direct messages." msgstr "あなたはダイレクトメッセージを送るのが禁止されています。" @@ -4090,7 +4108,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 "" @@ -4137,136 +4155,136 @@ msgid "Other options" msgstr "その他のオプション" #: lib/action.php:144 -#, php-format -msgid "%s - %s" -msgstr "" +#, fuzzy, php-format +msgid "%1$s - %2$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 "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 "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 +4293,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 %" @@ -4291,31 +4309,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 "あなたのセッショントークンに関する問題がありました。" @@ -4323,27 +4341,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 "パス設定" @@ -4368,20 +4391,18 @@ msgid "Tags for this attachment" msgstr "この添付のタグ" #: lib/authenticationplugin.php:182 lib/authenticationplugin.php:187 -#, fuzzy msgid "Password changing failed" -msgstr "パスワード変更" +msgstr "パスワード変更に失敗しました" #: lib/authenticationplugin.php:197 -#, fuzzy msgid "Password changing is not allowed" -msgstr "パスワード変更" +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 "コマンド完了" @@ -4394,7 +4415,7 @@ msgid "Sorry, this command is not yet implemented." msgstr "すみません、このコマンドはまだ実装されていません。" #: lib/command.php:88 -#, php-format +#, fuzzy, php-format msgid "Could not find a user with nickname %s" msgstr "ユーザを更新できません" @@ -4403,7 +4424,7 @@ msgid "It does not make a lot of sense to nudge yourself!" msgstr "それは自分自身への合図で多くは意味がありません!" #: lib/command.php:99 -#, php-format +#, fuzzy, php-format msgid "Nudge sent to %s" msgstr "%s へ合図を送りました" @@ -4419,11 +4440,13 @@ msgstr "" "つぶやき: %3$s" #: lib/command.php:152 lib/command.php:399 lib/command.php:460 +#, 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 +#, fuzzy msgid "User has no last notice" msgstr "利用者はまだつぶやいていません" @@ -4431,22 +4454,42 @@ msgstr "利用者はまだつぶやいていません" msgid "Notice marked as fave." msgstr "お気に入りにされているつぶやき。" -#: lib/command.php:315 -#, php-format -msgid "%1$s (%2$s)" -msgstr "" +#: lib/command.php:217 +#, fuzzy +msgid "You are already a member of that group" +msgstr "すでにこのグループのメンバーです。" + +#: lib/command.php:234 +#, fuzzy, php-format +msgid "Could not join user %s to group %s" +msgstr "利用者 %s はグループ %s に参加できません。" + +#: lib/command.php:239 +#, fuzzy, php-format +msgid "%s joined group %s" +msgstr "%s はグループ %s に参加しました" + +#: lib/command.php:284 +#, fuzzy, php-format +msgid "Could not remove user %s to group %s" +msgstr "利用者 %s をグループ %s から削除することができません" + +#: lib/command.php:289 +#, fuzzy, php-format +msgid "%s left group %s" +msgstr "%s はグループ %s に残りました。" #: lib/command.php:318 -#, php-format +#, fuzzy, php-format msgid "Fullname: %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" @@ -4456,25 +4499,32 @@ msgstr "ホームページ: %s" msgid "About: %s" msgstr "About: %s" -#: lib/command.php:358 scripts/xmppdaemon.php:301 -#, php-format +#: lib/command.php:358 +#, fuzzy, php-format msgid "Message too long - maximum is %d characters, you sent %d" msgstr "メッセージが長すぎます - 最大 %d 字、あなたが送ったのは %d" +#: lib/command.php:376 +#, fuzzy, php-format +msgid "Direct message to %s sent" +msgstr "ダイレクトメッセージを %s に送りました" + #: lib/command.php:378 msgid "Error sending direct message." msgstr "ダイレクトメッセージ送信エラー。" #: lib/command.php:422 +#, fuzzy msgid "Cannot repeat your own notice" -msgstr "自分のつぶやきを繰り返すことはできません" +msgstr "あなたのつぶやきを繰り返せません。" #: lib/command.php:427 +#, fuzzy msgid "Already repeated that notice" -msgstr "すでにこのつぶやきは繰り返されています" +msgstr "すでにつぶやきを繰り返しています。" #: lib/command.php:435 -#, php-format +#, fuzzy, php-format msgid "Notice from %s repeated" msgstr "%s からつぶやきが繰り返されています" @@ -4483,12 +4533,12 @@ msgid "Error repeating notice." msgstr "つぶやき繰り返しエラー" #: lib/command.php:491 -#, php-format +#, fuzzy, php-format msgid "Notice too long - maximum is %d characters, you sent %d" msgstr "つぶやきが長すぎます - 最大 %d 字、あなたが送ったのは %d" #: lib/command.php:500 -#, php-format +#, fuzzy, php-format msgid "Reply to %s sent" msgstr "%s へ返信を送りました" @@ -4497,6 +4547,7 @@ msgid "Error saving notice." msgstr "つぶやき保存エラー。" #: lib/command.php:556 +#, fuzzy msgid "Specify the name of the user to subscribe to" msgstr "フォローする利用者の名前を指定してください" @@ -4506,6 +4557,7 @@ msgid "Subscribed to %s" msgstr "%s をフォローしました" #: lib/command.php:584 +#, fuzzy msgid "Specify the name of the user to unsubscribe from" msgstr "フォローをやめるユーザの名前を指定してください" @@ -4535,47 +4587,43 @@ msgid "Can't turn on notification." msgstr "通知をオンできません。" #: lib/command.php:650 +#, fuzzy msgid "Login command is disabled" msgstr "ログインコマンドが無効になっています。" -#: lib/command.php:664 -#, php-format -msgid "Could not create login token for %s" -msgstr "%s 用のログイン・トークンを作成できませんでした" - -#: lib/command.php:669 -#, php-format +#: lib/command.php:661 +#, 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 +#: lib/command.php:677 msgid "You are not subscribed to anyone." msgstr "あなたはだれにもフォローされていません。" -#: lib/command.php:687 +#: lib/command.php:679 msgid "You are subscribed to this person:" msgid_plural "You are subscribed to these people:" msgstr[0] "あなたはこの人にフォローされています:" -#: lib/command.php:707 +#: lib/command.php:699 msgid "No one is subscribed to you." msgstr "誰もフォローしていません。" -#: lib/command.php:709 +#: lib/command.php:701 msgid "This person is subscribed to you:" msgid_plural "These people are subscribed to you:" msgstr[0] "この人はあなたにフォローされている:" -#: lib/command.php:729 +#: lib/command.php:721 msgid "You are not a member of any groups." msgstr "あなたはどのグループのメンバーでもありません。" -#: lib/command.php:731 +#: lib/command.php:723 msgid "You are a member of this group:" msgid_plural "You are a member of these groups:" msgstr[0] "あなたはこのグループのメンバーではありません:" -#: lib/command.php:745 +#: lib/command.php:737 msgid "" "Commands:\n" "on - turn on notifications\n" @@ -4734,10 +4782,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\"" @@ -4918,21 +4962,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" @@ -5132,6 +5164,27 @@ msgstr "" msgid "from" 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 "" @@ -5169,7 +5222,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 @@ -5177,7 +5231,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 "ファイルのMIMEタイプを決定できません" #: lib/mediafile.php:270 @@ -5186,8 +5241,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 @@ -5220,9 +5275,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" @@ -5341,6 +5406,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 "フォロー" @@ -5510,10 +5580,6 @@ msgstr "自己タグづけとしての人々タグクラウド" msgid "People Tagcloud as tagged" msgstr "タグ付けとしての人々タグクラウド" -#: lib/subscriptionlist.php:126 -msgid "(none)" -msgstr "(なし)" - #: lib/tagcloudsection.php:56 msgid "None" msgstr "なし" @@ -5575,47 +5641,47 @@ msgstr "メッセージ" msgid "Moderate" msgstr "司会" -#: lib/util.php:837 +#: lib/util.php:884 msgid "a few seconds ago" msgstr "数秒前" -#: lib/util.php:839 +#: lib/util.php:886 msgid "about a minute ago" msgstr "約 1 分前" -#: lib/util.php:841 +#: lib/util.php:888 #, php-format msgid "about %d minutes ago" msgstr "約 %d 分前" -#: lib/util.php:843 +#: lib/util.php:890 msgid "about an hour ago" msgstr "約 1 時間前" -#: lib/util.php:845 +#: lib/util.php:892 #, php-format msgid "about %d hours ago" msgstr "約 %d 時間前" -#: lib/util.php:847 +#: lib/util.php:894 msgid "about a day ago" msgstr "約 1 日前" -#: lib/util.php:849 +#: lib/util.php:896 #, php-format msgid "about %d days ago" msgstr "約 %d 日前" -#: lib/util.php:851 +#: lib/util.php:898 msgid "about a month ago" msgstr "約 1 ヵ月前" -#: lib/util.php:853 +#: lib/util.php:900 #, php-format msgid "about %d months ago" msgstr "約 %d ヵ月前" -#: lib/util.php:855 +#: lib/util.php:902 msgid "about a year ago" msgstr "約 1 年前" @@ -5629,18 +5695,7 @@ msgstr "%sは有効な色ではありません!" msgid "%s is not a valid color! Use 3 or 6 hex chars." msgstr "%s は有効な色ではありません! 3か6の16進数を使ってください。" -#: 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 "すみません、入ってくるメールは許可されていません。" +#: scripts/xmppdaemon.php:301 +#, fuzzy, php-format +msgid "Message too long - maximum is %1$d characters, you sent %2$d." +msgstr "メッセージが長すぎます - 最大 %d 字、あなたが送ったのは %d" diff --git a/locale/ko/LC_MESSAGES/statusnet.po b/locale/ko/LC_MESSAGES/statusnet.po index e90f2d338..0a2e4561e 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-05 22:10+0000\n" -"PO-Revision-Date: 2010-01-05 22:11:54+0000\n" +"POT-Creation-Date: 2010-01-11 23:25+0000\n" +"PO-Revision-Date: 2010-01-11 23:27:28+0000\n" "Language-Team: Korean\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha (r60693); Translate extension (2010-01-04)\n" +"X-Generator: MediaWiki 1.16alpha (r60950); 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" @@ -38,7 +38,7 @@ msgstr "그러한 태그가 없습니다." #: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79 #: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75 #: actions/favoritesrss.php:74 actions/foaf.php:40 actions/foaf.php:58 -#: actions/microsummary.php:62 actions/newmessage.php:116 +#: actions/microsummary.php:62 actions/newmessage.php:116 actions/otp.php:76 #: actions/remotesubscribe.php:145 actions/remotesubscribe.php:154 #: actions/replies.php:73 actions/repliesrss.php:38 #: actions/showfavorites.php:105 actions/userbyid.php:74 @@ -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 #, 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 #, 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" @@ -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,11 +609,11 @@ 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/invite.php:56 actions/login.php:115 actions/makeadmin.php:66 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80 #: actions/othersettings.php:145 actions/passwordsettings.php:138 #: actions/profilesettings.php:194 actions/recoverpassword.php:337 @@ -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" +#: actions/joingroup.php:135 +#, fuzzy, php-format +msgid "%1$s joined group %2$s" msgstr "%s 는 그룹 %s에 가입했습니다." #: actions/leavegroup.php:60 @@ -1858,74 +1827,64 @@ 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" +#: actions/leavegroup.php:134 +#, fuzzy, php-format +msgid "%1$s left group %2$s" msgstr "%s가 그룹%s를 떠났습니다." -#: actions/login.php:83 actions/register.php:137 +#: actions/login.php:80 actions/otp.php:62 actions/register.php:137 msgid "Already logged in." msgstr "이미 로그인 하셨습니다." -#: actions/login.php:114 actions/login.php:124 -#, fuzzy -msgid "Invalid or expired token." -msgstr "옳지 않은 통지 내용" - -#: actions/login.php:147 +#: actions/login.php:126 msgid "Incorrect username or password." msgstr "틀린 계정 또는 비밀 번호" -#: actions/login.php:153 +#: actions/login.php:132 actions/otp.php:120 #, fuzzy 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:188 actions/login.php:241 lib/action.php:460 #: lib/logingroupnav.php:79 msgid "Login" msgstr "로그인" -#: actions/login.php:247 +#: actions/login.php:227 msgid "Login to site" msgstr "사이트에 로그인하세요." -#: actions/login.php:250 actions/profilesettings.php:106 -#: actions/register.php:423 actions/showgroup.php:236 actions/tagother.php:94 +#: actions/login.php:230 actions/profilesettings.php:106 +#: actions/register.php:424 actions/showgroup.php:236 actions/tagother.php:94 #: lib/groupeditform.php:152 lib/userprofile.php:131 msgid "Nickname" msgstr "별명" -#: actions/login.php:253 actions/register.php:428 +#: actions/login.php:233 actions/register.php:429 #: lib/accountsettingsaction.php:116 msgid "Password" msgstr "비밀 번호" -#: actions/login.php:256 actions/register.php:477 +#: actions/login.php:236 actions/register.php:478 msgid "Remember me" msgstr "자동 로그인" -#: actions/login.php:257 actions/register.php:479 +#: actions/login.php:237 actions/register.php:480 msgid "Automatically login in the future; not for shared computers!" msgstr "앞으로는 자동으로 로그인합니다. 공용 컴퓨터에서는 이용하지 마십시오!" -#: actions/login.php:267 +#: actions/login.php:247 msgid "Lost or forgotten password?" msgstr "비밀 번호를 잊으셨나요?" -#: actions/login.php:286 +#: actions/login.php:266 msgid "" "For security reasons, please re-enter your user name and password before " "changing your settings." msgstr "" "보안을 위해 세팅을 저장하기 전에 계정과 비밀 번호를 다시 입력 해 주십시오." -#: actions/login.php:290 +#: actions/login.php:270 #, fuzzy, php-format msgid "" "Login with your username and password. Don't have a username yet? [Register]" @@ -1940,19 +1899,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" @@ -1994,9 +1953,9 @@ msgstr "" msgid "Message sent" msgstr "메시지" -#: actions/newmessage.php:185 lib/command.php:376 -#, php-format -msgid "Direct message to %s sent" +#: actions/newmessage.php:185 +#, 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 +1985,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 @@ -2085,8 +2044,8 @@ msgstr "연결" msgid "Only " msgstr "" -#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1031 -#: lib/api.php:1059 lib/api.php:1169 +#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1033 +#: lib/api.php:1061 lib/api.php:1171 msgid "Not a supported data format." msgstr "지원하는 형식의 데이터가 아닙니다." @@ -2131,10 +2090,30 @@ 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/otp.php:69 +#, fuzzy +msgid "No user ID specified." +msgstr "프로필을 지정하지 않았습니다." + +#: actions/otp.php:83 +#, fuzzy +msgid "No login token specified." +msgstr "프로필을 지정하지 않았습니다." + +#: actions/otp.php:90 +#, fuzzy +msgid "No login token requested." +msgstr "요청한 프로필id가 없습니다." + +#: actions/otp.php:95 +#, fuzzy +msgid "Invalid login token specified." +msgstr "옳지 않은 통지 내용" + +#: actions/otp.php:104 +#, fuzzy +msgid "Login token expired." +msgstr "사이트에 로그인하세요." #: actions/outbox.php:61 #, php-format @@ -2170,7 +2149,7 @@ msgid "6 or more characters" msgstr "6글자 이상" #: actions/passwordsettings.php:112 actions/recoverpassword.php:239 -#: actions/register.php:432 actions/smssettings.php:134 +#: actions/register.php:433 actions/smssettings.php:134 msgid "Confirm" msgstr "인증" @@ -2206,7 +2185,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 +2218,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 +2320,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 +2352,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 +2362,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 @@ -2404,43 +2384,43 @@ msgstr "프로필 정보" msgid "1-64 lowercase letters or numbers, no punctuation or spaces" msgstr "1-64자 사이에 영소문자, 숫자로만 씁니다. 기호나 공백을 쓰면 안 됩니다." -#: actions/profilesettings.php:111 actions/register.php:447 +#: actions/profilesettings.php:111 actions/register.php:448 #: actions/showgroup.php:247 actions/tagother.php:104 #: lib/groupeditform.php:157 lib/userprofile.php:149 msgid "Full name" msgstr "실명" -#: actions/profilesettings.php:115 actions/register.php:452 +#: actions/profilesettings.php:115 actions/register.php:453 #: lib/groupeditform.php:161 msgid "Homepage" msgstr "홈페이지" -#: actions/profilesettings.php:117 actions/register.php:454 +#: actions/profilesettings.php:117 actions/register.php:455 msgid "URL of your homepage, blog, or profile on another site" msgstr "귀하의 홈페이지, 블로그 혹은 다른 사이트의 프로필 페이지 URL" -#: actions/profilesettings.php:122 actions/register.php:460 +#: actions/profilesettings.php:122 actions/register.php:461 #, fuzzy, php-format msgid "Describe yourself and your interests in %d chars" msgstr "140자 이내에서 자기 소개" -#: actions/profilesettings.php:125 actions/register.php:463 +#: actions/profilesettings.php:125 actions/register.php:464 #, fuzzy msgid "Describe yourself and your interests" msgstr "당신에 대해 소개해주세요." -#: actions/profilesettings.php:127 actions/register.php:465 +#: actions/profilesettings.php:127 actions/register.php:466 msgid "Bio" msgstr "자기소개" -#: actions/profilesettings.php:132 actions/register.php:470 +#: actions/profilesettings.php:132 actions/register.php:471 #: actions/showgroup.php:256 actions/tagother.php:112 #: actions/userauthorization.php:158 lib/groupeditform.php:177 #: lib/userprofile.php:164 msgid "Location" msgstr "위치" -#: actions/profilesettings.php:134 actions/register.php:472 +#: actions/profilesettings.php:134 actions/register.php:473 msgid "Where you are, like \"City, State (or Region), Country\"" msgstr "당신은 어디에 삽니까? \"시, 도 (or 군,구), 나라" @@ -2502,20 +2482,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 "설정 저장" @@ -2738,7 +2718,7 @@ msgid "New password successfully saved. You are now logged in." msgstr "" "새로운 비밀 번호를 성공적으로 저장했습니다. 귀하는 이제 로그인 되었습니다." -#: actions/register.php:85 actions/register.php:189 actions/register.php:404 +#: actions/register.php:85 actions/register.php:189 actions/register.php:405 msgid "Sorry, only invited people can register." msgstr "죄송합니다. 단지 초대된 사람들만 등록할 수 있습니다." @@ -2751,7 +2731,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:503 lib/action.php:457 #: lib/logingroupnav.php:85 msgid "Register" msgstr "회원가입" @@ -2764,73 +2744,69 @@ 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 "이메일 주소가 이미 존재 합니다." -#: actions/register.php:243 actions/register.php:264 +#: actions/register.php:243 actions/register.php:265 msgid "Invalid username or password." msgstr "사용자 이름이나 비밀 번호가 틀렸습니다." -#: actions/register.php:342 +#: actions/register.php:343 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 +#: actions/register.php:425 msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required." msgstr "" "1-64자 사이에 영소문자, 숫자로만 씁니다. 기호나 공백을 쓰면 안 됩니다. 필수 " "입력." -#: actions/register.php:429 +#: actions/register.php:430 msgid "6 or more characters. Required." msgstr "6글자 이상이 필요합니다." -#: actions/register.php:433 +#: actions/register.php:434 msgid "Same as password above. Required." msgstr "위와 같은 비밀 번호. 필수 사항." -#: actions/register.php:437 actions/register.php:441 +#: actions/register.php:438 actions/register.php:442 #: actions/siteadminpanel.php:270 lib/accountsettingsaction.php:120 msgid "Email" msgstr "이메일" -#: actions/register.php:438 actions/register.php:442 +#: actions/register.php:439 actions/register.php:443 msgid "Used only for updates, announcements, and password recovery" msgstr "업데이트나 공지, 비밀번호 찾기에 사용하세요." -#: actions/register.php:449 +#: actions/register.php:450 msgid "Longer name, preferably your \"real\" name" msgstr "더욱 긴 이름을 요구합니다." -#: actions/register.php:493 +#: actions/register.php:494 msgid "My text and files are available under " msgstr "나의 글과 파일의 라이선스는 다음과 같습니다 " -#: actions/register.php:495 +#: actions/register.php:496 msgid "Creative Commons Attribution 3.0" msgstr "" -#: actions/register.php:496 +#: actions/register.php:497 #, fuzzy msgid "" " except this private data: password, email address, IM address, and phone " "number." msgstr "다음 개인정보 제외: 비밀 번호, 메일 주소, 메신저 주소, 전화 번호" -#: actions/register.php:537 -#, php-format +#: actions/register.php:538 +#, 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 " @@ -2857,7 +2833,7 @@ msgstr "" "\n" "다시 한번 가입하신 것을 환영하면서 즐거운 서비스가 되셨으면 합니다." -#: actions/register.php:561 +#: actions/register.php:562 msgid "" "(You should receive a message by email momentarily, with instructions on how " "to confirm your email address.)" @@ -2961,11 +2937,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 +2955,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 +2969,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 +2988,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 +3037,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 +3085,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 +3156,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 +3183,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 +3195,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 +3243,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 +3439,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 +3471,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 +3561,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 +3598,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 +3634,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 +3720,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 +3836,7 @@ msgstr "" "사용자의 통지를 구독하려면 상세를 확인해 주세요. 구독하지 않는 경우는, \"취소" "\"를 클릭해 주세요." -#: actions/userauthorization.php:188 +#: actions/userauthorization.php:188 actions/version.php:165 #, fuzzy msgid "License" msgstr "라이선스" @@ -3943,7 +3893,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 +3926,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 +3941,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,23 +3956,94 @@ msgstr "당신은 해당 그룹의 멤버가 아닙니다." msgid "Try [searching for groups](%%action.groupsearch%%) and joining them." msgstr "" -#: classes/File.php:137 +#: 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:144 #, 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 "" -#: classes/File.php:147 +#: classes/File.php:154 #, php-format msgid "A file this large would exceed your user quota of %d bytes." msgstr "" -#: classes/File.php:154 +#: classes/File.php:161 #, php-format msgid "A file this large would exceed your monthly quota of %d bytes." msgstr "" +#: classes/Login_token.php:76 +#, fuzzy, php-format +msgid "Could not create login token for %s" +msgstr "OpenID를 작성 할 수 없습니다 : %s" + #: classes/Message.php:45 #, fuzzy msgid "You are banned from sending direct messages." @@ -4089,7 +4100,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)" @@ -4137,139 +4148,139 @@ msgid "Other options" msgstr "다른 옵션들" #: lib/action.php:144 -#, php-format -msgid "%s - %s" -msgstr "%s - %s" +#, fuzzy, php-format +msgid "%1$s - %2$s" +msgstr "%1$s (%2$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 +4289,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 +4305,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 +4339,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 인증" @@ -4393,7 +4409,7 @@ msgstr "비밀번호 변경" msgid "Command results" msgstr "실행결과" -#: lib/channel.php:210 +#: lib/channel.php:210 lib/mailhandler.php:142 msgid "Command complete" msgstr "실행 완료" @@ -4428,11 +4444,13 @@ msgid "" msgstr "" #: lib/command.php:152 lib/command.php:399 lib/command.php:460 +#, fuzzy msgid "Notice with that id does not exist" -msgstr "" +msgstr "해당 id의 프로필이 없습니다." #: lib/command.php:168 lib/command.php:415 lib/command.php:476 #: lib/command.php:532 +#, fuzzy msgid "User has no last notice" msgstr "이용자의 지속적인 게시글이 없습니다." @@ -4440,22 +4458,42 @@ msgstr "이용자의 지속적인 게시글이 없습니다." 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:217 +#, fuzzy +msgid "You are already a member of that group" +msgstr "당신은 이미 이 그룹의 멤버입니다." + +#: lib/command.php:234 +#, fuzzy, php-format +msgid "Could not join user %s to group %s" +msgstr "그룹 %s에 %s는 가입할 수 없습니다." + +#: lib/command.php:239 +#, fuzzy, php-format +msgid "%s joined group %s" +msgstr "%s 는 그룹 %s에 가입했습니다." + +#: lib/command.php:284 +#, fuzzy, php-format +msgid "Could not remove user %s to group %s" +msgstr "그룹 %s에서 %s 사용자를 제거할 수 없습니다." + +#: lib/command.php:289 +#, fuzzy, php-format +msgid "%s left group %s" +msgstr "%s가 그룹%s를 떠났습니다." #: lib/command.php:318 -#, php-format +#, fuzzy, php-format msgid "Fullname: %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,11 +4503,16 @@ msgstr "홈페이지: %s" msgid "About: %s" msgstr "자기소개: %s" -#: lib/command.php:358 scripts/xmppdaemon.php:301 +#: lib/command.php:358 #, fuzzy, php-format msgid "Message too long - maximum is %d characters, you sent %d" msgstr "당신이 보낸 메시지가 너무 길어요. 최대 140글자까지입니다." +#: lib/command.php:376 +#, fuzzy, php-format +msgid "Direct message to %s sent" +msgstr "%s에게 보낸 직접 메시지" + #: lib/command.php:378 msgid "Error sending direct message." msgstr "직접 메시지 보내기 오류." @@ -4510,6 +4553,7 @@ msgid "Error saving notice." msgstr "통지를 저장하는데 문제가 발생했습니다." #: lib/command.php:556 +#, fuzzy msgid "Specify the name of the user to subscribe to" msgstr "구독하려는 사용자의 이름을 지정하십시오." @@ -4519,6 +4563,7 @@ msgid "Subscribed to %s" msgstr "%s에게 구독되었습니다." #: lib/command.php:584 +#, fuzzy msgid "Specify the name of the user to unsubscribe from" msgstr "구독을 해제하려는 사용자의 이름을 지정하십시오." @@ -4551,47 +4596,42 @@ msgstr "알림을 켤 수 없습니다." msgid "Login command is disabled" msgstr "" -#: lib/command.php:664 -#, fuzzy, php-format -msgid "Could not create login token for %s" -msgstr "OpenID를 작성 할 수 없습니다 : %s" - -#: lib/command.php:669 +#: lib/command.php:661 #, php-format msgid "This link is useable only once, and is good for only 2 minutes: %s" msgstr "" -#: lib/command.php:685 +#: lib/command.php:677 #, fuzzy msgid "You are not subscribed to anyone." msgstr "당신은 이 프로필에 구독되지 않고있습니다." -#: lib/command.php:687 +#: lib/command.php:679 msgid "You are subscribed to this person:" msgid_plural "You are subscribed to these people:" msgstr[0] "당신은 다음 사용자를 이미 구독하고 있습니다." -#: lib/command.php:707 +#: lib/command.php:699 #, fuzzy msgid "No one is subscribed to you." msgstr "다른 사람을 구독 하실 수 없습니다." -#: lib/command.php:709 +#: lib/command.php:701 msgid "This person is subscribed to you:" msgid_plural "These people are subscribed to you:" msgstr[0] "다른 사람을 구독 하실 수 없습니다." -#: lib/command.php:729 +#: lib/command.php:721 #, fuzzy msgid "You are not a member of any groups." msgstr "당신은 해당 그룹의 멤버가 아닙니다." -#: lib/command.php:731 +#: lib/command.php:723 msgid "You are a member of this group:" msgid_plural "You are a member of these groups:" msgstr[0] "당신은 해당 그룹의 멤버가 아닙니다." -#: lib/command.php:745 +#: lib/command.php:737 msgid "" "Commands:\n" "on - turn on notifications\n" @@ -4752,10 +4792,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\"" @@ -4919,21 +4955,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" @@ -5073,6 +5097,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 "" @@ -5104,7 +5149,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 @@ -5112,7 +5157,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 @@ -5122,7 +5168,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 @@ -5155,7 +5201,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 @@ -5278,6 +5334,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 "구독" @@ -5459,10 +5520,6 @@ msgstr "" msgid "People Tagcloud as tagged" msgstr "" -#: lib/subscriptionlist.php:126 -msgid "(none)" -msgstr "(없습니다)" - #: lib/tagcloudsection.php:56 msgid "None" msgstr "없음" @@ -5527,47 +5584,47 @@ msgstr "메시지" msgid "Moderate" msgstr "" -#: lib/util.php:837 +#: lib/util.php:884 msgid "a few seconds ago" msgstr "몇 초 전" -#: lib/util.php:839 +#: lib/util.php:886 msgid "about a minute ago" msgstr "1분 전" -#: lib/util.php:841 +#: lib/util.php:888 #, php-format msgid "about %d minutes ago" msgstr "%d분 전" -#: lib/util.php:843 +#: lib/util.php:890 msgid "about an hour ago" msgstr "1시간 전" -#: lib/util.php:845 +#: lib/util.php:892 #, php-format msgid "about %d hours ago" msgstr "%d시간 전" -#: lib/util.php:847 +#: lib/util.php:894 msgid "about a day ago" msgstr "하루 전" -#: lib/util.php:849 +#: lib/util.php:896 #, php-format msgid "about %d days ago" msgstr "%d일 전" -#: lib/util.php:851 +#: lib/util.php:898 msgid "about a month ago" msgstr "1달 전" -#: lib/util.php:853 +#: lib/util.php:900 #, php-format msgid "about %d months ago" msgstr "%d달 전" -#: lib/util.php:855 +#: lib/util.php:902 msgid "about a year ago" msgstr "1년 전" @@ -5581,18 +5638,7 @@ msgstr "홈페이지 주소형식이 올바르지 않습니다." 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 "죄송합니다. 이메일이 허용되지 않습니다." +#: scripts/xmppdaemon.php:301 +#, fuzzy, php-format +msgid "Message too long - maximum is %1$d characters, you sent %2$d." +msgstr "당신이 보낸 메시지가 너무 길어요. 최대 140글자까지입니다." diff --git a/locale/mk/LC_MESSAGES/statusnet.po b/locale/mk/LC_MESSAGES/statusnet.po index bd346776c..48495e59f 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-05 22:10+0000\n" -"PO-Revision-Date: 2010-01-05 22:11:58+0000\n" +"POT-Creation-Date: 2010-01-11 23:25+0000\n" +"PO-Revision-Date: 2010-01-11 23:27:31+0000\n" "Language-Team: Macedonian\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha (r60693); Translate extension (2010-01-04)\n" +"X-Generator: MediaWiki 1.16alpha (r60950); 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" @@ -39,7 +39,7 @@ msgstr "Нема таква страница" #: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79 #: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75 #: actions/favoritesrss.php:74 actions/foaf.php:40 actions/foaf.php:58 -#: actions/microsummary.php:62 actions/newmessage.php:116 +#: actions/microsummary.php:62 actions/newmessage.php:116 actions/otp.php:76 #: actions/remotesubscribe.php:145 actions/remotesubscribe.php:154 #: actions/replies.php:73 actions/repliesrss.php:38 #: actions/showfavorites.php:105 actions/userbyid.php:74 @@ -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 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 #, 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,21 +426,20 @@ 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 msgid "Cannot repeat your own notice." -msgstr "Не можете да ја повторувате сопствената белешка." +msgstr "Не можете да ја повторувате сопствената забелешка." #: actions/apistatusesretweet.php:91 -#, fuzzy msgid "Already repeated that notice." -msgstr "Веќе сте пријавени!" +msgstr "Забелешката е веќе повторена." #: actions/apistatusesshow.php:138 msgid "Status deleted." @@ -443,22 +447,24 @@ 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 +#: lib/mailhandler.php:60 #, php-format msgid "That's too long. Max notice size is %d chars." 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 msgid "Unsupported format." @@ -466,25 +472,25 @@ 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 #, php-format @@ -494,37 +500,37 @@ 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 #, php-format @@ -539,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 "Нема прекар." @@ -561,12 +570,14 @@ 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 @@ -576,7 +587,7 @@ 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 @@ -590,17 +601,17 @@ 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/invite.php:56 actions/login.php:115 actions/makeadmin.php:66 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80 #: actions/othersettings.php:145 actions/passwordsettings.php:138 #: actions/profilesettings.php:194 actions/recoverpassword.php:337 @@ -610,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 @@ -621,19 +632,19 @@ 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 msgid "Avatar deleted." @@ -644,9 +655,8 @@ msgid "You already blocked that user." msgstr "Веќе го имате блокирано тој корисник." #: actions/block.php:105 actions/block.php:128 actions/groupblock.php:160 -#, fuzzy msgid "Block user" -msgstr "Нема таков корисник." +msgstr "Блокирај корисник" #: actions/block.php:130 msgid "" @@ -654,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 @@ -661,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 @@ -701,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" @@ -722,7 +730,7 @@ msgstr "Одблокирај го овој корсник" #: actions/bookmarklet.php:50 msgid "Post to " -msgstr "" +msgstr "Објави во " #: actions/confirmaddress.php:75 msgid "No confirmation code." @@ -751,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 @@ -769,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 @@ -784,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." @@ -795,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" @@ -802,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" @@ -812,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 "Не можете да бришете корисници." @@ -833,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." @@ -862,7 +870,7 @@ msgstr "Промени лого" #: actions/designadminpanel.php:380 msgid "Site logo" -msgstr "Лого знак на сајт" +msgstr "Лого на веб-страницата" #: actions/designadminpanel.php:387 msgid "Change theme" @@ -870,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" @@ -891,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" @@ -932,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 @@ -950,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." @@ -971,30 +979,29 @@ 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 msgid "Could not create aliases." @@ -1005,13 +1012,13 @@ msgid "Options saved." 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 @@ -1020,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 @@ -1033,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 @@ -1040,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 @@ -1054,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 @@ -1136,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 @@ -1153,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 @@ -1162,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 @@ -1191,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 @@ -1215,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." @@ -1253,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!" @@ -1274,131 +1294,114 @@ 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 msgid "Design preferences saved." @@ -1406,60 +1409,65 @@ 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 msgid "Logo updated." 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 #, php-format @@ -1469,12 +1477,12 @@ 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 @@ -1485,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 @@ -1516,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 @@ -1523,23 +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 msgid "Error removing the block." msgstr "Грешка при отстранување на блокот." #: actions/imsettings.php:59 -msgid "IM Settings" -msgstr "Поставки за IM" +msgid "IM settings" +msgstr "Нагодувања за IM" #: actions/imsettings.php:70 #, php-format @@ -1547,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." @@ -1564,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 @@ -1583,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." @@ -1615,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 @@ -1630,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" @@ -1643,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 @@ -1750,155 +1769,159 @@ 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 +#: actions/joingroup.php:135 #, 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 "" +msgstr "Не можам да ја пронајдам членската евиденција." -#: actions/leavegroup.php:127 lib/command.php:284 +#: actions/leavegroup.php:134 #, php-format -msgid "Could not remove user %s to group %s" -msgstr "Не можев да го отстранам корисникот %s од групата %s" +msgid "%1$s left group %2$s" +msgstr "%1$s ја напушти групата %2$s" -#: actions/leavegroup.php:134 lib/command.php:289 -#, php-format -msgid "%s left group %s" -msgstr "" - -#: actions/login.php:83 actions/register.php:137 +#: actions/login.php:80 actions/otp.php:62 actions/register.php:137 msgid "Already logged in." msgstr "Веќе сте најавени." -#: actions/login.php:114 actions/login.php:124 -#, fuzzy -msgid "Invalid or expired token." -msgstr "Неправилна содржина за известување" - -#: actions/login.php:147 +#: actions/login.php:126 msgid "Incorrect username or password." msgstr "Неточно корисничко име или лозинка" -#: actions/login.php:153 -#, fuzzy +#: actions/login.php:132 actions/otp.php:120 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:188 actions/login.php:241 lib/action.php:460 #: lib/logingroupnav.php:79 msgid "Login" -msgstr "Пријави се" +msgstr "Најава" -#: actions/login.php:247 +#: actions/login.php:227 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 +#: actions/login.php:230 actions/profilesettings.php:106 +#: actions/register.php:424 actions/showgroup.php:236 actions/tagother.php:94 #: lib/groupeditform.php:152 lib/userprofile.php:131 msgid "Nickname" msgstr "Прекар" -#: actions/login.php:253 actions/register.php:428 +#: actions/login.php:233 actions/register.php:429 #: lib/accountsettingsaction.php:116 msgid "Password" msgstr "Лозинка" -#: actions/login.php:256 actions/register.php:477 +#: actions/login.php:236 actions/register.php:478 msgid "Remember me" msgstr "Запамети ме" -#: actions/login.php:257 actions/register.php:479 +#: actions/login.php:237 actions/register.php:480 msgid "Automatically login in the future; not for shared computers!" msgstr "" "Следниот пат најавете се автоматски; не за компјутери кои ги делите со други!" -#: actions/login.php:267 +#: actions/login.php:247 msgid "Lost or forgotten password?" -msgstr "Загубена или заборавена лозинка?" +msgstr "Ја загубивте или заборавивте лозинката?" -#: actions/login.php:286 +#: actions/login.php:266 msgid "" "For security reasons, please re-enter your user name and password before " "changing your settings." msgstr "" "Поради безбедносни причини треба повторно да го внесете Вашето корисничко " -"име и лозинка пред да ги смените Вашите поставки." +"име и лозинка пред да ги смените Вашите нагодувања." -#: actions/login.php:290 -#, fuzzy, php-format +#: actions/login.php:270 +#, 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 @@ -1907,34 +1930,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 +#: actions/newmessage.php:185 #, 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 @@ -1942,17 +1966,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 @@ -1960,6 +1984,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 @@ -1967,33 +1993,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 @@ -2001,26 +2032,25 @@ 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 +#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1033 +#: lib/api.php:1061 lib/api.php:1171 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 msgid "Other Settings" @@ -2028,19 +2058,19 @@ 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 msgid "View profile designs" @@ -2048,35 +2078,55 @@ 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 знаци)." +msgstr "Услугата за скратување на URL-адреси е предолга (највеќе до 50 знаци)." -#: actions/outbox.php:58 -#, php-format -msgid "Outbox for %s - page %d" -msgstr "" +#: actions/otp.php:69 +#, fuzzy +msgid "No user ID specified." +msgstr "Нема назначено група." + +#: actions/otp.php:83 +#, fuzzy +msgid "No login token specified." +msgstr "Нема назначено забелешка." + +#: actions/otp.php:90 +#, fuzzy +msgid "No login token requested." +msgstr "Во барањето нема id на профилот." + +#: actions/otp.php:95 +#, fuzzy +msgid "Invalid login token specified." +msgstr "Неважечки или истечен жетон." + +#: actions/otp.php:104 +#, fuzzy +msgid "Login token expired." +msgstr "Најавете се" #: 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 msgid "Password change" @@ -2095,7 +2145,7 @@ msgid "6 or more characters" msgstr "6 или повеќе знаци" #: actions/passwordsettings.php:112 actions/recoverpassword.php:239 -#: actions/register.php:432 actions/smssettings.php:134 +#: actions/register.php:433 actions/smssettings.php:134 msgid "Confirm" msgstr "Потврди" @@ -2109,7 +2159,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." @@ -2121,90 +2171,88 @@ 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 msgid "Avatar server" @@ -2220,58 +2268,55 @@ 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 @@ -2279,35 +2324,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 "" @@ -2324,49 +2372,48 @@ msgstr "Информации за профил" msgid "1-64 lowercase letters or numbers, no punctuation or spaces" msgstr "1-64 мали букви или бројки. Без интерпукциски знаци и празни места." -#: actions/profilesettings.php:111 actions/register.php:447 +#: actions/profilesettings.php:111 actions/register.php:448 #: actions/showgroup.php:247 actions/tagother.php:104 #: lib/groupeditform.php:157 lib/userprofile.php:149 msgid "Full name" msgstr "Цело име" -#: actions/profilesettings.php:115 actions/register.php:452 +#: actions/profilesettings.php:115 actions/register.php:453 #: lib/groupeditform.php:161 msgid "Homepage" msgstr "Домашна страница" -#: actions/profilesettings.php:117 actions/register.php:454 +#: actions/profilesettings.php:117 actions/register.php:455 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 +#: actions/profilesettings.php:122 actions/register.php:461 +#, php-format msgid "Describe yourself and your interests in %d chars" -msgstr "Опишете се себе си и сопствените интереси во 140 знаци." +msgstr "Опишете се себеси и своите интереси во %d знаци." -#: actions/profilesettings.php:125 actions/register.php:463 -#, fuzzy +#: actions/profilesettings.php:125 actions/register.php:464 msgid "Describe yourself and your interests" -msgstr "Опишете се себе си и сопствените интереси во 140 знаци." +msgstr "Опишете се себеси и Вашите интереси" -#: actions/profilesettings.php:127 actions/register.php:465 +#: actions/profilesettings.php:127 actions/register.php:466 msgid "Bio" -msgstr "Био" +msgstr "Биографија" -#: actions/profilesettings.php:132 actions/register.php:470 +#: actions/profilesettings.php:132 actions/register.php:471 #: actions/showgroup.php:256 actions/tagother.php:112 #: actions/userauthorization.php:158 lib/groupeditform.php:177 #: lib/userprofile.php:164 msgid "Location" msgstr "Локација" -#: actions/profilesettings.php:134 actions/register.php:472 +#: actions/profilesettings.php:134 actions/register.php:473 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 @@ -2378,6 +2425,8 @@ msgstr "Ознаки" msgid "" "Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated" msgstr "" +"Ознаки за Вас самите (букви, бројки, -, . и _), одделени со запирка или " +"празно место" #: actions/profilesettings.php:151 actions/siteadminpanel.php:294 msgid "Language" @@ -2385,91 +2434,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 +#: 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 "Профилот не може да се сними." +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 "Поставките се снимени." +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 @@ -2477,16 +2525,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 @@ -2496,6 +2547,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 @@ -2504,25 +2560,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 @@ -2530,14 +2588,16 @@ msgid "" "Why not [register an account](%%action.register%%) and be the first to post " "one!" msgstr "" +"Зошто не [регистрирате сметка](%%action.register%%) и станете прв што ќе " +"објави!" #: 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." @@ -2561,25 +2621,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." @@ -2605,15 +2667,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." @@ -2621,7 +2683,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." @@ -2629,7 +2691,7 @@ msgstr "Нема регистрирана адреса за е-пошта за #: actions/recoverpassword.php:301 msgid "Error saving address confirmation." -msgstr "Грешка во снимањето на потвдата за адресата." +msgstr "Грешка при зачувувањето на потврдата за адреса." #: actions/recoverpassword.php:325 msgid "" @@ -2641,7 +2703,7 @@ msgstr "" #: actions/recoverpassword.php:344 msgid "Unexpected password reset." -msgstr "Неочекувано ресетирање на лозинка." +msgstr "Неочекувано подновување на лозинката." #: actions/recoverpassword.php:352 msgid "Password must be 6 chars or more." @@ -2657,101 +2719,99 @@ 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 +#: actions/register.php:85 actions/register.php:189 actions/register.php:405 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:503 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 "Адресата веќе постои." -#: actions/register.php:243 actions/register.php:264 +#: actions/register.php:243 actions/register.php:265 msgid "Invalid username or password." msgstr "Погрешно име или лозинка." -#: actions/register.php:342 +#: actions/register.php:343 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 +#: actions/register.php:425 msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required." msgstr "" +"1-64 мали букви или бројки, без интерпункциски знаци и празни места. " +"Задолжително поле." -#: actions/register.php:429 +#: actions/register.php:430 msgid "6 or more characters. Required." -msgstr "" +msgstr "Барем 6 знаци. Задолжително поле." -#: actions/register.php:433 +#: actions/register.php:434 msgid "Same as password above. Required." -msgstr "" +msgstr "Исто што и лозинката погоре. Задолжително поле." -#: actions/register.php:437 actions/register.php:441 +#: actions/register.php:438 actions/register.php:442 #: actions/siteadminpanel.php:270 lib/accountsettingsaction.php:120 msgid "Email" msgstr "Е-пошта" -#: actions/register.php:438 actions/register.php:442 +#: actions/register.php:439 actions/register.php:443 msgid "Used only for updates, announcements, and password recovery" -msgstr "Се користи само за надградби, објави и пронаоѓање на лозинка." +msgstr "Се користи само за подновувања, објави и повраќање на лозинка." -#: actions/register.php:449 +#: actions/register.php:450 msgid "Longer name, preferably your \"real\" name" -msgstr "" +msgstr "Подолго име, по можност Вашето вистинско име и презиме" -#: actions/register.php:493 +#: actions/register.php:494 msgid "My text and files are available under " msgstr "Мојот текст и податотеки се достапни под " -#: actions/register.php:495 +#: actions/register.php:496 msgid "Creative Commons Attribution 3.0" -msgstr "" +msgstr "Creative Commons Наведи извор 3.0" -#: actions/register.php:496 -#, fuzzy +#: actions/register.php:497 msgid "" " except this private data: password, email address, IM address, and phone " "number." msgstr "" -"освен следниве лични податоци: лозинка, адреса за е-пошта, адреса за ИМ, " -"телефонски број." +" освен овие приватни податоци: лозинка, е-пошта, IM-адреса и телефонски " +"број." -#: actions/register.php:537 +#: actions/register.php:538 #, 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 " @@ -2763,12 +2823,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 +#: actions/register.php:562 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 @@ -2777,19 +2854,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" @@ -2805,7 +2881,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 @@ -2817,37 +2893,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" @@ -2863,32 +2936,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 @@ -2896,58 +2966,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 @@ -2955,6 +3025,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 @@ -2963,20 +3035,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" @@ -2985,7 +3055,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 @@ -2994,50 +3064,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" @@ -3052,6 +3121,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 @@ -3061,23 +3136,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 @@ -3091,55 +3170,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 @@ -3149,6 +3227,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 @@ -3157,6 +3240,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 @@ -3165,83 +3251,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" @@ -3249,11 +3336,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" @@ -3261,7 +3348,7 @@ msgstr "Основен јазик" #: actions/siteadminpanel.php:303 msgid "URLs" -msgstr "" +msgstr "URL-адреси" #: actions/siteadminpanel.php:306 msgid "Server" @@ -3269,189 +3356,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 msgid "Save site settings" 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 @@ -3459,59 +3550,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 @@ -3519,25 +3611,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 @@ -3548,149 +3642,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 @@ -3699,84 +3785,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" @@ -3784,18 +3867,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!" @@ -3806,69 +3887,63 @@ 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 msgid "Profile design" @@ -3879,112 +3954,195 @@ 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" -#: classes/File.php:137 +#: 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:144 #, 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 +#: classes/File.php:154 #, php-format msgid "A file this large would exceed your user quota of %d bytes." msgstr "" +"Волку голема податотека ќе ја надмине Вашата корисничка квота од %d бајти." -#: classes/File.php:154 +#: classes/File.php:161 #, php-format msgid "A file this large would exceed your monthly quota of %d bytes." -msgstr "" +msgstr "ВОлку голема податотека ќе ја надмине Вашата месечна квота од %d бајти" + +#: classes/Login_token.php:76 +#, fuzzy, php-format +msgid "Could not create login token for %s" +msgstr "Не можам да создадам најавен жетон за %s." #: 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." @@ -3992,172 +4150,163 @@ 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 "" +msgstr "Други нагодувања" #: lib/action.php:144 -#, php-format -msgid "%s - %s" -msgstr "" +#, fuzzy, php-format +msgid "%1$s - %2$s" +msgstr "%1$s (%2$s)" #: 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." @@ -4166,12 +4315,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 %" @@ -4182,68 +4331,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:107 +msgid "Changes to that panel are not allowed." +msgstr "Менувањето на тој алатник не е дозволено." -#: lib/adminpanelaction.php:195 +#: 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" @@ -4255,51 +4405,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 -#, fuzzy msgid "Password changing failed" -msgstr "Промена на лозинка" +msgstr "Менувањето на лозинката не успеа" #: lib/authenticationplugin.php:197 -#, fuzzy msgid "Password changing is not allowed" -msgstr "Промена на лозинка" +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 +#, fuzzy, php-format msgid "Could not find a user with nickname %s" -msgstr "Корисникот не може да се освежи/" +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 +#, fuzzy, php-format msgid "Nudge sent to %s" -msgstr "" +msgstr "Испратено подбуцнување на %s." #: lib/command.php:126 #, php-format @@ -4308,173 +4456,201 @@ 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 +#, fuzzy msgid "Notice with that id does not exist" -msgstr "" +msgstr "Не постои забелешка со таков id." #: lib/command.php:168 lib/command.php:415 lib/command.php:476 #: lib/command.php:532 +#, fuzzy msgid "User has no last notice" -msgstr "" +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:217 +#, fuzzy +msgid "You are already a member of that group" +msgstr "Веќе членувате во таа група." + +#: lib/command.php:234 +#, fuzzy, php-format +msgid "Could not join user %s to group %s" +msgstr "Не можам да го зачленам корисникот %1$s во групата 2$s." + +#: lib/command.php:239 +#, fuzzy, php-format +msgid "%s joined group %s" +msgstr "%1$s се зачлени во групата %2$s" + +#: lib/command.php:284 +#, fuzzy, php-format +msgid "Could not remove user %s to group %s" +msgstr "Не можев да го отстранам корисникот %1$s од групата %2$s." + +#: lib/command.php:289 +#, fuzzy, php-format +msgid "%s left group %s" +msgstr "%1$s ја напушти групата %2$s" #: lib/command.php:318 -#, php-format +#, fuzzy, php-format msgid "Fullname: %s" -msgstr "" +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 +#: lib/command.php:358 +#, fuzzy, php-format msgid "Message too long - maximum is %d characters, you sent %d" msgstr "" +"Пораката е предолга - дозволени се највеќе %1$d знаци, а вие испративте %2$d." + +#: lib/command.php:376 +#, fuzzy, php-format +msgid "Direct message to %s sent" +msgstr "Директната порака до %s е испратена." #: lib/command.php:378 msgid "Error sending direct message." -msgstr "" +msgstr "Грашка при испаќањето на директната порака." #: lib/command.php:422 +#, fuzzy msgid "Cannot repeat your own notice" -msgstr "" +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 "Известувања" +msgstr "Забелешката од %s е повторена." #: lib/command.php:437 -#, fuzzy msgid "Error repeating notice." -msgstr "Проблем во снимањето на известувањето." +msgstr "Грешка при повторувањето на белешката." #: lib/command.php:491 -#, php-format +#, fuzzy, php-format msgid "Notice too long - maximum is %d characters, you sent %d" msgstr "" +"Забелешката е предолга - треба да нема повеќе од %1$d знаци, а Вие " +"испративте %2$d." #: lib/command.php:500 #, fuzzy, php-format msgid "Reply to %s sent" -msgstr "Одговори испратени до %s" +msgstr "Одговорот на %s е испратен." #: lib/command.php:502 -#, fuzzy msgid "Error saving notice." -msgstr "Проблем во снимањето на известувањето." +msgstr "Грешка при зачувувањето на белешката." #: lib/command.php:556 +#, fuzzy msgid "Specify the name of the user to subscribe to" -msgstr "" +msgstr "Назначете го името на корисникот на којшто сакате да се претплатите." #: lib/command.php:563 #, php-format msgid "Subscribed to %s" -msgstr "" +msgstr "Претплатено на %s" #: lib/command.php:584 +#, fuzzy msgid "Specify the name of the user to unsubscribe from" -msgstr "" +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 +#, fuzzy msgid "Login command is disabled" -msgstr "" - -#: lib/command.php:664 -#, php-format -msgid "Could not create login token for %s" -msgstr "Не можам да создадам најавен жетон за" +msgstr "Наредбата за најава е оневозможена." -#: lib/command.php:669 -#, php-format +#: lib/command.php:661 +#, fuzzy, php-format msgid "This link is useable only once, and is good for only 2 minutes: %s" -msgstr "" +msgstr "Оваа врска може да се употреби само еднаш, и трае само 2 минути: %s." -#: lib/command.php:685 -#, fuzzy +#: lib/command.php:677 msgid "You are not subscribed to anyone." -msgstr "Не ни го испративте тој профил." +msgstr "Не сте претплатени никому." -#: lib/command.php:687 +#: lib/command.php:679 msgid "You are subscribed to this person:" msgid_plural "You are subscribed to these people:" msgstr[0] "Не ни го испративте тој профил." msgstr[1] "Не ни го испративте тој профил." -#: lib/command.php:707 -#, fuzzy +#: lib/command.php:699 msgid "No one is subscribed to you." -msgstr "Оддалечена претплата" +msgstr "Никој не е претплатен на Вас." -#: lib/command.php:709 +#: lib/command.php:701 msgid "This person is subscribed to you:" msgid_plural "These people are subscribed to you:" msgstr[0] "Оддалечена претплата" msgstr[1] "Оддалечена претплата" -#: lib/command.php:729 -#, fuzzy +#: lib/command.php:721 msgid "You are not a member of any groups." -msgstr "Не ни го испративте тој профил." +msgstr "Не членувате во ниедна група." -#: lib/command.php:731 +#: lib/command.php:723 msgid "You are a member of this group:" msgid_plural "You are a member of these groups:" msgstr[0] "Не ни го испративте тој профил." msgstr[1] "Не ни го испративте тој профил." -#: lib/command.php:745 +#: lib/command.php:737 msgid "" "Commands:\n" "on - turn on notifications\n" @@ -4514,189 +4690,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" @@ -4709,56 +4912,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" @@ -4784,14 +4983,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" @@ -4804,34 +5016,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 @@ -4845,20 +5050,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 @@ -4875,11 +5088,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 @@ -4899,11 +5123,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 @@ -4925,11 +5163,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 @@ -4945,86 +5200,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" @@ -5033,49 +5327,58 @@ 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 "" +#, 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" -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" @@ -5083,28 +5386,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" @@ -5120,11 +5422,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." @@ -5140,28 +5442,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" @@ -5181,7 +5487,7 @@ msgstr "Сите претплатници" #: lib/profileaction.php:178 msgid "User ID" -msgstr "" +msgstr "Кориснички ID" #: lib/profileaction.php:183 msgid "Member since" @@ -5192,13 +5498,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" @@ -5206,73 +5511,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..." @@ -5280,43 +5579,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 @@ -5324,9 +5622,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." @@ -5335,59 +5632,52 @@ 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 msgid "Edit profile settings" @@ -5399,7 +5689,7 @@ msgstr "Уреди" #: lib/userprofile.php:272 msgid "Send a direct message to this user" -msgstr "" +msgstr "Испрати му директна порака на корисников" #: lib/userprofile.php:273 msgid "Message" @@ -5407,74 +5697,64 @@ msgstr "Порака" #: lib/userprofile.php:311 msgid "Moderate" -msgstr "" +msgstr "Модерирај" -#: lib/util.php:837 +#: lib/util.php:884 msgid "a few seconds ago" msgstr "пред неколку секунди" -#: lib/util.php:839 +#: lib/util.php:886 msgid "about a minute ago" msgstr "пред една минута" -#: lib/util.php:841 +#: lib/util.php:888 #, php-format msgid "about %d minutes ago" msgstr "пред %d минути" -#: lib/util.php:843 +#: lib/util.php:890 msgid "about an hour ago" msgstr "пред еден час" -#: lib/util.php:845 +#: lib/util.php:892 #, php-format msgid "about %d hours ago" msgstr "пред %d часа" -#: lib/util.php:847 +#: lib/util.php:894 msgid "about a day ago" msgstr "пред еден ден" -#: lib/util.php:849 +#: lib/util.php:896 #, php-format msgid "about %d days ago" msgstr "пред %d денови" -#: lib/util.php:851 +#: lib/util.php:898 msgid "about a month ago" msgstr "пред еден месец" -#: lib/util.php:853 +#: lib/util.php:900 #, php-format msgid "about %d months ago" -msgstr "пред %d месеци" +msgstr "пред %d месеца" -#: lib/util.php:855 +#: lib/util.php:902 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 "" +msgstr "%s не е важечка боја! Користете 3 или 6 шеснаесетни (hex) знаци." -#: 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." +#: scripts/xmppdaemon.php:301 +#, php-format +msgid "Message too long - maximum is %1$d characters, you sent %2$d." msgstr "" +"Пораката е предолга - дозволени се највеќе %1$d знаци, а вие испративте %2$d." diff --git a/locale/nb/LC_MESSAGES/statusnet.po b/locale/nb/LC_MESSAGES/statusnet.po index efb2320b6..5ff0bfa91 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-05 22:10+0000\n" -"PO-Revision-Date: 2010-01-05 22:12:02+0000\n" +"POT-Creation-Date: 2010-01-11 23:25+0000\n" +"PO-Revision-Date: 2010-01-11 23:27:35+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 (r60693); Translate extension (2010-01-04)\n" +"X-Generator: MediaWiki 1.16alpha (r60950); 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" @@ -38,7 +38,7 @@ msgstr "Ingen slik side" #: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79 #: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75 #: actions/favoritesrss.php:74 actions/foaf.php:40 actions/foaf.php:58 -#: actions/microsummary.php:62 actions/newmessage.php:116 +#: actions/microsummary.php:62 actions/newmessage.php:116 actions/otp.php:76 #: actions/remotesubscribe.php:145 actions/remotesubscribe.php:154 #: actions/replies.php:73 actions/repliesrss.php:38 #: actions/showfavorites.php:105 actions/userbyid.php:74 @@ -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 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 #, 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" @@ -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,11 +611,11 @@ 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/invite.php:56 actions/login.php:115 actions/makeadmin.php:66 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80 #: actions/othersettings.php:145 actions/passwordsettings.php:138 #: actions/profilesettings.php:194 actions/recoverpassword.php:337 @@ -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 +#: actions/joingroup.php:135 #, php-format -msgid "%s joined group %s" +msgid "%1$s joined group %2$s" msgstr "" #: actions/leavegroup.php:60 @@ -1826,73 +1796,64 @@ msgstr "" msgid "Could not find membership record." msgstr "" -#: actions/leavegroup.php:127 lib/command.php:284 +#: actions/leavegroup.php:134 #, 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 "" +msgid "%1$s left group %2$s" +msgstr "%1$s sin status på %2$s" -#: actions/login.php:83 actions/register.php:137 +#: actions/login.php:80 actions/otp.php:62 actions/register.php:137 msgid "Already logged in." msgstr "Allerede innlogget." -#: actions/login.php:114 actions/login.php:124 -msgid "Invalid or expired token." -msgstr "" - -#: actions/login.php:147 +#: actions/login.php:126 msgid "Incorrect username or password." msgstr "Feil brukernavn eller passord" -#: actions/login.php:153 +#: actions/login.php:132 actions/otp.php:120 #, fuzzy 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:188 actions/login.php:241 lib/action.php:460 #: lib/logingroupnav.php:79 msgid "Login" msgstr "Logg inn" -#: actions/login.php:247 +#: actions/login.php:227 msgid "Login to site" msgstr "" -#: actions/login.php:250 actions/profilesettings.php:106 -#: actions/register.php:423 actions/showgroup.php:236 actions/tagother.php:94 +#: actions/login.php:230 actions/profilesettings.php:106 +#: actions/register.php:424 actions/showgroup.php:236 actions/tagother.php:94 #: lib/groupeditform.php:152 lib/userprofile.php:131 msgid "Nickname" msgstr "Nick" -#: actions/login.php:253 actions/register.php:428 +#: actions/login.php:233 actions/register.php:429 #: lib/accountsettingsaction.php:116 msgid "Password" msgstr "Passord" -#: actions/login.php:256 actions/register.php:477 +#: actions/login.php:236 actions/register.php:478 msgid "Remember me" msgstr "Husk meg" -#: actions/login.php:257 actions/register.php:479 +#: actions/login.php:237 actions/register.php:480 msgid "Automatically login in the future; not for shared computers!" msgstr "" "Logg inn automatisk i framtiden. Ikke for datamaskiner du deler med andre!" -#: actions/login.php:267 +#: actions/login.php:247 msgid "Lost or forgotten password?" msgstr "Mistet eller glemt passordet?" -#: actions/login.php:286 +#: actions/login.php:266 msgid "" "For security reasons, please re-enter your user name and password before " "changing your settings." msgstr "" -#: actions/login.php:290 +#: actions/login.php:270 #, php-format msgid "" "Login with your username and password. Don't have a username yet? [Register]" @@ -1904,19 +1865,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" @@ -1956,10 +1917,10 @@ msgstr "" msgid "Message sent" msgstr "" -#: actions/newmessage.php:185 lib/command.php:376 -#, php-format -msgid "Direct message to %s sent" -msgstr "" +#: actions/newmessage.php:185 +#, 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 +1947,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 @@ -2043,8 +2004,8 @@ msgstr "" msgid "Only " msgstr "" -#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1031 -#: lib/api.php:1059 lib/api.php:1169 +#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1033 +#: lib/api.php:1061 lib/api.php:1171 msgid "Not a supported data format." msgstr "" @@ -2090,9 +2051,27 @@ 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" +#: actions/otp.php:69 +#, fuzzy +msgid "No user ID specified." +msgstr "Nytt nick" + +#: actions/otp.php:83 +#, fuzzy +msgid "No login token specified." +msgstr "Nytt nick" + +#: actions/otp.php:90 +msgid "No login token requested." +msgstr "" + +#: actions/otp.php:95 +#, fuzzy +msgid "Invalid login token specified." +msgstr "Nytt nick" + +#: actions/otp.php:104 +msgid "Login token expired." msgstr "" #: actions/outbox.php:61 @@ -2131,7 +2110,7 @@ msgid "6 or more characters" msgstr "6 eller flere tegn" #: actions/passwordsettings.php:112 actions/recoverpassword.php:239 -#: actions/register.php:432 actions/smssettings.php:134 +#: actions/register.php:433 actions/smssettings.php:134 msgid "Confirm" msgstr "Bekreft" @@ -2167,7 +2146,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 +2179,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 +2277,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 +2306,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 +2316,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 @@ -2356,43 +2336,43 @@ msgstr "" msgid "1-64 lowercase letters or numbers, no punctuation or spaces" msgstr "1-64 små bokstaver eller nummer, ingen punktum eller mellomrom" -#: actions/profilesettings.php:111 actions/register.php:447 +#: actions/profilesettings.php:111 actions/register.php:448 #: actions/showgroup.php:247 actions/tagother.php:104 #: lib/groupeditform.php:157 lib/userprofile.php:149 msgid "Full name" msgstr "Fullt navn" -#: actions/profilesettings.php:115 actions/register.php:452 +#: actions/profilesettings.php:115 actions/register.php:453 #: lib/groupeditform.php:161 msgid "Homepage" msgstr "Hjemmesiden" -#: actions/profilesettings.php:117 actions/register.php:454 +#: actions/profilesettings.php:117 actions/register.php:455 msgid "URL of your homepage, blog, or profile on another site" msgstr "URL til din hjemmeside, blogg, eller profil på annen nettside." -#: actions/profilesettings.php:122 actions/register.php:460 +#: actions/profilesettings.php:122 actions/register.php:461 #, fuzzy, php-format msgid "Describe yourself and your interests in %d chars" msgstr "Beskriv degselv og dine interesser med 140 tegn" -#: actions/profilesettings.php:125 actions/register.php:463 +#: actions/profilesettings.php:125 actions/register.php:464 #, fuzzy msgid "Describe yourself and your interests" msgstr "Beskriv degselv og dine interesser med 140 tegn" -#: actions/profilesettings.php:127 actions/register.php:465 +#: actions/profilesettings.php:127 actions/register.php:466 msgid "Bio" msgstr "Om meg" -#: actions/profilesettings.php:132 actions/register.php:470 +#: actions/profilesettings.php:132 actions/register.php:471 #: actions/showgroup.php:256 actions/tagother.php:112 #: actions/userauthorization.php:158 lib/groupeditform.php:177 #: lib/userprofile.php:164 msgid "Location" msgstr "" -#: actions/profilesettings.php:134 actions/register.php:472 +#: actions/profilesettings.php:134 actions/register.php:473 msgid "Where you are, like \"City, State (or Region), Country\"" msgstr "" @@ -2455,21 +2435,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 "" @@ -2689,7 +2669,7 @@ msgstr "" msgid "New password successfully saved. You are now logged in." msgstr "" -#: actions/register.php:85 actions/register.php:189 actions/register.php:404 +#: actions/register.php:85 actions/register.php:189 actions/register.php:405 msgid "Sorry, only invited people can register." msgstr "" @@ -2701,7 +2681,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:503 lib/action.php:457 #: lib/logingroupnav.php:85 msgid "Register" msgstr "" @@ -2714,59 +2694,55 @@ 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 "" -#: actions/register.php:243 actions/register.php:264 +#: actions/register.php:243 actions/register.php:265 msgid "Invalid username or password." msgstr "Ugyldig brukernavn eller passord" -#: actions/register.php:342 +#: actions/register.php:343 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 +#: actions/register.php:425 msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required." msgstr "" "1-64 små bokstaver eller nummer, ingen punktum eller mellomrom. Påkrevd." -#: actions/register.php:429 +#: actions/register.php:430 msgid "6 or more characters. Required." msgstr "6 eller flere tegn. Påkrevd." -#: actions/register.php:433 +#: actions/register.php:434 msgid "Same as password above. Required." msgstr "" -#: actions/register.php:437 actions/register.php:441 +#: actions/register.php:438 actions/register.php:442 #: actions/siteadminpanel.php:270 lib/accountsettingsaction.php:120 msgid "Email" msgstr "E-post" -#: actions/register.php:438 actions/register.php:442 +#: actions/register.php:439 actions/register.php:443 msgid "Used only for updates, announcements, and password recovery" msgstr "" -#: actions/register.php:449 +#: actions/register.php:450 msgid "Longer name, preferably your \"real\" name" msgstr "Lengre navn, helst ditt \"ekte\" navn" -#: actions/register.php:493 +#: actions/register.php:494 msgid "My text and files are available under " msgstr "" -#: actions/register.php:495 +#: actions/register.php:496 msgid "Creative Commons Attribution 3.0" msgstr "" -#: actions/register.php:496 +#: actions/register.php:497 #, fuzzy msgid "" " except this private data: password, email address, IM address, and phone " @@ -2775,13 +2751,13 @@ msgstr "" "utenom disse private dataene: passord, epost, adresse, lynmeldingsadresse og " "telefonnummer." -#: actions/register.php:537 -#, php-format +#: actions/register.php:538 +#, 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 " @@ -2808,7 +2784,7 @@ msgstr "" "\n" "Thanks for signing up and we hope you enjoy using this service." -#: actions/register.php:561 +#: actions/register.php:562 msgid "" "(You should receive a message by email momentarily, with instructions on how " "to confirm your email address.)" @@ -2903,11 +2879,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 +2895,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 +2909,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 +2933,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 +2982,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 +3032,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 +3099,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 +3125,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 +3136,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 +3186,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 +3374,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 +3404,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 +3494,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 +3532,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 +3568,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 +3651,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 +3764,7 @@ msgid "" "click “Reject”." msgstr "" -#: actions/userauthorization.php:188 +#: actions/userauthorization.php:188 actions/version.php:165 msgid "License" msgstr "" @@ -3858,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 @@ -3891,11 +3847,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 +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 "" @@ -3930,23 +3876,95 @@ msgstr "Du er allerede logget inn!" msgid "Try [searching for groups](%%action.groupsearch%%) and joining them." msgstr "" -#: classes/File.php:137 +#: 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:144 #, 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 "" -#: classes/File.php:147 +#: classes/File.php:154 #, php-format msgid "A file this large would exceed your user quota of %d bytes." msgstr "" -#: classes/File.php:154 +#: classes/File.php:161 #, php-format msgid "A file this large would exceed your monthly quota of %d bytes." msgstr "" +#: classes/Login_token.php:76 +#, fuzzy, php-format +msgid "Could not create login token for %s" +msgstr "Klarte ikke å lagre avatar-informasjonen" + #: classes/Message.php:45 msgid "You are banned from sending direct messages." msgstr "" @@ -3996,7 +4014,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 "" @@ -4046,139 +4064,139 @@ msgid "Other options" msgstr "" #: lib/action.php:144 -#, php-format -msgid "%s - %s" -msgstr "" +#, fuzzy, php-format +msgid "%1$s - %2$s" +msgstr "%1$s sin status på %2$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 "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 +4205,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 +4218,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 +4251,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 "" @@ -4292,7 +4314,7 @@ msgstr "Passordet ble lagret" msgid "Command results" msgstr "" -#: lib/channel.php:210 +#: lib/channel.php:210 lib/mailhandler.php:142 msgid "Command complete" msgstr "" @@ -4314,9 +4336,9 @@ msgid "It does not make a lot of sense to nudge yourself!" msgstr "" #: lib/command.php:99 -#, php-format +#, fuzzy, php-format msgid "Nudge sent to %s" -msgstr "" +msgstr "Svar til %s" #: lib/command.php:126 #, php-format @@ -4332,29 +4354,50 @@ msgstr "" #: lib/command.php:168 lib/command.php:415 lib/command.php:476 #: lib/command.php:532 +#, fuzzy msgid "User has no last notice" -msgstr "" +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:217 +#, fuzzy +msgid "You are already a member of that group" +msgstr "Du er allerede medlem av den gruppen." + +#: lib/command.php:234 +#, fuzzy, php-format +msgid "Could not join user %s to group %s" +msgstr "Klarte ikke å oppdatere bruker." + +#: lib/command.php:239 +#, fuzzy, php-format +msgid "%s joined group %s" +msgstr "%1$s sin status på %2$s" + +#: lib/command.php:284 +#, fuzzy, php-format +msgid "Could not remove user %s to group %s" +msgstr "Klarte ikke å oppdatere bruker." + +#: lib/command.php:289 +#, fuzzy, php-format +msgid "%s left group %s" +msgstr "%1$s sin status på %2$s" #: lib/command.php:318 -#, php-format +#, fuzzy, php-format msgid "Fullname: %s" -msgstr "" +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 "" @@ -4364,18 +4407,24 @@ msgstr "" msgid "About: %s" msgstr "" -#: lib/command.php:358 scripts/xmppdaemon.php:301 +#: lib/command.php:358 #, php-format msgid "Message too long - maximum is %d characters, you sent %d" msgstr "" +#: lib/command.php:376 +#, fuzzy, php-format +msgid "Direct message to %s sent" +msgstr "Direktemeldinger til %s" + #: lib/command.php:378 msgid "Error sending direct message." msgstr "" #: lib/command.php:422 +#, fuzzy msgid "Cannot repeat your own notice" -msgstr "" +msgstr "Kan ikke slette notisen." #: lib/command.php:427 #, fuzzy @@ -4383,9 +4432,9 @@ msgid "Already repeated that notice" msgstr "Kan ikke slette notisen." #: lib/command.php:435 -#, php-format +#, fuzzy, php-format msgid "Notice from %s repeated" -msgstr "" +msgstr "Nytt nick" #: lib/command.php:437 msgid "Error repeating notice." @@ -4447,50 +4496,45 @@ msgstr "" msgid "Login command is disabled" msgstr "" -#: lib/command.php:664 -#, fuzzy, php-format -msgid "Could not create login token for %s" -msgstr "Klarte ikke å lagre avatar-informasjonen" - -#: lib/command.php:669 +#: lib/command.php:661 #, php-format msgid "This link is useable only once, and is good for only 2 minutes: %s" msgstr "" -#: lib/command.php:685 +#: lib/command.php:677 #, fuzzy msgid "You are not subscribed to anyone." msgstr "Ikke autorisert." -#: lib/command.php:687 +#: lib/command.php:679 msgid "You are subscribed to this person:" msgid_plural "You are subscribed to these people:" msgstr[0] "Ikke autorisert." msgstr[1] "Ikke autorisert." -#: lib/command.php:707 +#: lib/command.php:699 #, fuzzy msgid "No one is subscribed to you." msgstr "Svar til %s" -#: lib/command.php:709 +#: lib/command.php:701 msgid "This person is subscribed to you:" msgid_plural "These people are subscribed to you:" msgstr[0] "Svar til %s" msgstr[1] "Svar til %s" -#: lib/command.php:729 +#: lib/command.php:721 #, fuzzy msgid "You are not a member of any groups." msgstr "Du er allerede logget inn!" -#: lib/command.php:731 +#: lib/command.php:723 msgid "You are a member of this group:" msgid_plural "You are a member of these groups:" msgstr[0] "Du er allerede logget inn!" msgstr[1] "Du er allerede logget inn!" -#: lib/command.php:745 +#: lib/command.php:737 msgid "" "Commands:\n" "on - turn on notifications\n" @@ -4651,11 +4695,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\"" @@ -4826,22 +4865,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 @@ -4976,6 +5003,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 "" @@ -5007,7 +5055,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 @@ -5015,8 +5063,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 @@ -5025,7 +5074,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 @@ -5059,7 +5108,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 @@ -5179,6 +5238,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 "" @@ -5359,10 +5422,6 @@ msgstr "" msgid "People Tagcloud as tagged" msgstr "" -#: lib/subscriptionlist.php:126 -msgid "(none)" -msgstr "" - #: lib/tagcloudsection.php:56 msgid "None" msgstr "" @@ -5427,47 +5486,47 @@ msgstr "" msgid "Moderate" msgstr "" -#: lib/util.php:837 +#: lib/util.php:884 msgid "a few seconds ago" msgstr "noen få sekunder siden" -#: lib/util.php:839 +#: lib/util.php:886 msgid "about a minute ago" msgstr "omtrent ett minutt siden" -#: lib/util.php:841 +#: lib/util.php:888 #, php-format msgid "about %d minutes ago" msgstr "omtrent %d minutter siden" -#: lib/util.php:843 +#: lib/util.php:890 msgid "about an hour ago" msgstr "omtrent én time siden" -#: lib/util.php:845 +#: lib/util.php:892 #, php-format msgid "about %d hours ago" msgstr "omtrent %d timer siden" -#: lib/util.php:847 +#: lib/util.php:894 msgid "about a day ago" msgstr "omtrent én dag siden" -#: lib/util.php:849 +#: lib/util.php:896 #, php-format msgid "about %d days ago" msgstr "omtrent %d dager siden" -#: lib/util.php:851 +#: lib/util.php:898 msgid "about a month ago" msgstr "omtrent én måned siden" -#: lib/util.php:853 +#: lib/util.php:900 #, php-format msgid "about %d months ago" msgstr "omtrent %d måneder siden" -#: lib/util.php:855 +#: lib/util.php:902 msgid "about a year ago" msgstr "omtrent ett år siden" @@ -5481,18 +5540,7 @@ msgstr "" 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." +#: scripts/xmppdaemon.php:301 +#, php-format +msgid "Message too long - maximum is %1$d characters, you sent %2$d." msgstr "" diff --git a/locale/nl/LC_MESSAGES/statusnet.po b/locale/nl/LC_MESSAGES/statusnet.po index 378b88a23..36906bde7 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-05 22:10+0000\n" -"PO-Revision-Date: 2010-01-05 22:12:13+0000\n" +"POT-Creation-Date: 2010-01-11 23:25+0000\n" +"PO-Revision-Date: 2010-01-11 23:27:46+0000\n" "Language-Team: Dutch\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha (r60693); Translate extension (2010-01-04)\n" +"X-Generator: MediaWiki 1.16alpha (r60950); 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" @@ -39,7 +40,7 @@ msgstr "Deze pagina bestaat niet" #: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79 #: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75 #: actions/favoritesrss.php:74 actions/foaf.php:40 actions/foaf.php:58 -#: actions/microsummary.php:62 actions/newmessage.php:116 +#: actions/microsummary.php:62 actions/newmessage.php:116 actions/otp.php:76 #: actions/remotesubscribe.php:145 actions/remotesubscribe.php:154 #: actions/replies.php:73 actions/repliesrss.php:38 #: actions/showfavorites.php:105 actions/userbyid.php:74 @@ -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 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 #, 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." @@ -450,7 +441,7 @@ msgstr "De mededeling bestaat niet." #: actions/apistatusesretweet.php:83 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 msgid "Already repeated that notice." @@ -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,11 +612,11 @@ 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/invite.php:56 actions/login.php:115 actions/makeadmin.php:66 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80 #: actions/othersettings.php:145 actions/passwordsettings.php:138 #: actions/profilesettings.php:194 actions/recoverpassword.php:337 @@ -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 +#: actions/joingroup.php:135 #, 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,67 +1831,58 @@ 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 +#: actions/leavegroup.php:134 #, 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 +#: actions/login.php:80 actions/otp.php:62 actions/register.php:137 msgid "Already logged in." msgstr "U bent al aangemeld." -#: actions/login.php:114 actions/login.php:124 -msgid "Invalid or expired token." -msgstr "Het token is ongeldig of verlopen." - -#: actions/login.php:147 +#: actions/login.php:126 msgid "Incorrect username or password." msgstr "De gebruikersnaam of wachtwoord is onjuist." -#: actions/login.php:153 +#: actions/login.php:132 actions/otp.php:120 msgid "Error setting user. You are probably not authorized." 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:188 actions/login.php:241 lib/action.php:460 #: lib/logingroupnav.php:79 msgid "Login" msgstr "Aanmelden" -#: actions/login.php:247 +#: actions/login.php:227 msgid "Login to site" msgstr "Aanmelden" -#: actions/login.php:250 actions/profilesettings.php:106 -#: actions/register.php:423 actions/showgroup.php:236 actions/tagother.php:94 +#: actions/login.php:230 actions/profilesettings.php:106 +#: actions/register.php:424 actions/showgroup.php:236 actions/tagother.php:94 #: lib/groupeditform.php:152 lib/userprofile.php:131 msgid "Nickname" msgstr "Gebruikersnaam" -#: actions/login.php:253 actions/register.php:428 +#: actions/login.php:233 actions/register.php:429 #: lib/accountsettingsaction.php:116 msgid "Password" msgstr "Wachtwoord" -#: actions/login.php:256 actions/register.php:477 +#: actions/login.php:236 actions/register.php:478 msgid "Remember me" msgstr "Aanmeldgegevens onthouden" -#: actions/login.php:257 actions/register.php:479 +#: actions/login.php:237 actions/register.php:480 msgid "Automatically login in the future; not for shared computers!" msgstr "Voortaan automatisch aanmelden. Niet gebruiken op gedeelde computers!" -#: actions/login.php:267 +#: actions/login.php:247 msgid "Lost or forgotten password?" msgstr "Wachtwoord kwijt of vergeten?" -#: actions/login.php:286 +#: actions/login.php:266 msgid "" "For security reasons, please re-enter your user name and password before " "changing your settings." @@ -1936,7 +1890,7 @@ msgstr "" "Om veiligheidsredenen moet u uw gebruikersnaam en wachtwoord nogmaals " "invoeren alvorens u uw instellingen kunt wijzigen." -#: actions/login.php:290 +#: actions/login.php:270 #, php-format msgid "" "Login with your username and password. Don't have a username yet? [Register]" @@ -1951,18 +1905,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" @@ -2002,10 +1956,10 @@ msgstr "Stuur geen berichten naar uzelf. Zeg het gewoon in uw hoofd." msgid "Message sent" msgstr "Bericht verzonden." -#: actions/newmessage.php:185 lib/command.php:376 +#: actions/newmessage.php:185 #, 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 +1988,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 @@ -2098,8 +2052,8 @@ msgstr "inhoudstype " msgid "Only " msgstr "Alleen " -#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1031 -#: lib/api.php:1059 lib/api.php:1169 +#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1033 +#: lib/api.php:1061 lib/api.php:1171 msgid "Not a supported data format." msgstr "Geen ondersteund gegevensformaat." @@ -2143,10 +2097,30 @@ 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/otp.php:69 +#, fuzzy +msgid "No user ID specified." +msgstr "Er is geen groep aangegeven." + +#: actions/otp.php:83 +#, fuzzy +msgid "No login token specified." +msgstr "Er is geen mededeling opgegeven." + +#: actions/otp.php:90 +#, fuzzy +msgid "No login token requested." +msgstr "Het profiel-ID was niet aanwezig in het verzoek." + +#: actions/otp.php:95 +#, fuzzy +msgid "Invalid login token specified." +msgstr "Het token is ongeldig of verlopen." + +#: actions/otp.php:104 +#, fuzzy +msgid "Login token expired." +msgstr "Aanmelden" #: actions/outbox.php:61 #, php-format @@ -2182,7 +2156,7 @@ msgid "6 or more characters" msgstr "Zes of meer tekens" #: actions/passwordsettings.php:112 actions/recoverpassword.php:239 -#: actions/register.php:432 actions/smssettings.php:134 +#: actions/register.php:433 actions/smssettings.php:134 msgid "Confirm" msgstr "Bevestigen" @@ -2218,7 +2192,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 +2225,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 +2318,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 +2350,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 +2359,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" @@ -2409,42 +2383,42 @@ msgstr "Profielinformatie" msgid "1-64 lowercase letters or numbers, no punctuation or spaces" msgstr "1-64 kleine letters of cijfers, geen leestekens of spaties" -#: actions/profilesettings.php:111 actions/register.php:447 +#: actions/profilesettings.php:111 actions/register.php:448 #: actions/showgroup.php:247 actions/tagother.php:104 #: lib/groupeditform.php:157 lib/userprofile.php:149 msgid "Full name" msgstr "Volledige naam" -#: actions/profilesettings.php:115 actions/register.php:452 +#: actions/profilesettings.php:115 actions/register.php:453 #: lib/groupeditform.php:161 msgid "Homepage" msgstr "Thuispagina" -#: actions/profilesettings.php:117 actions/register.php:454 +#: actions/profilesettings.php:117 actions/register.php:455 msgid "URL of your homepage, blog, or profile on another site" msgstr "De URL van uw thuispagina, blog of profiel bij een andere website" -#: actions/profilesettings.php:122 actions/register.php:460 +#: actions/profilesettings.php:122 actions/register.php:461 #, php-format msgid "Describe yourself and your interests in %d chars" msgstr "Geef een beschrijving van uzelf en uw interesses in %d tekens" -#: actions/profilesettings.php:125 actions/register.php:463 +#: actions/profilesettings.php:125 actions/register.php:464 msgid "Describe yourself and your interests" msgstr "Beschrijf uzelf en uw interesses" -#: actions/profilesettings.php:127 actions/register.php:465 +#: actions/profilesettings.php:127 actions/register.php:466 msgid "Bio" msgstr "Beschrijving" -#: actions/profilesettings.php:132 actions/register.php:470 +#: actions/profilesettings.php:132 actions/register.php:471 #: actions/showgroup.php:256 actions/tagother.php:112 #: actions/userauthorization.php:158 lib/groupeditform.php:177 #: lib/userprofile.php:164 msgid "Location" msgstr "Locatie" -#: actions/profilesettings.php:134 actions/register.php:472 +#: actions/profilesettings.php:134 actions/register.php:473 msgid "Where you are, like \"City, State (or Region), Country\"" msgstr "Waar u bent, bijvoorbeeld \"woonplaats, land\" of \"postcode, land\"" @@ -2512,19 +2486,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." @@ -2764,7 +2738,7 @@ msgstr "Er is een fout opgetreden tijdens het instellen van de gebruiker." msgid "New password successfully saved. You are now logged in." msgstr "Het nieuwe wachtwoord is opgeslagen. U bent nu aangemeld." -#: actions/register.php:85 actions/register.php:189 actions/register.php:404 +#: actions/register.php:85 actions/register.php:189 actions/register.php:405 msgid "Sorry, only invited people can register." msgstr "U kunt zich alleen registreren als u wordt uitgenodigd." @@ -2776,7 +2750,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:503 lib/action.php:457 #: lib/logingroupnav.php:85 msgid "Register" msgstr "Registreren" @@ -2789,19 +2763,15 @@ 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." -#: actions/register.php:243 actions/register.php:264 +#: actions/register.php:243 actions/register.php:265 msgid "Invalid username or password." msgstr "Ongeldige gebruikersnaam of wachtwoord." -#: actions/register.php:342 +#: actions/register.php:343 msgid "" "With this form you can create a new account. You can then post notices and " "link up to friends and colleagues. " @@ -2809,40 +2779,40 @@ msgstr "" "Via dit formulier kunt u een nieuwe gebruiker aanmaken. Daarna kunt u " "mededelingen uitsturen en contact maken met vrienden en collega's. " -#: actions/register.php:424 +#: actions/register.php:425 msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required." msgstr "1-64 kleine letters of cijfers, geen leestekens of spaties. Verplicht." -#: actions/register.php:429 +#: actions/register.php:430 msgid "6 or more characters. Required." msgstr "Zes of meer tekens. Verplicht" -#: actions/register.php:433 +#: actions/register.php:434 msgid "Same as password above. Required." msgstr "Gelijk aan het wachtwoord hierboven. Verplicht" -#: actions/register.php:437 actions/register.php:441 +#: actions/register.php:438 actions/register.php:442 #: actions/siteadminpanel.php:270 lib/accountsettingsaction.php:120 msgid "Email" msgstr "E-mail" -#: actions/register.php:438 actions/register.php:442 +#: actions/register.php:439 actions/register.php:443 msgid "Used only for updates, announcements, and password recovery" msgstr "Alleen gebruikt voor updates, aankondigingen en wachtwoordherstel" -#: actions/register.php:449 +#: actions/register.php:450 msgid "Longer name, preferably your \"real\" name" msgstr "Een langere naam, mogelijk uw echte naam" -#: actions/register.php:493 +#: actions/register.php:494 msgid "My text and files are available under " msgstr "Mijn teksten en bestanden zijn beschikbaar onder " -#: actions/register.php:495 +#: actions/register.php:496 msgid "Creative Commons Attribution 3.0" msgstr "Creative Commons Naamsvermelding 3.0" -#: actions/register.php:496 +#: actions/register.php:497 msgid "" " except this private data: password, email address, IM address, and phone " "number." @@ -2850,13 +2820,13 @@ msgstr "" " behalve de volgende privégegevens: wachtwoord, e-mailadres, IM-adres, " "telefoonnummer." -#: actions/register.php:537 +#: actions/register.php:538 #, 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 +2838,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 " @@ -2884,7 +2854,7 @@ msgstr "" "Dank u wel voor het registreren en we hopen dat deze dienst u biedt wat u " "ervan verwacht." -#: actions/register.php:561 +#: actions/register.php:562 msgid "" "(You should receive a message by email momentarily, with instructions on how " "to confirm your email address.)" @@ -2981,11 +2951,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 +2969,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 +2987,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 +3006,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 +3064,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 +3112,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 +3188,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 +3215,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 +3230,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 +3283,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 +3476,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 +3505,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 +3597,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 +3638,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 +3679,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 +3764,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 +3878,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 +3933,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 +3966,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 +3982,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,7 +3997,82 @@ msgid "Try [searching for groups](%%action.groupsearch%%) and joining them." msgstr "" "U kunt [naar groepen zoeken](%%action.groupsearch%%) en daar lid van worden." -#: classes/File.php:137 +#: 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:144 #, php-format msgid "" "No file may be larger than %d bytes and the file you sent was %d bytes. Try " @@ -4073,18 +4081,23 @@ msgstr "" "Bestanden mogen niet groter zijn dan %d bytes, en uw bestand was %d bytes. " "Probeer een kleinere versie te uploaden." -#: classes/File.php:147 +#: classes/File.php:154 #, php-format msgid "A file this large would exceed your user quota of %d bytes." msgstr "" "Een bestand van deze grootte overschijdt uw gebruikersquota van %d bytes." -#: classes/File.php:154 +#: classes/File.php:161 #, php-format msgid "A file this large would exceed your monthly quota of %d bytes." msgstr "" "Een bestand van deze grootte overschijdt uw maandelijkse quota van %d bytes." +#: classes/Login_token.php:76 +#, fuzzy, php-format +msgid "Could not create login token for %s" +msgstr "Het was niet mogelijk een aanmeldtoken aan te maken voor %s." + #: classes/Message.php:45 msgid "You are banned from sending direct messages." msgstr "U mag geen directe berichten verzenden." @@ -4144,7 +4157,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" @@ -4191,136 +4204,136 @@ msgid "Other options" msgstr "Overige instellingen" #: lib/action.php:144 -#, php-format -msgid "%s - %s" -msgstr "%s - %s" +#, fuzzy, php-format +msgid "%1$s - %2$s" +msgstr "%1$s (%2$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 +4342,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 +4358,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 +4390,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" @@ -4422,20 +4439,18 @@ msgid "Tags for this attachment" msgstr "Labels voor deze bijlage" #: lib/authenticationplugin.php:182 lib/authenticationplugin.php:187 -#, fuzzy msgid "Password changing failed" -msgstr "Wachtwoord wijzigen" +msgstr "Wachtwoord wijzigen is mislukt" #: lib/authenticationplugin.php:197 -#, fuzzy msgid "Password changing is not allowed" -msgstr "Wachtwoord wijzigen" +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" @@ -4448,18 +4463,18 @@ msgid "Sorry, this command is not yet implemented." msgstr "Dit commando is nog niet geïmplementeerd." #: lib/command.php:88 -#, php-format +#, fuzzy, php-format msgid "Could not find a user with nickname %s" -msgstr "De gebruiker %s is niet aangetroffen" +msgstr "De gebruiker %s is niet aangetroffen." #: lib/command.php:92 msgid "It does not make a lot of sense to nudge yourself!" msgstr "Het heeft niet zoveel zin om uzelf te porren..." #: lib/command.php:99 -#, php-format +#, fuzzy, php-format msgid "Nudge sent to %s" -msgstr "De por naar %s is verzonden" +msgstr "De por naar %s is verzonden." #: lib/command.php:126 #, php-format @@ -4473,34 +4488,56 @@ msgstr "" "Mededelingen: %3$s" #: lib/command.php:152 lib/command.php:399 lib/command.php:460 +#, fuzzy msgid "Notice with that id does not exist" -msgstr "Er bestaat geen mededeling met dat ID" +msgstr "Er bestaat geen mededeling met dat ID." #: lib/command.php:168 lib/command.php:415 lib/command.php:476 #: lib/command.php:532 +#, fuzzy msgid "User has no last notice" -msgstr "Deze gebruiker heeft geen laatste mededeling" +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 -#, php-format -msgid "%1$s (%2$s)" -msgstr "%1$s (%2$s)" +#: lib/command.php:217 +#, fuzzy +msgid "You are already a member of that group" +msgstr "U bent al lid van die groep." + +#: lib/command.php:234 +#, fuzzy, php-format +msgid "Could not join user %s to group %s" +msgstr "Het was niet mogelijk gebruiker %1$s toe te voegen aan de groep %2$s." + +#: lib/command.php:239 +#, fuzzy, php-format +msgid "%s joined group %s" +msgstr "%1$s is lid geworden van de groep %2$s" + +#: lib/command.php:284 +#, fuzzy, php-format +msgid "Could not remove user %s to group %s" +msgstr "De gebruiker %1$s kon niet uit de groep %2$s verwijderd worden." + +#: lib/command.php:289 +#, fuzzy, php-format +msgid "%s left group %s" +msgstr "%1$s heeft de groep %2$s verlaten" #: lib/command.php:318 -#, php-format +#, fuzzy, php-format msgid "Fullname: %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" @@ -4510,53 +4547,61 @@ msgstr "Thuispagina: %s" msgid "About: %s" msgstr "Over: %s" -#: lib/command.php:358 scripts/xmppdaemon.php:301 -#, php-format +#: lib/command.php:358 +#, fuzzy, php-format msgid "Message too long - maximum is %d characters, you sent %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:376 +#, fuzzy, php-format +msgid "Direct message to %s sent" +msgstr "Het directe bericht aan %s is verzonden." #: 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 +#, fuzzy msgid "Cannot repeat your own notice" -msgstr "U kunt uw eigen mededelingen niet herhalen." +msgstr "U kunt uw eigen mededeling niet herhalen." #: lib/command.php:427 +#, fuzzy msgid "Already repeated that notice" msgstr "U hebt die mededeling al herhaald." #: lib/command.php:435 -#, php-format +#, fuzzy, php-format msgid "Notice from %s repeated" -msgstr "De mededeling van %s is herhaald" +msgstr "De mededeling van %s is herhaald." #: lib/command.php:437 msgid "Error repeating notice." msgstr "Er is een fout opgetreden bij het herhalen van de mededeling." #: lib/command.php:491 -#, php-format +#, fuzzy, php-format msgid "Notice too long - maximum is %d characters, you sent %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 +#, fuzzy, php-format msgid "Reply to %s sent" -msgstr "Het antwoord aan %s is verzonden" +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 +#, fuzzy msgid "Specify the name of the user to subscribe to" -msgstr "Geef de naam op van de gebruiker waarop u wilt abonneren" +msgstr "Geef de naam op van de gebruiker waarop u wilt abonneren." #: lib/command.php:563 #, php-format @@ -4564,9 +4609,10 @@ msgid "Subscribed to %s" msgstr "Geabonneerd op %s" #: lib/command.php:584 +#, fuzzy 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 @@ -4594,52 +4640,48 @@ msgid "Can't turn on notification." msgstr "Het is niet mogelijk de notificatie uit te schakelen." #: lib/command.php:650 +#, fuzzy 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" +msgstr "Het aanmeldcommando is uitgeschakeld." -#: lib/command.php:669 -#, php-format +#: lib/command.php:661 +#, fuzzy, php-format 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 +#: lib/command.php:677 msgid "You are not subscribed to anyone." msgstr "U bent op geen enkele gebruiker geabonneerd." -#: lib/command.php:687 +#: lib/command.php:679 msgid "You are subscribed to this person:" msgid_plural "You are subscribed to these people:" msgstr[0] "U bent geabonneerd op deze gebruiker:" msgstr[1] "U bent geabonneerd op deze gebruikers:" -#: lib/command.php:707 +#: lib/command.php:699 msgid "No one is subscribed to you." msgstr "Niemand heeft een abonnenment op u." -#: lib/command.php:709 +#: lib/command.php:701 msgid "This person is subscribed to you:" msgid_plural "These people are subscribed to you:" msgstr[0] "Deze gebruiker is op u geabonneerd:" msgstr[1] "Deze gebruikers zijn op u geabonneerd:" -#: lib/command.php:729 +#: lib/command.php:721 msgid "You are not a member of any groups." msgstr "U bent lid van geen enkele groep." -#: lib/command.php:731 +#: lib/command.php:723 msgid "You are a member of this group:" msgid_plural "You are a member of these groups:" msgstr[0] "U bent lid van deze groep:" msgstr[1] "U bent lid van deze groepen:" -#: lib/command.php:745 +#: lib/command.php:737 msgid "" "Commands:\n" "on - turn on notifications\n" @@ -4836,10 +4878,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\"" @@ -5023,24 +5061,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 @@ -5238,6 +5262,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 "" @@ -5275,16 +5320,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 @@ -5293,7 +5338,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 @@ -5326,8 +5371,18 @@ msgid "Attach a file" msgstr "Bestand toevoegen" #: lib/noticeform.php:212 -msgid "Share your location" -msgstr "Uw locatie bekend maken" +#, fuzzy +msgid "Share my location" +msgstr "Mijn locatie bekend maken." + +#: lib/noticeform.php:214 +#, fuzzy +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 @@ -5444,6 +5499,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" @@ -5613,10 +5672,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" @@ -5677,47 +5732,47 @@ msgstr "Bericht" msgid "Moderate" msgstr "Modereren" -#: lib/util.php:837 +#: lib/util.php:884 msgid "a few seconds ago" msgstr "een paar seconden geleden" -#: lib/util.php:839 +#: lib/util.php:886 msgid "about a minute ago" msgstr "ongeveer een minuut geleden" -#: lib/util.php:841 +#: lib/util.php:888 #, php-format msgid "about %d minutes ago" msgstr "ongeveer %d minuten geleden" -#: lib/util.php:843 +#: lib/util.php:890 msgid "about an hour ago" msgstr "ongeveer een uur geleden" -#: lib/util.php:845 +#: lib/util.php:892 #, php-format msgid "about %d hours ago" msgstr "ongeveer %d uur geleden" -#: lib/util.php:847 +#: lib/util.php:894 msgid "about a day ago" msgstr "ongeveer een dag geleden" -#: lib/util.php:849 +#: lib/util.php:896 #, php-format msgid "about %d days ago" msgstr "ongeveer %d dagen geleden" -#: lib/util.php:851 +#: lib/util.php:898 msgid "about a month ago" msgstr "ongeveer een maand geleden" -#: lib/util.php:853 +#: lib/util.php:900 #, php-format msgid "about %d months ago" msgstr "ongeveer %d maanden geleden" -#: lib/util.php:855 +#: lib/util.php:902 msgid "about a year ago" msgstr "ongeveer een jaar geleden" @@ -5731,18 +5786,9 @@ msgstr "%s is geen geldige kleur." 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." +#: scripts/xmppdaemon.php:301 +#, php-format +msgid "Message too long - maximum is %1$d characters, you sent %2$d." +msgstr "" +"Het bericht te is lang. De maximale lengte is %1$d tekens. De lengte van uw " +"bericht was %2$d." diff --git a/locale/nn/LC_MESSAGES/statusnet.po b/locale/nn/LC_MESSAGES/statusnet.po index 66a393e7b..383493bbf 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-05 22:10+0000\n" -"PO-Revision-Date: 2010-01-05 22:12:07+0000\n" +"POT-Creation-Date: 2010-01-11 23:25+0000\n" +"PO-Revision-Date: 2010-01-11 23:27:39+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 (r60693); Translate extension (2010-01-04)\n" +"X-Generator: MediaWiki 1.16alpha (r60950); 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" @@ -38,7 +38,7 @@ msgstr "Dette emneord finst ikkje." #: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79 #: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75 #: actions/favoritesrss.php:74 actions/foaf.php:40 actions/foaf.php:58 -#: actions/microsummary.php:62 actions/newmessage.php:116 +#: actions/microsummary.php:62 actions/newmessage.php:116 actions/otp.php:76 #: actions/remotesubscribe.php:145 actions/remotesubscribe.php:154 #: actions/replies.php:73 actions/repliesrss.php:38 #: actions/showfavorites.php:105 actions/userbyid.php:74 @@ -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 #, 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 #, 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" @@ -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,11 +607,11 @@ 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/invite.php:56 actions/login.php:115 actions/makeadmin.php:66 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80 #: actions/othersettings.php:145 actions/passwordsettings.php:138 #: actions/profilesettings.php:194 actions/recoverpassword.php:337 @@ -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" +#: actions/joingroup.php:135 +#, fuzzy, php-format +msgid "%1$s joined group %2$s" msgstr "%s blei medlem av gruppe %s" #: actions/leavegroup.php:60 @@ -1860,67 +1829,57 @@ 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" +#: actions/leavegroup.php:134 +#, fuzzy, php-format +msgid "%1$s left group %2$s" msgstr "%s forlot %s gruppa" -#: actions/login.php:83 actions/register.php:137 +#: actions/login.php:80 actions/otp.php:62 actions/register.php:137 msgid "Already logged in." msgstr "Allereie logga inn." -#: actions/login.php:114 actions/login.php:124 -#, fuzzy -msgid "Invalid or expired token." -msgstr "Ugyldig notisinnhald" - -#: actions/login.php:147 +#: actions/login.php:126 msgid "Incorrect username or password." msgstr "Feil brukarnamn eller passord" -#: actions/login.php:153 +#: actions/login.php:132 actions/otp.php:120 #, fuzzy 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:188 actions/login.php:241 lib/action.php:460 #: lib/logingroupnav.php:79 msgid "Login" msgstr "Logg inn" -#: actions/login.php:247 +#: actions/login.php:227 msgid "Login to site" msgstr "Logg inn " -#: actions/login.php:250 actions/profilesettings.php:106 -#: actions/register.php:423 actions/showgroup.php:236 actions/tagother.php:94 +#: actions/login.php:230 actions/profilesettings.php:106 +#: actions/register.php:424 actions/showgroup.php:236 actions/tagother.php:94 #: lib/groupeditform.php:152 lib/userprofile.php:131 msgid "Nickname" msgstr "Kallenamn" -#: actions/login.php:253 actions/register.php:428 +#: actions/login.php:233 actions/register.php:429 #: lib/accountsettingsaction.php:116 msgid "Password" msgstr "Passord" -#: actions/login.php:256 actions/register.php:477 +#: actions/login.php:236 actions/register.php:478 msgid "Remember me" msgstr "Hugs meg" -#: actions/login.php:257 actions/register.php:479 +#: actions/login.php:237 actions/register.php:480 msgid "Automatically login in the future; not for shared computers!" msgstr "Logg inn automatisk i framtidi (ikkje for delte maskiner)." -#: actions/login.php:267 +#: actions/login.php:247 msgid "Lost or forgotten password?" msgstr "Mista eller gløymd passord?" -#: actions/login.php:286 +#: actions/login.php:266 msgid "" "For security reasons, please re-enter your user name and password before " "changing your settings." @@ -1928,7 +1887,7 @@ msgstr "" "Skriv inn brukarnam og passord før du endrar innstillingar (av " "tryggleiksomsyn)." -#: actions/login.php:290 +#: actions/login.php:270 #, fuzzy, php-format msgid "" "Login with your username and password. Don't have a username yet? [Register]" @@ -1943,19 +1902,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" @@ -1998,9 +1957,9 @@ msgstr "" msgid "Message sent" msgstr "Melding" -#: actions/newmessage.php:185 lib/command.php:376 -#, php-format -msgid "Direct message to %s sent" +#: actions/newmessage.php:185 +#, 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 +1989,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 @@ -2090,8 +2049,8 @@ msgstr "Kopla til" msgid "Only " msgstr "" -#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1031 -#: lib/api.php:1059 lib/api.php:1169 +#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1033 +#: lib/api.php:1061 lib/api.php:1171 msgid "Not a supported data format." msgstr "Ikkje eit støtta dataformat." @@ -2136,10 +2095,30 @@ 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/otp.php:69 +#, fuzzy +msgid "No user ID specified." +msgstr "Ingen vald profil." + +#: actions/otp.php:83 +#, fuzzy +msgid "No login token specified." +msgstr "Ingen vald profil." + +#: actions/otp.php:90 +#, fuzzy +msgid "No login token requested." +msgstr "Ingen profil-ID i førespurnaden." + +#: actions/otp.php:95 +#, fuzzy +msgid "Invalid login token specified." +msgstr "Ugyldig notisinnhald" + +#: actions/otp.php:104 +#, fuzzy +msgid "Login token expired." +msgstr "Logg inn " #: actions/outbox.php:61 #, php-format @@ -2175,7 +2154,7 @@ msgid "6 or more characters" msgstr "6 eller fleire teikn" #: actions/passwordsettings.php:112 actions/recoverpassword.php:239 -#: actions/register.php:432 actions/smssettings.php:134 +#: actions/register.php:433 actions/smssettings.php:134 msgid "Confirm" msgstr "Godta" @@ -2211,7 +2190,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 +2223,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 +2325,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 +2357,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 +2367,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 @@ -2410,43 +2390,43 @@ msgid "1-64 lowercase letters or numbers, no punctuation or spaces" msgstr "" "1-64 små bokstavar eller tal, ingen punktum (og liknande) eller mellomrom" -#: actions/profilesettings.php:111 actions/register.php:447 +#: actions/profilesettings.php:111 actions/register.php:448 #: actions/showgroup.php:247 actions/tagother.php:104 #: lib/groupeditform.php:157 lib/userprofile.php:149 msgid "Full name" msgstr "Fullt namn" -#: actions/profilesettings.php:115 actions/register.php:452 +#: actions/profilesettings.php:115 actions/register.php:453 #: lib/groupeditform.php:161 msgid "Homepage" msgstr "Heimeside" -#: actions/profilesettings.php:117 actions/register.php:454 +#: actions/profilesettings.php:117 actions/register.php:455 msgid "URL of your homepage, blog, or profile on another site" msgstr "URL til heimesida di, bloggen din, eller ein profil på ei anna side." -#: actions/profilesettings.php:122 actions/register.php:460 +#: actions/profilesettings.php:122 actions/register.php:461 #, fuzzy, php-format msgid "Describe yourself and your interests in %d chars" msgstr "Skriv om deg og interessene dine med 140 teikn" -#: actions/profilesettings.php:125 actions/register.php:463 +#: actions/profilesettings.php:125 actions/register.php:464 #, fuzzy msgid "Describe yourself and your interests" msgstr "Skildra deg sjølv og din" -#: actions/profilesettings.php:127 actions/register.php:465 +#: actions/profilesettings.php:127 actions/register.php:466 msgid "Bio" msgstr "Om meg" -#: actions/profilesettings.php:132 actions/register.php:470 +#: actions/profilesettings.php:132 actions/register.php:471 #: actions/showgroup.php:256 actions/tagother.php:112 #: actions/userauthorization.php:158 lib/groupeditform.php:177 #: lib/userprofile.php:164 msgid "Location" msgstr "Plassering" -#: actions/profilesettings.php:134 actions/register.php:472 +#: actions/profilesettings.php:134 actions/register.php:473 msgid "Where you are, like \"City, State (or Region), Country\"" msgstr "Kvar er du, t.d. «By, Fylke (eller Region), Land»" @@ -2511,20 +2491,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." @@ -2748,7 +2728,7 @@ msgstr "Feil ved å setja brukar." msgid "New password successfully saved. You are now logged in." msgstr "Lagra det nye passordet. Du er logga inn." -#: actions/register.php:85 actions/register.php:189 actions/register.php:404 +#: actions/register.php:85 actions/register.php:189 actions/register.php:405 msgid "Sorry, only invited people can register." msgstr "Beklage, men kun inviterte kan registrere seg." @@ -2761,7 +2741,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:503 lib/action.php:457 #: lib/logingroupnav.php:85 msgid "Register" msgstr "Registrér" @@ -2774,61 +2754,57 @@ 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." -#: actions/register.php:243 actions/register.php:264 +#: actions/register.php:243 actions/register.php:265 msgid "Invalid username or password." msgstr "Ugyldig brukarnamn eller passord." -#: actions/register.php:342 +#: actions/register.php:343 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 +#: actions/register.php:425 msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required." msgstr "" "1-64 små bokstavar eller tal, ingen punktum (og liknande) eller mellomrom. " "Kravd." -#: actions/register.php:429 +#: actions/register.php:430 msgid "6 or more characters. Required." msgstr "6 eller fleire teikn. Kravd." -#: actions/register.php:433 +#: actions/register.php:434 msgid "Same as password above. Required." msgstr "Samme som passord over. Påkrevd." -#: actions/register.php:437 actions/register.php:441 +#: actions/register.php:438 actions/register.php:442 #: actions/siteadminpanel.php:270 lib/accountsettingsaction.php:120 msgid "Email" msgstr "Epost" -#: actions/register.php:438 actions/register.php:442 +#: actions/register.php:439 actions/register.php:443 msgid "Used only for updates, announcements, and password recovery" msgstr "" "Blir berre brukt for uppdateringar, viktige meldingar og for gløymde passord" -#: actions/register.php:449 +#: actions/register.php:450 msgid "Longer name, preferably your \"real\" name" msgstr "Lengre namn, fortrinnsvis ditt «ekte» namn" -#: actions/register.php:493 +#: actions/register.php:494 msgid "My text and files are available under " msgstr "Teksten og filene mine er tilgjengeleg under " -#: actions/register.php:495 +#: actions/register.php:496 msgid "Creative Commons Attribution 3.0" msgstr "" -#: actions/register.php:496 +#: actions/register.php:497 #, fuzzy msgid "" " except this private data: password, email address, IM address, and phone " @@ -2837,13 +2813,13 @@ msgstr "" " unnateke privatdata: passord, epostadresse, ljonmeldingsadresse og " "telefonnummer." -#: actions/register.php:537 -#, php-format +#: actions/register.php:538 +#, 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 " @@ -2869,7 +2845,7 @@ msgstr "" "\n" "Takk for at du blei med, og vi håpar du vil lika tenesta!" -#: actions/register.php:561 +#: actions/register.php:562 msgid "" "(You should receive a message by email momentarily, with instructions on how " "to confirm your email address.)" @@ -2974,11 +2950,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 +2968,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 +2982,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 +3001,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 +3050,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 +3098,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 +3169,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 +3196,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 +3208,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 +3256,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 +3452,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 +3483,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 +3575,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 +3612,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 +3648,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 +3737,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 +3854,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 +3912,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 +3945,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 +3960,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,23 +3975,94 @@ msgstr "Du er ikkje medlem av den gruppa." msgid "Try [searching for groups](%%action.groupsearch%%) and joining them." msgstr "" -#: classes/File.php:137 +#: 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:144 #, 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 "" -#: classes/File.php:147 +#: classes/File.php:154 #, php-format msgid "A file this large would exceed your user quota of %d bytes." msgstr "" -#: classes/File.php:154 +#: classes/File.php:161 #, php-format msgid "A file this large would exceed your monthly quota of %d bytes." msgstr "" +#: classes/Login_token.php:76 +#, fuzzy, php-format +msgid "Could not create login token for %s" +msgstr "Kunne ikkje lagre favoritt." + #: classes/Message.php:45 #, fuzzy msgid "You are banned from sending direct messages." @@ -4106,7 +4117,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)" @@ -4154,139 +4165,139 @@ msgid "Other options" msgstr "Andre val" #: lib/action.php:144 -#, php-format -msgid "%s - %s" -msgstr "%s - %s" +#, fuzzy, php-format +msgid "%1$s - %2$s" +msgstr "%1$s (%2$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 +4306,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 +4322,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 +4356,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" @@ -4410,7 +4426,7 @@ msgstr "Endra passord" 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" @@ -4445,11 +4461,13 @@ msgid "" msgstr "" #: lib/command.php:152 lib/command.php:399 lib/command.php:460 +#, fuzzy msgid "Notice with that id does not exist" -msgstr "" +msgstr "Fann ingen profil med den IDen." #: lib/command.php:168 lib/command.php:415 lib/command.php:476 #: lib/command.php:532 +#, fuzzy msgid "User has no last notice" msgstr "Brukaren har ikkje siste notis" @@ -4457,22 +4475,42 @@ msgstr "Brukaren har ikkje siste notis" 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:217 +#, fuzzy +msgid "You are already a member of that group" +msgstr "Du er allereie medlem av den gruppa" + +#: lib/command.php:234 +#, fuzzy, php-format +msgid "Could not join user %s to group %s" +msgstr "Kunne ikkje melde brukaren %s inn i gruppa %s" + +#: lib/command.php:239 +#, fuzzy, php-format +msgid "%s joined group %s" +msgstr "%s blei medlem av gruppe %s" + +#: lib/command.php:284 +#, fuzzy, php-format +msgid "Could not remove user %s to group %s" +msgstr "Kunne ikkje fjerne %s fra %s gruppa " + +#: lib/command.php:289 +#, fuzzy, php-format +msgid "%s left group %s" +msgstr "%s forlot %s gruppa" #: lib/command.php:318 -#, php-format +#, fuzzy, php-format msgid "Fullname: %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" @@ -4482,11 +4520,16 @@ msgstr "Heimeside: %s" msgid "About: %s" msgstr "Om: %s" -#: lib/command.php:358 scripts/xmppdaemon.php:301 +#: lib/command.php:358 #, fuzzy, php-format msgid "Message too long - maximum is %d characters, you sent %d" msgstr "Melding for lang - maksimum 140 teikn, du skreiv %d" +#: lib/command.php:376 +#, fuzzy, php-format +msgid "Direct message to %s sent" +msgstr "Direkte melding til %s sendt" + #: lib/command.php:378 msgid "Error sending direct message." msgstr "Ein feil oppstod ved sending av direkte melding." @@ -4527,6 +4570,7 @@ msgid "Error saving notice." msgstr "Eit problem oppstod ved lagring av notis." #: lib/command.php:556 +#, fuzzy msgid "Specify the name of the user to subscribe to" msgstr "Spesifer namnet til brukaren du vil tinge" @@ -4536,6 +4580,7 @@ msgid "Subscribed to %s" msgstr "Tingar %s" #: lib/command.php:584 +#, fuzzy msgid "Specify the name of the user to unsubscribe from" msgstr "Spesifer namnet til brukar du vil fjerne tinging på" @@ -4568,50 +4613,45 @@ msgstr "Kan ikkje slå på notifikasjon." msgid "Login command is disabled" msgstr "" -#: lib/command.php:664 -#, fuzzy, php-format -msgid "Could not create login token for %s" -msgstr "Kunne ikkje lagre favoritt." - -#: lib/command.php:669 +#: lib/command.php:661 #, php-format msgid "This link is useable only once, and is good for only 2 minutes: %s" msgstr "" -#: lib/command.php:685 +#: lib/command.php:677 #, fuzzy msgid "You are not subscribed to anyone." msgstr "Du tingar ikkje oppdateringar til den profilen." -#: lib/command.php:687 +#: lib/command.php:679 msgid "You are subscribed to this person:" msgid_plural "You are subscribed to these people:" msgstr[0] "Du tingar allereie oppdatering frå desse brukarane:" msgstr[1] "Du tingar allereie oppdatering frå desse brukarane:" -#: lib/command.php:707 +#: lib/command.php:699 #, fuzzy msgid "No one is subscribed to you." msgstr "Kan ikkje tinga andre til deg." -#: lib/command.php:709 +#: lib/command.php:701 msgid "This person is subscribed to you:" msgid_plural "These people are subscribed to you:" msgstr[0] "Kan ikkje tinga andre til deg." msgstr[1] "Kan ikkje tinga andre til deg." -#: lib/command.php:729 +#: lib/command.php:721 #, fuzzy msgid "You are not a member of any groups." msgstr "Du er ikkje medlem av den gruppa." -#: lib/command.php:731 +#: lib/command.php:723 msgid "You are a member of this group:" msgid_plural "You are a member of these groups:" msgstr[0] "Du er ikkje medlem av den gruppa." msgstr[1] "Du er ikkje medlem av den gruppa." -#: lib/command.php:745 +#: lib/command.php:737 msgid "" "Commands:\n" "on - turn on notifications\n" @@ -4772,10 +4812,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\"" @@ -4941,21 +4977,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" @@ -5100,6 +5124,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 "" @@ -5131,7 +5176,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 @@ -5139,7 +5184,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 @@ -5149,7 +5195,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 @@ -5182,7 +5228,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 @@ -5305,6 +5361,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" @@ -5486,10 +5547,6 @@ msgstr "" msgid "People Tagcloud as tagged" msgstr "" -#: lib/subscriptionlist.php:126 -msgid "(none)" -msgstr "(ingen)" - #: lib/tagcloudsection.php:56 msgid "None" msgstr "Ingen" @@ -5554,47 +5611,47 @@ msgstr "Melding" msgid "Moderate" msgstr "" -#: lib/util.php:837 +#: lib/util.php:884 msgid "a few seconds ago" msgstr "eit par sekund sidan" -#: lib/util.php:839 +#: lib/util.php:886 msgid "about a minute ago" msgstr "omtrent eitt minutt sidan" -#: lib/util.php:841 +#: lib/util.php:888 #, php-format msgid "about %d minutes ago" msgstr "~%d minutt sidan" -#: lib/util.php:843 +#: lib/util.php:890 msgid "about an hour ago" msgstr "omtrent ein time sidan" -#: lib/util.php:845 +#: lib/util.php:892 #, php-format msgid "about %d hours ago" msgstr "~%d timar sidan" -#: lib/util.php:847 +#: lib/util.php:894 msgid "about a day ago" msgstr "omtrent ein dag sidan" -#: lib/util.php:849 +#: lib/util.php:896 #, php-format msgid "about %d days ago" msgstr "~%d dagar sidan" -#: lib/util.php:851 +#: lib/util.php:898 msgid "about a month ago" msgstr "omtrent ein månad sidan" -#: lib/util.php:853 +#: lib/util.php:900 #, php-format msgid "about %d months ago" msgstr "~%d månadar sidan" -#: lib/util.php:855 +#: lib/util.php:902 msgid "about a year ago" msgstr "omtrent eitt år sidan" @@ -5608,18 +5665,7 @@ msgstr "Heimesida er ikkje ei gyldig internettadresse." 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." +#: scripts/xmppdaemon.php:301 +#, fuzzy, php-format +msgid "Message too long - maximum is %1$d characters, you sent %2$d." +msgstr "Melding for lang - maksimum 140 teikn, du skreiv %d" diff --git a/locale/pl/LC_MESSAGES/statusnet.po b/locale/pl/LC_MESSAGES/statusnet.po index 63fb0d9d7..d06e4a119 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-05 22:10+0000\n" -"PO-Revision-Date: 2010-01-05 22:12:18+0000\n" +"POT-Creation-Date: 2010-01-11 23:25+0000\n" +"PO-Revision-Date: 2010-01-11 23:27:54+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 (r60693); Translate extension (2010-01-04)\n" +"X-Generator: MediaWiki 1.16alpha (r60950); 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" @@ -43,7 +43,7 @@ msgstr "Nie ma takiej strony" #: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79 #: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75 #: actions/favoritesrss.php:74 actions/foaf.php:40 actions/foaf.php:58 -#: actions/microsummary.php:62 actions/newmessage.php:116 +#: actions/microsummary.php:62 actions/newmessage.php:116 actions/otp.php:76 #: actions/remotesubscribe.php:145 actions/remotesubscribe.php:154 #: actions/replies.php:73 actions/repliesrss.php:38 #: actions/showfavorites.php:105 actions/userbyid.php:74 @@ -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 @@ -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 "" -"Można spróbować [szturchnąć użytkownika %s](../%s) z jego profilu lub " +"Można spróbować [szturchnąć użytkownika %1$s](../%2$s) z jego profilu lub " "[wysłać coś wymagającego jego uwagi](%%%%action.newnotice%%%%?" -"status_textarea=%s)." +"status_textarea=%3$s)." #: actions/all.php:137 actions/replies.php:209 actions/showstream.php:202 #, php-format @@ -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,7 @@ 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!" +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 +279,7 @@ msgid "Could not create favorite." msgstr "Nie można utworzyć ulubionego wpisu." #: actions/apifavoritedestroy.php:122 -msgid "That status is not a favorite!" +msgid "That status is not a favorite." msgstr "Ten stan nie jest ulubiony." #: actions/apifavoritedestroy.php:134 actions/disfavor.php:87 @@ -306,7 +301,7 @@ msgstr "" "Nie można zrezygnować z obserwacji użytkownika: nie odnaleziono użytkownika." #: actions/apifriendshipsdestroy.php:120 -msgid "You cannot unfollow yourself!" +msgid "You cannot unfollow yourself." msgstr "Nie można zrezygnować z obserwacji samego siebie." #: actions/apifriendshipsexists.php:94 @@ -391,7 +386,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 msgid "You are already a member of that group." msgstr "Jesteś już członkiem tej grupy." @@ -399,30 +394,25 @@ 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 +#: actions/apigroupjoin.php:138 actions/joingroup.php:128 #, php-format -msgid "Could not join user %s to group %s." -msgstr "Nie można dołączyć użytkownika %s do grupy %s." +msgid "Could not join user %1$s to group %2$s." +msgstr "Nie można dołączyć użytkownika %1$s do grupy %2$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 +#: actions/apigroupleave.php:124 actions/leavegroup.php:127 #, php-format -msgid "Could not remove user %s to group %s." -msgstr "Nie można usunąć użytkownika %s z grupy %s." +msgid "Could not remove user %1$s from group %2$s." +msgstr "Nie można usunąć użytkownika %1$s z grupy %2$s." #: actions/apigrouplist.php:95 #, php-format 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" @@ -463,7 +453,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." @@ -483,13 +473,13 @@ msgstr "Nieobsługiwany format." #: actions/apitimelinefavorites.php:108 #, php-format -msgid "%s / Favorites from %s" -msgstr "%s/ulubione wpisy od %s" +msgid "%1$s / Favorites from %2$s" +msgstr "%1$s/ulubione wpisy od %2$s" #: actions/apitimelinefavorites.php:120 #, php-format -msgid "%s updates favorited by %s / %s." -msgstr "Użytkownik %s aktualizuje ulubione według %s/%s." +msgid "%1$s updates favorited by %2$s / %2$s." +msgstr "Użytkownik %1$s aktualizuje ulubione według %2$s/%2$s." #: actions/apitimelinegroup.php:109 actions/apitimelineuser.php:118 #: actions/grouprss.php:131 actions/userrss.php:90 @@ -556,8 +546,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 +573,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,11 +606,11 @@ 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/invite.php:56 actions/login.php:115 actions/makeadmin.php:66 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80 #: actions/othersettings.php:145 actions/passwordsettings.php:138 #: actions/profilesettings.php:194 actions/recoverpassword.php:337 @@ -697,19 +690,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 @@ -718,8 +707,8 @@ msgstr "%s zablokowane profile" #: actions/blockedfromgroup.php:93 #, php-format -msgid "%s blocked profiles, page %d" -msgstr "%s zablokowane profile, strona %d" +msgid "%1$s blocked profiles, page %2$d" +msgstr "%1$s zablokowane profile, strona %2$d" #: actions/blockedfromgroup.php:108 msgid "A list of the users blocked from joining this group." @@ -831,10 +820,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 +845,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,8 +983,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" -msgstr "Musisz być administratorem, aby zmodyfikować grupę" +msgid "You must be an admin to edit the group." +msgstr "Musisz być administratorem, aby zmodyfikować grupę." #: actions/editgroup.php:154 msgid "Use this form to edit the group." @@ -1023,7 +1008,7 @@ msgid "Options saved." msgstr "Zapisano opcje." #: actions/emailsettings.php:60 -msgid "Email Settings" +msgid "Email settings" msgstr "Ustawienia adresu e-mail" #: actions/emailsettings.php:71 @@ -1061,7 +1046,7 @@ msgid "Cancel" msgstr "Anuluj" #: actions/emailsettings.php:121 -msgid "Email Address" +msgid "Email address" msgstr "Adres e-mail" #: actions/emailsettings.php:123 @@ -1135,9 +1120,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 +1306,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 +1322,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." @@ -1371,11 +1350,11 @@ msgstr "Zablokuj użytkownika w grupie" #: 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 "" -"Jesteś pewny, że chcesz zablokować użytkownika \"%s\" w grupie \"%s\"? " +"Jesteś pewny, że chcesz zablokować użytkownika \"%1$s\" w grupie \"%2$s\"? " "Zostanie usunięty z grupy, nie będzie mógł wysyłać wpisów i subskrybować " "grupy w przyszłości." @@ -1391,9 +1370,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 +1393,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 +1407,10 @@ 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 +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." @@ -1453,14 +1430,14 @@ msgstr "Członkowie grupy %s" #: actions/groupmembers.php:96 #, php-format -msgid "%s group members, page %d" -msgstr "Członkowie grupy %s, strona %d" +msgid "%1$s group members, page %2$d" +msgstr "Członkowie grupy %1$s, strona %2$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 +1540,7 @@ msgid "Error removing the block." msgstr "Błąd podczas usuwania blokady." #: actions/imsettings.php:59 -msgid "IM Settings" +msgid "IM settings" msgstr "Ustawienia komunikatora" #: actions/imsettings.php:70 @@ -1594,7 +1571,7 @@ msgstr "" "znajomych?)." #: actions/imsettings.php:124 -msgid "IM Address" +msgid "IM address" msgstr "Adres komunikatora" #: actions/imsettings.php:126 @@ -1656,11 +1633,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 +1670,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 +1716,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,19 +1786,10 @@ 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 +#: actions/joingroup.php:135 #, 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" -msgstr "Użytkownik %s dołączył do grupy %s" +msgid "%1$s joined group %2$s" +msgstr "Użytkownik %1$s dołączył do grupy %2$s" #: actions/leavegroup.php:60 msgid "You must be logged in to leave a group." @@ -1840,67 +1803,58 @@ 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 +#: actions/leavegroup.php:134 #, php-format -msgid "%s left group %s" -msgstr "Użytkownik %s opuścił grupę %s" +msgid "%1$s left group %2$s" +msgstr "Użytkownik %1$s opuścił grupę %2$s" -#: actions/login.php:83 actions/register.php:137 +#: actions/login.php:80 actions/otp.php:62 actions/register.php:137 msgid "Already logged in." msgstr "Jesteś już zalogowany." -#: actions/login.php:114 actions/login.php:124 -msgid "Invalid or expired token." -msgstr "Nieprawidłowy lub wygasły token." - -#: actions/login.php:147 +#: actions/login.php:126 msgid "Incorrect username or password." msgstr "Niepoprawna nazwa użytkownika lub hasło." -#: actions/login.php:153 +#: actions/login.php:132 actions/otp.php:120 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:188 actions/login.php:241 lib/action.php:460 #: lib/logingroupnav.php:79 msgid "Login" msgstr "Zaloguj się" -#: actions/login.php:247 +#: actions/login.php:227 msgid "Login to site" msgstr "Zaloguj się na stronie" -#: actions/login.php:250 actions/profilesettings.php:106 -#: actions/register.php:423 actions/showgroup.php:236 actions/tagother.php:94 +#: actions/login.php:230 actions/profilesettings.php:106 +#: actions/register.php:424 actions/showgroup.php:236 actions/tagother.php:94 #: lib/groupeditform.php:152 lib/userprofile.php:131 msgid "Nickname" msgstr "Pseudonim" -#: actions/login.php:253 actions/register.php:428 +#: actions/login.php:233 actions/register.php:429 #: lib/accountsettingsaction.php:116 msgid "Password" msgstr "Hasło" -#: actions/login.php:256 actions/register.php:477 +#: actions/login.php:236 actions/register.php:478 msgid "Remember me" msgstr "Zapamiętaj mnie" -#: actions/login.php:257 actions/register.php:479 +#: actions/login.php:237 actions/register.php:480 msgid "Automatically login in the future; not for shared computers!" msgstr "" "Automatyczne logowanie. Nie należy używać na komputerach używanych przez " "wiele osób." -#: actions/login.php:267 +#: actions/login.php:247 msgid "Lost or forgotten password?" msgstr "Zgubione lub zapomniane hasło?" -#: actions/login.php:286 +#: actions/login.php:266 msgid "" "For security reasons, please re-enter your user name and password before " "changing your settings." @@ -1908,7 +1862,7 @@ msgstr "" "Z powodów bezpieczeństwa ponownie podaj nazwę użytkownika i hasło przed " "zmienianiem ustawień." -#: actions/login.php:290 +#: actions/login.php:270 #, php-format msgid "" "Login with your username and password. Don't have a username yet? [Register]" @@ -1923,18 +1877,18 @@ 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\"." -msgstr "Użytkownika %s jest już administratorem grupy \"%s\"." +msgid "%1$s is already an admin for group \"%2$s\"." +msgstr "Użytkownika %1$s jest już administratorem grupy \"%2$s\"." #: actions/makeadmin.php:132 #, php-format -msgid "Can't get membership record for %s in group %s" -msgstr "Nie można uzyskać wpisu członkostwa użytkownika %s w grupie %s" +msgid "Can't get membership record for %1$s in group %2$s." +msgstr "Nie można uzyskać wpisu członkostwa użytkownika %1$s w grupie %2$s." #: actions/makeadmin.php:145 #, php-format -msgid "Can't make %s an admin for group %s" -msgstr "Nie można uczynić %s administratorem grupy %s" +msgid "Can't make %1$s an admin for group %2$s." +msgstr "Nie można uczynić %1$s administratorem grupy %2$s." #: actions/microsummary.php:69 msgid "No current status" @@ -1974,10 +1928,10 @@ msgstr "Nie wysyłaj wiadomości do siebie, po prostu powiedz to sobie po cichu. msgid "Message sent" msgstr "Wysłano wiadomość" -#: actions/newmessage.php:185 lib/command.php:376 +#: actions/newmessage.php:185 #, php-format -msgid "Direct message to %s sent" -msgstr "Wysłano bezpośrednią wiadomość do użytkownika %s" +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 msgid "Ajax Error" @@ -2006,8 +1960,8 @@ msgstr "Wyszukiwanie tekstu" #: actions/noticesearch.php:91 #, php-format -msgid "Search results for \"%s\" on %s" -msgstr "Wyniki wyszukiwania dla \"%s\" na %s" +msgid "Search results for \"%1$s\" on %2$s" +msgstr "Wyniki wyszukiwania dla \"%1$s\" na %2$s" #: actions/noticesearch.php:121 #, php-format @@ -2070,8 +2024,8 @@ msgstr "typ zawartości " msgid "Only " msgstr "Tylko " -#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1031 -#: lib/api.php:1059 lib/api.php:1169 +#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1033 +#: lib/api.php:1061 lib/api.php:1171 msgid "Not a supported data format." msgstr "To nie jest obsługiwany format danych." @@ -2115,10 +2069,30 @@ 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/otp.php:69 +#, fuzzy +msgid "No user ID specified." +msgstr "Nie podano grupy." + +#: actions/otp.php:83 +#, fuzzy +msgid "No login token specified." +msgstr "Nie podano wpisu." + +#: actions/otp.php:90 +#, fuzzy +msgid "No login token requested." +msgstr "Brak identyfikatora profilu w żądaniu." + +#: actions/otp.php:95 +#, fuzzy +msgid "Invalid login token specified." +msgstr "Nieprawidłowy lub wygasły token." + +#: actions/otp.php:104 +#, fuzzy +msgid "Login token expired." +msgstr "Zaloguj się na stronie" #: actions/outbox.php:61 #, php-format @@ -2154,7 +2128,7 @@ msgid "6 or more characters" msgstr "6 lub więcej znaków" #: actions/passwordsettings.php:112 actions/recoverpassword.php:239 -#: actions/register.php:432 actions/smssettings.php:134 +#: actions/register.php:433 actions/smssettings.php:134 msgid "Confirm" msgstr "Potwierdź" @@ -2190,7 +2164,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 +2197,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 +2290,7 @@ msgid "When to use SSL" msgstr "Kiedy używać SSL" #: actions/pathsadminpanel.php:308 -msgid "SSL Server" +msgid "SSL server" msgstr "Serwer SSL" #: actions/pathsadminpanel.php:309 @@ -2348,8 +2322,8 @@ msgstr "Nieprawidłowy znacznik osób: %s" #: actions/peopletag.php:144 #, php-format -msgid "Users self-tagged with %s - page %d" -msgstr "Użytkownicy używający znacznika %s - strona %d" +msgid "Users self-tagged with %1$s - page %2$d" +msgstr "Użytkownicy używający znacznika %1$s - strona %2$d" #: actions/postnotice.php:84 msgid "Invalid notice content" @@ -2357,8 +2331,8 @@ msgstr "Nieprawidłowa zawartość wpisu" #: actions/postnotice.php:90 #, php-format -msgid "Notice license ‘%s’ is not compatible with site license ‘%s’." -msgstr "Licencja wpisu \"%s\" nie jest zgodna z licencją strony \"%s\"." +msgid "Notice license ‘%1$s’ is not compatible with site license ‘%2$s’." +msgstr "Licencja wpisu \"%1$s\" nie jest zgodna z licencją strony \"%2$s\"." #: actions/profilesettings.php:60 msgid "Profile settings" @@ -2379,42 +2353,42 @@ msgstr "Informacje o profilu" msgid "1-64 lowercase letters or numbers, no punctuation or spaces" msgstr "1-64 małe litery lub liczby, bez spacji i znaków przestankowych" -#: actions/profilesettings.php:111 actions/register.php:447 +#: actions/profilesettings.php:111 actions/register.php:448 #: actions/showgroup.php:247 actions/tagother.php:104 #: lib/groupeditform.php:157 lib/userprofile.php:149 msgid "Full name" msgstr "Imię i nazwisko" -#: actions/profilesettings.php:115 actions/register.php:452 +#: actions/profilesettings.php:115 actions/register.php:453 #: lib/groupeditform.php:161 msgid "Homepage" msgstr "Strona domowa" -#: actions/profilesettings.php:117 actions/register.php:454 +#: actions/profilesettings.php:117 actions/register.php:455 msgid "URL of your homepage, blog, or profile on another site" msgstr "Adres URL strony domowej, bloga lub profilu na innej stronie" -#: actions/profilesettings.php:122 actions/register.php:460 +#: actions/profilesettings.php:122 actions/register.php:461 #, php-format msgid "Describe yourself and your interests in %d chars" msgstr "Opisz się i swoje zainteresowania w %d znakach" -#: actions/profilesettings.php:125 actions/register.php:463 +#: actions/profilesettings.php:125 actions/register.php:464 msgid "Describe yourself and your interests" msgstr "Opisz się i swoje zainteresowania" -#: actions/profilesettings.php:127 actions/register.php:465 +#: actions/profilesettings.php:127 actions/register.php:466 msgid "Bio" msgstr "O mnie" -#: actions/profilesettings.php:132 actions/register.php:470 +#: actions/profilesettings.php:132 actions/register.php:471 #: actions/showgroup.php:256 actions/tagother.php:112 #: actions/userauthorization.php:158 lib/groupeditform.php:177 #: lib/userprofile.php:164 msgid "Location" msgstr "Położenie" -#: actions/profilesettings.php:134 actions/register.php:472 +#: actions/profilesettings.php:134 actions/register.php:473 msgid "Where you are, like \"City, State (or Region), Country\"" msgstr "Gdzie jesteś, np. \"miasto, województwo (lub region), kraj\"" @@ -2479,19 +2453,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." @@ -2725,7 +2699,7 @@ msgstr "Błąd podczas ustawiania użytkownika." msgid "New password successfully saved. You are now logged in." msgstr "Pomyślnie zapisano nowe hasło. Jesteś teraz zalogowany." -#: actions/register.php:85 actions/register.php:189 actions/register.php:404 +#: actions/register.php:85 actions/register.php:189 actions/register.php:405 msgid "Sorry, only invited people can register." msgstr "Tylko zaproszone osoby mogą się rejestrować." @@ -2737,7 +2711,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:503 lib/action.php:457 #: lib/logingroupnav.php:85 msgid "Register" msgstr "Zarejestruj się" @@ -2751,19 +2725,15 @@ 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." -#: actions/register.php:243 actions/register.php:264 +#: actions/register.php:243 actions/register.php:265 msgid "Invalid username or password." msgstr "Nieprawidłowa nazwa użytkownika lub hasło." -#: actions/register.php:342 +#: actions/register.php:343 msgid "" "With this form you can create a new account. You can then post notices and " "link up to friends and colleagues. " @@ -2771,41 +2741,41 @@ msgstr "" "Za pomocą tego formularza można utworzyć nowe konto. Można wtedy wysyłać " "wpisy i połączyć się z przyjaciółmi i kolegami. " -#: actions/register.php:424 +#: actions/register.php:425 msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required." msgstr "" "1-64 małe litery lub liczby, bez spacji i znaków przestankowych. Wymagane." -#: actions/register.php:429 +#: actions/register.php:430 msgid "6 or more characters. Required." msgstr "6 lub więcej znaków. Wymagane." -#: actions/register.php:433 +#: actions/register.php:434 msgid "Same as password above. Required." msgstr "Takie samo jak powyższe hasło. Wymagane." -#: actions/register.php:437 actions/register.php:441 +#: actions/register.php:438 actions/register.php:442 #: actions/siteadminpanel.php:270 lib/accountsettingsaction.php:120 msgid "Email" msgstr "E-mail" -#: actions/register.php:438 actions/register.php:442 +#: actions/register.php:439 actions/register.php:443 msgid "Used only for updates, announcements, and password recovery" msgstr "Używane tylko do aktualizacji, ogłoszeń i przywracania hasła" -#: actions/register.php:449 +#: actions/register.php:450 msgid "Longer name, preferably your \"real\" name" msgstr "Dłuższa nazwa, najlepiej twoje \"prawdziwe\" imię i nazwisko" -#: actions/register.php:493 +#: actions/register.php:494 msgid "My text and files are available under " msgstr "Moje teksty i pliki są dostępne na " -#: actions/register.php:495 +#: actions/register.php:496 msgid "Creative Commons Attribution 3.0" msgstr "Creative Commons Uznanie autorstwa 3.0" -#: actions/register.php:496 +#: actions/register.php:497 msgid "" " except this private data: password, email address, IM address, and phone " "number." @@ -2813,13 +2783,13 @@ msgstr "" " poza tymi prywatnymi danymi: hasło, adres e-mail, adres komunikatora i " "numer telefonu." -#: actions/register.php:537 +#: actions/register.php:538 #, 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 " @@ -2831,11 +2801,11 @@ msgid "" "\n" "Thanks for signing up and we hope you enjoy using this service." msgstr "" -"Gratulacje, %s! Witaj na %%%%site.name%%%%. Stąd można...\n" +"Gratulacje, %1$s! Witaj na %%%%site.name%%%%. Stąd można...\n" "\n" -"* Przejść do [swojego profilu](%s) i wysłać swoją pierwszą wiadomość.\n" -"* Dodać [adres Jabber/GTalk](%%%%action.imsettings%%%%), abyś mógł wysyłać " -"wpisy przez komunikatora.\n" +"* Przejść do [swojego profilu](%2$s) i wysłać swoją pierwszą wiadomość.\n" +"* Dodać [adres Jabber/GTalk](%%%%action.imsettings%%%%), abyś móc wysyłać " +"wpisy przez komunikator.\n" "* [Poszukać osób](%%%%action.peoplesearch%%%%), których możesz znać lub " "którzy dzielą twoje zainteresowania. \n" "* Zaktualizować swoje [ustawienia profilu](%%%%action.profilesettings%%%%), " @@ -2846,7 +2816,7 @@ msgstr "" "Dziękujemy za zarejestrowanie się i mamy nadzieję, że używanie tej usługi " "sprawi ci przyjemność." -#: actions/register.php:561 +#: actions/register.php:562 msgid "" "(You should receive a message by email momentarily, with instructions on how " "to confirm your email address.)" @@ -2943,11 +2913,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)" @@ -2966,11 +2931,11 @@ msgstr "Kanał odpowiedzi dla użytkownika %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 "" -"To jest oś czasu wyświetlająca odpowiedzi na wpisy użytkownika %s, ale %s " -"nie otrzymał jeszcze wpisów wymagających jego uwagi." +"To jest oś czasu wyświetlająca odpowiedzi na wpisy użytkownika %1$s, ale %2" +"$s nie otrzymał jeszcze wpisów wymagających jego uwagi." #: actions/replies.php:203 #, php-format @@ -2984,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 "" -"Można spróbować [szturchnąć użytkownika %s](../%s) lub [wysłać coś " -"wymagającego jego uwagi](%%%%action.newnotice%%%%?status_textarea=%s)." +"Można spróbować [szturchnąć użytkownika %1$s](../%2$s) lub [wysłać coś " +"wymagającego jego uwagi](%%%%action.newnotice%%%%?status_textarea=%3$s)." #: actions/repliesrss.php:72 #, php-format @@ -3003,11 +2968,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 +3025,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 +3073,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,15 +3149,10 @@ 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)" -msgstr "Kanał wpisów dla %s ze znacznikiem %s (RSS 1.0)" +msgid "Notice feed for %1$s tagged %2$s (RSS 1.0)" +msgstr "Kanał wpisów dla %1$s ze znacznikiem %2$s (RSS 1.0)" #: actions/showstream.php:129 #, php-format @@ -3226,9 +3176,9 @@ msgstr "FOAF dla %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 "" -"To jest oś czasu dla użytkownika %s, ale %s nie nic jeszcze nie wysłał." +"To jest oś czasu dla użytkownika %1$s, ale %2$s nie nic jeszcze nie wysłał." #: actions/showstream.php:196 msgid "" @@ -3241,11 +3191,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 "" -"Można spróbować szturchnąć użytkownika %s lub [wysłać coś, co wymaga jego " -"uwagi](%%%%action.newnotice%%%%?status_textarea=%s)." +"Można spróbować szturchnąć użytkownika %1$s lub [wysłać coś, co wymaga jego " +"uwagi](%%%%action.newnotice%%%%?status_textarea=%2$s)." #: actions/showstream.php:234 #, php-format @@ -3294,13 +3244,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" -msgstr "Należy posiadać prawidłowy kontaktowy adres e-mail" +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\"" -msgstr "Nieznany język \"%s\"" +msgid "Unknown language \"%s\"." +msgstr "Nieznany język \"%s\"." #: actions/siteadminpanel.php:179 msgid "Invalid snapshot report URL." @@ -3483,7 +3433,7 @@ msgid "Save site settings" msgstr "Zapisz ustawienia strony" #: actions/smssettings.php:58 -msgid "SMS Settings" +msgid "SMS settings" msgstr "Ustawienia SMS" #: actions/smssettings.php:69 @@ -3512,7 +3462,7 @@ 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" +msgid "SMS phone number" msgstr "Numer telefonu SMS" #: actions/smssettings.php:140 @@ -3604,8 +3554,8 @@ msgstr "Subskrybenci użytkownika %s" #: actions/subscribers.php:52 #, php-format -msgid "%s subscribers, page %d" -msgstr "Subskrybenci użytkownika %s, strona %d" +msgid "%1$s subscribers, page %2$d" +msgstr "Subskrybenci użytkownika %1$s, strona %2$d" #: actions/subscribers.php:63 msgid "These are the people who listen to your notices." @@ -3645,8 +3595,8 @@ msgstr "Subskrypcje użytkownika %s" #: actions/subscriptions.php:54 #, php-format -msgid "%s subscriptions, page %d" -msgstr "Subskrypcje użytkownika %s, strona %d" +msgid "%1$s subscriptions, page %2$d" +msgstr "Subskrypcje użytkownika %1$s, strona %2$d" #: actions/subscriptions.php:65 msgid "These are the people whose notices you listen to." @@ -3686,11 +3636,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 +3720,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’." +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\"." +"Licencja nasłuchiwanego strumienia \"%1$s\" nie jest zgodna z licencją " +"strony \"%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 "Użytkownik" @@ -3891,7 +3833,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" @@ -3944,8 +3886,8 @@ msgstr "" #: actions/userauthorization.php:296 #, php-format -msgid "Listener URI ‘%s’ not found here" -msgstr "Adres URI nasłuchującego \"%s\" nie został tutaj odnaleziony" +msgid "Listener URI ‘%s’ not found here." +msgstr "Adres URI nasłuchującego \"%s\" nie został tutaj odnaleziony." #: actions/userauthorization.php:301 #, php-format @@ -3977,10 +3919,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 +3934,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,7 +3948,84 @@ 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." -#: classes/File.php:137 +#: 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 "" +"Ta strona korzysta z oprogramowania %1$s w wersji %2$s, Copyright 2008-2010 " +"StatusNet, Inc. i współtwórcy." + +#: actions/version.php:157 +msgid "StatusNet" +msgstr "StatusNet" + +#: actions/version.php:161 +msgid "Contributors" +msgstr "Współtwórcy" + +#: 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 "" +"Program StatusNet jest wolnym oprogramowaniem; można go rozprowadzać dalej i/" +"lub modyfikować na warunkach Powszechnej Licencji Publicznej Affero GNU, " +"wydanej przez Fundację Wolnego Oprogramowania (Free Software Foundation) - " +"według wersji trzeciej tej Licencji lub którejś z późniejszych wersji. " + +#: 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 "" +"Niniejszy program rozpowszechniany jest z nadzieją, iż będzie on użyteczny - " +"jednak BEZ JAKIEJKOLWIEK GWARANCJI, nawet domyślnej gwarancji PRZYDATNOŚCI " +"HANDLOWEJ albo PRZYDATNOŚCI DO OKREŚLONYCH ZASTOSOWAŃ. W celu uzyskania " +"bliższych informacji należy zapoznać się z Powszechną Licencją Publiczną " +"Affero GNU. " + +#: 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 "" +"Z pewnością wraz z niniejszym programem dostarczono także egzemplarz " +"Powszechnej Licencji Publicznej Affero GNU (GNU Affero General Public " +"License); jeśli nie - proszę odwiedzić stronę internetową %s." + +#: actions/version.php:189 +msgid "Plugins" +msgstr "Wtyczki" + +#: actions/version.php:195 +msgid "Name" +msgstr "Nazwa" + +#: actions/version.php:196 lib/action.php:741 +msgid "Version" +msgstr "Wersja" + +#: actions/version.php:197 +msgid "Author(s)" +msgstr "Autorzy" + +#: actions/version.php:198 lib/groupeditform.php:172 +msgid "Description" +msgstr "Opis" + +#: classes/File.php:144 #, php-format msgid "" "No file may be larger than %d bytes and the file you sent was %d bytes. Try " @@ -4024,19 +4034,24 @@ msgstr "" "Żaden plik nie może być większy niż %d bajty, a wysłany plik miał %d bajty. " "Spróbuj wysłać mniejszą wersję." -#: classes/File.php:147 +#: classes/File.php:154 #, php-format msgid "A file this large would exceed your user quota of %d bytes." msgstr "" "Plik tej wielkości przekroczyłby przydział użytkownika wynoszący %d bajty." -#: classes/File.php:154 +#: classes/File.php:161 #, php-format msgid "A file this large would exceed your monthly quota of %d bytes." msgstr "" "Plik tej wielkości przekroczyłby miesięczny przydział użytkownika wynoszący %" "d bajty." +#: classes/Login_token.php:76 +#, fuzzy, php-format +msgid "Could not create login token for %s" +msgstr "Nie można utworzyć tokenów loginów dla %s." + #: classes/Message.php:45 msgid "You are banned from sending direct messages." msgstr "Zablokowano wysyłanie bezpośrednich wiadomości." @@ -4090,7 +4105,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" @@ -4137,136 +4152,136 @@ msgid "Other options" msgstr "Inne opcje" #: lib/action.php:144 -#, php-format -msgid "%s - %s" -msgstr "%s - %s" +#, fuzzy, php-format +msgid "%1$s - %2$s" +msgstr "%1$s (%2$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 +4290,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 +4306,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 +4338,31 @@ 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 +msgid "Changes to that panel are not allowed." +msgstr "Zmiany w tym panelu nie są dozwolone." + +#: 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" @@ -4368,20 +4387,18 @@ msgid "Tags for this attachment" msgstr "Znaczniki dla tego załącznika" #: lib/authenticationplugin.php:182 lib/authenticationplugin.php:187 -#, fuzzy msgid "Password changing failed" -msgstr "Zmiana hasła" +msgstr "Zmiana hasła nie powiodła się" #: lib/authenticationplugin.php:197 -#, fuzzy msgid "Password changing is not allowed" -msgstr "Zmiana hasła" +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" @@ -4394,18 +4411,18 @@ msgid "Sorry, this command is not yet implemented." msgstr "Te polecenie nie zostało jeszcze zaimplementowane." #: lib/command.php:88 -#, php-format +#, fuzzy, php-format msgid "Could not find a user with nickname %s" -msgstr "Nie można odnaleźć użytkownika z pseudonimem %s" +msgstr "Nie można odnaleźć użytkownika z pseudonimem %s." #: lib/command.php:92 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 +#, fuzzy, php-format msgid "Nudge sent to %s" -msgstr "Wysłano szturchnięcie do użytkownika %s" +msgstr "Wysłano szturchnięcie do użytkownika %s." #: lib/command.php:126 #, php-format @@ -4419,34 +4436,56 @@ msgstr "" "Wpisy: %3$s" #: lib/command.php:152 lib/command.php:399 lib/command.php:460 +#, fuzzy msgid "Notice with that id does not exist" -msgstr "Wpis z tym identyfikatorem nie istnieje" +msgstr "Wpis z tym identyfikatorem nie istnieje." #: lib/command.php:168 lib/command.php:415 lib/command.php:476 #: lib/command.php:532 +#, fuzzy msgid "User has no last notice" -msgstr "Użytkownik nie posiada ostatniego wpisu" +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:217 +#, fuzzy +msgid "You are already a member of that group" +msgstr "Jesteś już członkiem tej grupy." + +#: lib/command.php:234 +#, fuzzy, php-format +msgid "Could not join user %s to group %s" +msgstr "Nie można dołączyć użytkownika %1$s do grupy %2$s." + +#: lib/command.php:239 +#, fuzzy, php-format +msgid "%s joined group %s" +msgstr "Użytkownik %1$s dołączył do grupy %2$s" + +#: lib/command.php:284 +#, fuzzy, php-format +msgid "Could not remove user %s to group %s" +msgstr "Nie można usunąć użytkownika %1$s z grupy %2$s." + +#: lib/command.php:289 +#, fuzzy, php-format +msgid "%s left group %s" +msgstr "Użytkownik %1$s opuścił grupę %2$s" #: lib/command.php:318 -#, php-format +#, fuzzy, php-format msgid "Fullname: %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" @@ -4456,49 +4495,57 @@ msgstr "Strona domowa: %s" msgid "About: %s" msgstr "O mnie: %s" -#: lib/command.php:358 scripts/xmppdaemon.php:301 -#, php-format +#: lib/command.php:358 +#, fuzzy, php-format msgid "Message too long - maximum is %d characters, you sent %d" -msgstr "Wiadomość jest za długa - maksymalnie %d znaków, wysłano %d" +msgstr "Wiadomość jest za długa - maksymalnie %1$d znaków, wysłano %2$d." + +#: lib/command.php:376 +#, fuzzy, php-format +msgid "Direct message to %s sent" +msgstr "Wysłano bezpośrednią wiadomość do użytkownika %s." #: lib/command.php:378 msgid "Error sending direct message." msgstr "Błąd podczas wysyłania bezpośredniej wiadomości." #: lib/command.php:422 +#, fuzzy msgid "Cannot repeat your own notice" -msgstr "Nie można powtórzyć własnego wpisu" +msgstr "Nie można powtórzyć własnego wpisu." #: lib/command.php:427 +#, fuzzy msgid "Already repeated that notice" -msgstr "Już powtórzono ten wpis" +msgstr "Już powtórzono ten wpis." #: lib/command.php:435 -#, php-format +#, fuzzy, php-format msgid "Notice from %s repeated" -msgstr "Powtórzono wpis od użytkownika %s" +msgstr "Powtórzono wpis od użytkownika %s." #: lib/command.php:437 msgid "Error repeating notice." msgstr "Błąd podczas powtarzania wpisu." #: lib/command.php:491 -#, php-format +#, fuzzy, php-format msgid "Notice too long - maximum is %d characters, you sent %d" -msgstr "Wpis jest za długi - maksymalnie %d znaków, wysłano %d" +msgstr "Wpis jest za długi - maksymalnie %1$d znaków, wysłano %2$d." #: lib/command.php:500 -#, php-format +#, fuzzy, php-format msgid "Reply to %s sent" -msgstr "Wysłano odpowiedź do %s" +msgstr "Wysłano odpowiedź do %s." #: lib/command.php:502 msgid "Error saving notice." msgstr "Błąd podczas zapisywania wpisu." #: lib/command.php:556 +#, fuzzy msgid "Specify the name of the user to subscribe to" -msgstr "Podaj nazwę użytkownika do subskrybowania" +msgstr "Podaj nazwę użytkownika do subskrybowania." #: lib/command.php:563 #, php-format @@ -4506,8 +4553,9 @@ msgid "Subscribed to %s" msgstr "Subskrybowano użytkownika %s" #: lib/command.php:584 +#, fuzzy msgid "Specify the name of the user to unsubscribe from" -msgstr "Podaj nazwę użytkownika do usunięcia subskrypcji" +msgstr "Podaj nazwę użytkownika do usunięcia subskrypcji." #: lib/command.php:591 #, php-format @@ -4535,55 +4583,51 @@ msgid "Can't turn on notification." msgstr "Nie można włączyć powiadomień." #: lib/command.php:650 +#, 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" -msgstr "Nie można utworzyć tokenów loginów dla %s" +msgstr "Polecenie logowania jest wyłączone." -#: lib/command.php:669 -#, php-format +#: lib/command.php:661 +#, 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" +"Tego odnośnika można użyć tylko raz i będzie prawidłowy tylko przez dwie " +"minuty: %s." -#: lib/command.php:685 +#: lib/command.php:677 msgid "You are not subscribed to anyone." msgstr "Nie subskrybujesz nikogo." -#: lib/command.php:687 +#: lib/command.php:679 msgid "You are subscribed to this person:" msgid_plural "You are subscribed to these people:" msgstr[0] "Subskrybujesz tę osobę:" msgstr[1] "Subskrybujesz te osoby:" msgstr[2] "Subskrybujesz te osoby:" -#: lib/command.php:707 +#: lib/command.php:699 msgid "No one is subscribed to you." msgstr "Nikt cię nie subskrybuje." -#: lib/command.php:709 +#: lib/command.php:701 msgid "This person is subscribed to you:" msgid_plural "These people are subscribed to you:" msgstr[0] "Ta osoba cię subskrybuje:" msgstr[1] "Te osoby cię subskrybują:" msgstr[2] "Te osoby cię subskrybują:" -#: lib/command.php:729 +#: lib/command.php:721 msgid "You are not a member of any groups." msgstr "Nie jesteś członkiem żadnej grupy." -#: lib/command.php:731 +#: lib/command.php:723 msgid "You are a member of this group:" msgid_plural "You are a member of these groups:" msgstr[0] "Jesteś członkiem tej grupy:" msgstr[1] "Jesteś członkiem tych grup:" msgstr[2] "Jesteś członkiem tych grup:" -#: lib/command.php:745 +#: lib/command.php:737 msgid "" "Commands:\n" "on - turn on notifications\n" @@ -4777,10 +4821,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\"" @@ -4966,24 +5006,10 @@ 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" -msgstr "" -"O mnie: %s\n" -"\n" +msgid "Bio: %s" +msgstr "O mnie: %s" #: lib/mail.php:286 #, php-format @@ -5181,6 +5207,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 +#, php-format +msgid "Unsupported message type: %s" +msgstr "Nieobsługiwany typ wiadomości: %s" + #: 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." @@ -5213,7 +5260,7 @@ 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!" +msgid "File exceeds user's quota." msgstr "Plik przekracza przydział użytkownika." #: lib/mediafile.php:196 lib/mediafile.php:233 @@ -5221,7 +5268,7 @@ 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!" +msgid "Could not determine file's MIME type." msgstr "Nie można określić typu MIME pliku." #: lib/mediafile.php:270 @@ -5231,7 +5278,7 @@ msgstr " Spróbuj innego formatu %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 "%s nie jest obsługiwanym typem pliku na tym serwerze." #: lib/messageform.php:120 @@ -5264,8 +5311,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 położenie." + +#: lib/noticeform.php:214 +#, fuzzy +msgid "Do not share my location" +msgstr "Nie ujawniaj położenia." + +#: lib/noticeform.php:215 +msgid "Hide this info" +msgstr "Ukryj tę informację" #: lib/noticelist.php:428 #, php-format @@ -5381,6 +5438,10 @@ msgstr "Wysłane wiadomości" msgid "Tags in %s's notices" msgstr "Znaczniki we wpisach użytkownika %s" +#: lib/plugin.php:114 +msgid "Unknown" +msgstr "Nieznane" + #: lib/profileaction.php:109 lib/profileaction.php:192 lib/subgroupnav.php:82 msgid "Subscriptions" msgstr "Subskrypcje" @@ -5550,10 +5611,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" @@ -5614,47 +5671,47 @@ msgstr "Wiadomość" msgid "Moderate" msgstr "Moderuj" -#: lib/util.php:837 +#: lib/util.php:884 msgid "a few seconds ago" msgstr "kilka sekund temu" -#: lib/util.php:839 +#: lib/util.php:886 msgid "about a minute ago" msgstr "około minutę temu" -#: lib/util.php:841 +#: lib/util.php:888 #, php-format msgid "about %d minutes ago" msgstr "około %d minut temu" -#: lib/util.php:843 +#: lib/util.php:890 msgid "about an hour ago" msgstr "około godzinę temu" -#: lib/util.php:845 +#: lib/util.php:892 #, php-format msgid "about %d hours ago" msgstr "około %d godzin temu" -#: lib/util.php:847 +#: lib/util.php:894 msgid "about a day ago" msgstr "blisko dzień temu" -#: lib/util.php:849 +#: lib/util.php:896 #, php-format msgid "about %d days ago" msgstr "około %d dni temu" -#: lib/util.php:851 +#: lib/util.php:898 msgid "about a month ago" msgstr "około miesiąc temu" -#: lib/util.php:853 +#: lib/util.php:900 #, php-format msgid "about %d months ago" msgstr "około %d miesięcy temu" -#: lib/util.php:855 +#: lib/util.php:902 msgid "about a year ago" msgstr "około rok temu" @@ -5670,18 +5727,7 @@ 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." +#: scripts/xmppdaemon.php:301 +#, php-format +msgid "Message too long - maximum is %1$d characters, you sent %2$d." +msgstr "Wiadomość jest za długa - maksymalnie %1$d znaków, wysłano %2$d." diff --git a/locale/pt/LC_MESSAGES/statusnet.po b/locale/pt/LC_MESSAGES/statusnet.po index 9e0172663..0c8f086ba 100644 --- a/locale/pt/LC_MESSAGES/statusnet.po +++ b/locale/pt/LC_MESSAGES/statusnet.po @@ -1,7 +1,7 @@ # Translation of StatusNet to Portuguese # # Author@translatewiki.net: Hamilton Abreu -# Author@translatewiki.net: McDutchie +# Author@translatewiki.net: Ipublicis # -- # This file is distributed under the same license as the StatusNet package. # @@ -9,12 +9,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-01-05 22:10+0000\n" -"PO-Revision-Date: 2010-01-05 22:12:21+0000\n" +"POT-Creation-Date: 2010-01-11 23:25+0000\n" +"PO-Revision-Date: 2010-01-11 23:27:59+0000\n" "Language-Team: Portuguese\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha (r60693); Translate extension (2010-01-04)\n" +"X-Generator: MediaWiki 1.16alpha (r60950); 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" @@ -39,7 +39,7 @@ msgstr "Página não encontrada." #: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79 #: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75 #: actions/favoritesrss.php:74 actions/foaf.php:40 actions/foaf.php:58 -#: actions/microsummary.php:62 actions/newmessage.php:116 +#: actions/microsummary.php:62 actions/newmessage.php:116 actions/otp.php:76 #: actions/remotesubscribe.php:145 actions/remotesubscribe.php:154 #: actions/replies.php:73 actions/repliesrss.php:38 #: actions/showfavorites.php:105 actions/userbyid.php:74 @@ -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 @@ -66,17 +61,17 @@ msgstr "%s e amigos" #: actions/all.php:99 #, php-format msgid "Feed for friends of %s (RSS 1.0)" -msgstr "Feed para os amigos de %s (RSS 1.0)" +msgstr "Fonte para os amigos de %s (RSS 1.0)" #: actions/all.php:107 #, php-format msgid "Feed for friends of %s (RSS 2.0)" -msgstr "Feed para os amigos de %s (RSS 2.0)" +msgstr "Fonte para os amigos de %s (RSS 2.0)" #: actions/all.php:115 #, php-format msgid "Feed for friends of %s (Atom)" -msgstr "Feed para os amigos de %s (Atom)" +msgstr "Fonte para os amigos de %s (Atom)" #: actions/all.php:127 #, php-format @@ -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,12 +104,12 @@ 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 tocar %s ou " +"publicar uma nota à sua atenção." #: actions/all.php:165 msgid "You and friends" -msgstr "Você e amigos" +msgstr "Você e seus amigos" #: actions/allrss.php:119 actions/apitimelinefriends.php:122 #: actions/apitimelinehome.php:122 @@ -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." @@ -149,7 +161,7 @@ msgid "" "You must specify a parameter named 'device' with a value of one of: sms, im, " "none" msgstr "" -"Tem de especificar um parâmetro 'device' com um dos valores: sms, im, none" +"Tem de especificar um parâmetro 'aparelho' com um dos valores: sms, im, none" #: actions/apiaccountupdatedeliverydevice.php:132 msgid "Could not update user." @@ -185,13 +197,16 @@ 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." +msgstr "Não foi possível gravar as configurações do estilo." #: actions/apiaccountupdateprofilebackgroundimage.php:187 #: actions/apiaccountupdateprofilecolors.php:142 msgid "Could not update your design." -msgstr "Não foi possível actualizar o seu design." +msgstr "Não foi possível actualizar o seu estilo." #: actions/apiblockcreate.php:105 msgid "You cannot block yourself!" @@ -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,16 +264,16 @@ 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!" -msgstr "Este estado já é um favorito!" +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 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!" -msgstr "Esse estado não é um favorito!" +msgid "That status is not a favorite." +msgstr "Esse estado não é um favorito." #: actions/apifavoritedestroy.php:134 actions/disfavor.php:87 msgid "Could not delete favorite." @@ -299,12 +294,12 @@ msgstr "" "Não foi possível deixar de seguir utilizador: Utilizador não encontrado." #: actions/apifriendshipsdestroy.php:120 -msgid "You cannot unfollow yourself!" -msgstr "Não pode deixar de seguir-se a si próprio!" +msgid "You cannot unfollow yourself." +msgstr "Não pode deixar de seguir-se a si próprio." #: actions/apifriendshipsexists.php:94 msgid "Two user ids or screen_names must be supplied." -msgstr "Devem ser fornecidos dois nomes de utilizador ou alcunhas." +msgstr "Devem ser fornecidos dois nomes de utilizador ou utilizadors." #: actions/apifriendshipsshow.php:135 msgid "Could not determine source user." @@ -318,25 +313,25 @@ msgstr "Não foi possível encontrar o utilizador de destino." #: actions/newgroup.php:126 actions/profilesettings.php:215 #: actions/register.php:205 msgid "Nickname must have only lowercase letters and numbers and no spaces." -msgstr "Alcunha só deve conter letras minúsculas e números. Sem espaços." +msgstr "Utilizador só deve conter letras minúsculas e números. Sem espaços." #: actions/apigroupcreate.php:173 actions/editgroup.php:186 #: actions/newgroup.php:130 actions/profilesettings.php:238 #: actions/register.php:208 msgid "Nickname already in use. Try another one." -msgstr "Alcunha já é usada. Tente outra." +msgstr "Utilizador já é usado. Tente outro." #: actions/apigroupcreate.php:180 actions/editgroup.php:189 #: actions/newgroup.php:133 actions/profilesettings.php:218 #: actions/register.php:210 msgid "Not a valid nickname." -msgstr "Alcunha não é válida." +msgstr "Utilizador não é válido." #: actions/apigroupcreate.php:196 actions/editgroup.php:195 #: actions/newgroup.php:139 actions/profilesettings.php:222 #: actions/register.php:217 msgid "Homepage is not a valid URL." -msgstr "Página de acolhimento não é uma URL válida." +msgstr "Página de ínicio não é uma URL válida." #: actions/apigroupcreate.php:205 actions/editgroup.php:198 #: actions/newgroup.php:142 actions/profilesettings.php:225 @@ -359,24 +354,24 @@ msgstr "Localidade demasiado longa (máx. 255 caracteres)." #: actions/newgroup.php:159 #, php-format msgid "Too many aliases! Maximum %d." -msgstr "Demasiados cognomes (máx. %d)." +msgstr "Demasiados sinónimos (máx. %d)." #: actions/apigroupcreate.php:264 actions/editgroup.php:224 #: actions/newgroup.php:168 #, php-format msgid "Invalid alias: \"%s\"" -msgstr "Cognome inválido: \"%s\"" +msgstr "Sinónimo inválido: \"%s\"" #: actions/apigroupcreate.php:273 actions/editgroup.php:228 #: actions/newgroup.php:172 #, php-format msgid "Alias \"%s\" already in use. Try another one." -msgstr "Cognome \"%s\" já é usado. Tente outro." +msgstr "Sinónimo \"%s\" já em uso. Tente outro." #: actions/apigroupcreate.php:286 actions/editgroup.php:234 #: actions/newgroup.php:178 msgid "Alias can't be the same as nickname." -msgstr "Os cognomes não podem ser iguais à alcunha." +msgstr "Os sinónimos não podem ser iguais ao nome do utilizador." #: actions/apigroupismember.php:95 actions/apigroupjoin.php:104 #: actions/apigroupleave.php:104 actions/apigroupmembership.php:91 @@ -384,38 +379,33 @@ 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 msgid "You are already a member of that group." msgstr "Já é membro desse grupo." #: actions/apigroupjoin.php:119 actions/joingroup.php:95 lib/command.php:221 msgid "You have been blocked from that group by the admin." -msgstr "Foi bloqueado desse grupo pelo administrador." +msgstr "Foi bloqueado desse grupo pelo gestor." -#: actions/apigroupjoin.php:138 +#: actions/apigroupjoin.php:138 actions/joingroup.php:128 #, 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" @@ -456,7 +446,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 +466,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,10 +539,13 @@ 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." +msgstr "Nenhuma utilizador." #: actions/avatarbynickname.php:64 msgid "No size." @@ -573,8 +566,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,11 +599,11 @@ 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/invite.php:56 actions/login.php:115 actions/makeadmin.php:66 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80 #: actions/othersettings.php:145 actions/passwordsettings.php:138 #: actions/profilesettings.php:194 actions/recoverpassword.php:337 @@ -620,8 +613,7 @@ msgstr "Cortar" #: 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 "" -"Ocorreu um problema com a sua chave de sessão. Por favor, tente novamente." +msgstr "Ocorreu um problema com a sua sessão. Por favor, tente novamente." #: actions/avatarsettings.php:281 actions/designadminpanel.php:103 #: actions/emailsettings.php:256 actions/grouplogo.php:319 @@ -691,19 +683,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 +700,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 +813,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,17 +838,17 @@ 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" +msgstr "Estilo" #: actions/designadminpanel.php:73 msgid "Design settings for this StatusNet site." -msgstr "Configurações do design deste site StatusNet." +msgstr "Configurações do estilo deste site StatusNet." #: actions/designadminpanel.php:275 msgid "Invalid logo URL." -msgstr "URL do logótipo inválida." +msgstr "URL do logotipo inválida." #: actions/designadminpanel.php:279 #, php-format @@ -874,11 +857,11 @@ msgstr "Tema não está disponível: %s" #: actions/designadminpanel.php:375 msgid "Change logo" -msgstr "Alterar logótipo" +msgstr "Alterar logotipo" #: actions/designadminpanel.php:380 msgid "Site logo" -msgstr "Logótipo do site" +msgstr "Logotipo do site" #: actions/designadminpanel.php:387 msgid "Change theme" @@ -936,7 +919,7 @@ msgstr "Conteúdo" #: actions/designadminpanel.php:523 lib/designsettings.php:204 msgid "Sidebar" -msgstr "Lateral" +msgstr "Barra" #: actions/designadminpanel.php:536 lib/designsettings.php:217 msgid "Text" @@ -952,7 +935,7 @@ msgstr "Usar predefinições" #: actions/designadminpanel.php:578 lib/designsettings.php:248 msgid "Restore default designs" -msgstr "Repor designs predefinidos" +msgstr "Repor estilos predefinidos" #: actions/designadminpanel.php:584 lib/designsettings.php:254 msgid "Reset back to default" @@ -970,7 +953,7 @@ msgstr "Gravar" #: actions/designadminpanel.php:587 lib/designsettings.php:257 msgid "Save design" -msgstr "Gravar o design" +msgstr "Gravar o estilo" #: actions/disfavor.php:81 msgid "This notice is not a favorite!" @@ -995,8 +978,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" -msgstr "Tem de ser administrador para editar o grupo" +msgid "You must be an admin to edit the group." +msgstr "Tem de ser administrador para editar o grupo." #: actions/editgroup.php:154 msgid "Use this form to edit the group." @@ -1005,7 +988,7 @@ msgstr "Use este formulário para editar o grupo." #: actions/editgroup.php:201 actions/newgroup.php:145 #, php-format msgid "description is too long (max %d chars)." -msgstr "descrição é demasiada extensa (máx. 140 caracteres)." +msgstr "descrição é demasiada extensa (máx. %d caracteres)." #: actions/editgroup.php:253 msgid "Could not update group." @@ -1013,20 +996,20 @@ msgstr "Não foi possível actualizar o grupo." #: actions/editgroup.php:259 classes/User_group.php:390 msgid "Could not create aliases." -msgstr "Não foi possível criar cognomes." +msgstr "Não foi possível criar sinónimos." #: actions/editgroup.php:269 msgid "Options saved." msgstr "Opções gravadas." #: actions/emailsettings.php:60 -msgid "Email Settings" +msgid "Email settings" msgstr "Configurações do correio electrónico" #: actions/emailsettings.php:71 #, php-format msgid "Manage how you get email from %%site.name%%." -msgstr "Defina como receberá mensagens electrónicas do site %%site.name%%." +msgstr "Defina como receberá mensagens electrónicas de %%site.name%%." #: actions/emailsettings.php:100 actions/imsettings.php:100 #: actions/smssettings.php:104 @@ -1048,7 +1031,7 @@ msgid "" "Awaiting confirmation on this address. Check your inbox (and spam box!) for " "a message with further instructions." msgstr "" -"A aguardar a confirmação deste endereço. Procure na sua caixa de entrada (e " +"A aguardar a confirmação deste endereço. Procure na sua caixa de entrada (ou " "na caixa de spam!) uma mensagem com mais instruções." #: actions/emailsettings.php:117 actions/imsettings.php:120 @@ -1057,13 +1040,13 @@ msgid "Cancel" msgstr "Cancelar" #: actions/emailsettings.php:121 -msgid "Email Address" -msgstr "Endereço electrónico" +msgid "Email address" +msgstr "Endereço de correio electrónico" #: actions/emailsettings.php:123 msgid "Email address, like \"UserName@example.org\"" msgstr "" -"Endereço de correio electrónico, por ex. \"nomedeutilizador@example.org\"" +"Endereço de correio electrónico, por ex. \"nomedeutilizador@exemplo.pt\"" #: actions/emailsettings.php:126 actions/imsettings.php:133 #: actions/smssettings.php:145 @@ -1113,7 +1096,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 toquem e enviem mensagens electrónicas." #: actions/emailsettings.php:185 msgid "I want to post notices by email." @@ -1136,9 +1119,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." @@ -1222,7 +1206,7 @@ msgstr "Notas populares, página %d" #: actions/favorited.php:79 msgid "The most popular notices on the site right now." -msgstr "As notas mais populares do site nesta altura." +msgstr "As notas mais populares agora." #: actions/favorited.php:150 msgid "Favorite notices appear on this page but no one has favorited one yet." @@ -1235,7 +1219,7 @@ msgid "" "next to any notice you like." msgstr "" "Seja a primeira pessoa a adicionar uma nota às favoritas, clicando o botão " -"de favorecimento correspondente a uma nota de que goste." +"de marcação correspondente a uma nota de que goste." #: actions/favorited.php:156 #, php-format @@ -1255,7 +1239,7 @@ msgstr "Notas favoritas de %s" #: actions/favoritesrss.php:115 #, php-format msgid "Updates favored by %1$s on %2$s!" -msgstr "Actualizações favorecidas por %1$s em %2$s!" +msgstr "Actualizações marcadas por %1$s em %2$s!" #: actions/featured.php:69 lib/featureduserssection.php:87 #: lib/publicgroupnav.php:89 @@ -1274,7 +1258,7 @@ msgstr "Uma selecção dos melhores utilizadores no %s" #: actions/file.php:34 msgid "No notice ID." -msgstr "Sem identificação (ID) de nota." +msgstr "Sem identificação de nota." #: actions/file.php:38 msgid "No notice." @@ -1320,18 +1304,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 +1320,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." @@ -1354,7 +1331,7 @@ msgstr "Não foi especificado um grupo." #: actions/groupblock.php:91 msgid "Only an admin can block group members." -msgstr "Só um administrador pode bloquear membros de um grupo." +msgstr "Só um gestor pode bloquear membros de um grupo." #: actions/groupblock.php:95 msgid "User is already blocked from group." @@ -1371,12 +1348,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 +1368,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." @@ -1401,7 +1378,7 @@ msgstr "Precisa de iniciar sessão para editar um grupo." #: actions/groupdesignsettings.php:141 msgid "Group design" -msgstr "Design do grupo" +msgstr "Estilo do grupo" #: actions/groupdesignsettings.php:152 msgid "" @@ -1414,41 +1391,39 @@ msgstr "" #: actions/groupdesignsettings.php:263 actions/userdesignsettings.php:186 #: lib/designsettings.php:391 lib/designsettings.php:413 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!" +msgstr "Não foi possível actualizar o estilo." #: actions/groupdesignsettings.php:308 actions/userdesignsettings.php:231 msgid "Design preferences saved." -msgstr "Preferências do design foram gravadas." +msgstr "Preferências de estilo foram gravadas." #: actions/grouplogo.php:139 actions/grouplogo.php:192 msgid "Group logo" -msgstr "Logótipo do grupo" +msgstr "Logotipo do grupo" #: actions/grouplogo.php:150 #, php-format msgid "" "You can upload a logo image for your group. The maximum file size is %s." msgstr "" -"Pode carregar uma imagem para logótipo do seu grupo. O tamanho máximo do " +"Pode carregar uma imagem para logotipo do seu grupo. O tamanho máximo do " "ficheiro é %s." +#: actions/grouplogo.php:178 +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." +msgstr "Escolha uma área quadrada da imagem para ser o logotipo." #: actions/grouplogo.php:396 msgid "Logo updated." -msgstr "Logótipo actualizado." +msgstr "Logotipo actualizado." #: actions/grouplogo.php:398 msgid "Failed updating logo." -msgstr "Não foi possível actualizar o logótipo." +msgstr "Não foi possível actualizar o logotipo." #: actions/groupmembers.php:93 lib/groupnav.php:92 #, php-format @@ -1457,16 +1432,16 @@ 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" +msgstr "Gestor" #: actions/groupmembers.php:346 lib/blockform.php:69 msgid "Block" @@ -1474,15 +1449,15 @@ msgstr "Bloquear" #: actions/groupmembers.php:441 msgid "Make user an admin of the group" -msgstr "Tornar utilizador o administrador do grupo" +msgstr "Tornar utilizador o gestor do grupo" #: actions/groupmembers.php:473 msgid "Make Admin" -msgstr "Tornar Admin" +msgstr "Tornar Gestor" #: actions/groupmembers.php:473 msgid "Make this user an admin" -msgstr "Tornar este utilizador um administrador" +msgstr "Tornar este utilizador um gestor" #: actions/grouprss.php:133 #, php-format @@ -1508,11 +1483,11 @@ msgid "" "for one](%%%%action.groupsearch%%%%) or [start your own!](%%%%action.newgroup" "%%%%)" msgstr "" -"Os grupos no site %%%%site.name%%%% permitem-lhe encontrar e falar com " -"pessoas que têm interesses semelhantes aos seus. Após juntar-se a um grupo, " -"pode enviar mensagens a outros membros usando a sintaxe \"!groupname\". Não " -"encontra nenhum grupo de que gosta? Tente [pesquisar um grupo](%%%%action." -"groupsearch%%%%) ou [crie o seu!](%%%%action.newgroup%%%%)" +"Os grupos no site %%site.name%% permitem-lhe encontrar e falar com pessoas " +"que têm interesses semelhantes aos seus. Após juntar-se a um grupo, pode " +"enviar mensagens a outros membros usando a sintaxe \"!groupname\". Não " +"encontra nenhum grupo de que gosta? Tente [pesquisar um grupo](%%action." +"groupsearch%%) ou [crie o seu!](%%action.newgroup%%)" #: actions/groups.php:107 actions/usergroups.php:124 lib/groupeditform.php:122 msgid "Create a new group" @@ -1556,7 +1531,7 @@ msgstr "" #: actions/groupunblock.php:91 msgid "Only an admin can unblock group members." -msgstr "Só um administrador pode desbloquear membros de um grupo." +msgstr "Só um gestor pode desbloquear membros de um grupo." #: actions/groupunblock.php:95 msgid "User is not blocked from group." @@ -1567,8 +1542,8 @@ msgid "Error removing the block." msgstr "Erro ao remover o bloqueio." #: actions/imsettings.php:59 -msgid "IM Settings" -msgstr "Definições de IM" +msgid "IM settings" +msgstr "Configurações do IM" #: actions/imsettings.php:70 #, php-format @@ -1581,7 +1556,7 @@ msgstr "" #: actions/imsettings.php:89 msgid "IM is not available." -msgstr "IM não está disponível." +msgstr "MI não está disponível." #: actions/imsettings.php:106 msgid "Current confirmed Jabber/GTalk address." @@ -1598,7 +1573,7 @@ msgstr "" "amigos?)" #: actions/imsettings.php:124 -msgid "IM Address" +msgid "IM address" msgstr "Endereço IM" #: actions/imsettings.php:126 @@ -1607,9 +1582,9 @@ msgid "" "Jabber or GTalk address, like \"UserName@example.org\". First, make sure to " "add %s to your buddy list in your IM client or on GTalk." msgstr "" -"Endereço Jabber ou GTalk, por exemplo \"NomeDeUtilizador@example.org\". " +"Endereço Jabber ou GTalk, por exemplo \"NomeDeUtilizador@exemplo.pt\". " "Primeiro, certifique-se de que adicionou %s à sua lista de amigos no cliente " -"IM ou no GTalk." +"MI ou no GTalk." #: actions/imsettings.php:143 msgid "Send me notices through Jabber/GTalk." @@ -1654,17 +1629,12 @@ msgid "" "s for sending messages to you." msgstr "" "Um código de confirmação foi enviado para o endereço fornecido. Tem que " -"aprovar que %s envie mensagens para sí." +"aprovar que %s envie mensagens para si." #: actions/imsettings.php:387 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" @@ -1678,7 +1648,7 @@ msgstr "" #: actions/invite.php:39 msgid "Invites have been disabled." -msgstr "Convites foram impossibilitados." +msgstr "Convites foram desabilitados." #: actions/invite.php:41 #, php-format @@ -1694,7 +1664,7 @@ msgstr "Endereço electrónico inválido: %s" #: actions/invite.php:110 msgid "Invitation(s) sent" -msgstr "Contive(s) enviado(s)" +msgstr "Convite(s) enviado(s)" #: actions/invite.php:112 msgid "Invite new users" @@ -1704,10 +1674,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 +1719,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 +1788,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 +#: actions/joingroup.php:135 #, 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,101 +1805,92 @@ 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 +#: actions/leavegroup.php:134 #, 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 +#: actions/login.php:80 actions/otp.php:62 actions/register.php:137 msgid "Already logged in." msgstr "Sessão já foi iniciada." -#: actions/login.php:114 actions/login.php:124 -msgid "Invalid or expired token." -msgstr "Chave inválida ou expirada." - -#: actions/login.php:147 +#: actions/login.php:126 msgid "Incorrect username or password." -msgstr "Nome de utilizador ou palavra-chave incorrectos." +msgstr "Nome de utilizador ou senha incorrectos." -#: actions/login.php:153 +#: actions/login.php:132 actions/otp.php:120 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:188 actions/login.php:241 lib/action.php:460 #: lib/logingroupnav.php:79 msgid "Login" msgstr "Entrar" -#: actions/login.php:247 +#: actions/login.php:227 msgid "Login to site" msgstr "Iniciar sessão no site" -#: actions/login.php:250 actions/profilesettings.php:106 -#: actions/register.php:423 actions/showgroup.php:236 actions/tagother.php:94 +#: actions/login.php:230 actions/profilesettings.php:106 +#: actions/register.php:424 actions/showgroup.php:236 actions/tagother.php:94 #: lib/groupeditform.php:152 lib/userprofile.php:131 msgid "Nickname" -msgstr "Alcunha" +msgstr "Utilizador" -#: actions/login.php:253 actions/register.php:428 +#: actions/login.php:233 actions/register.php:429 #: lib/accountsettingsaction.php:116 msgid "Password" -msgstr "Palavra-chave" +msgstr "Senha" -#: actions/login.php:256 actions/register.php:477 +#: actions/login.php:236 actions/register.php:478 msgid "Remember me" msgstr "Lembrar-me neste computador" -#: actions/login.php:257 actions/register.php:479 +#: actions/login.php:237 actions/register.php:480 msgid "Automatically login in the future; not for shared computers!" msgstr "" "De futuro, iniciar sessão automaticamente. Não usar em computadores " "partilhados!" -#: actions/login.php:267 +#: actions/login.php:247 msgid "Lost or forgotten password?" -msgstr "Perdeu ou esqueceu-se da palavra-chave?" +msgstr "Perdeu ou esqueceu-se da senha?" -#: actions/login.php:286 +#: actions/login.php:266 msgid "" "For security reasons, please re-enter your user name and password before " "changing your settings." msgstr "" -"Por razões de segurança, por favor reintroduza o seu nome de utilizador e " -"palavra-chave antes de alterar as configurações." +"Por razões de segurança, por favor re-introduza o seu nome de utilizador e " +"senha antes de alterar as configurações." -#: actions/login.php:290 +#: actions/login.php:270 #, php-format msgid "" "Login with your username and password. Don't have a username yet? [Register]" "(%%action.register%%) a new account." msgstr "" -"Entrar com o seu nome de utilizador e palavra-chave. Ainda não está " -"registado? [Registe](%%action.register%%) uma conta." +"Entrar com o seu nome de utilizador e senha. Ainda não está registado? " +"[Registe](%%action.register%%) uma conta." #: actions/makeadmin.php:91 msgid "Only an admin can make another user an admin." -msgstr "Só um administrador pode tornar outro utilizador num administrador." +msgstr "Só um gestor pode tornar outro utilizador num gestor." #: 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" +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" +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" @@ -1978,10 +1930,10 @@ msgstr "Não auto-envie uma mensagem; basta lê-la baixinho a si próprio." msgid "Message sent" msgstr "Mensagem enviada" -#: actions/newmessage.php:185 lib/command.php:376 +#: actions/newmessage.php:185 #, php-format -msgid "Direct message to %s sent" -msgstr "Mensagem directa para %s enviada" +msgid "Direct message to %s sent." +msgstr "Mensagem directa para %s foi enviada." #: actions/newmessage.php:210 actions/newnotice.php:245 lib/channel.php:170 msgid "Ajax Error" @@ -2010,8 +1962,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 @@ -2019,7 +1971,7 @@ msgid "" "Be the first to [post on this topic](%%%%action.newnotice%%%%?" "status_textarea=%s)!" msgstr "" -"Seja o primeiro a [publicar neste tópico](%%%%action.newnotice%%%%?" +"Seja o primeiro a [publicar neste tópico](%%action.newnotice%%?" "status_textarea=%s)!" #: actions/noticesearch.php:124 @@ -2028,8 +1980,8 @@ msgid "" "Why not [register an account](%%%%action.register%%%%) and be the first to " "[post on this topic](%%%%action.newnotice%%%%?status_textarea=%s)!" msgstr "" -"Podia [registar uma conta](%%%%action.register%%%%) e ser a primeira pessoa " -"a [publicar neste tópico](%%%%action.newnotice%%%%?status_textarea=%s)!" +"Podia [registar uma conta](%%action.register%%) e ser a primeira pessoa a " +"[publicar neste tópico](%%action.newnotice%%?status_textarea=%s)!" #: actions/noticesearchrss.php:96 #, php-format @@ -2045,16 +1997,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 confirmou ou forneceu 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" @@ -2073,8 +2025,8 @@ msgstr "tipo de conteúdo " msgid "Only " msgstr "Apenas " -#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1031 -#: lib/api.php:1059 lib/api.php:1169 +#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1033 +#: lib/api.php:1061 lib/api.php:1171 msgid "Not a supported data format." msgstr "Formato de dados não suportado." @@ -2100,28 +2052,48 @@ msgstr " (serviço gratuito)" #: actions/othersettings.php:116 msgid "Shorten URLs with" -msgstr "Compactar URLs com" +msgstr "Encurtar URLs com" #: actions/othersettings.php:117 msgid "Automatic shortening service to use." -msgstr "Serviço de compactação automática que será usado" +msgstr "Serviço de encurtamento que será usado automaticamente" #: actions/othersettings.php:122 msgid "View profile designs" -msgstr "Ver designs para o perfil" +msgstr "Ver estilos para o perfil" #: actions/othersettings.php:123 msgid "Show or hide profile designs." -msgstr "Mostrar ou esconder designs para o perfil." +msgstr "Mostrar ou esconder estilos para o perfil." #: actions/othersettings.php:153 msgid "URL shortening service is too long (max 50 chars)." -msgstr "Serviço de compactação de URLs demasiado extenso (máx. 50 caracteres)" +msgstr "Serviço de encurtamento 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/otp.php:69 +#, fuzzy +msgid "No user ID specified." +msgstr "Não foi especificado um grupo." + +#: actions/otp.php:83 +#, fuzzy +msgid "No login token specified." +msgstr "Nota não foi especificada." + +#: actions/otp.php:90 +#, fuzzy +msgid "No login token requested." +msgstr "O pedido não tem a identificação do perfil." + +#: actions/otp.php:95 +#, fuzzy +msgid "Invalid login token specified." +msgstr "Chave inválida ou expirada." + +#: actions/otp.php:104 +#, fuzzy +msgid "Login token expired." +msgstr "Iniciar sessão no site" #: actions/outbox.php:61 #, php-format @@ -2135,15 +2107,15 @@ msgstr "" #: actions/passwordsettings.php:58 msgid "Change password" -msgstr "Modificar palavra-chave" +msgstr "Modificar senha" #: actions/passwordsettings.php:69 msgid "Change your password." -msgstr "Modificar a sua palavra-chave." +msgstr "Modificar a sua senha." #: actions/passwordsettings.php:96 actions/recoverpassword.php:231 msgid "Password change" -msgstr "Mudança da palavra-chave" +msgstr "Mudança da senha" #: actions/passwordsettings.php:104 msgid "Old password" @@ -2158,13 +2130,13 @@ msgid "6 or more characters" msgstr "6 ou mais caracteres" #: actions/passwordsettings.php:112 actions/recoverpassword.php:239 -#: actions/register.php:432 actions/smssettings.php:134 +#: actions/register.php:433 actions/smssettings.php:134 msgid "Confirm" msgstr "Confirmação" #: actions/passwordsettings.php:113 actions/recoverpassword.php:240 msgid "Same as password above" -msgstr "Repita a palavra-chave nova" +msgstr "Repita a senha nova" #: actions/passwordsettings.php:117 msgid "Change" @@ -2172,15 +2144,15 @@ msgstr "Modificar" #: actions/passwordsettings.php:154 actions/register.php:230 msgid "Password must be 6 or more characters." -msgstr "Palavra-chave tem de ter 6 ou mais caracteres." +msgstr "Senha tem de ter 6 ou mais caracteres." #: actions/passwordsettings.php:157 actions/register.php:233 msgid "Passwords don't match." -msgstr "Palavras-chave não coincidem." +msgstr "Senhas não coincidem." #: actions/passwordsettings.php:165 msgid "Incorrect old password" -msgstr "Palavra-chave antiga incorrecta." +msgstr "Senha antiga incorrecta." #: actions/passwordsettings.php:181 msgid "Error saving user; invalid." @@ -2188,13 +2160,13 @@ msgstr "Erro ao guardar utilizador; inválido." #: actions/passwordsettings.php:186 actions/recoverpassword.php:368 msgid "Can't save new password." -msgstr "Não é possível guardar a nova palavra-chave." +msgstr "Não é possível guardar a nova senha." #: actions/passwordsettings.php:192 actions/recoverpassword.php:211 msgid "Password saved." -msgstr "Palavra-chave gravada." +msgstr "Senha gravada." -#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:308 +#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:326 msgid "Paths" msgstr "Localizações" @@ -2220,14 +2192,14 @@ msgstr "Sem acesso de escrita no directório do fundo: %s" #: actions/pathsadminpanel.php:160 #, php-format msgid "Locales directory not readable: %s" -msgstr "Sem acesso de leitura ao directório do locales: %s" +msgstr "Sem acesso de leitura ao directório de idiomas: %s" #: actions/pathsadminpanel.php:166 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" @@ -2241,11 +2213,11 @@ msgstr "Localização do site" #: actions/pathsadminpanel.php:225 msgid "Path to locales" -msgstr "Localização do locales" +msgstr "Localização de idiomas" #: actions/pathsadminpanel.php:225 msgid "Directory path to locales" -msgstr "Localização do directório do locales" +msgstr "Localização do directório de idiomas" #: actions/pathsadminpanel.php:232 msgid "Theme" @@ -2285,15 +2257,15 @@ msgstr "Fundos" #: actions/pathsadminpanel.php:278 msgid "Background server" -msgstr "Servidor do fundo" +msgstr "Servidor de fundos" #: actions/pathsadminpanel.php:282 msgid "Background path" -msgstr "Localização do fundo" +msgstr "Localização dos fundos" #: actions/pathsadminpanel.php:286 msgid "Background directory" -msgstr "Directório do fundo" +msgstr "Directório dos fundos" #: actions/pathsadminpanel.php:293 msgid "SSL" @@ -2320,7 +2292,7 @@ msgid "When to use SSL" msgstr "Quando usar SSL" #: actions/pathsadminpanel.php:308 -msgid "SSL Server" +msgid "SSL server" msgstr "Servidor SSL" #: actions/pathsadminpanel.php:309 @@ -2352,8 +2324,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 +2333,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" @@ -2383,43 +2356,42 @@ msgstr "Informação do perfil" msgid "1-64 lowercase letters or numbers, no punctuation or spaces" msgstr "1-64 letras minúsculas ou números, sem pontuação ou espaços" -#: actions/profilesettings.php:111 actions/register.php:447 +#: actions/profilesettings.php:111 actions/register.php:448 #: actions/showgroup.php:247 actions/tagother.php:104 #: lib/groupeditform.php:157 lib/userprofile.php:149 msgid "Full name" msgstr "Nome completo" -#: actions/profilesettings.php:115 actions/register.php:452 +#: actions/profilesettings.php:115 actions/register.php:453 #: lib/groupeditform.php:161 msgid "Homepage" -msgstr "Página de acolhimento" +msgstr "Página pessoal" -#: actions/profilesettings.php:117 actions/register.php:454 +#: actions/profilesettings.php:117 actions/register.php:455 msgid "URL of your homepage, blog, or profile on another site" -msgstr "" -"URL da sua página de acolhimento, blogue ou perfil noutro site na internet" +msgstr "URL da sua página pessoal, blogue ou perfil noutro site na internet" -#: actions/profilesettings.php:122 actions/register.php:460 +#: actions/profilesettings.php:122 actions/register.php:461 #, php-format msgid "Describe yourself and your interests in %d chars" msgstr "Descreva-se e aos seus interesses (máx. 140 caracteres)" -#: actions/profilesettings.php:125 actions/register.php:463 +#: actions/profilesettings.php:125 actions/register.php:464 msgid "Describe yourself and your interests" msgstr "Descreva-se e aos seus interesses" -#: actions/profilesettings.php:127 actions/register.php:465 +#: actions/profilesettings.php:127 actions/register.php:466 msgid "Bio" msgstr "Biografia" -#: actions/profilesettings.php:132 actions/register.php:470 +#: actions/profilesettings.php:132 actions/register.php:471 #: actions/showgroup.php:256 actions/tagother.php:112 #: actions/userauthorization.php:158 lib/groupeditform.php:177 #: lib/userprofile.php:164 msgid "Location" msgstr "Localidade" -#: actions/profilesettings.php:134 actions/register.php:472 +#: actions/profilesettings.php:134 actions/register.php:473 msgid "Where you are, like \"City, State (or Region), Country\"" msgstr "Onde está, por ex. \"Cidade, Região, País\"" @@ -2442,11 +2414,11 @@ msgstr "" #: actions/profilesettings.php:151 actions/siteadminpanel.php:294 msgid "Language" -msgstr "Língua" +msgstr "Idioma" #: actions/profilesettings.php:152 msgid "Preferred language" -msgstr "Língua preferida" +msgstr "Idioma preferido" #: actions/profilesettings.php:161 msgid "Timezone" @@ -2459,8 +2431,7 @@ msgstr "Em que fuso horário se encontra normalmente?" #: actions/profilesettings.php:167 msgid "" "Automatically subscribe to whoever subscribes to me (best for non-humans)" -msgstr "" -"Subscrever automaticamente quem me subscreva (óptimo para seres não-humanos)" +msgstr "Subscrever automaticamente quem me subscreva (óptimo para não-humanos)" #: actions/profilesettings.php:228 actions/register.php:223 #, php-format @@ -2473,7 +2444,7 @@ msgstr "Fuso horário não foi seleccionado." #: actions/profilesettings.php:241 msgid "Language is too long (max 50 chars)." -msgstr "Língua é demasiado extensa (máx. 50 caracteres)." +msgstr "Idioma é demasiado extenso (máx. 50 caracteres)." #: actions/profilesettings.php:253 actions/tagother.php:178 #, php-format @@ -2484,19 +2455,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." @@ -2520,15 +2491,15 @@ msgstr "Notas públicas" #: actions/public.php:151 msgid "Public Stream Feed (RSS 1.0)" -msgstr "Feed de Notas Públicas (RSS 1.0)" +msgstr "Fonte de Notas Públicas (RSS 1.0)" #: actions/public.php:155 msgid "Public Stream Feed (RSS 2.0)" -msgstr "Feed de Notas Públicas (RSS 2.0)" +msgstr "Fonte de Notas Públicas (RSS 2.0)" #: actions/public.php:159 msgid "Public Stream Feed (Atom)" -msgstr "Feed de Notas Públicas (Atom)" +msgstr "Fonte de Notas Públicas (Atom)" #: actions/public.php:179 #, php-format @@ -2559,11 +2530,10 @@ msgid "" "tool. [Join now](%%action.register%%) to share notices about yourself with " "friends, family, and colleagues! ([Read more](%%doc.help%%))" msgstr "" -"Este é o site %%%%site.name%%%%, um serviço de [microblogues](http://en." -"wikipedia.org/wiki/Micro-blogging) baseado na aplicação de Software Livre " -"[StatusNet](http://status.net/). [Registe-se agora](%%%%action.register%%%%) " -"para partilhar notas sobre si, família e amigos! ([Saber mais](%%%%doc.help%%" -"%%))" +"Este é o site %%site.name%%, um serviço de [microblogues](http://en." +"wikipedia.org/wiki/Micro-blogging) baseado no programa de Software Livre " +"[StatusNet](http://status.net/). [Registe-se agora](%%action.register%%) " +"para partilhar notas sobre si, família e amigos! ([Saber mais](%%doc.help%%))" #: actions/public.php:238 #, php-format @@ -2572,8 +2542,8 @@ msgid "" "blogging) service based on the Free Software [StatusNet](http://status.net/) " "tool." msgstr "" -"Este é o site %%%%site.name%%%%, um serviço de [microblogues](http://en." -"wikipedia.org/wiki/Micro-blogging) baseado na aplicação de Software Livre " +"Este é o site %%site.name%%, um serviço de [microblogues](http://en." +"wikipedia.org/wiki/Micro-blogging) baseado no programa de Software Livre " "[StatusNet](http://status.net/)." #: actions/publictagcloud.php:57 @@ -2588,9 +2558,7 @@ msgstr "Estas são as categorias recentes mais populares em %s " #: actions/publictagcloud.php:69 #, php-format msgid "No one has posted a notice with a [hashtag](%%doc.tags%%) yet." -msgstr "" -"Ainda ninguém publicou uma nota com uma categoria de resumo [hashtag](%%doc." -"tags%%)." +msgstr "Ainda ninguém publicou uma nota com uma [categoria](%%doc.tags%%)." #: actions/publictagcloud.php:72 msgid "Be the first to post one!" @@ -2644,24 +2612,25 @@ 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 "" -"Se perdeu ou se esqueceu da sua palavra-chave, podemos enviar-lhe uma nova " -"para o correio electrónico registado na sua conta." +"Se perdeu ou se esqueceu da sua senha, podemos enviar-lhe uma nova para o " +"correio electrónico registado na sua conta." #: actions/recoverpassword.php:158 msgid "You have been identified. Enter a new password below. " -msgstr "Identificação positiva. Introduza abaixo uma palavra-chave nova. " +msgstr "Identificação positiva. Introduza abaixo uma senha nova. " #: actions/recoverpassword.php:188 msgid "Password recovery" -msgstr "Recuperação da palavra-chave" +msgstr "Recuperação da senha" #: actions/recoverpassword.php:191 msgid "Nickname or email address" -msgstr "Alcunha ou endereço de correio electrónico" +msgstr "Utilizador ou endereço de correio electrónico" #: actions/recoverpassword.php:193 msgid "Your nickname on this server, or your registered email address." -msgstr "A sua alcunha neste servidor, ou o seu correio electrónico registado." +msgstr "" +"A sua utilizador neste servidor, ou o seu correio electrónico registado." #: actions/recoverpassword.php:199 actions/recoverpassword.php:200 msgid "Recover" @@ -2669,15 +2638,15 @@ msgstr "Recuperar" #: actions/recoverpassword.php:208 msgid "Reset password" -msgstr "Reiniciar palavra-chave" +msgstr "Reiniciar senha" #: actions/recoverpassword.php:209 msgid "Recover password" -msgstr "Recuperar palavra-chave" +msgstr "Recuperar senha" #: actions/recoverpassword.php:210 actions/recoverpassword.php:322 msgid "Password recovery requested" -msgstr "Solicitada recuperação da palavra-chave" +msgstr "Solicitada recuperação da senha" #: actions/recoverpassword.php:213 msgid "Unknown action" @@ -2693,7 +2662,7 @@ msgstr "Reiniciar" #: actions/recoverpassword.php:252 msgid "Enter a nickname or email address." -msgstr "Introduza uma alcunha ou um endereço de correio electrónico." +msgstr "Introduza uma utilizador ou um endereço de correio electrónico." #: actions/recoverpassword.php:272 msgid "No user with that email address or username." @@ -2713,20 +2682,20 @@ msgid "" "Instructions for recovering your password have been sent to the email " "address registered to your account." msgstr "" -"Instruções para recuperação da sua palavra-chave foram enviadas para o " -"correio electrónico registado na sua conta." +"Instruções para recuperação da sua senha foram enviadas para o correio " +"electrónico registado na sua conta." #: actions/recoverpassword.php:344 msgid "Unexpected password reset." -msgstr "Reinício inesperado da palavra-chave." +msgstr "Reinício inesperado da senha." #: actions/recoverpassword.php:352 msgid "Password must be 6 chars or more." -msgstr "Palavra-chave tem de ter 6 ou mais caracteres." +msgstr "Senha tem de ter 6 ou mais caracteres." #: actions/recoverpassword.php:356 msgid "Password and confirmation do not match." -msgstr "A palavra-chave e a confirmação não coincidem." +msgstr "A senha e a confirmação não coincidem." #: actions/recoverpassword.php:375 actions/register.php:248 msgid "Error setting user." @@ -2734,9 +2703,9 @@ msgstr "Erro ao configurar utilizador." #: actions/recoverpassword.php:382 msgid "New password successfully saved. You are now logged in." -msgstr "A palavra-chave nova foi gravada com sucesso. Iniciou uma sessão." +msgstr "A senha nova foi gravada com sucesso. Iniciou uma sessão." -#: actions/register.php:85 actions/register.php:189 actions/register.php:404 +#: actions/register.php:85 actions/register.php:189 actions/register.php:405 msgid "Sorry, only invited people can register." msgstr "Desculpe, só pessoas convidadas se podem registar." @@ -2748,7 +2717,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:503 lib/action.php:457 #: lib/logingroupnav.php:85 msgid "Register" msgstr "Registar" @@ -2761,19 +2730,15 @@ 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." -#: actions/register.php:243 actions/register.php:264 +#: actions/register.php:243 actions/register.php:265 msgid "Invalid username or password." -msgstr "Nome de utilizador ou palavra-chave inválidos." +msgstr "Nome de utilizador ou senha inválidos." -#: actions/register.php:342 +#: actions/register.php:343 msgid "" "With this form you can create a new account. You can then post notices and " "link up to friends and colleagues. " @@ -2781,56 +2746,55 @@ msgstr "" "Com este formulário pode criar uma conta nova. Poderá então publicar notas e " "ligar-se a amigos e colegas. " -#: actions/register.php:424 +#: actions/register.php:425 msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required." msgstr "" "1-64 letras minúsculas ou números, sem pontuação ou espaços. Obrigatório." -#: actions/register.php:429 +#: actions/register.php:430 msgid "6 or more characters. Required." msgstr "6 ou mais caracteres. Obrigatório." -#: actions/register.php:433 +#: actions/register.php:434 msgid "Same as password above. Required." -msgstr "Repita a palavra-chave acima. Obrigatório." +msgstr "Repita a senha acima. Obrigatório." -#: actions/register.php:437 actions/register.php:441 +#: actions/register.php:438 actions/register.php:442 #: actions/siteadminpanel.php:270 lib/accountsettingsaction.php:120 msgid "Email" msgstr "Correio" -#: actions/register.php:438 actions/register.php:442 +#: actions/register.php:439 actions/register.php:443 msgid "Used only for updates, announcements, and password recovery" -msgstr "" -"Usado apenas para actualizações, anúncios e recuperação da palavra-chave" +msgstr "Usado apenas para actualizações, anúncios e recuperação da senha" -#: actions/register.php:449 +#: actions/register.php:450 msgid "Longer name, preferably your \"real\" name" msgstr "Nome mais longo, de preferência o seu nome \"verdadeiro\"" -#: actions/register.php:493 +#: actions/register.php:494 msgid "My text and files are available under " msgstr "Os meus textos e ficheiros são disponibilizados nos termos da " -#: actions/register.php:495 +#: actions/register.php:496 msgid "Creative Commons Attribution 3.0" msgstr "Creative Commons Atribuição 3.0" -#: actions/register.php:496 +#: actions/register.php:497 msgid "" " except this private data: password, email address, IM address, and phone " "number." msgstr "" -" excepto estes dados privados: palavra-chave, endereço de correio " -"electrónico, endereço de mensageiro instantâneo, número de telefone." +" excepto estes dados privados: senha, endereço de correio electrónico, " +"endereço de mensageiro instantâneo, número de telefone." -#: actions/register.php:537 +#: actions/register.php:538 #, 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,22 +2806,22 @@ 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." -#: actions/register.php:561 +#: actions/register.php:562 msgid "" "(You should receive a message by email momentarily, with instructions on how " "to confirm your email address.)" @@ -2887,11 +2851,11 @@ msgstr "Subscrever um utilizador remoto" #: actions/remotesubscribe.php:129 msgid "User nickname" -msgstr "Alcunha do utilizador" +msgstr "Nome do utilizador" #: actions/remotesubscribe.php:130 msgid "Nickname of the user you want to follow" -msgstr "Alcunha do utilizador que pretende seguir" +msgstr "Nome do utilizador que pretende seguir" #: actions/remotesubscribe.php:133 msgid "Profile URL" @@ -2954,33 +2918,28 @@ 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)" -msgstr "Feed de respostas a %s (RSS 1.0)" +msgstr "Fonte de respostas a %s (RSS 1.0)" #: actions/replies.php:151 #, php-format msgid "Replies feed for %s (RSS 2.0)" -msgstr "Feed de respostas a %s (RSS 2.0)" +msgstr "Fonte de respostas a %s (RSS 2.0)" #: actions/replies.php:158 #, php-format msgid "Replies feed for %s (Atom)" -msgstr "Feed de respostas a %s (Atom)" +msgstr "Fonte 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 +2954,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 +2973,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." @@ -3026,25 +2980,25 @@ msgstr "Não foi possível importar notas favoritas." #: actions/showfavorites.php:170 #, php-format msgid "Feed for favorites of %s (RSS 1.0)" -msgstr "Feed das favoritas de %s (RSS 1.0)" +msgstr "Fonte dos favoritos de %s (RSS 1.0)" #: actions/showfavorites.php:177 #, php-format msgid "Feed for favorites of %s (RSS 2.0)" -msgstr "Feed das favoritas de %s (RSS 2.0)" +msgstr "Fonte dos favoritos de %s (RSS 2.0)" #: actions/showfavorites.php:184 #, php-format msgid "Feed for favorites of %s (Atom)" -msgstr "Feed das favoritas de %s (Atom)" +msgstr "Fonte dos favoritos de %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 "" -"Ainda não escolheu nenhuma nota favorita. Clique o botão de favorecimento " -"nas notas de que goste, para marcá-las para mais tarde ou para lhes dar " +"Ainda não escolheu nenhuma nota favorita. Clique o botão de marcação nas " +"notas de que goste, para marcá-las para mais tarde ou para lhes dar " "relevância." #: actions/showfavorites.php:207 @@ -3064,7 +3018,7 @@ msgid "" "would add to their favorites :)" msgstr "" "%s ainda não adicionou nenhuma nota às favoritas. Que tal [registar uma " -"conta](%%%%action.register%%%%) e publicar algo interessante que mude este " +"conta](%%action.register%%) e publicar algo interessante que mude este " "estado de coisas :)" #: actions/showfavorites.php:242 @@ -3076,11 +3030,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" @@ -3097,7 +3046,7 @@ msgstr "Anotação" #: actions/showgroup.php:284 lib/groupeditform.php:184 msgid "Aliases" -msgstr "Cognomes" +msgstr "Sinónimos" #: actions/showgroup.php:293 msgid "Group actions" @@ -3106,17 +3055,17 @@ msgstr "Acções do grupo" #: actions/showgroup.php:328 #, php-format msgid "Notice feed for %s group (RSS 1.0)" -msgstr "Feed de notas do grupo %s (RSS 1.0)" +msgstr "Fonte de notas do grupo %s (RSS 1.0)" #: actions/showgroup.php:334 #, php-format msgid "Notice feed for %s group (RSS 2.0)" -msgstr "Feed de notas do grupo %s (RSS 2.0)" +msgstr "Fonte de notas do grupo %s (RSS 2.0)" #: actions/showgroup.php:340 #, php-format msgid "Notice feed for %s group (Atom)" -msgstr "Feed de notas do grupo %s (Atom)" +msgstr "Fonte de notas do grupo %s (Atom)" #: actions/showgroup.php:345 #, php-format @@ -3129,7 +3078,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)" @@ -3154,12 +3103,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** é um grupo de utilizadores no site %%%%site.name%%%%, um serviço de " -"[microblogues](http://en.wikipedia.org/wiki/Micro-blogging) baseado na " -"aplicação de Software Livre [StatusNet](http://status.net/). Os membros " -"deste grupo partilham mensagens curtas acerca das suas vidas e interesses. " -"[Registe-se agora](%%%%action.register%%%%) para se juntar a este grupo e a " -"muitos mais! ([Saber mais](%%%%doc.help%%%%))" +"**%s** é um grupo de utilizadores no site %%site.name%%, um serviço de " +"[microblogues](http://en.wikipedia.org/wiki/Micro-blogging) baseado no " +"programa de Software Livre [StatusNet](http://status.net/). Os membros deste " +"grupo partilham mensagens curtas acerca das suas vidas e interesses. " +"[Registe-se agora](%%action.register%%) para se juntar a este grupo e a " +"muitos mais! ([Saber mais](%%doc.help%%))" #: actions/showgroup.php:454 #, php-format @@ -3169,14 +3118,14 @@ msgid "" "[StatusNet](http://status.net/) tool. Its members share short messages about " "their life and interests. " msgstr "" -"**%s** é um grupo de utilizadores no site %%%%site.name%%%%, um serviço de " -"[microblogues](http://en.wikipedia.org/wiki/Micro-blogging) baseado na " -"aplicação de Software Livre [StatusNet](http://status.net/). Os membros " -"deste grupo partilham mensagens curtas acerca das suas vidas e interesses. " +"**%s** é um grupo de utilizadores no site %%site.name%%, um serviço de " +"[microblogues](http://en.wikipedia.org/wiki/Micro-blogging) baseado no " +"programa de Software Livre [StatusNet](http://status.net/). Os membros deste " +"grupo partilham mensagens curtas acerca das suas vidas e interesses. " #: actions/showgroup.php:482 msgid "Admins" -msgstr "Administradores" +msgstr "Gestores" #: actions/showmessage.php:81 msgid "No such message." @@ -3205,30 +3154,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 "Fonte de notas para %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 "Fonte de notas para %s (RSS 2.0)" #: actions/showstream.php:143 #, php-format msgid "Notice feed for %s (Atom)" -msgstr "Feed de notas para %s (Atom)" +msgstr "Fonte de notas para %s (Atom)" #: actions/showstream.php:148 #, php-format @@ -3237,8 +3181,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 +3195,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 @@ -3265,11 +3209,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** tem uma conta no site %%%%site.name%%%%, um serviço de [microblogues]" -"(http://en.wikipedia.org/wiki/Micro-blogging) baseado na aplicação de " -"Software Livre [StatusNet](http://status.net/). [Registe-se agora](%%%%" -"action.register%%%%) para seguir as notas de **%s** e de muitos mais! " -"([Saber mais](%%%%doc.help%%%%))" +"**%s** tem uma conta no site %%site.name%%, um serviço de [microblogues]" +"(http://en.wikipedia.org/wiki/Micro-blogging) baseado no programa de " +"Software Livre [StatusNet](http://status.net/). [Registe-se agora](%%action." +"register%%) para seguir as notas de **%s** e de muitos mais! ([Saber mais](%%" +"doc.help%%))" #: actions/showstream.php:239 #, php-format @@ -3278,8 +3222,8 @@ msgid "" "wikipedia.org/wiki/Micro-blogging) service based on the Free Software " "[StatusNet](http://status.net/) tool. " msgstr "" -"**%s** tem uma conta no site %%%%site.name%%%%, um serviço de [microblogues]" -"(http://en.wikipedia.org/wiki/Micro-blogging) baseado na aplicação de " +"**%s** tem uma conta no site %%site.name%%, um serviço de [microblogues]" +"(http://en.wikipedia.org/wiki/Micro-blogging) baseado no programa de " "Software Livre [StatusNet](http://status.net/). " #: actions/showstream.php:313 @@ -3304,13 +3248,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" -msgstr "Tem de ter um endereço válido para o correio electrónico de contacto" +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\"" -msgstr "Língua desconhecida \"%s\"" +msgid "Unknown language \"%s\"." +msgstr "Língua desconhecida \"%s\"." #: actions/siteadminpanel.php:179 msgid "Invalid snapshot report URL." @@ -3330,7 +3274,7 @@ msgstr "O valor mínimo de limite para o texto é 140 caracteres." #: actions/siteadminpanel.php:203 msgid "Dupe limit must 1 or more seconds." -msgstr "O limite de dupes tem de ser 1 ou mais segundos." +msgstr "O limite de duplicados tem de ser 1 ou mais segundos." #: actions/siteadminpanel.php:253 msgid "General" @@ -3378,7 +3322,7 @@ msgstr "Fuso horário por omissão, para o site; normalmente, UTC." #: actions/siteadminpanel.php:295 msgid "Default site language" -msgstr "Língua do site, por omissão" +msgstr "Idioma do site, por omissão" #: actions/siteadminpanel.php:303 msgid "URLs" @@ -3390,15 +3334,15 @@ msgstr "Servidor" #: actions/siteadminpanel.php:306 msgid "Site's server hostname." -msgstr "Hostname do servidor do site." +msgstr "Nome do servidor do site." #: actions/siteadminpanel.php:310 msgid "Fancy URLs" -msgstr "URLs caprichosas" +msgstr "URLs bonitas" #: actions/siteadminpanel.php:312 msgid "Use fancy (more readable and memorable) URLs?" -msgstr "Usar URLs caprichosas (fancy URLs) mais legíveis e memoráveis" +msgstr "Usar URLs bonitas (mais legíveis e memoráveis)" #: actions/siteadminpanel.php:318 msgid "Access" @@ -3478,7 +3422,7 @@ msgstr "Número máximo de caracteres nas notas." #: actions/siteadminpanel.php:374 msgid "Dupe limit" -msgstr "Limite de dupes (duplicações)" +msgstr "Limite de duplicações" #: actions/siteadminpanel.php:374 msgid "How long users must wait (in seconds) to post the same thing again." @@ -3491,7 +3435,7 @@ msgid "Save site settings" msgstr "Gravar configurações do site" #: actions/smssettings.php:58 -msgid "SMS Settings" +msgid "SMS settings" msgstr "Configurações de SMS" #: actions/smssettings.php:69 @@ -3520,7 +3464,7 @@ 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" +msgid "SMS phone number" msgstr "Número de telefone para SMS" #: actions/smssettings.php:140 @@ -3613,8 +3557,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." @@ -3644,8 +3588,8 @@ msgid "" "%s has no subscribers. Why not [register an account](%%%%action.register%%%" "%) and be the first?" msgstr "" -"%s não tem subscritores. Quer [registar uma conta](%%%%action.register%%%%) " -"e ser o primeiro?" +"%s não tem subscritores. Quer [registar uma conta](%%action.register%%) e " +"ser o primeiro?" #: actions/subscriptions.php:52 #, php-format @@ -3654,8 +3598,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,25 +3639,20 @@ 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)" -msgstr "Feed de notas para a categoria %s (RSS 1.0)" +msgstr "Fonte de notas para a categoria %s (RSS 1.0)" #: actions/tag.php:92 #, php-format msgid "Notice feed for tag %s (RSS 2.0)" -msgstr "Feed de notas para a categoria %s (RSS 2.0)" +msgstr "Fonte de notas para a categoria %s (RSS 2.0)" #: actions/tag.php:98 #, php-format msgid "Notice feed for tag %s (Atom)" -msgstr "Feed de notas para a categoria %s (Atom)" +msgstr "Fonte de notas para a categoria %s (Atom)" #: actions/tagother.php:39 msgid "No ID argument." @@ -3765,7 +3704,7 @@ msgstr "Categoria não existe." #: actions/twitapitrends.php:87 msgid "API method under construction." -msgstr "Método da API está em construção." +msgstr "Método da API em desenvolvimento." #: actions/unblock.php:59 msgid "You haven't blocked that user." @@ -3783,21 +3722,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" @@ -3826,7 +3763,7 @@ msgstr "Perfil" #: actions/useradminpanel.php:222 msgid "Bio Limit" -msgstr "Limite da Bio" +msgstr "Limite da Biografia" #: actions/useradminpanel.php:223 msgid "Maximum length of a profile bio in characters." @@ -3858,7 +3795,7 @@ msgstr "Convites" #: actions/useradminpanel.php:256 msgid "Invitations enabled" -msgstr "Convites possibilitados" +msgstr "Convites habilitados" #: actions/useradminpanel.php:258 msgid "Whether to allow users to invite new users." @@ -3898,7 +3835,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,18 +3890,18 @@ 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 msgid "Listenee URI ‘%s’ is too long." -msgstr "Listenee URI ‘%s’ é demasiado longo." +msgstr "URI do escutado ‘%s’ é demasiado longo." #: actions/userauthorization.php:307 #, php-format msgid "Listenee URI ‘%s’ is a local user." -msgstr "Listenee URI ‘%s’ é um utilizador local." +msgstr "URI do ouvido ‘%s’ é um utilizador local." #: actions/userauthorization.php:322 #, php-format @@ -3986,31 +3923,22 @@ 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" +msgstr "Estilo do perfil" #: actions/userdesignsettings.php:87 lib/designsettings.php:76 msgid "" "Customize the way your profile looks with a background image and a colour " "palette of your choice." msgstr "" -"Personalize o aspecto do seu perfil com uma imagem de fundo e uma paleta de " +"Personalize o estilo do seu perfil com uma imagem de fundo e uma paleta de " "cores à sua escolha." #: actions/userdesignsettings.php:282 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,7 +3953,81 @@ 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." -#: classes/File.php:137 +#: 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:144 #, php-format msgid "" "No file may be larger than %d bytes and the file you sent was %d bytes. Try " @@ -4034,17 +4036,22 @@ msgstr "" "Nenhum ficheiro pode ter mais de %d bytes e o que enviou tinha %d bytes. " "Tente carregar uma versão menor." -#: classes/File.php:147 +#: classes/File.php:154 #, php-format msgid "A file this large would exceed your user quota of %d bytes." msgstr "" "Um ficheiro desta dimensão excederia a sua quota de utilizador de %d bytes." -#: classes/File.php:154 +#: classes/File.php:161 #, php-format msgid "A file this large would exceed your monthly quota of %d bytes." msgstr "Um ficheiro desta dimensão excederia a sua quota mensal de %d bytes." +#: classes/Login_token.php:76 +#, fuzzy, php-format +msgid "Could not create login token for %s" +msgstr "Não foi possível criar a chave de entrada para %s." + #: classes/Message.php:45 msgid "You are banned from sending direct messages." msgstr "Está proibido de enviar mensagens directas." @@ -4060,7 +4067,7 @@ msgstr "Não foi possível actualizar a mensagem com a nova URI." #: classes/Notice.php:172 #, php-format msgid "DB error inserting hashtag: %s" -msgstr "Erro na base de dados ao inserir a hashtag: %s" +msgstr "Erro na base de dados ao inserir a marca: %s" #: classes/Notice.php:226 msgid "Problem saving notice. Too long." @@ -4098,7 +4105,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" @@ -4126,15 +4133,15 @@ msgstr "Carregar um avatar" #: lib/accountsettingsaction.php:116 msgid "Change your password" -msgstr "Modificar a sua palavra-chave" +msgstr "Modificar a sua senha" #: lib/accountsettingsaction.php:120 msgid "Change email handling" -msgstr "Alterar email handling" +msgstr "Alterar manuseamento de email" #: lib/accountsettingsaction.php:124 msgid "Design your profile" -msgstr "Altere o design do seu perfil" +msgstr "Altere o estilo do seu perfil" #: lib/accountsettingsaction.php:128 msgid "Other" @@ -4145,136 +4152,136 @@ msgid "Other options" msgstr "Outras opções" #: lib/action.php:144 -#, php-format -msgid "%s - %s" -msgstr "%s - %s" +#, fuzzy, php-format +msgid "%1$s - %2$s" +msgstr "%1$s (%2$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" +msgstr "Altere o seu endereço electrónico, avatar, senha, 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" +msgstr "Termos" -#: 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 +4290,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,61 +4306,65 @@ 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." +msgstr "Ocorreu um problema com a sua sessão." #: lib/adminpanelaction.php:96 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." +msgstr "Não foi possível apagar a configuração do estilo." -#: 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" +msgstr "Configuração do estilo" -#: 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" +msgstr "Configuração das localizações" #: lib/attachmentlist.php:87 msgid "Attachments" @@ -4376,20 +4387,18 @@ msgid "Tags for this attachment" msgstr "Categorias para este anexo" #: lib/authenticationplugin.php:182 lib/authenticationplugin.php:187 -#, fuzzy msgid "Password changing failed" -msgstr "Mudança da palavra-chave" +msgstr "Não foi possível mudar a palavra-chave" #: lib/authenticationplugin.php:197 -#, fuzzy msgid "Password changing is not allowed" -msgstr "Mudança da palavra-chave" +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" @@ -4402,18 +4411,18 @@ msgid "Sorry, this command is not yet implemented." msgstr "Desculpe, este comando ainda não foi implementado." #: lib/command.php:88 -#, php-format +#, fuzzy, php-format msgid "Could not find a user with nickname %s" -msgstr "Não foi encontrado um utilizador com a alcunha %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 muito sentido tocar-nos a nós mesmos!" #: lib/command.php:99 -#, php-format +#, fuzzy, php-format msgid "Nudge sent to %s" -msgstr "Cotovelada enviada a %s" +msgstr "Toque enviado para %s." #: lib/command.php:126 #, php-format @@ -4427,86 +4436,116 @@ msgstr "" "Notas: %3$s" #: lib/command.php:152 lib/command.php:399 lib/command.php:460 +#, fuzzy msgid "Notice with that id does not exist" -msgstr "Não existe nenhuma nota com essa identificação" +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 +#, fuzzy msgid "User has no last notice" -msgstr "Utilizador não tem nenhuma última nota" +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:217 +#, fuzzy +msgid "You are already a member of that group" +msgstr "Já é membro desse grupo." + +#: lib/command.php:234 +#, fuzzy, php-format +msgid "Could not join user %s to group %s" +msgstr "Não foi possível adicionar %1$s ao grupo %2$s." + +#: lib/command.php:239 +#, fuzzy, php-format +msgid "%s joined group %s" +msgstr "%1$s juntou-se ao grupo %2$s" + +#: lib/command.php:284 +#, fuzzy, php-format +msgid "Could not remove user %s to group %s" +msgstr "Não foi possível remover o utilizador %1$s do grupo %2$s." + +#: lib/command.php:289 +#, fuzzy, php-format +msgid "%s left group %s" +msgstr "%1$s deixou o grupo %2$s" #: lib/command.php:318 -#, php-format +#, fuzzy, php-format msgid "Fullname: %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" +msgstr "Página pessoal: %s" #: lib/command.php:327 #, php-format msgid "About: %s" msgstr "Sobre: %s" -#: lib/command.php:358 scripts/xmppdaemon.php:301 -#, php-format +#: lib/command.php:358 +#, fuzzy, php-format msgid "Message too long - maximum is %d characters, you sent %d" -msgstr "Mensagem demasiado extensa - máx. %d caracteres, enviou %d" +msgstr "Mensagem demasiado extensa - máx. %1$d caracteres, enviou %2$d." + +#: lib/command.php:376 +#, fuzzy, php-format +msgid "Direct message to %s sent" +msgstr "Mensagem directa para %s foi enviada." #: lib/command.php:378 msgid "Error sending direct message." msgstr "Erro no envio da mensagem directa." #: lib/command.php:422 +#, fuzzy msgid "Cannot repeat your own notice" -msgstr "Não pode repetir a sua própria nota" +msgstr "Não pode repetir a sua própria nota." #: lib/command.php:427 +#, fuzzy msgid "Already repeated that notice" -msgstr "Já repetiu essa nota" +msgstr "Já repetiu essa nota." #: lib/command.php:435 -#, php-format +#, fuzzy, php-format msgid "Notice from %s repeated" -msgstr "Nota de %s repetida" +msgstr "Nota de %s repetida." #: lib/command.php:437 msgid "Error repeating notice." msgstr "Erro ao repetir nota." #: lib/command.php:491 -#, php-format +#, fuzzy, php-format msgid "Notice too long - maximum is %d characters, you sent %d" -msgstr "Nota demasiado extensa - máx. %d caracteres, enviou %d" +msgstr "Nota demasiado extensa - máx. %1$d caracteres, enviou %2$d." #: lib/command.php:500 -#, php-format +#, fuzzy, php-format msgid "Reply to %s sent" -msgstr "Resposta a %s enviada" +msgstr "Resposta a %s enviada." #: lib/command.php:502 msgid "Error saving notice." msgstr "Erro ao gravar nota." #: lib/command.php:556 +#, fuzzy msgid "Specify the name of the user to subscribe to" -msgstr "Introduza o nome do utilizador para subscrever" +msgstr "Introduza o nome do utilizador para subscrever." #: lib/command.php:563 #, php-format @@ -4514,8 +4553,9 @@ msgid "Subscribed to %s" msgstr "Subscreveu %s" #: lib/command.php:584 +#, fuzzy msgid "Specify the name of the user to unsubscribe from" -msgstr "Introduza o nome do utilizador para deixar de subscrever" +msgstr "Introduza o nome do utilizador para deixar de subscrever." #: lib/command.php:591 #, php-format @@ -4543,52 +4583,48 @@ msgid "Can't turn on notification." msgstr "Não foi possível ligar a notificação." #: lib/command.php:650 +#, fuzzy msgid "Login command is disabled" -msgstr "Comando para iniciar sessão foi desactivado" +msgstr "Comando para iniciar sessão foi desactivado." -#: lib/command.php:664 -#, 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 +#: lib/command.php:661 +#, 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" +"s." -#: lib/command.php:685 +#: lib/command.php:677 msgid "You are not subscribed to anyone." msgstr "Não subscreveu ninguém." -#: lib/command.php:687 +#: lib/command.php:679 msgid "You are subscribed to this person:" msgid_plural "You are subscribed to these people:" -msgstr[0] "Subscreve esta pessoa:" -msgstr[1] "Subscreve estas pessoas:" +msgstr[0] "Subscreveu esta pessoa:" +msgstr[1] "Subscreveu estas pessoas:" -#: lib/command.php:707 +#: lib/command.php:699 msgid "No one is subscribed to you." msgstr "Ninguém subscreve as suas notas." -#: lib/command.php:709 +#: lib/command.php:701 msgid "This person is subscribed to you:" msgid_plural "These people are subscribed to you:" msgstr[0] "Esta pessoa subscreve as suas notas:" msgstr[1] "Estas pessoas subscrevem as suas notas:" -#: lib/command.php:729 +#: lib/command.php:721 msgid "You are not a member of any groups." msgstr "Não está em nenhum grupo." -#: lib/command.php:731 +#: lib/command.php:723 msgid "You are a member of this group:" msgid_plural "You are a member of these groups:" msgstr[0] "Está no grupo:" msgstr[1] "Está nos grupos:" -#: lib/command.php:745 +#: lib/command.php:737 msgid "" "Commands:\n" "on - turn on notifications\n" @@ -4632,32 +4668,32 @@ msgstr "" "on - ligar notificações\n" "off - desligar notificações\n" "help - mostrar esta ajuda\n" -"follow <alcunha> - subscrever este utilizador\n" +"follow <utilizador> - subscrever este utilizador\n" "groups - lista os grupos a que se juntou\n" "subscriptions - lista as pessoas que está a seguir\n" "subscribers - lista as pessoas que estão a segui-lo(a)\n" -"leave <alcunha> - deixar de subscrever este utilizador\n" -"d <alcunha> <texto> - mensagem directa para o utilizador\n" -"get <alcunha> - receber última nota do utilizador\n" -"whois <alcunha> - receber perfil do utilizador\n" -"fav <alcunha> - adicionar última nota do utilizador às favoritas\n" +"leave <utilizador> - deixar de subscrever este utilizador\n" +"d <utilizador> <texto> - mensagem directa para o utilizador\n" +"get <utilizador> - receber última nota do utilizador\n" +"whois <utilizador> - receber perfil do utilizador\n" +"fav <utilizador> - adicionar última nota do utilizador às favoritas\n" "fav #<id_da_nota> - adicionar nota com esta identificação às favoritas\n" "repeat #<id_da_nota> - repetir uma nota com uma certa identificação\n" -"repeat <alcunha> - repetir a última nota do utilizador\n" +"repeat <utilizador> - repetir a última nota do utilizador\n" "reply #<id_da_nota> - responder à nota com esta identificação\n" -"reply <alcunha> - responder à última nota do utilizador\n" +"reply <utilizador> - responder à última nota do utilizador\n" "join <grupo> - juntar-se ao grupo\n" "login - Receber uma ligação para iniciar sessão na interface web\n" "drop <grupo> - afastar-se do grupo\n" "stats - receber as suas estatísticas\n" "stop - o mesmo que 'off'\n" "quit - o mesmo que 'off'\n" -"sub <alcunha> - o mesmo que 'follow'\n" -"unsub <alcunha> - o mesmo que 'leave'\n" -"last <alcunha> - o mesmo que 'get'\n" -"on <alcunha> - ainda não implementado.\n" -"off <alcunha> - ainda não implementado.\n" -"nudge <alcunha> - relembrar um utilizador para actualizar.\n" +"sub <utilizador> - o mesmo que 'follow'\n" +"unsub <utilizador> - o mesmo que 'leave'\n" +"last <utilizador> - o mesmo que 'get'\n" +"on <utilizador> - ainda não implementado.\n" +"off <utilizador> - ainda não implementado.\n" +"nudge <utilizador> - relembrar um utilizador para actualizar.\n" "invite <número de telefone> - ainda não implementado.\n" "track <palavra> - ainda não implementado.\n" "untrack <palavra> - ainda não implementado.\n" @@ -4672,7 +4708,7 @@ msgstr "Ficheiro de configuração não encontrado. " #: lib/common.php:200 msgid "I looked for configuration files in the following places: " -msgstr "Procurei ficheiros de configuração nos seguintes: " +msgstr "Procurei ficheiros de configuração nos seguintes sítios: " #: lib/common.php:201 msgid "You may wish to run the installer to fix this." @@ -4684,11 +4720,11 @@ msgstr "Ir para o instalador." #: lib/connectsettingsaction.php:110 msgid "IM" -msgstr "IM" +msgstr "MI" #: lib/connectsettingsaction.php:111 msgid "Updates by instant messenger (IM)" -msgstr "Actualizações por mensagem instantânea (IM)" +msgstr "Actualizações por mensagem instantânea (MI)" #: lib/connectsettingsaction.php:116 msgid "Updates by SMS" @@ -4711,7 +4747,7 @@ msgstr "" #: lib/designsettings.php:418 msgid "Design defaults restored." -msgstr "Predefinições do design repostas" +msgstr "Predefinições do estilo repostas" #: lib/disfavorform.php:114 lib/disfavorform.php:140 msgid "Disfavor this notice" @@ -4771,7 +4807,7 @@ msgstr "Prosseguir" #: lib/groupeditform.php:163 msgid "URL of the homepage or blog of the group or topic" -msgstr "URL da página de acolhimento ou do blogue, deste grupo ou assunto" +msgstr "URL da página ou do blogue, deste grupo ou assunto" #: lib/groupeditform.php:168 msgid "Describe the group or topic" @@ -4782,10 +4818,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\"" @@ -4795,7 +4827,7 @@ msgstr "Localidade do grupo, se aplicável, por ex. \"Cidade, Região, País\"" #, php-format msgid "Extra nicknames for the group, comma- or space- separated, max %d" msgstr "" -"Alcunhas extra para o grupo, separadas por vírgulas ou espaços, máx. %d" +"Utilizadors extra para o grupo, separadas por vírgulas ou espaços, máx. %d" #: lib/groupnav.php:85 msgid "Group" @@ -4817,12 +4849,12 @@ msgstr "Editar propriedades do grupo %s" #: lib/groupnav.php:113 msgid "Logo" -msgstr "Logótipo" +msgstr "Logotipo" #: lib/groupnav.php:114 #, php-format msgid "Add or edit %s logo" -msgstr "Adicionar ou editar o logótipo de %s" +msgstr "Adicionar ou editar o logotipo de %s" #: lib/groupnav.php:120 #, php-format @@ -4898,7 +4930,7 @@ msgstr "Afastar-me" #: lib/logingroupnav.php:80 msgid "Login with a username and password" -msgstr "Iniciar sessão com um nome de utilizador e palavra-chave" +msgstr "Iniciar sessão com um nome de utilizador e senha" #: lib/logingroupnav.php:86 msgid "Sign up for a new account" @@ -4968,29 +5000,15 @@ 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" -msgstr "" -"Bio: %s\n" -"\n" +msgid "Bio: %s" +msgstr "Bio: %s" #: lib/mail.php:286 #, php-format msgid "New email address for posting to %s" -msgstr "Endereço electrónico novo para publicar no site %s" +msgstr "Novo endereço electrónico para publicar no site %s" #: lib/mail.php:289 #, php-format @@ -5004,7 +5022,7 @@ msgid "" "Faithfully yours,\n" "%4$s" msgstr "" -"Tem um endereço electrónico novo para fazer publicações no site %1$s.\n" +"Tem um novo endereço electrónico para fazer publicações no site %1$s.\n" "\n" "Envie correio para o endereço %2$s para publicar novas mensagens.\n" "\n" @@ -5025,7 +5043,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 envia-lhe um toque" #: lib/mail.php:467 #, php-format @@ -5057,7 +5075,7 @@ msgstr "" #: lib/mail.php:510 #, php-format msgid "New private message from %s" -msgstr "Mensagem privada nova de %s" +msgstr "Nova mensagem privada de %s" #: lib/mail.php:514 #, php-format @@ -5182,6 +5200,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 +#, php-format +msgid "Unsupported message type: %s" +msgstr "Tipo de mensagem não suportado: %s" + #: lib/mediafile.php:98 lib/mediafile.php:123 msgid "There was a database error while saving your file. Please try again." msgstr "" @@ -5217,25 +5256,25 @@ 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!" -msgstr "Ficheiro excede quota do utilizador!" +msgid "File exceeds user's quota." +msgstr "Ficheiro excede quota do utilizador." #: lib/mediafile.php:196 lib/mediafile.php:233 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!" +msgid "Could not determine file's MIME type." msgstr "Não foi possível determinar o tipo MIME do ficheiro." #: lib/mediafile.php:270 #, php-format msgid " Try using another %s format." -msgstr " Tente usar outro tipo de %s." +msgstr " Tente usar outro tipo de %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 "%s não é um tipo de ficheiro suportado neste servidor." #: lib/messageform.php:120 @@ -5268,8 +5307,18 @@ msgid "Attach a file" msgstr "Anexar um ficheiro" #: lib/noticeform.php:212 -msgid "Share your location" -msgstr "Compartilhe a sua localização" +#, fuzzy +msgid "Share my location" +msgstr "Partilhar a minha localização." + +#: lib/noticeform.php:214 +#, fuzzy +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 @@ -5298,7 +5347,7 @@ msgstr "coords." #: lib/noticelist.php:531 msgid "in context" -msgstr "em contexto" +msgstr "no contexto" #: lib/noticelist.php:556 msgid "Repeated by" @@ -5318,15 +5367,15 @@ msgstr "Nota repetida" #: lib/nudgeform.php:116 msgid "Nudge this user" -msgstr "Acotovelar este utilizador" +msgstr "Tocar este utilizador" #: lib/nudgeform.php:128 msgid "Nudge" -msgstr "Acotovelar" +msgstr "Tocar" #: lib/nudgeform.php:128 msgid "Send a nudge to this user" -msgstr "Enviar cotovelada a este utilizador" +msgstr "Enviar toque a este utilizador" #: lib/oauthstore.php:283 msgid "Error inserting new profile" @@ -5385,6 +5434,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" @@ -5451,7 +5504,7 @@ msgstr "Repetir esta nota" #: lib/sandboxform.php:67 msgid "Sandbox" -msgstr "Impedir notas públicas" +msgstr "Bloquear notas públicas" #: lib/sandboxform.php:78 msgid "Sandbox this user" @@ -5499,7 +5552,7 @@ msgstr "Silenciar" #: lib/silenceform.php:78 msgid "Silence this user" -msgstr "Impedir este utilizador de publicar notas" +msgstr "Silenciar este utilizador" #: lib/subgroupnav.php:83 #, php-format @@ -5554,10 +5607,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" @@ -5618,47 +5667,47 @@ msgstr "Mensagem" msgid "Moderate" msgstr "Moderar" -#: lib/util.php:837 +#: lib/util.php:884 msgid "a few seconds ago" msgstr "há alguns segundos" -#: lib/util.php:839 +#: lib/util.php:886 msgid "about a minute ago" msgstr "há cerca de um minuto" -#: lib/util.php:841 +#: lib/util.php:888 #, php-format msgid "about %d minutes ago" msgstr "há cerca de %d minutos" -#: lib/util.php:843 +#: lib/util.php:890 msgid "about an hour ago" msgstr "há cerca de uma hora" -#: lib/util.php:845 +#: lib/util.php:892 #, php-format msgid "about %d hours ago" msgstr "há cerca de %d horas" -#: lib/util.php:847 +#: lib/util.php:894 msgid "about a day ago" msgstr "há cerca de um dia" -#: lib/util.php:849 +#: lib/util.php:896 #, php-format msgid "about %d days ago" msgstr "há cerca de %d dias" -#: lib/util.php:851 +#: lib/util.php:898 msgid "about a month ago" msgstr "há cerca de um mês" -#: lib/util.php:853 +#: lib/util.php:900 #, php-format msgid "about %d months ago" msgstr "há cerca de %d meses" -#: lib/util.php:855 +#: lib/util.php:902 msgid "about a year ago" msgstr "há cerca de um ano" @@ -5672,18 +5721,7 @@ msgstr "%s não é uma cor válida!" 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." +#: scripts/xmppdaemon.php:301 +#, php-format +msgid "Message too long - maximum is %1$d characters, you sent %2$d." +msgstr "Mensagem demasiado extensa - máx. %1$d caracteres, enviou %2$d." diff --git a/locale/pt_BR/LC_MESSAGES/statusnet.po b/locale/pt_BR/LC_MESSAGES/statusnet.po index 72f9897f2..c608b3ba5 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-05 22:10+0000\n" -"PO-Revision-Date: 2010-01-05 22:12:24+0000\n" +"POT-Creation-Date: 2010-01-11 23:25+0000\n" +"PO-Revision-Date: 2010-01-11 23:28:03+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 (r60693); Translate extension (2010-01-04)\n" +"X-Generator: MediaWiki 1.16alpha (r60950); 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" @@ -40,7 +40,7 @@ msgstr "Esta página não existe." #: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79 #: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75 #: actions/favoritesrss.php:74 actions/foaf.php:40 actions/foaf.php:58 -#: actions/microsummary.php:62 actions/newmessage.php:116 +#: actions/microsummary.php:62 actions/newmessage.php:116 actions/otp.php:76 #: actions/remotesubscribe.php:145 actions/remotesubscribe.php:154 #: actions/replies.php:73 actions/repliesrss.php:38 #: actions/showfavorites.php:105 actions/userbyid.php:74 @@ -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 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 +#, 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" @@ -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,11 +609,11 @@ 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/invite.php:56 actions/login.php:115 actions/makeadmin.php:66 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80 #: actions/othersettings.php:145 actions/passwordsettings.php:138 #: actions/profilesettings.php:194 actions/recoverpassword.php:337 @@ -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" +#: actions/joingroup.php:135 +#, fuzzy, php-format +msgid "%1$s joined group %2$s" msgstr "%s associou-se ao grupo %s" #: actions/leavegroup.php:60 @@ -1856,68 +1827,59 @@ 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" +#: actions/leavegroup.php:134 +#, fuzzy, php-format +msgid "%1$s left group %2$s" msgstr "%s deixou o grupo %s" -#: actions/login.php:83 actions/register.php:137 +#: actions/login.php:80 actions/otp.php:62 actions/register.php:137 msgid "Already logged in." msgstr "Já está autenticado." -#: actions/login.php:114 actions/login.php:124 -msgid "Invalid or expired token." -msgstr "Token inválido ou expirado." - -#: actions/login.php:147 +#: actions/login.php:126 msgid "Incorrect username or password." msgstr "Nome de usuário e/ou senha incorreto(s)." -#: actions/login.php:153 +#: actions/login.php:132 actions/otp.php:120 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:188 actions/login.php:241 lib/action.php:460 #: lib/logingroupnav.php:79 msgid "Login" msgstr "Entrar" -#: actions/login.php:247 +#: actions/login.php:227 msgid "Login to site" msgstr "Autenticar-se no site" -#: actions/login.php:250 actions/profilesettings.php:106 -#: actions/register.php:423 actions/showgroup.php:236 actions/tagother.php:94 +#: actions/login.php:230 actions/profilesettings.php:106 +#: actions/register.php:424 actions/showgroup.php:236 actions/tagother.php:94 #: lib/groupeditform.php:152 lib/userprofile.php:131 msgid "Nickname" msgstr "Usuário" -#: actions/login.php:253 actions/register.php:428 +#: actions/login.php:233 actions/register.php:429 #: lib/accountsettingsaction.php:116 msgid "Password" msgstr "Senha" -#: actions/login.php:256 actions/register.php:477 +#: actions/login.php:236 actions/register.php:478 msgid "Remember me" msgstr "Lembrar neste computador" -#: actions/login.php:257 actions/register.php:479 +#: actions/login.php:237 actions/register.php:480 msgid "Automatically login in the future; not for shared computers!" msgstr "" "Entra automaticamente da próxima vez, sem pedir a senha. Não use em " "computadores compartilhados!" -#: actions/login.php:267 +#: actions/login.php:247 msgid "Lost or forgotten password?" msgstr "Perdeu ou esqueceu sua senha?" -#: actions/login.php:286 +#: actions/login.php:266 msgid "" "For security reasons, please re-enter your user name and password before " "changing your settings." @@ -1925,7 +1887,7 @@ msgstr "" "Por razões de segurança, por favor, digite novamente seu nome de usuário e " "senha antes de alterar suas configurações." -#: actions/login.php:290 +#: actions/login.php:270 #, php-format msgid "" "Login with your username and password. Don't have a username yet? [Register]" @@ -1941,18 +1903,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 @@ -1995,9 +1957,9 @@ msgstr "" msgid "Message sent" msgstr "A mensagem foi enviada" -#: actions/newmessage.php:185 lib/command.php:376 -#, php-format -msgid "Direct message to %s sent" +#: actions/newmessage.php:185 +#, 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 +1988,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 @@ -2091,8 +2053,8 @@ msgstr "tipo de conteúdo " msgid "Only " msgstr "Apenas " -#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1031 -#: lib/api.php:1059 lib/api.php:1169 +#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1033 +#: lib/api.php:1061 lib/api.php:1171 msgid "Not a supported data format." msgstr "Não é um formato de dados suportado." @@ -2136,10 +2098,30 @@ 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/otp.php:69 +#, fuzzy +msgid "No user ID specified." +msgstr "Não foi especificado nenhum grupo." + +#: actions/otp.php:83 +#, fuzzy +msgid "No login token specified." +msgstr "Não foi especificada nenhuma mensagem." + +#: actions/otp.php:90 +#, fuzzy +msgid "No login token requested." +msgstr "Nenhuma ID de perfil na requisição." + +#: actions/otp.php:95 +#, fuzzy +msgid "Invalid login token specified." +msgstr "Token inválido ou expirado." + +#: actions/otp.php:104 +#, fuzzy +msgid "Login token expired." +msgstr "Autenticar-se no site" #: actions/outbox.php:61 #, php-format @@ -2177,7 +2159,7 @@ msgid "6 or more characters" msgstr "No mínimo 6 caracteres" #: actions/passwordsettings.php:112 actions/recoverpassword.php:239 -#: actions/register.php:432 actions/smssettings.php:134 +#: actions/register.php:433 actions/smssettings.php:134 msgid "Confirm" msgstr "Confirmar" @@ -2213,7 +2195,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 +2229,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 +2322,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 +2353,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 +2362,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." @@ -2403,42 +2386,42 @@ msgstr "Informações do perfil" msgid "1-64 lowercase letters or numbers, no punctuation or spaces" msgstr "1-64 letras minúsculas ou números, sem pontuações ou espaços" -#: actions/profilesettings.php:111 actions/register.php:447 +#: actions/profilesettings.php:111 actions/register.php:448 #: actions/showgroup.php:247 actions/tagother.php:104 #: lib/groupeditform.php:157 lib/userprofile.php:149 msgid "Full name" msgstr "Nome completo" -#: actions/profilesettings.php:115 actions/register.php:452 +#: actions/profilesettings.php:115 actions/register.php:453 #: lib/groupeditform.php:161 msgid "Homepage" msgstr "Site" -#: actions/profilesettings.php:117 actions/register.php:454 +#: actions/profilesettings.php:117 actions/register.php:455 msgid "URL of your homepage, blog, or profile on another site" msgstr "URL do seu site, blog ou perfil em outro site" -#: actions/profilesettings.php:122 actions/register.php:460 +#: actions/profilesettings.php:122 actions/register.php:461 #, php-format msgid "Describe yourself and your interests in %d chars" msgstr "Descreva a si mesmo e os seus interesses em %d caracteres" -#: actions/profilesettings.php:125 actions/register.php:463 +#: actions/profilesettings.php:125 actions/register.php:464 msgid "Describe yourself and your interests" msgstr "Descreva a si mesmo e os seus interesses" -#: actions/profilesettings.php:127 actions/register.php:465 +#: actions/profilesettings.php:127 actions/register.php:466 msgid "Bio" msgstr "Descrição" -#: actions/profilesettings.php:132 actions/register.php:470 +#: actions/profilesettings.php:132 actions/register.php:471 #: actions/showgroup.php:256 actions/tagother.php:112 #: actions/userauthorization.php:158 lib/groupeditform.php:177 #: lib/userprofile.php:164 msgid "Location" msgstr "Localização" -#: actions/profilesettings.php:134 actions/register.php:472 +#: actions/profilesettings.php:134 actions/register.php:473 msgid "Where you are, like \"City, State (or Region), Country\"" msgstr "Onde você está, ex: \"cidade, estado (ou região), país\"" @@ -2503,19 +2486,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." @@ -2754,7 +2737,7 @@ msgstr "" "A nova senha foi salva com sucesso. A partir de agora você já está " "autenticado." -#: actions/register.php:85 actions/register.php:189 actions/register.php:404 +#: actions/register.php:85 actions/register.php:189 actions/register.php:405 msgid "Sorry, only invited people can register." msgstr "Desculpe, mas somente convidados podem se registrar." @@ -2766,7 +2749,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:503 lib/action.php:457 #: lib/logingroupnav.php:85 msgid "Register" msgstr "Registrar-se" @@ -2779,19 +2762,15 @@ 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." -#: actions/register.php:243 actions/register.php:264 +#: actions/register.php:243 actions/register.php:265 msgid "Invalid username or password." msgstr "Nome de usuário e/ou senha inválido(s)" -#: actions/register.php:342 +#: actions/register.php:343 msgid "" "With this form you can create a new account. You can then post notices and " "link up to friends and colleagues. " @@ -2799,41 +2778,41 @@ msgstr "" "Através deste formulário você pode criar uma nova conta. A partir daí você " "pode publicar mensagens e se conectar a amigos e colegas. " -#: actions/register.php:424 +#: actions/register.php:425 msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required." msgstr "" "1-64 letras minúsculas ou números, sem pontuação ou espaços. Obrigatório." -#: actions/register.php:429 +#: actions/register.php:430 msgid "6 or more characters. Required." msgstr "No mínimo 6 caracteres. Obrigatório." -#: actions/register.php:433 +#: actions/register.php:434 msgid "Same as password above. Required." msgstr "Igual à senha acima. Obrigatório." -#: actions/register.php:437 actions/register.php:441 +#: actions/register.php:438 actions/register.php:442 #: actions/siteadminpanel.php:270 lib/accountsettingsaction.php:120 msgid "Email" msgstr "E-mail" -#: actions/register.php:438 actions/register.php:442 +#: actions/register.php:439 actions/register.php:443 msgid "Used only for updates, announcements, and password recovery" msgstr "Usado apenas para atualizações, anúncios e recuperações de senha" -#: actions/register.php:449 +#: actions/register.php:450 msgid "Longer name, preferably your \"real\" name" msgstr "Nome completo, de preferência seu nome \"real\"" -#: actions/register.php:493 +#: actions/register.php:494 msgid "My text and files are available under " msgstr "Meus textos e arquivos estão disponíveis sob " -#: actions/register.php:495 +#: actions/register.php:496 msgid "Creative Commons Attribution 3.0" msgstr "Creative Commons Attribution 3.0" -#: actions/register.php:496 +#: actions/register.php:497 msgid "" " except this private data: password, email address, IM address, and phone " "number." @@ -2841,13 +2820,13 @@ msgstr "" " exceto estes dados particulares: senha, endereço de e-mail, endereço de MI " "e número de telefone." -#: actions/register.php:537 -#, php-format +#: actions/register.php:538 +#, 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,7 +2853,7 @@ msgstr "" "\n" "Obrigado por se registrar e esperamos que você aproveite o serviço." -#: actions/register.php:561 +#: actions/register.php:562 msgid "" "(You should receive a message by email momentarily, with instructions on how " "to confirm your email address.)" @@ -2970,11 +2949,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 +2965,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 +2983,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 +3004,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 +3061,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 +3109,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 +3185,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 +3211,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 +3225,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 +3280,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 +3468,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 +3498,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 +3589,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 +3630,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 +3672,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 +3755,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 +3869,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 +3923,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 +3957,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 +3973,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,7 +3989,74 @@ msgstr "" "Experimente [procurar por grupos](%%action.groupsearch%%) e associar-se à " "eles." -#: classes/File.php:137 +#: 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:144 #, php-format msgid "" "No file may be larger than %d bytes and the file you sent was %d bytes. Try " @@ -4053,16 +4065,21 @@ msgstr "" "Nenhum arquivo pode ser maior que %d bytes e o arquivo que você enviou " "possui %d bytes. Experimente enviar uma versão menor." -#: classes/File.php:147 +#: classes/File.php:154 #, php-format msgid "A file this large would exceed your user quota of %d bytes." msgstr "Um arquivo deste tamanho excederá a sua conta de %d bytes." -#: classes/File.php:154 +#: classes/File.php:161 #, php-format msgid "A file this large would exceed your monthly quota of %d bytes." msgstr "Um arquivo deste tamanho excederá a sua conta mensal de %d bytes." +#: classes/Login_token.php:76 +#, 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" + #: classes/Message.php:45 msgid "You are banned from sending direct messages." msgstr "Você está proibido de enviar mensagens diretas." @@ -4116,7 +4133,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" @@ -4163,136 +4180,136 @@ msgid "Other options" msgstr "Outras opções" #: lib/action.php:144 -#, php-format -msgid "%s - %s" -msgstr "%s - %s" +#, fuzzy, php-format +msgid "%1$s - %2$s" +msgstr "%1$s (%2$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 +4318,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 +4334,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 +4366,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" @@ -4407,7 +4429,7 @@ msgstr "Alterar a senha" 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" @@ -4420,7 +4442,7 @@ msgid "Sorry, this command is not yet implemented." msgstr "Desculpe, mas esse comando ainda não foi implementado." #: lib/command.php:88 -#, php-format +#, 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" @@ -4429,7 +4451,7 @@ 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 +#, fuzzy, php-format msgid "Nudge sent to %s" msgstr "Foi enviada a chamada de atenção para %s" @@ -4445,11 +4467,13 @@ msgstr "" "Mensagens: %3$s" #: lib/command.php:152 lib/command.php:399 lib/command.php:460 +#, 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 +#, fuzzy msgid "User has no last notice" msgstr "O usuário não tem uma \"última mensagem\"" @@ -4457,22 +4481,42 @@ msgstr "O usuário não tem uma \"última mensagem\"" 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:217 +#, fuzzy +msgid "You are already a member of that group" +msgstr "Você já é membro desse grupo." + +#: lib/command.php:234 +#, fuzzy, 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." + +#: lib/command.php:239 +#, fuzzy, php-format +msgid "%s joined group %s" +msgstr "%s associou-se ao grupo %s" + +#: lib/command.php:284 +#, fuzzy, 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" + +#: lib/command.php:289 +#, fuzzy, php-format +msgid "%s left group %s" +msgstr "%s deixou o grupo %s" #: lib/command.php:318 -#, php-format +#, fuzzy, php-format msgid "Fullname: %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" @@ -4482,26 +4526,33 @@ msgstr "Site: %s" msgid "About: %s" msgstr "Sobre: %s" -#: lib/command.php:358 scripts/xmppdaemon.php:301 -#, php-format +#: lib/command.php:358 +#, fuzzy, php-format msgid "Message too long - maximum is %d characters, you sent %d" msgstr "" "A mensagem é muito extensa - o máximo são %d caracteres e você enviou %d" +#: lib/command.php:376 +#, fuzzy, php-format +msgid "Direct message to %s sent" +msgstr "A mensagem direta para %s foi enviada" + #: lib/command.php:378 msgid "Error sending direct message." msgstr "Ocorreu um erro durante o envio da mensagem direta." #: lib/command.php:422 +#, fuzzy msgid "Cannot repeat your own notice" -msgstr "Você não pode repetir sua própria mensagem" +msgstr "Você não pode repetria sua própria mensagem." #: lib/command.php:427 +#, fuzzy msgid "Already repeated that notice" -msgstr "Você já repetiu essa mensagem" +msgstr "Você já repetiu essa mensagem." #: lib/command.php:435 -#, php-format +#, fuzzy, php-format msgid "Notice from %s repeated" msgstr "Mensagem de %s repetida" @@ -4510,13 +4561,13 @@ msgid "Error repeating notice." msgstr "Erro na repetição da mensagem." #: lib/command.php:491 -#, php-format +#, fuzzy, php-format msgid "Notice too long - maximum is %d characters, you sent %d" msgstr "" "A mensagem é muito extensa - o máximo são %d caracteres e você enviou %d" #: lib/command.php:500 -#, php-format +#, fuzzy, php-format msgid "Reply to %s sent" msgstr "A resposta a %s foi enviada" @@ -4525,6 +4576,7 @@ msgid "Error saving notice." msgstr "Erro no salvamento da mensagem." #: lib/command.php:556 +#, fuzzy msgid "Specify the name of the user to subscribe to" msgstr "Especifique o nome do usuário que será assinado" @@ -4534,6 +4586,7 @@ msgid "Subscribed to %s" msgstr "Efetuada a assinatura de %s" #: lib/command.php:584 +#, fuzzy msgid "Specify the name of the user to unsubscribe from" msgstr "Especifique o nome do usuário cuja assinatura será cancelada" @@ -4563,52 +4616,48 @@ msgid "Can't turn on notification." msgstr "Não é possível ligar a notificação." #: lib/command.php:650 +#, 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" -msgstr "Não foi possível criar o token de autenticação para %s" - -#: lib/command.php:669 -#, php-format +#: lib/command.php:661 +#, 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" -#: lib/command.php:685 +#: lib/command.php:677 msgid "You are not subscribed to anyone." msgstr "Você não está assinando ninguém." -#: lib/command.php:687 +#: lib/command.php:679 msgid "You are subscribed to this person:" msgid_plural "You are subscribed to these people:" msgstr[0] "Você já está assinando esta pessoa:" msgstr[1] "Você já está assinando estas pessoas:" -#: lib/command.php:707 +#: lib/command.php:699 msgid "No one is subscribed to you." msgstr "Ninguém o assinou ainda." -#: lib/command.php:709 +#: lib/command.php:701 msgid "This person is subscribed to you:" msgid_plural "These people are subscribed to you:" msgstr[0] "Esta pessoa está assinando você:" msgstr[1] "Estas pessoas estão assinando você:" -#: lib/command.php:729 +#: lib/command.php:721 msgid "You are not a member of any groups." msgstr "Você não é membro de nenhum grupo." -#: lib/command.php:731 +#: lib/command.php:723 msgid "You are a member of this group:" msgid_plural "You are a member of these groups:" msgstr[0] "Você é membro deste grupo:" msgstr[1] "Você é membro destes grupos:" -#: lib/command.php:745 +#: lib/command.php:737 msgid "" "Commands:\n" "on - turn on notifications\n" @@ -4802,10 +4851,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\"" @@ -4989,21 +5034,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" @@ -5203,6 +5236,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 "" @@ -5240,7 +5294,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 @@ -5248,7 +5303,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 @@ -5257,8 +5313,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 @@ -5291,9 +5347,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" @@ -5408,6 +5474,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" @@ -5577,10 +5648,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" @@ -5641,47 +5708,47 @@ msgstr "Mensagem" msgid "Moderate" msgstr "Moderar" -#: lib/util.php:837 +#: lib/util.php:884 msgid "a few seconds ago" msgstr "alguns segundos atrás" -#: lib/util.php:839 +#: lib/util.php:886 msgid "about a minute ago" msgstr "cerca de 1 minuto atrás" -#: lib/util.php:841 +#: lib/util.php:888 #, php-format msgid "about %d minutes ago" msgstr "cerca de %d minutos atrás" -#: lib/util.php:843 +#: lib/util.php:890 msgid "about an hour ago" msgstr "cerca de 1 hora atrás" -#: lib/util.php:845 +#: lib/util.php:892 #, php-format msgid "about %d hours ago" msgstr "cerca de %d horas atrás" -#: lib/util.php:847 +#: lib/util.php:894 msgid "about a day ago" msgstr "cerca de 1 dia atrás" -#: lib/util.php:849 +#: lib/util.php:896 #, php-format msgid "about %d days ago" msgstr "cerca de %d dias atrás" -#: lib/util.php:851 +#: lib/util.php:898 msgid "about a month ago" msgstr "cerca de 1 mês atrás" -#: lib/util.php:853 +#: lib/util.php:900 #, php-format msgid "about %d months ago" msgstr "cerca de %d meses atrás" -#: lib/util.php:855 +#: lib/util.php:902 msgid "about a year ago" msgstr "cerca de 1 ano atrás" @@ -5695,18 +5762,8 @@ msgstr "%s não é uma cor válida!" 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." +#: scripts/xmppdaemon.php:301 +#, 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" diff --git a/locale/ru/LC_MESSAGES/statusnet.po b/locale/ru/LC_MESSAGES/statusnet.po index b5301b1ab..574ae66a2 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-05 22:10+0000\n" -"PO-Revision-Date: 2010-01-05 22:12:28+0000\n" +"POT-Creation-Date: 2010-01-11 23:25+0000\n" +"PO-Revision-Date: 2010-01-11 23:28:10+0000\n" "Language-Team: Russian\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha (r60693); Translate extension (2010-01-04)\n" +"X-Generator: MediaWiki 1.16alpha (r60950); 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" @@ -41,7 +41,7 @@ msgstr "Нет такой страницы" #: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79 #: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75 #: actions/favoritesrss.php:74 actions/foaf.php:40 actions/foaf.php:58 -#: actions/microsummary.php:62 actions/newmessage.php:116 +#: actions/microsummary.php:62 actions/newmessage.php:116 actions/otp.php:76 #: actions/remotesubscribe.php:145 actions/remotesubscribe.php:154 #: actions/replies.php:73 actions/repliesrss.php:38 #: actions/showfavorites.php:105 actions/userbyid.php:74 @@ -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 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 #, 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" @@ -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,11 +606,11 @@ 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/invite.php:56 actions/login.php:115 actions/makeadmin.php:66 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80 #: actions/othersettings.php:145 actions/passwordsettings.php:138 #: actions/profilesettings.php:194 actions/recoverpassword.php:337 @@ -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 +#: actions/joingroup.php:135 #, 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,65 +1819,56 @@ 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 +#: actions/leavegroup.php:134 #, 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 +#: actions/login.php:80 actions/otp.php:62 actions/register.php:137 msgid "Already logged in." msgstr "Вы уже авторизовались." -#: actions/login.php:114 actions/login.php:124 -msgid "Invalid or expired token." -msgstr "Неверный или устаревший ключ." - -#: actions/login.php:147 +#: actions/login.php:126 msgid "Incorrect username or password." msgstr "Некорректное имя или пароль." -#: actions/login.php:153 +#: actions/login.php:132 actions/otp.php:120 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:188 actions/login.php:241 lib/action.php:460 #: lib/logingroupnav.php:79 msgid "Login" msgstr "Вход" -#: actions/login.php:247 +#: actions/login.php:227 msgid "Login to site" msgstr "Авторизоваться" -#: actions/login.php:250 actions/profilesettings.php:106 -#: actions/register.php:423 actions/showgroup.php:236 actions/tagother.php:94 +#: actions/login.php:230 actions/profilesettings.php:106 +#: actions/register.php:424 actions/showgroup.php:236 actions/tagother.php:94 #: lib/groupeditform.php:152 lib/userprofile.php:131 msgid "Nickname" msgstr "Имя" -#: actions/login.php:253 actions/register.php:428 +#: actions/login.php:233 actions/register.php:429 #: lib/accountsettingsaction.php:116 msgid "Password" msgstr "Пароль" -#: actions/login.php:256 actions/register.php:477 +#: actions/login.php:236 actions/register.php:478 msgid "Remember me" msgstr "Запомнить меня" -#: actions/login.php:257 actions/register.php:479 +#: actions/login.php:237 actions/register.php:480 msgid "Automatically login in the future; not for shared computers!" msgstr "Автоматическии входить в дальнейшем. Не для общедоступных компьютеров!" -#: actions/login.php:267 +#: actions/login.php:247 msgid "Lost or forgotten password?" msgstr "Потеряли или забыли пароль?" -#: actions/login.php:286 +#: actions/login.php:266 msgid "" "For security reasons, please re-enter your user name and password before " "changing your settings." @@ -1922,7 +1876,7 @@ msgstr "" "По причинам сохранения безопасности введите имя и пароль ещё раз, прежде чем " "изменять Ваши установки." -#: actions/login.php:290 +#: actions/login.php:270 #, php-format msgid "" "Login with your username and password. Don't have a username yet? [Register]" @@ -1938,18 +1892,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" @@ -1989,10 +1943,10 @@ msgstr "Не посылайте сообщения сами себе; прост msgid "Message sent" msgstr "Сообщение отправлено" -#: actions/newmessage.php:185 lib/command.php:376 +#: actions/newmessage.php:185 #, 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 +1975,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 @@ -2084,8 +2038,8 @@ msgstr "тип содержимого " msgid "Only " msgstr "Только " -#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1031 -#: lib/api.php:1059 lib/api.php:1169 +#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1033 +#: lib/api.php:1061 lib/api.php:1171 msgid "Not a supported data format." msgstr "Неподдерживаемый формат данных." @@ -2129,10 +2083,30 @@ 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/otp.php:69 +#, fuzzy +msgid "No user ID specified." +msgstr "Группа не определена." + +#: actions/otp.php:83 +#, fuzzy +msgid "No login token specified." +msgstr "Не указана запись." + +#: actions/otp.php:90 +#, fuzzy +msgid "No login token requested." +msgstr "Нет ID профиля в запросе." + +#: actions/otp.php:95 +#, fuzzy +msgid "Invalid login token specified." +msgstr "Неверный или устаревший ключ." + +#: actions/otp.php:104 +#, fuzzy +msgid "Login token expired." +msgstr "Авторизоваться" #: actions/outbox.php:61 #, php-format @@ -2170,7 +2144,7 @@ msgid "6 or more characters" msgstr "6 или больше знаков" #: actions/passwordsettings.php:112 actions/recoverpassword.php:239 -#: actions/register.php:432 actions/smssettings.php:134 +#: actions/register.php:433 actions/smssettings.php:134 msgid "Confirm" msgstr "Подтверждение" @@ -2206,7 +2180,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 +2213,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 +2306,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 +2337,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 +2346,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" @@ -2394,48 +2368,48 @@ msgstr "Информация профиля" msgid "1-64 lowercase letters or numbers, no punctuation or spaces" msgstr "1-64 латинских строчных буквы или цифры, без пробелов" -#: actions/profilesettings.php:111 actions/register.php:447 +#: actions/profilesettings.php:111 actions/register.php:448 #: actions/showgroup.php:247 actions/tagother.php:104 #: lib/groupeditform.php:157 lib/userprofile.php:149 msgid "Full name" msgstr "Полное имя" -#: actions/profilesettings.php:115 actions/register.php:452 +#: actions/profilesettings.php:115 actions/register.php:453 #: lib/groupeditform.php:161 msgid "Homepage" msgstr "Главная" -#: actions/profilesettings.php:117 actions/register.php:454 +#: actions/profilesettings.php:117 actions/register.php:455 msgid "URL of your homepage, blog, or profile on another site" msgstr "Адрес твоей страницы, дневника или профиля на другом портале" -#: actions/profilesettings.php:122 actions/register.php:460 +#: actions/profilesettings.php:122 actions/register.php:461 #, php-format msgid "Describe yourself and your interests in %d chars" msgstr "Опишите себя и свои увлечения при помощи %d символов" -#: actions/profilesettings.php:125 actions/register.php:463 +#: actions/profilesettings.php:125 actions/register.php:464 msgid "Describe yourself and your interests" msgstr "Опишите себя и свои интересы" -#: actions/profilesettings.php:127 actions/register.php:465 +#: actions/profilesettings.php:127 actions/register.php:466 msgid "Bio" msgstr "Биография" -#: actions/profilesettings.php:132 actions/register.php:470 +#: actions/profilesettings.php:132 actions/register.php:471 #: actions/showgroup.php:256 actions/tagother.php:112 #: actions/userauthorization.php:158 lib/groupeditform.php:177 #: lib/userprofile.php:164 msgid "Location" msgstr "Месторасположение" -#: actions/profilesettings.php:134 actions/register.php:472 +#: actions/profilesettings.php:134 actions/register.php:473 msgid "Where you are, like \"City, State (or Region), Country\"" 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 +2467,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 "Настройки сохранены." @@ -2739,7 +2712,7 @@ msgstr "Ошибка в установках пользователя." msgid "New password successfully saved. You are now logged in." msgstr "Новый пароль успешно сохранён. Вы авторизовались." -#: actions/register.php:85 actions/register.php:189 actions/register.php:404 +#: actions/register.php:85 actions/register.php:189 actions/register.php:405 msgid "Sorry, only invited people can register." msgstr "Простите, регистрация только по приглашению." @@ -2751,7 +2724,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:503 lib/action.php:457 #: lib/logingroupnav.php:85 msgid "Register" msgstr "Регистрация" @@ -2766,19 +2739,15 @@ msgstr "" "Вы не можете зарегистрироваться, если Вы не подтверждаете лицензионного " "соглашения." -#: actions/register.php:201 -msgid "Not a valid email address." -msgstr "Неверный электронный адрес." - #: actions/register.php:212 msgid "Email address already exists." msgstr "Такой электронный адрес уже задействован." -#: actions/register.php:243 actions/register.php:264 +#: actions/register.php:243 actions/register.php:265 msgid "Invalid username or password." msgstr "Неверное имя или пароль." -#: actions/register.php:342 +#: actions/register.php:343 msgid "" "With this form you can create a new account. You can then post notices and " "link up to friends and colleagues. " @@ -2788,41 +2757,41 @@ msgstr "" "[OpenID](http://openid.net/) аккаунт? Тогда используй [OpenID регистрацию](%%" "action.openidlogin%%)!)" -#: actions/register.php:424 +#: actions/register.php:425 msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required." msgstr "" "1-64 латинских строчных букв или цифр, без пробелов. Обязательное поле." -#: actions/register.php:429 +#: actions/register.php:430 msgid "6 or more characters. Required." msgstr "6 или более символов. Обязательное поле." -#: actions/register.php:433 +#: actions/register.php:434 msgid "Same as password above. Required." msgstr "Тот же пароль что и сверху. Обязательное поле." -#: actions/register.php:437 actions/register.php:441 +#: actions/register.php:438 actions/register.php:442 #: actions/siteadminpanel.php:270 lib/accountsettingsaction.php:120 msgid "Email" msgstr "Email" -#: actions/register.php:438 actions/register.php:442 +#: actions/register.php:439 actions/register.php:443 msgid "Used only for updates, announcements, and password recovery" msgstr "Нужна только для обновлений, осведомлений и восстановления пароля." -#: actions/register.php:449 +#: actions/register.php:450 msgid "Longer name, preferably your \"real\" name" msgstr "Полное имя, предпочтительно Ваше настоящее имя" -#: actions/register.php:493 +#: actions/register.php:494 msgid "My text and files are available under " msgstr "Мои тексты и файлы находятся под лицензией" -#: actions/register.php:495 +#: actions/register.php:496 msgid "Creative Commons Attribution 3.0" msgstr "Creative Commons Attribution 3.0" -#: actions/register.php:496 +#: actions/register.php:497 msgid "" " except this private data: password, email address, IM address, and phone " "number." @@ -2830,13 +2799,13 @@ msgstr "" ", за исключением моей личной информации: пароля, почты, мессенджера и номера " "телефона." -#: actions/register.php:537 +#: actions/register.php:538 #, 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 +2817,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,12 +2828,12 @@ msgstr "" "* Обновить ваши [настройки профиля](%%%%action.profilesettings%%%%), чтобы " "больше рассказать другим о себе.\n" "* Прочитать [документацию](%%%%doc.help%%%%), чтобы узнать о возможностях, о " -"которые вы можете не знать.\n" +"которых вы можете не знать.\n" "\n" "Спасибо за то, что присоединились к нам, надеемся, что вы получите " "удовольствие от использования данного сервиса!" -#: actions/register.php:561 +#: actions/register.php:562 msgid "" "(You should receive a message by email momentarily, with instructions on how " "to confirm your email address.)" @@ -2957,11 +2926,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 +2944,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 +2961,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 +2982,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 +3038,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 +3086,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 +3162,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 +3189,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 +3203,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 +3259,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 +3448,7 @@ msgid "Save site settings" msgstr "Сохранить настройки сайта" #: actions/smssettings.php:58 -msgid "SMS Settings" +msgid "SMS settings" msgstr "Установки СМС" #: actions/smssettings.php:69 @@ -3529,7 +3479,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 +3571,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 +3612,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 +3653,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 +3737,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 +3850,7 @@ msgstr "" "подписаться на записи этого пользователя. Если Вы этого не хотите делать, " "нажмите «Отказ»." -#: actions/userauthorization.php:188 +#: actions/userauthorization.php:188 actions/version.php:165 msgid "License" msgstr "Лицензия" @@ -3961,8 +3903,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 +3936,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 +3952,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,7 +3967,82 @@ msgid "Try [searching for groups](%%action.groupsearch%%) and joining them." msgstr "" "Попробуйте [найти группы](%%action.groupsearch%%) и присоединиться к ним." -#: classes/File.php:137 +#: 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:144 #, php-format msgid "" "No file may be larger than %d bytes and the file you sent was %d bytes. Try " @@ -4043,16 +4051,21 @@ msgstr "" "Файл не может быть больше %d байт, тогда как отправленный вами файл содержал " "%d байт. Попробуйте загрузить меньшую версию." -#: classes/File.php:147 +#: classes/File.php:154 #, php-format msgid "A file this large would exceed your user quota of %d bytes." msgstr "Файл такого размера превысит вашу пользовательскую квоту в %d байта." -#: classes/File.php:154 +#: classes/File.php:161 #, php-format msgid "A file this large would exceed your monthly quota of %d bytes." msgstr "Файл такого размера превысит вашу месячную квоту в %d байта." +#: classes/Login_token.php:76 +#, fuzzy, php-format +msgid "Could not create login token for %s" +msgstr "Не удаётся создать токен входа для %s." + #: classes/Message.php:45 msgid "You are banned from sending direct messages." msgstr "Вы заблокированы от отправки прямых сообщений." @@ -4106,7 +4119,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" @@ -4153,136 +4166,136 @@ msgid "Other options" msgstr "Другие опции" #: lib/action.php:144 -#, php-format -msgid "%s - %s" -msgstr "%s (%s)" +#, fuzzy, php-format +msgid "%1$s - %2$s" +msgstr "%1$s (%2$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 +4304,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 +4321,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 +4353,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 "Конфигурация путей" @@ -4385,20 +4402,18 @@ msgid "Tags for this attachment" msgstr "Теги для этого вложения" #: lib/authenticationplugin.php:182 lib/authenticationplugin.php:187 -#, fuzzy msgid "Password changing failed" -msgstr "Пароль сохранён." +msgstr "Изменение пароля не удалось" #: lib/authenticationplugin.php:197 -#, fuzzy msgid "Password changing is not allowed" -msgstr "Пароль сохранён." +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 "Команда завершена" @@ -4411,18 +4426,18 @@ msgid "Sorry, this command is not yet implemented." msgstr "Простите, эта команда ещё не выполнена." #: lib/command.php:88 -#, php-format +#, fuzzy, php-format msgid "Could not find a user with nickname %s" -msgstr "Не удаётся найти пользователя с именем %s" +msgstr "Не удаётся найти пользователя с именем %s." #: lib/command.php:92 msgid "It does not make a lot of sense to nudge yourself!" msgstr "Нет смысла «подталкивать» самого себя!" #: lib/command.php:99 -#, php-format +#, fuzzy, php-format msgid "Nudge sent to %s" -msgstr "«Подталкивание» послано %s" +msgstr "«Подталкивание» послано %s." #: lib/command.php:126 #, php-format @@ -4436,34 +4451,56 @@ msgstr "" "Записей: %3$s" #: lib/command.php:152 lib/command.php:399 lib/command.php:460 +#, fuzzy msgid "Notice with that id does not exist" -msgstr "Записи с таким id не существует" +msgstr "Записи с таким id не существует." #: lib/command.php:168 lib/command.php:415 lib/command.php:476 #: lib/command.php:532 +#, fuzzy msgid "User has no last notice" -msgstr "У пользователя нет записей" +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:217 +#, fuzzy +msgid "You are already a member of that group" +msgstr "Вы уже являетесь членом этой группы." + +#: lib/command.php:234 +#, fuzzy, php-format +msgid "Could not join user %s to group %s" +msgstr "Не удаётся присоединить пользователя %1$s к группе %2$s." + +#: lib/command.php:239 +#, fuzzy, php-format +msgid "%s joined group %s" +msgstr "%1$s вступил в группу %2$s" + +#: lib/command.php:284 +#, fuzzy, php-format +msgid "Could not remove user %s to group %s" +msgstr "Не удаётся удалить пользователя %1$s из группы %2$s." + +#: lib/command.php:289 +#, fuzzy, php-format +msgid "%s left group %s" +msgstr "%1$s покинул группу %2$s" #: lib/command.php:318 -#, php-format +#, fuzzy, php-format msgid "Fullname: %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" @@ -4473,49 +4510,58 @@ msgstr "Домашняя страница: %s" msgid "About: %s" msgstr "О пользователе: %s" -#: lib/command.php:358 scripts/xmppdaemon.php:301 -#, php-format +#: lib/command.php:358 +#, fuzzy, php-format msgid "Message too long - maximum is %d characters, you sent %d" -msgstr "Сообщение слишком длинное — не больше %d символов, вы посылаете %d" +msgstr "" +"Сообщение слишком длинное — не больше %1$d символов, вы отправили %2$d." + +#: lib/command.php:376 +#, fuzzy, php-format +msgid "Direct message to %s sent" +msgstr "Прямое сообщение для %s послано." #: 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 "Эта запись уже повторена" +msgstr "Запись уже повторена." #: lib/command.php:435 -#, php-format +#, fuzzy, php-format msgid "Notice from %s repeated" -msgstr "Запись %s повторена" +msgstr "Запись %s повторена." #: lib/command.php:437 msgid "Error repeating notice." msgstr "Ошибка при повторении записи." #: lib/command.php:491 -#, php-format +#, fuzzy, php-format msgid "Notice too long - maximum is %d characters, you sent %d" -msgstr "Запись слишком длинная — не больше %d символов, вы посылаете %d" +msgstr "Запись слишком длинная — не больше %1$d символов, вы отправили %2$d." #: lib/command.php:500 -#, php-format +#, fuzzy, php-format msgid "Reply to %s sent" -msgstr "Ответ %s отправлен" +msgstr "Ответ %s отправлен." #: lib/command.php:502 msgid "Error saving notice." msgstr "Проблемы с сохранением записи." #: lib/command.php:556 +#, fuzzy msgid "Specify the name of the user to subscribe to" -msgstr "Определите имя пользователя при подписке на" +msgstr "Укажите имя пользователя для подписки." #: lib/command.php:563 #, php-format @@ -4523,8 +4569,9 @@ msgid "Subscribed to %s" msgstr "Подписано на %s" #: lib/command.php:584 +#, fuzzy msgid "Specify the name of the user to unsubscribe from" -msgstr "Определите имя пользователя для отписки от" +msgstr "Укажите имя пользователя для отмены подписки." #: lib/command.php:591 #, php-format @@ -4552,53 +4599,49 @@ msgid "Can't turn on notification." msgstr "Есть оповещение." #: lib/command.php:650 +#, fuzzy msgid "Login command is disabled" -msgstr "Команда входа отключена" +msgstr "Команда входа отключена." -#: lib/command.php:664 -#, php-format -msgid "Could not create login token for %s" -msgstr "Не удаётся создать токен входа для %s" - -#: lib/command.php:669 -#, php-format +#: lib/command.php:661 +#, fuzzy, php-format msgid "This link is useable only once, and is good for only 2 minutes: %s" -msgstr "Эта ссылка действительна только один раз в течение 2 минут: %s" +msgstr "Эта ссылка действительна только один раз в течение 2 минут: %s." -#: lib/command.php:685 +#: lib/command.php:677 msgid "You are not subscribed to anyone." msgstr "Вы ни на кого не подписаны." -#: lib/command.php:687 +#: lib/command.php:679 msgid "You are subscribed to this person:" msgid_plural "You are subscribed to these people:" msgstr[0] "Вы подписаны на этих людей:" msgstr[1] "Вы подписаны на этих людей:" msgstr[2] "Вы подписаны на этих людей:" -#: lib/command.php:707 +#: lib/command.php:699 msgid "No one is subscribed to you." msgstr "Никто не подписан на вас." -#: lib/command.php:709 +#: lib/command.php:701 msgid "This person is subscribed to you:" msgid_plural "These people are subscribed to you:" msgstr[0] "Эти люди подписались на вас:" msgstr[1] "Эти люди подписались на вас:" msgstr[2] "Эти люди подписались на вас:" -#: lib/command.php:729 +#: lib/command.php:721 msgid "You are not a member of any groups." msgstr "Вы не состоите ни в одной группе." -#: lib/command.php:731 +#: lib/command.php:723 msgid "You are a member of this group:" msgid_plural "You are a member of these groups:" msgstr[0] "Вы являетесь участником следующих групп:" msgstr[1] "Вы являетесь участником следующих групп:" msgstr[2] "Вы являетесь участником следующих групп:" -#: lib/command.php:745 +#: lib/command.php:737 msgid "" "Commands:\n" "on - turn on notifications\n" @@ -4792,10 +4835,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\"" @@ -4979,24 +5018,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 @@ -5193,6 +5218,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 "" @@ -5227,16 +5273,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 @@ -5245,7 +5291,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 @@ -5278,8 +5324,18 @@ msgid "Attach a file" msgstr "Прикрепить файл" #: lib/noticeform.php:212 -msgid "Share your location" -msgstr "" +#, 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 @@ -5395,6 +5451,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 "Подписки" @@ -5564,10 +5624,6 @@ msgstr "Облако собственных тегов людей" msgid "People Tagcloud as tagged" msgstr "Облако тегов людей" -#: lib/subscriptionlist.php:126 -msgid "(none)" -msgstr "(пока ничего нет)" - #: lib/tagcloudsection.php:56 msgid "None" msgstr "Нет тегов" @@ -5628,47 +5684,47 @@ msgstr "Сообщение" msgid "Moderate" msgstr "Модерировать" -#: lib/util.php:837 +#: lib/util.php:884 msgid "a few seconds ago" msgstr "пару секунд назад" -#: lib/util.php:839 +#: lib/util.php:886 msgid "about a minute ago" msgstr "около минуты назад" -#: lib/util.php:841 +#: lib/util.php:888 #, php-format msgid "about %d minutes ago" msgstr "около %d минут(ы) назад" -#: lib/util.php:843 +#: lib/util.php:890 msgid "about an hour ago" msgstr "около часа назад" -#: lib/util.php:845 +#: lib/util.php:892 #, php-format msgid "about %d hours ago" msgstr "около %d часа(ов) назад" -#: lib/util.php:847 +#: lib/util.php:894 msgid "about a day ago" msgstr "около дня назад" -#: lib/util.php:849 +#: lib/util.php:896 #, php-format msgid "about %d days ago" msgstr "около %d дня(ей) назад" -#: lib/util.php:851 +#: lib/util.php:898 msgid "about a month ago" msgstr "около месяца назад" -#: lib/util.php:853 +#: lib/util.php:900 #, php-format msgid "about %d months ago" msgstr "около %d месяца(ев) назад" -#: lib/util.php:855 +#: lib/util.php:902 msgid "about a year ago" msgstr "около года назад" @@ -5684,18 +5740,8 @@ 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 "Простите, входящих писем нет." +#: scripts/xmppdaemon.php:301 +#, php-format +msgid "Message too long - maximum is %1$d characters, you sent %2$d." +msgstr "" +"Сообщение слишком длинное — не больше %1$d символов, вы отправили %2$d." diff --git a/locale/statusnet.po b/locale/statusnet.po index 44a0d92fc..87d8b0b50 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-05 22:10+0000\n" +"POT-Creation-Date: 2010-01-11 23:25+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" @@ -36,7 +36,7 @@ msgstr "" #: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79 #: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75 #: actions/favoritesrss.php:74 actions/foaf.php:40 actions/foaf.php:58 -#: actions/microsummary.php:62 actions/newmessage.php:116 +#: actions/microsummary.php:62 actions/newmessage.php:116 actions/otp.php:76 #: actions/remotesubscribe.php:145 actions/remotesubscribe.php:154 #: actions/replies.php:73 actions/repliesrss.php:38 #: actions/showfavorites.php:105 actions/userbyid.php:74 @@ -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 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 #, 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" @@ -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,11 +584,11 @@ 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/invite.php:56 actions/login.php:115 actions/makeadmin.php:66 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80 #: actions/othersettings.php:145 actions/passwordsettings.php:138 #: actions/profilesettings.php:194 actions/recoverpassword.php:337 @@ -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 +#: actions/joingroup.php:135 #, 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,71 +1705,62 @@ msgstr "" msgid "Could not find membership record." msgstr "" -#: actions/leavegroup.php:127 lib/command.php:284 +#: actions/leavegroup.php:134 #, php-format -msgid "Could not remove user %s to group %s" +msgid "%1$s left group %2$s" msgstr "" -#: actions/leavegroup.php:134 lib/command.php:289 -#, php-format -msgid "%s left group %s" -msgstr "" - -#: actions/login.php:83 actions/register.php:137 +#: actions/login.php:80 actions/otp.php:62 actions/register.php:137 msgid "Already logged in." msgstr "" -#: actions/login.php:114 actions/login.php:124 -msgid "Invalid or expired token." -msgstr "" - -#: actions/login.php:147 +#: actions/login.php:126 msgid "Incorrect username or password." msgstr "" -#: actions/login.php:153 +#: actions/login.php:132 actions/otp.php:120 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:188 actions/login.php:241 lib/action.php:460 #: lib/logingroupnav.php:79 msgid "Login" msgstr "" -#: actions/login.php:247 +#: actions/login.php:227 msgid "Login to site" msgstr "" -#: actions/login.php:250 actions/profilesettings.php:106 -#: actions/register.php:423 actions/showgroup.php:236 actions/tagother.php:94 +#: actions/login.php:230 actions/profilesettings.php:106 +#: actions/register.php:424 actions/showgroup.php:236 actions/tagother.php:94 #: lib/groupeditform.php:152 lib/userprofile.php:131 msgid "Nickname" msgstr "" -#: actions/login.php:253 actions/register.php:428 +#: actions/login.php:233 actions/register.php:429 #: lib/accountsettingsaction.php:116 msgid "Password" msgstr "" -#: actions/login.php:256 actions/register.php:477 +#: actions/login.php:236 actions/register.php:478 msgid "Remember me" msgstr "" -#: actions/login.php:257 actions/register.php:479 +#: actions/login.php:237 actions/register.php:480 msgid "Automatically login in the future; not for shared computers!" msgstr "" -#: actions/login.php:267 +#: actions/login.php:247 msgid "Lost or forgotten password?" msgstr "" -#: actions/login.php:286 +#: actions/login.php:266 msgid "" "For security reasons, please re-enter your user name and password before " "changing your settings." msgstr "" -#: actions/login.php:290 +#: actions/login.php:270 #, php-format msgid "" "Login with your username and password. Don't have a username yet? [Register]" @@ -1819,17 +1773,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 @@ -1870,9 +1824,9 @@ msgstr "" msgid "Message sent" msgstr "" -#: actions/newmessage.php:185 lib/command.php:376 +#: actions/newmessage.php:185 #, 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 +1854,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 @@ -1957,8 +1911,8 @@ msgstr "" msgid "Only " msgstr "" -#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1031 -#: lib/api.php:1059 lib/api.php:1169 +#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1033 +#: lib/api.php:1061 lib/api.php:1171 msgid "Not a supported data format." msgstr "" @@ -2002,9 +1956,24 @@ msgstr "" msgid "URL shortening service is too long (max 50 chars)." msgstr "" -#: actions/outbox.php:58 -#, php-format -msgid "Outbox for %s - page %d" +#: actions/otp.php:69 +msgid "No user ID specified." +msgstr "" + +#: actions/otp.php:83 +msgid "No login token specified." +msgstr "" + +#: actions/otp.php:90 +msgid "No login token requested." +msgstr "" + +#: actions/otp.php:95 +msgid "Invalid login token specified." +msgstr "" + +#: actions/otp.php:104 +msgid "Login token expired." msgstr "" #: actions/outbox.php:61 @@ -2041,7 +2010,7 @@ msgid "6 or more characters" msgstr "" #: actions/passwordsettings.php:112 actions/recoverpassword.php:239 -#: actions/register.php:432 actions/smssettings.php:134 +#: actions/register.php:433 actions/smssettings.php:134 msgid "Confirm" msgstr "" @@ -2077,7 +2046,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 +2079,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 +2172,7 @@ msgid "When to use SSL" msgstr "" #: actions/pathsadminpanel.php:308 -msgid "SSL Server" +msgid "SSL server" msgstr "" #: actions/pathsadminpanel.php:309 @@ -2232,7 +2201,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 +2210,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 @@ -2261,42 +2230,42 @@ msgstr "" msgid "1-64 lowercase letters or numbers, no punctuation or spaces" msgstr "" -#: actions/profilesettings.php:111 actions/register.php:447 +#: actions/profilesettings.php:111 actions/register.php:448 #: actions/showgroup.php:247 actions/tagother.php:104 #: lib/groupeditform.php:157 lib/userprofile.php:149 msgid "Full name" msgstr "" -#: actions/profilesettings.php:115 actions/register.php:452 +#: actions/profilesettings.php:115 actions/register.php:453 #: lib/groupeditform.php:161 msgid "Homepage" msgstr "" -#: actions/profilesettings.php:117 actions/register.php:454 +#: actions/profilesettings.php:117 actions/register.php:455 msgid "URL of your homepage, blog, or profile on another site" msgstr "" -#: actions/profilesettings.php:122 actions/register.php:460 +#: actions/profilesettings.php:122 actions/register.php:461 #, php-format msgid "Describe yourself and your interests in %d chars" msgstr "" -#: actions/profilesettings.php:125 actions/register.php:463 +#: actions/profilesettings.php:125 actions/register.php:464 msgid "Describe yourself and your interests" msgstr "" -#: actions/profilesettings.php:127 actions/register.php:465 +#: actions/profilesettings.php:127 actions/register.php:466 msgid "Bio" msgstr "" -#: actions/profilesettings.php:132 actions/register.php:470 +#: actions/profilesettings.php:132 actions/register.php:471 #: actions/showgroup.php:256 actions/tagother.php:112 #: actions/userauthorization.php:158 lib/groupeditform.php:177 #: lib/userprofile.php:164 msgid "Location" msgstr "" -#: actions/profilesettings.php:134 actions/register.php:472 +#: actions/profilesettings.php:134 actions/register.php:473 msgid "Where you are, like \"City, State (or Region), Country\"" msgstr "" @@ -2358,19 +2327,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 "" @@ -2587,7 +2556,7 @@ msgstr "" msgid "New password successfully saved. You are now logged in." msgstr "" -#: actions/register.php:85 actions/register.php:189 actions/register.php:404 +#: actions/register.php:85 actions/register.php:189 actions/register.php:405 msgid "Sorry, only invited people can register." msgstr "" @@ -2599,7 +2568,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:503 lib/action.php:457 #: lib/logingroupnav.php:85 msgid "Register" msgstr "" @@ -2612,70 +2581,66 @@ 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 "" -#: actions/register.php:243 actions/register.php:264 +#: actions/register.php:243 actions/register.php:265 msgid "Invalid username or password." msgstr "" -#: actions/register.php:342 +#: actions/register.php:343 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 +#: actions/register.php:425 msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required." msgstr "" -#: actions/register.php:429 +#: actions/register.php:430 msgid "6 or more characters. Required." msgstr "" -#: actions/register.php:433 +#: actions/register.php:434 msgid "Same as password above. Required." msgstr "" -#: actions/register.php:437 actions/register.php:441 +#: actions/register.php:438 actions/register.php:442 #: actions/siteadminpanel.php:270 lib/accountsettingsaction.php:120 msgid "Email" msgstr "" -#: actions/register.php:438 actions/register.php:442 +#: actions/register.php:439 actions/register.php:443 msgid "Used only for updates, announcements, and password recovery" msgstr "" -#: actions/register.php:449 +#: actions/register.php:450 msgid "Longer name, preferably your \"real\" name" msgstr "" -#: actions/register.php:493 +#: actions/register.php:494 msgid "My text and files are available under " msgstr "" -#: actions/register.php:495 +#: actions/register.php:496 msgid "Creative Commons Attribution 3.0" msgstr "" -#: actions/register.php:496 +#: actions/register.php:497 msgid "" " except this private data: password, email address, IM address, and phone " "number." msgstr "" -#: actions/register.php:537 +#: actions/register.php:538 #, 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 " @@ -2688,7 +2653,7 @@ msgid "" "Thanks for signing up and we hope you enjoy using this service." msgstr "" -#: actions/register.php:561 +#: actions/register.php:562 msgid "" "(You should receive a message by email momentarily, with instructions on how " "to confirm your email address.)" @@ -2777,11 +2742,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 +2760,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 +2774,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 +2791,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 +2840,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 +2888,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 +2954,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 +2981,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 +2993,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 +3036,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 +3221,7 @@ msgid "Save site settings" msgstr "" #: actions/smssettings.php:58 -msgid "SMS Settings" +msgid "SMS settings" msgstr "" #: actions/smssettings.php:69 @@ -3305,7 +3250,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 +3335,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 +3372,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 +3407,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 +3486,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 +3594,7 @@ msgid "" "click “Reject”." msgstr "" -#: actions/userauthorization.php:188 +#: actions/userauthorization.php:188 actions/version.php:165 msgid "License" msgstr "" @@ -3706,7 +3643,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 +3676,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 +3690,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,23 +3704,91 @@ msgstr "" msgid "Try [searching for groups](%%action.groupsearch%%) and joining them." msgstr "" -#: classes/File.php:137 +#: 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:144 #, 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 "" -#: classes/File.php:147 +#: classes/File.php:154 #, php-format msgid "A file this large would exceed your user quota of %d bytes." msgstr "" -#: classes/File.php:154 +#: classes/File.php:161 #, php-format msgid "A file this large would exceed your monthly quota of %d bytes." msgstr "" +#: classes/Login_token.php:76 +#, php-format +msgid "Could not create login token for %s" +msgstr "" + #: classes/Message.php:45 msgid "You are banned from sending direct messages." msgstr "" @@ -3842,7 +3838,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 "" @@ -3890,147 +3886,147 @@ msgstr "" #: lib/action.php:144 #, php-format -msgid "%s - %s" +msgid "%1$s - %2$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 +4034,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 +4066,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 "" @@ -4126,7 +4126,7 @@ msgstr "" msgid "Command results" msgstr "" -#: lib/channel.php:210 +#: lib/channel.php:210 lib/mailhandler.php:142 msgid "Command complete" msgstr "" @@ -4173,9 +4173,28 @@ msgstr "" msgid "Notice marked as fave." msgstr "" -#: lib/command.php:315 +#: lib/command.php:217 +msgid "You are already a member of that group" +msgstr "" + +#: lib/command.php:234 #, php-format -msgid "%1$s (%2$s)" +msgid "Could not join user %s to group %s" +msgstr "" + +#: lib/command.php:239 +#, php-format +msgid "%s joined group %s" +msgstr "" + +#: lib/command.php:284 +#, php-format +msgid "Could not remove user %s to group %s" +msgstr "" + +#: lib/command.php:289 +#, php-format +msgid "%s left group %s" msgstr "" #: lib/command.php:318 @@ -4183,12 +4202,12 @@ msgstr "" msgid "Fullname: %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 "" @@ -4198,11 +4217,16 @@ msgstr "" msgid "About: %s" msgstr "" -#: lib/command.php:358 scripts/xmppdaemon.php:301 +#: lib/command.php:358 #, php-format msgid "Message too long - maximum is %d characters, you sent %d" msgstr "" +#: lib/command.php:376 +#, php-format +msgid "Direct message to %s sent" +msgstr "" + #: lib/command.php:378 msgid "Error sending direct message." msgstr "" @@ -4280,47 +4304,42 @@ msgstr "" msgid "Login command is disabled" msgstr "" -#: lib/command.php:664 -#, php-format -msgid "Could not create login token for %s" -msgstr "" - -#: lib/command.php:669 +#: lib/command.php:661 #, php-format msgid "This link is useable only once, and is good for only 2 minutes: %s" msgstr "" -#: lib/command.php:685 +#: lib/command.php:677 msgid "You are not subscribed to anyone." msgstr "" -#: lib/command.php:687 +#: lib/command.php:679 msgid "You are subscribed to this person:" msgid_plural "You are subscribed to these people:" msgstr[0] "" msgstr[1] "" -#: lib/command.php:707 +#: lib/command.php:699 msgid "No one is subscribed to you." msgstr "" -#: lib/command.php:709 +#: lib/command.php:701 msgid "This person is subscribed to you:" msgid_plural "These people are subscribed to you:" msgstr[0] "" msgstr[1] "" -#: lib/command.php:729 +#: lib/command.php:721 msgid "You are not a member of any groups." msgstr "" -#: lib/command.php:731 +#: lib/command.php:723 msgid "You are a member of this group:" msgid_plural "You are a member of these groups:" msgstr[0] "" msgstr[1] "" -#: lib/command.php:745 +#: lib/command.php:737 msgid "" "Commands:\n" "on - turn on notifications\n" @@ -4475,10 +4494,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\"" @@ -4637,21 +4652,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 @@ -4786,6 +4789,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 "" @@ -4817,7 +4841,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 @@ -4825,7 +4849,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 @@ -4835,7 +4859,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 @@ -4868,7 +4892,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 @@ -4985,6 +5017,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 "" @@ -5154,10 +5190,6 @@ msgstr "" msgid "People Tagcloud as tagged" msgstr "" -#: lib/subscriptionlist.php:126 -msgid "(none)" -msgstr "" - #: lib/tagcloudsection.php:56 msgid "None" msgstr "" @@ -5218,47 +5250,47 @@ msgstr "" msgid "Moderate" msgstr "" -#: lib/util.php:837 +#: lib/util.php:884 msgid "a few seconds ago" msgstr "" -#: lib/util.php:839 +#: lib/util.php:886 msgid "about a minute ago" msgstr "" -#: lib/util.php:841 +#: lib/util.php:888 #, php-format msgid "about %d minutes ago" msgstr "" -#: lib/util.php:843 +#: lib/util.php:890 msgid "about an hour ago" msgstr "" -#: lib/util.php:845 +#: lib/util.php:892 #, php-format msgid "about %d hours ago" msgstr "" -#: lib/util.php:847 +#: lib/util.php:894 msgid "about a day ago" msgstr "" -#: lib/util.php:849 +#: lib/util.php:896 #, php-format msgid "about %d days ago" msgstr "" -#: lib/util.php:851 +#: lib/util.php:898 msgid "about a month ago" msgstr "" -#: lib/util.php:853 +#: lib/util.php:900 #, php-format msgid "about %d months ago" msgstr "" -#: lib/util.php:855 +#: lib/util.php:902 msgid "about a year ago" msgstr "" @@ -5272,18 +5304,7 @@ msgstr "" 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." +#: scripts/xmppdaemon.php:301 +#, php-format +msgid "Message too long - maximum is %1$d characters, you sent %2$d." msgstr "" diff --git a/locale/sv/LC_MESSAGES/statusnet.po b/locale/sv/LC_MESSAGES/statusnet.po index 9d1e7b9c6..3d395afce 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-05 22:10+0000\n" -"PO-Revision-Date: 2010-01-05 22:12:32+0000\n" +"POT-Creation-Date: 2010-01-11 23:25+0000\n" +"PO-Revision-Date: 2010-01-11 23:28:14+0000\n" "Language-Team: Swedish\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha (r60693); Translate extension (2010-01-04)\n" +"X-Generator: MediaWiki 1.16alpha (r60950); 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" @@ -39,7 +39,7 @@ msgstr "Ingen sådan sida" #: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79 #: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75 #: actions/favoritesrss.php:74 actions/foaf.php:40 actions/foaf.php:58 -#: actions/microsummary.php:62 actions/newmessage.php:116 +#: actions/microsummary.php:62 actions/newmessage.php:116 actions/otp.php:76 #: actions/remotesubscribe.php:145 actions/remotesubscribe.php:154 #: actions/replies.php:73 actions/repliesrss.php:38 #: actions/showfavorites.php:105 actions/userbyid.php:74 @@ -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 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 +#, 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" @@ -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,11 +601,11 @@ 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/invite.php:56 actions/login.php:115 actions/makeadmin.php:66 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80 #: actions/othersettings.php:145 actions/passwordsettings.php:138 #: actions/profilesettings.php:194 actions/recoverpassword.php:337 @@ -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" +#: actions/joingroup.php:135 +#, fuzzy, php-format +msgid "%1$s joined group %2$s" msgstr "%s gick med i grupp %s" #: actions/leavegroup.php:60 @@ -1811,65 +1785,56 @@ 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" +#: actions/leavegroup.php:134 +#, fuzzy, php-format +msgid "%1$s left group %2$s" msgstr "%s lämnade grupp %s" -#: actions/login.php:83 actions/register.php:137 +#: actions/login.php:80 actions/otp.php:62 actions/register.php:137 msgid "Already logged in." msgstr "Redan inloggad." -#: actions/login.php:114 actions/login.php:124 -msgid "Invalid or expired token." -msgstr "Ogiltig eller utgången token." - -#: actions/login.php:147 +#: actions/login.php:126 msgid "Incorrect username or password." msgstr "Felaktigt användarnamn eller lösenord." -#: actions/login.php:153 +#: actions/login.php:132 actions/otp.php:120 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:188 actions/login.php:241 lib/action.php:460 #: lib/logingroupnav.php:79 msgid "Login" msgstr "Logga in" -#: actions/login.php:247 +#: actions/login.php:227 msgid "Login to site" msgstr "Logga in på webbplatsen" -#: actions/login.php:250 actions/profilesettings.php:106 -#: actions/register.php:423 actions/showgroup.php:236 actions/tagother.php:94 +#: actions/login.php:230 actions/profilesettings.php:106 +#: actions/register.php:424 actions/showgroup.php:236 actions/tagother.php:94 #: lib/groupeditform.php:152 lib/userprofile.php:131 msgid "Nickname" msgstr "Smeknamn" -#: actions/login.php:253 actions/register.php:428 +#: actions/login.php:233 actions/register.php:429 #: lib/accountsettingsaction.php:116 msgid "Password" msgstr "Lösenord" -#: actions/login.php:256 actions/register.php:477 +#: actions/login.php:236 actions/register.php:478 msgid "Remember me" msgstr "Kom ihåg mig" -#: actions/login.php:257 actions/register.php:479 +#: actions/login.php:237 actions/register.php:480 msgid "Automatically login in the future; not for shared computers!" msgstr "Logga in automatiskt i framtiden; inte för delade datorer!" -#: actions/login.php:267 +#: actions/login.php:247 msgid "Lost or forgotten password?" msgstr "Tappat bort eller glömt ditt lösenord?" -#: actions/login.php:286 +#: actions/login.php:266 msgid "" "For security reasons, please re-enter your user name and password before " "changing your settings." @@ -1877,7 +1842,7 @@ msgstr "" "Av säkerhetsskäl, var vänlig och skriv in ditt användarnamn och lösenord " "igen innan du ändrar dina inställningar." -#: actions/login.php:290 +#: actions/login.php:270 #, php-format msgid "" "Login with your username and password. Don't have a username yet? [Register]" @@ -1891,18 +1856,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 @@ -1945,9 +1910,9 @@ msgstr "" msgid "Message sent" msgstr "Meddelande skickat" -#: actions/newmessage.php:185 lib/command.php:376 -#, php-format -msgid "Direct message to %s sent" +#: actions/newmessage.php:185 +#, 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 +1941,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 @@ -2040,8 +2005,8 @@ msgstr "innehållstyp " msgid "Only " msgstr "Bara " -#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1031 -#: lib/api.php:1059 lib/api.php:1169 +#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1033 +#: lib/api.php:1061 lib/api.php:1171 msgid "Not a supported data format." msgstr "Ett dataformat som inte stödjs" @@ -2085,10 +2050,30 @@ 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/otp.php:69 +#, fuzzy +msgid "No user ID specified." +msgstr "Ingen grupp angiven." + +#: actions/otp.php:83 +#, fuzzy +msgid "No login token specified." +msgstr "Ingen notis angiven." + +#: actions/otp.php:90 +#, fuzzy +msgid "No login token requested." +msgstr "Ingen profil-ID i begäran." + +#: actions/otp.php:95 +#, fuzzy +msgid "Invalid login token specified." +msgstr "Ogiltig eller utgången token." + +#: actions/otp.php:104 +#, fuzzy +msgid "Login token expired." +msgstr "Logga in på webbplatsen" #: actions/outbox.php:61 #, php-format @@ -2124,7 +2109,7 @@ msgid "6 or more characters" msgstr "Minst 6 tecken" #: actions/passwordsettings.php:112 actions/recoverpassword.php:239 -#: actions/register.php:432 actions/smssettings.php:134 +#: actions/register.php:433 actions/smssettings.php:134 msgid "Confirm" msgstr "Bekräfta" @@ -2160,7 +2145,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 +2178,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 +2271,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 +2302,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 +2311,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 @@ -2348,48 +2334,48 @@ msgstr "Profilinformation" msgid "1-64 lowercase letters or numbers, no punctuation or spaces" msgstr "1-64 små bokstäver eller nummer, inga punkter eller mellanslag" -#: actions/profilesettings.php:111 actions/register.php:447 +#: actions/profilesettings.php:111 actions/register.php:448 #: actions/showgroup.php:247 actions/tagother.php:104 #: lib/groupeditform.php:157 lib/userprofile.php:149 msgid "Full name" msgstr "Fullständigt namn" -#: actions/profilesettings.php:115 actions/register.php:452 +#: actions/profilesettings.php:115 actions/register.php:453 #: lib/groupeditform.php:161 msgid "Homepage" msgstr "Hemsida" -#: actions/profilesettings.php:117 actions/register.php:454 +#: actions/profilesettings.php:117 actions/register.php:455 msgid "URL of your homepage, blog, or profile on another site" msgstr "URL till din hemsida, blogg eller profil på en annan webbplats." -#: actions/profilesettings.php:122 actions/register.php:460 +#: actions/profilesettings.php:122 actions/register.php:461 #, php-format msgid "Describe yourself and your interests in %d chars" msgstr "Beskriv dig själv och dina intressen med högst 140 tecken" -#: actions/profilesettings.php:125 actions/register.php:463 +#: actions/profilesettings.php:125 actions/register.php:464 msgid "Describe yourself and your interests" msgstr "Beskriv dig själv och dina intressen" -#: actions/profilesettings.php:127 actions/register.php:465 +#: actions/profilesettings.php:127 actions/register.php:466 msgid "Bio" msgstr "Biografi" -#: actions/profilesettings.php:132 actions/register.php:470 +#: actions/profilesettings.php:132 actions/register.php:471 #: actions/showgroup.php:256 actions/tagother.php:112 #: actions/userauthorization.php:158 lib/groupeditform.php:177 #: lib/userprofile.php:164 msgid "Location" msgstr "Plats" -#: actions/profilesettings.php:134 actions/register.php:472 +#: actions/profilesettings.php:134 actions/register.php:473 msgid "Where you are, like \"City, State (or Region), Country\"" 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 +2434,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." @@ -2696,7 +2681,7 @@ msgstr "Fel uppstog i användarens inställning" msgid "New password successfully saved. You are now logged in." msgstr "Nya lösenordet sparat. Du är nu inloggad." -#: actions/register.php:85 actions/register.php:189 actions/register.php:404 +#: actions/register.php:85 actions/register.php:189 actions/register.php:405 msgid "Sorry, only invited people can register." msgstr "Ledsen, bara inbjudna personer kan registrera sig." @@ -2708,7 +2693,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:503 lib/action.php:457 #: lib/logingroupnav.php:85 msgid "Register" msgstr "Registrera" @@ -2721,19 +2706,15 @@ 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." -#: actions/register.php:243 actions/register.php:264 +#: actions/register.php:243 actions/register.php:265 msgid "Invalid username or password." msgstr "Ogiltigt användarnamn eller lösenord." -#: actions/register.php:342 +#: actions/register.php:343 msgid "" "With this form you can create a new account. You can then post notices and " "link up to friends and colleagues. " @@ -2741,44 +2722,44 @@ msgstr "" "Med detta formulär kan du skapa ett nytt konto. Du kan sedan posta notiser " "och ansluta till vänner och kollegor. " -#: actions/register.php:424 +#: actions/register.php:425 msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required." msgstr "" "1-64 små bokstäver eller nummer, inga punkter eller mellanslag. Måste fyllas " "i." -#: actions/register.php:429 +#: actions/register.php:430 msgid "6 or more characters. Required." msgstr "Minst 6 tecken. Måste fyllas i." -#: actions/register.php:433 +#: actions/register.php:434 msgid "Same as password above. Required." msgstr "Samma som lösenordet ovan. Måste fyllas i." -#: actions/register.php:437 actions/register.php:441 +#: actions/register.php:438 actions/register.php:442 #: actions/siteadminpanel.php:270 lib/accountsettingsaction.php:120 msgid "Email" msgstr "E-post" -#: actions/register.php:438 actions/register.php:442 +#: actions/register.php:439 actions/register.php:443 msgid "Used only for updates, announcements, and password recovery" msgstr "" "Används endast för uppdateringar, tillkännagivanden och återskapande av " "lösenord" -#: actions/register.php:449 +#: actions/register.php:450 msgid "Longer name, preferably your \"real\" name" msgstr "Längre namn, förslagsvis ditt \"verkliga\" namn" -#: actions/register.php:493 +#: actions/register.php:494 msgid "My text and files are available under " msgstr "Min text och mina filer är tillgängliga under " -#: actions/register.php:495 +#: actions/register.php:496 msgid "Creative Commons Attribution 3.0" msgstr "Creative Commons Erkännande 3.0" -#: actions/register.php:496 +#: actions/register.php:497 msgid "" " except this private data: password, email address, IM address, and phone " "number." @@ -2786,13 +2767,13 @@ msgstr "" "med undantag av den här privata datan: lösenord, e-postadress, IM-adress, " "telefonnummer." -#: actions/register.php:537 +#: actions/register.php:538 #, 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 " @@ -2805,7 +2786,7 @@ msgid "" "Thanks for signing up and we hope you enjoy using this service." msgstr "" -#: actions/register.php:561 +#: actions/register.php:562 msgid "" "(You should receive a message by email momentarily, with instructions on how " "to confirm your email address.)" @@ -2902,11 +2883,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 +2899,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 +2917,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 +2931,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 +2987,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 +3035,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 +3110,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 +3136,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 +3149,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 +3203,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 +3336,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 +3392,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 +3422,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 +3514,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 +3555,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 +3591,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 +3664,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 +3675,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 +3790,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 +3844,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 +3878,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 +3891,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,7 +3908,74 @@ msgid "Try [searching for groups](%%action.groupsearch%%) and joining them." msgstr "" "Prova att [söka efter grupper](%%action.groupsearch%%) och gå med i dem." -#: classes/File.php:137 +#: 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:144 #, php-format msgid "" "No file may be larger than %d bytes and the file you sent was %d bytes. Try " @@ -3973,16 +3984,21 @@ msgstr "" "Inga filer får vara större än %d byte och filen du skickade var %d byte. " "Prova att ladda upp en mindre version." -#: classes/File.php:147 +#: classes/File.php:154 #, php-format msgid "A file this large would exceed your user quota of %d bytes." msgstr "En så här stor fil skulle överskrida din användarkvot på %d byte." -#: classes/File.php:154 +#: classes/File.php:161 #, php-format msgid "A file this large would exceed your monthly quota of %d bytes." msgstr "En sådan här stor fil skulle överskrida din månatliga kvot på %d byte." +#: classes/Login_token.php:76 +#, fuzzy, php-format +msgid "Could not create login token for %s" +msgstr "Kunde inte skapa inloggnings-token för %s" + #: classes/Message.php:45 msgid "You are banned from sending direct messages." msgstr "Du är utestängd från att skicka direktmeddelanden." @@ -4036,7 +4052,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" @@ -4083,136 +4099,136 @@ msgid "Other options" msgstr "Övriga alternativ" #: lib/action.php:144 -#, php-format -msgid "%s - %s" -msgstr "%s - %s" +#, fuzzy, php-format +msgid "%1$s - %2$s" +msgstr "%1$s (%2$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 +4237,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 +4253,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 +4285,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" @@ -4314,20 +4335,18 @@ msgid "Tags for this attachment" msgstr "Taggar för denna billaga" #: lib/authenticationplugin.php:182 lib/authenticationplugin.php:187 -#, fuzzy msgid "Password changing failed" -msgstr "Byte av lösenord" +msgstr "Byte av lösenord misslyckades" #: lib/authenticationplugin.php:197 -#, fuzzy msgid "Password changing is not allowed" -msgstr "Byte av lösenord" +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" @@ -4340,7 +4359,7 @@ msgid "Sorry, this command is not yet implemented." msgstr "Ledsen, detta kommando är inte implementerat än." #: lib/command.php:88 -#, php-format +#, fuzzy, php-format msgid "Could not find a user with nickname %s" msgstr "Kunde inte hitta en användare med smeknamnet %s" @@ -4349,7 +4368,7 @@ 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 +#, fuzzy, php-format msgid "Nudge sent to %s" msgstr "Knuff skickad till %s" @@ -4365,11 +4384,13 @@ msgstr "" "Notiser: %3$s" #: lib/command.php:152 lib/command.php:399 lib/command.php:460 +#, 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 +#, fuzzy msgid "User has no last notice" msgstr "Användare har ingen sista notis" @@ -4377,22 +4398,42 @@ msgstr "Användare har ingen sista notis" 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:217 +#, fuzzy +msgid "You are already a member of that group" +msgstr "Du är redan en medlem i denna grupp." + +#: lib/command.php:234 +#, fuzzy, php-format +msgid "Could not join user %s to group %s" +msgstr "Kunde inte ansluta användare % till grupp %s." + +#: lib/command.php:239 +#, fuzzy, php-format +msgid "%s joined group %s" +msgstr "%s gick med i grupp %s" + +#: lib/command.php:284 +#, fuzzy, php-format +msgid "Could not remove user %s to group %s" +msgstr "Kunde inte ta bort användare %s från grupp %s" + +#: lib/command.php:289 +#, fuzzy, php-format +msgid "%s left group %s" +msgstr "%s lämnade grupp %s" #: lib/command.php:318 -#, php-format +#, fuzzy, php-format msgid "Fullname: %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" @@ -4402,25 +4443,32 @@ msgstr "Hemsida: %s" msgid "About: %s" msgstr "Om: %s" -#: lib/command.php:358 scripts/xmppdaemon.php:301 -#, php-format +#: lib/command.php:358 +#, fuzzy, php-format msgid "Message too long - maximum is %d characters, you sent %d" msgstr "Meddelande för långt - maximum är %d tecken, du skickade %d" +#: lib/command.php:376 +#, fuzzy, php-format +msgid "Direct message to %s sent" +msgstr "Direktmeddelande till %s skickat" + #: lib/command.php:378 msgid "Error sending direct message." msgstr "Fel vid sändning av direktmeddelande." #: lib/command.php:422 +#, fuzzy msgid "Cannot repeat your own notice" -msgstr "Kan inte upprepa din egen notis" +msgstr "Kan inte upprepa din egen notis." #: lib/command.php:427 +#, fuzzy msgid "Already repeated that notice" -msgstr "Redan upprepat denna notis" +msgstr "Redan upprepat denna notis." #: lib/command.php:435 -#, php-format +#, fuzzy, php-format msgid "Notice from %s repeated" msgstr "Notis fron %s upprepad" @@ -4429,12 +4477,12 @@ msgid "Error repeating notice." msgstr "Fel vid upprepning av notis." #: lib/command.php:491 -#, php-format +#, fuzzy, php-format msgid "Notice too long - maximum is %d characters, you sent %d" msgstr "Notis för långt - maximum är %d tecken, du skickade %d" #: lib/command.php:500 -#, php-format +#, fuzzy, php-format msgid "Reply to %s sent" msgstr "Svar på %s skickat" @@ -4443,6 +4491,7 @@ msgid "Error saving notice." msgstr "Fel vid sparande av notis." #: lib/command.php:556 +#, fuzzy msgid "Specify the name of the user to subscribe to" msgstr "Ange namnet på användaren att prenumerara på" @@ -4452,6 +4501,7 @@ msgid "Subscribed to %s" msgstr "Prenumerar på %s" #: lib/command.php:584 +#, fuzzy msgid "Specify the name of the user to unsubscribe from" msgstr "Ange namnet på användaren att avsluta prenumeration på" @@ -4481,51 +4531,47 @@ msgid "Can't turn on notification." msgstr "Kan inte stänga av notifikation." #: lib/command.php:650 +#, fuzzy msgid "Login command is disabled" msgstr "Inloggningskommando är inaktiverat" -#: lib/command.php:664 -#, 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 +#: lib/command.php:661 +#, 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" -#: lib/command.php:685 +#: lib/command.php:677 msgid "You are not subscribed to anyone." msgstr "Du prenumererar inte på någon." -#: lib/command.php:687 +#: lib/command.php:679 msgid "You are subscribed to this person:" msgid_plural "You are subscribed to these people:" msgstr[0] "Du prenumererar på denna person:" msgstr[1] "Du prenumererar på dessa personer:" -#: lib/command.php:707 +#: lib/command.php:699 msgid "No one is subscribed to you." msgstr "Ingen prenumerar på dig." -#: lib/command.php:709 +#: lib/command.php:701 msgid "This person is subscribed to you:" msgid_plural "These people are subscribed to you:" msgstr[0] "Denna person prenumererar på dig:" msgstr[1] "Dessa personer prenumererar på dig:" -#: lib/command.php:729 +#: lib/command.php:721 msgid "You are not a member of any groups." msgstr "Du är inte medlem i några grupper." -#: lib/command.php:731 +#: lib/command.php:723 msgid "You are a member of this group:" msgid_plural "You are a member of these groups:" msgstr[0] "Du är en medlem i denna grupp:" msgstr[1] "Du är en medlem i dessa grupper:" -#: lib/command.php:745 +#: lib/command.php:737 msgid "" "Commands:\n" "on - turn on notifications\n" @@ -4682,10 +4728,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\"" @@ -4844,21 +4886,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" @@ -5006,6 +5036,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 "" @@ -5041,7 +5092,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 @@ -5049,7 +5101,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 @@ -5058,8 +5111,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 @@ -5092,7 +5145,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 @@ -5209,6 +5272,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" @@ -5266,23 +5334,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" @@ -5381,10 +5446,6 @@ msgstr "" msgid "People Tagcloud as tagged" msgstr "" -#: lib/subscriptionlist.php:126 -msgid "(none)" -msgstr "(ingen)" - #: lib/tagcloudsection.php:56 msgid "None" msgstr "Ingen" @@ -5394,14 +5455,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" @@ -5447,47 +5506,47 @@ msgstr "Meddelande" msgid "Moderate" msgstr "Moderera" -#: lib/util.php:837 +#: lib/util.php:884 msgid "a few seconds ago" msgstr "ett par sekunder sedan" -#: lib/util.php:839 +#: lib/util.php:886 msgid "about a minute ago" msgstr "för nån minut sedan" -#: lib/util.php:841 +#: lib/util.php:888 #, php-format msgid "about %d minutes ago" msgstr "för %d minuter sedan" -#: lib/util.php:843 +#: lib/util.php:890 msgid "about an hour ago" msgstr "för en timma sedan" -#: lib/util.php:845 +#: lib/util.php:892 #, php-format msgid "about %d hours ago" msgstr "för %d timmar sedan" -#: lib/util.php:847 +#: lib/util.php:894 msgid "about a day ago" msgstr "för en dag sedan" -#: lib/util.php:849 +#: lib/util.php:896 #, php-format msgid "about %d days ago" msgstr "för %d dagar sedan" -#: lib/util.php:851 +#: lib/util.php:898 msgid "about a month ago" msgstr "för en månad sedan" -#: lib/util.php:853 +#: lib/util.php:900 #, php-format msgid "about %d months ago" msgstr "för %d månader sedan" -#: lib/util.php:855 +#: lib/util.php:902 msgid "about a year ago" msgstr "för ett år sedan" @@ -5501,18 +5560,7 @@ msgstr "%s är inte en giltig färg!" 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." +#: scripts/xmppdaemon.php:301 +#, 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" diff --git a/locale/te/LC_MESSAGES/statusnet.po b/locale/te/LC_MESSAGES/statusnet.po index 028e60c47..a9e89cc5a 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-05 22:10+0000\n" -"PO-Revision-Date: 2010-01-05 22:12:35+0000\n" +"POT-Creation-Date: 2010-01-11 23:25+0000\n" +"PO-Revision-Date: 2010-01-11 23:28:19+0000\n" "Language-Team: Telugu\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha (r60693); Translate extension (2010-01-04)\n" +"X-Generator: MediaWiki 1.16alpha (r60950); 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" @@ -38,7 +38,7 @@ msgstr "అటువంటి పేజీ లేదు" #: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79 #: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75 #: actions/favoritesrss.php:74 actions/foaf.php:40 actions/foaf.php:58 -#: actions/microsummary.php:62 actions/newmessage.php:116 +#: actions/microsummary.php:62 actions/newmessage.php:116 actions/otp.php:76 #: actions/remotesubscribe.php:145 actions/remotesubscribe.php:154 #: actions/replies.php:73 actions/repliesrss.php:38 #: actions/showfavorites.php:105 actions/userbyid.php:74 @@ -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 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 #, 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" @@ -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,11 +598,11 @@ 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/invite.php:56 actions/login.php:115 actions/makeadmin.php:66 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80 #: actions/othersettings.php:145 actions/passwordsettings.php:138 #: actions/profilesettings.php:194 actions/recoverpassword.php:337 @@ -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" +#: actions/joingroup.php:135 +#, fuzzy, php-format +msgid "%1$s joined group %2$s" msgstr "%s %s గుంపులో చేరారు" #: actions/leavegroup.php:60 @@ -1763,73 +1735,63 @@ 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" +#: actions/leavegroup.php:134 +#, fuzzy, php-format +msgid "%1$s left group %2$s" msgstr "%2$s గుంపు నుండి %1$s వైదొలిగారు" -#: actions/login.php:83 actions/register.php:137 +#: actions/login.php:80 actions/otp.php:62 actions/register.php:137 msgid "Already logged in." msgstr "ఇప్పటికే లోనికి ప్రవేశించారు." -#: actions/login.php:114 actions/login.php:124 -#, fuzzy -msgid "Invalid or expired token." -msgstr "సందేశపు విషయం సరైనది కాదు" - -#: actions/login.php:147 +#: actions/login.php:126 msgid "Incorrect username or password." msgstr "వాడుకరిపేరు లేదా సంకేతపదం తప్పు." -#: actions/login.php:153 +#: actions/login.php:132 actions/otp.php:120 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:188 actions/login.php:241 lib/action.php:460 #: lib/logingroupnav.php:79 msgid "Login" msgstr "ప్రవేశించండి" -#: actions/login.php:247 +#: actions/login.php:227 msgid "Login to site" msgstr "సైటు లోనికి ప్రవేశించు" -#: actions/login.php:250 actions/profilesettings.php:106 -#: actions/register.php:423 actions/showgroup.php:236 actions/tagother.php:94 +#: actions/login.php:230 actions/profilesettings.php:106 +#: actions/register.php:424 actions/showgroup.php:236 actions/tagother.php:94 #: lib/groupeditform.php:152 lib/userprofile.php:131 msgid "Nickname" msgstr "పేరు" -#: actions/login.php:253 actions/register.php:428 +#: actions/login.php:233 actions/register.php:429 #: lib/accountsettingsaction.php:116 msgid "Password" msgstr "సంకేతపదం" -#: actions/login.php:256 actions/register.php:477 +#: actions/login.php:236 actions/register.php:478 msgid "Remember me" msgstr "నన్ను గుర్తుంచుకో" -#: actions/login.php:257 actions/register.php:479 +#: actions/login.php:237 actions/register.php:480 msgid "Automatically login in the future; not for shared computers!" msgstr "భవిష్యత్తులో ఆటోమెటిగ్గా లోనికి ప్రవేశించు; బయటి కంప్యూర్ల కొరకు కాదు!" -#: actions/login.php:267 +#: actions/login.php:247 msgid "Lost or forgotten password?" msgstr "మీ సంకేతపదం మర్చిపోయారా?" -#: actions/login.php:286 +#: actions/login.php:266 msgid "" "For security reasons, please re-enter your user name and password before " "changing your settings." msgstr "" "భద్రతా కారణాల దృష్ట్యా, అమరికలు మార్చే ముందు మీ వాడుకరి పేరుని మరియు సంకేతపదాన్ని మరోసారి ఇవ్వండి." -#: actions/login.php:290 +#: actions/login.php:270 #, php-format msgid "" "Login with your username and password. Don't have a username yet? [Register]" @@ -1843,19 +1805,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" @@ -1895,9 +1857,9 @@ msgstr "మీకు మీరే సందేశాన్ని పంపుక msgid "Message sent" msgstr "సందేశాన్ని పంపించాం" -#: actions/newmessage.php:185 lib/command.php:376 -#, php-format -msgid "Direct message to %s sent" +#: actions/newmessage.php:185 +#, 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 +1889,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 @@ -1985,8 +1947,8 @@ msgstr "విషయ రకం " msgid "Only " msgstr "మాత్రమే " -#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1031 -#: lib/api.php:1059 lib/api.php:1169 +#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1033 +#: lib/api.php:1061 lib/api.php:1171 msgid "Not a supported data format." msgstr "" @@ -2031,11 +1993,30 @@ 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" +#: actions/otp.php:69 +#, fuzzy +msgid "No user ID specified." +msgstr "కొత్త సందేశం" + +#: actions/otp.php:83 +#, fuzzy +msgid "No login token specified." +msgstr "కొత్త సందేశం" + +#: actions/otp.php:90 +msgid "No login token requested." msgstr "" +#: actions/otp.php:95 +#, fuzzy +msgid "Invalid login token specified." +msgstr "సందేశపు విషయం సరైనది కాదు" + +#: actions/otp.php:104 +#, fuzzy +msgid "Login token expired." +msgstr "సైటు లోనికి ప్రవేశించు" + #: actions/outbox.php:61 #, php-format msgid "Outbox for %s" @@ -2070,7 +2051,7 @@ msgid "6 or more characters" msgstr "6 లేదా అంతకంటే ఎక్కువ అక్షరాలు" #: actions/passwordsettings.php:112 actions/recoverpassword.php:239 -#: actions/register.php:432 actions/smssettings.php:134 +#: actions/register.php:433 actions/smssettings.php:134 msgid "Confirm" msgstr "నిర్థారించు" @@ -2106,7 +2087,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 +2120,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 +2155,7 @@ msgstr "" #: actions/pathsadminpanel.php:245 msgid "Theme directory" -msgstr "" +msgstr "అలంకార సంచయం" #: actions/pathsadminpanel.php:252 msgid "Avatars" @@ -2238,8 +2219,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" @@ -2269,9 +2251,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" @@ -2279,7 +2261,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 @@ -2301,42 +2283,42 @@ msgstr "ప్రొఫైలు సమాచారం" msgid "1-64 lowercase letters or numbers, no punctuation or spaces" msgstr "1-64 చిన్నబడి అక్షరాలు లేదా అంకెలు, విరామచిహ్నాలు మరియు ఖాళీలు తప్ప" -#: actions/profilesettings.php:111 actions/register.php:447 +#: actions/profilesettings.php:111 actions/register.php:448 #: actions/showgroup.php:247 actions/tagother.php:104 #: lib/groupeditform.php:157 lib/userprofile.php:149 msgid "Full name" msgstr "పూర్తి పేరు" -#: actions/profilesettings.php:115 actions/register.php:452 +#: actions/profilesettings.php:115 actions/register.php:453 #: lib/groupeditform.php:161 msgid "Homepage" msgstr "హోమ్ పేజీ" -#: actions/profilesettings.php:117 actions/register.php:454 +#: actions/profilesettings.php:117 actions/register.php:455 msgid "URL of your homepage, blog, or profile on another site" msgstr "మీ హోమ్ పేజీ, బ్లాగు, లేదా వేరే సేటులోని మీ ప్రొఫైలు యొక్క చిరునామా" -#: actions/profilesettings.php:122 actions/register.php:460 +#: actions/profilesettings.php:122 actions/register.php:461 #, php-format msgid "Describe yourself and your interests in %d chars" msgstr "మీ గురించి మరియు మీ ఆసక్తుల గురించి %d అక్షరాల్లో చెప్పండి" -#: actions/profilesettings.php:125 actions/register.php:463 +#: actions/profilesettings.php:125 actions/register.php:464 msgid "Describe yourself and your interests" msgstr "మీ గురించి మరియు మీ ఆసక్తుల గురించి చెప్పండి" -#: actions/profilesettings.php:127 actions/register.php:465 +#: actions/profilesettings.php:127 actions/register.php:466 msgid "Bio" msgstr "స్వపరిచయం" -#: actions/profilesettings.php:132 actions/register.php:470 +#: actions/profilesettings.php:132 actions/register.php:471 #: actions/showgroup.php:256 actions/tagother.php:112 #: actions/userauthorization.php:158 lib/groupeditform.php:177 #: lib/userprofile.php:164 msgid "Location" msgstr "ప్రాంతం" -#: actions/profilesettings.php:134 actions/register.php:472 +#: actions/profilesettings.php:134 actions/register.php:473 msgid "Where you are, like \"City, State (or Region), Country\"" msgstr "మీరు ఎక్కడ నుండి, \"నగరం, రాష్ట్రం (లేదా ప్రాంతం), దేశం\"" @@ -2398,20 +2380,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 "అమరికలు భద్రమయ్యాయి." @@ -2633,7 +2615,7 @@ msgstr "" msgid "New password successfully saved. You are now logged in." msgstr "మీ కొత్త సంకేతపదం భద్రమైంది. మీరు ఇప్పుడు లోనికి ప్రవేశించారు." -#: actions/register.php:85 actions/register.php:189 actions/register.php:404 +#: actions/register.php:85 actions/register.php:189 actions/register.php:405 msgid "Sorry, only invited people can register." msgstr "క్షమించండి, ఆహ్వానితులు మాత్రమే నమోదుకాగలరు." @@ -2645,7 +2627,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:503 lib/action.php:457 #: lib/logingroupnav.php:85 msgid "Register" msgstr "నమోదు" @@ -2658,70 +2640,66 @@ 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 "ఈమెయిల్ చిరునామా ఇప్పటికే ఉంది." -#: actions/register.php:243 actions/register.php:264 +#: actions/register.php:243 actions/register.php:265 msgid "Invalid username or password." msgstr "వాడుకరిపేరు లేదా సంకేతపదం తప్పు." -#: actions/register.php:342 +#: actions/register.php:343 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 +#: actions/register.php:425 msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required." msgstr "1-64 చిన్నబడి అక్షరాలు లేదా అంకెలు, విరామ చిహ్నాలు లేదా ఖాళీలు లేకుండా. తప్పనిసరి." -#: actions/register.php:429 +#: actions/register.php:430 msgid "6 or more characters. Required." msgstr "6 లేదా అంతకంటే ఎక్కువ అక్షరాలు. తప్పనిసరి." -#: actions/register.php:433 +#: actions/register.php:434 msgid "Same as password above. Required." msgstr "పై సంకేతపదం మరోసారి. తప్పనిసరి." -#: actions/register.php:437 actions/register.php:441 +#: actions/register.php:438 actions/register.php:442 #: actions/siteadminpanel.php:270 lib/accountsettingsaction.php:120 msgid "Email" msgstr "ఈమెయిల్" -#: actions/register.php:438 actions/register.php:442 +#: actions/register.php:439 actions/register.php:443 msgid "Used only for updates, announcements, and password recovery" msgstr "తాజా విశేషాలు, ప్రకటనలు, మరియు సంకేతపదం పోయినప్పుడు మాత్రమే ఉపయోగిస్తాం." -#: actions/register.php:449 +#: actions/register.php:450 msgid "Longer name, preferably your \"real\" name" msgstr "పొడుగాటి పేరు, మీ \"అసలు\" పేరైతే మంచిది" -#: actions/register.php:493 +#: actions/register.php:494 msgid "My text and files are available under " msgstr "నా పాఠ్యం మరియు ఫైళ్ళు లభ్యమయ్యే లైసెన్సు " -#: actions/register.php:495 +#: actions/register.php:496 msgid "Creative Commons Attribution 3.0" msgstr "క్రియేటివ్ కామన్స్ అట్రిబ్యూషన్ 3.0" -#: actions/register.php:496 +#: actions/register.php:497 msgid "" " except this private data: password, email address, IM address, and phone " "number." msgstr " ఈ అంతరంగిక భోగట్టా తప్ప: సంకేతపదం, ఈమెయిల్ చిరునామా, IM చిరునామా, మరియు ఫోన్ నంబర్." -#: actions/register.php:537 +#: actions/register.php:538 #, 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 " @@ -2734,7 +2712,7 @@ msgid "" "Thanks for signing up and we hope you enjoy using this service." msgstr "" -#: actions/register.php:561 +#: actions/register.php:562 msgid "" "(You should receive a message by email momentarily, with instructions on how " "to confirm your email address.)" @@ -2829,11 +2807,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)" @@ -2850,11 +2823,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 @@ -2866,8 +2839,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 @@ -2885,11 +2858,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 "" @@ -2939,11 +2907,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 "గుంపు ప్రొఫైలు" @@ -2992,7 +2955,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 "(ఏమీలేదు)" @@ -3058,14 +3021,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 @@ -3089,9 +3047,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 "" @@ -3102,8 +3060,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 @@ -3146,12 +3104,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 @@ -3184,7 +3143,7 @@ msgstr "సైటు పేరు" #: actions/siteadminpanel.php:257 msgid "The name of your site, like \"Yourcompany Microblog\"" -msgstr "" +msgstr "మీ సైటు యొక్క పేరు, ఇలా \"మీకంపెనీ మైక్రోబ్లాగు\"" #: actions/siteadminpanel.php:261 msgid "Brought by" @@ -3257,7 +3216,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" @@ -3337,7 +3296,8 @@ msgid "Save site settings" msgstr "సైటు అమరికలను భద్రపరచు" #: actions/smssettings.php:58 -msgid "SMS Settings" +#, fuzzy +msgid "SMS settings" msgstr "SMS అమరికలు" #: actions/smssettings.php:69 @@ -3367,7 +3327,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 @@ -3454,8 +3414,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 @@ -3491,8 +3451,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 @@ -3527,11 +3487,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)" @@ -3614,10 +3569,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" @@ -3625,10 +3576,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 "వాడుకరి" @@ -3729,7 +3681,7 @@ msgid "" "click “Reject”." msgstr "" -#: actions/userauthorization.php:188 +#: actions/userauthorization.php:188 actions/version.php:165 msgid "License" msgstr "లైసెన్సు" @@ -3778,7 +3730,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 @@ -3811,11 +3763,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 "ఫ్రొఫైలు రూపురేఖలు" @@ -3830,11 +3777,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 "మరిన్ని గుంపులకై వెతుకు" @@ -3849,23 +3791,95 @@ msgstr "%s ఏ గుంపు లోనూ సభ్యులు కాదు." msgid "Try [searching for groups](%%action.groupsearch%%) and joining them." msgstr "[గుంపులని వెతికి](%%action.groupsearch%%) వాటిలో చేరడానికి ప్రయత్నించండి." -#: classes/File.php:137 +#: 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:144 #, 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 "" -#: classes/File.php:147 +#: classes/File.php:154 #, php-format msgid "A file this large would exceed your user quota of %d bytes." msgstr "" -#: classes/File.php:154 +#: classes/File.php:161 #, php-format msgid "A file this large would exceed your monthly quota of %d bytes." msgstr "" +#: classes/Login_token.php:76 +#, fuzzy, php-format +msgid "Could not create login token for %s" +msgstr "మారుపేర్లని సృష్టించలేకపోయాం." + #: classes/Message.php:45 msgid "You are banned from sending direct messages." msgstr "నేరుగా సందేశాలు పంపడం నుండి మిమ్మల్ని నిషేధించారు." @@ -3917,7 +3931,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,140 +3980,140 @@ msgid "Other options" msgstr "ఇతర ఎంపికలు" #: lib/action.php:144 -#, php-format -msgid "%s - %s" -msgstr "%s - %s" +#, fuzzy, php-format +msgid "%1$s - %2$s" +msgstr "%1$s (%2$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." @@ -4108,12 +4122,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 %" @@ -4124,32 +4138,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 "" @@ -4157,28 +4171,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 నిర్ధారణ" @@ -4218,7 +4236,7 @@ msgstr "సంకేతపదం మార్పు" msgid "Command results" msgstr "ఆదేశ ఫలితాలు" -#: lib/channel.php:210 +#: lib/channel.php:210 lib/mailhandler.php:142 msgid "Command complete" msgstr "ఆదేశం పూర్తయ్యింది" @@ -4231,7 +4249,7 @@ msgid "Sorry, this command is not yet implemented." msgstr "" #: lib/command.php:88 -#, php-format +#, fuzzy, php-format msgid "Could not find a user with nickname %s" msgstr "వాడుకరిని తాజాకరించలేకున్నాం." @@ -4240,9 +4258,9 @@ msgid "It does not make a lot of sense to nudge yourself!" msgstr "" #: lib/command.php:99 -#, php-format +#, fuzzy, php-format msgid "Nudge sent to %s" -msgstr "" +msgstr "%sకి స్పందనలు" #: lib/command.php:126 #, php-format @@ -4256,34 +4274,56 @@ msgstr "" "నోటీసులు: %3$s" #: lib/command.php:152 lib/command.php:399 lib/command.php:460 +#, fuzzy msgid "Notice with that id does not exist" -msgstr "" +msgstr "ఆ ఈమెయిలు చిరునామా లేదా వాడుకరిపేరుతో వాడుకరులెవరూ లేరు." #: lib/command.php:168 lib/command.php:415 lib/command.php:476 #: lib/command.php:532 +#, fuzzy msgid "User has no last notice" -msgstr "" +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:217 +#, fuzzy +msgid "You are already a member of that group" +msgstr "మీరు ఇప్పటికే ఆ గుంపులో సభ్యులు." + +#: lib/command.php:234 +#, fuzzy, php-format +msgid "Could not join user %s to group %s" +msgstr "ఓపెన్ఐడీ ఫారమును సృష్టించలేకపోయాం: %s" + +#: lib/command.php:239 +#, fuzzy, php-format +msgid "%s joined group %s" +msgstr "%s %s గుంపులో చేరారు" + +#: lib/command.php:284 +#, fuzzy, php-format +msgid "Could not remove user %s to group %s" +msgstr "వాడుకరి %sని %s గుంపు నుండి తొలగించలేకపోయాం" + +#: lib/command.php:289 +#, fuzzy, php-format +msgid "%s left group %s" +msgstr "%2$s గుంపు నుండి %1$s వైదొలిగారు" #: lib/command.php:318 -#, php-format +#, fuzzy, php-format msgid "Fullname: %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 "" @@ -4293,18 +4333,24 @@ msgstr "" msgid "About: %s" msgstr "గురించి: %s" -#: lib/command.php:358 scripts/xmppdaemon.php:301 -#, php-format +#: lib/command.php:358 +#, fuzzy, php-format msgid "Message too long - maximum is %d characters, you sent %d" -msgstr "" +msgstr "నోటిసు చాలా పొడవుగా ఉంది - %d అక్షరాలు గరిష్ఠం, మీరు %d పంపించారు" + +#: lib/command.php:376 +#, fuzzy, php-format +msgid "Direct message to %s sent" +msgstr "%sకి నేరు సందేశాన్ని పంపించాం" #: lib/command.php:378 msgid "Error sending direct message." msgstr "" #: lib/command.php:422 +#, fuzzy msgid "Cannot repeat your own notice" -msgstr "" +msgstr "ఈ లైసెన్సుకి అంగీకరించకపోతే మీరు నమోదుచేసుకోలేరు." #: lib/command.php:427 #, fuzzy @@ -4322,7 +4368,7 @@ msgid "Error repeating notice." msgstr "సందేశాన్ని భద్రపరచడంలో పొరపాటు." #: lib/command.php:491 -#, php-format +#, fuzzy, php-format msgid "Notice too long - maximum is %d characters, you sent %d" msgstr "నోటిసు చాలా పొడవుగా ఉంది - %d అక్షరాలు గరిష్ఠం, మీరు %d పంపించారు" @@ -4378,47 +4424,42 @@ msgstr "" msgid "Login command is disabled" msgstr "" -#: lib/command.php:664 +#: lib/command.php:661 #, 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" msgstr "ఈ లంకెని ఒకే సారి ఉపయోగించగలరు, మరియు అది పనిచేసేది 2 నిమిషాలు మాత్రమే: %s" -#: lib/command.php:685 +#: lib/command.php:677 msgid "You are not subscribed to anyone." msgstr "మీరు ఎవరికీ చందాచేరలేదు." -#: lib/command.php:687 +#: lib/command.php:679 msgid "You are subscribed to this person:" msgid_plural "You are subscribed to these people:" msgstr[0] "%sకి స్పందనలు" msgstr[1] "%sకి స్పందనలు" -#: lib/command.php:707 +#: lib/command.php:699 msgid "No one is subscribed to you." msgstr "మీకు చందాదార్లు ఎవరూ లేరు." -#: lib/command.php:709 +#: lib/command.php:701 msgid "This person is subscribed to you:" msgid_plural "These people are subscribed to you:" msgstr[0] "%sకి స్పందనలు" msgstr[1] "%sకి స్పందనలు" -#: lib/command.php:729 +#: lib/command.php:721 msgid "You are not a member of any groups." msgstr "మీరు ఏ గుంపులోనూ సభ్యులు కాదు." -#: lib/command.php:731 +#: lib/command.php:723 msgid "You are a member of this group:" msgid_plural "You are a member of these groups:" msgstr[0] "మీరు ఇప్పటికే లోనికి ప్రవేశించారు!" msgstr[1] "మీరు ఇప్పటికే లోనికి ప్రవేశించారు!" -#: lib/command.php:745 +#: lib/command.php:737 msgid "" "Commands:\n" "on - turn on notifications\n" @@ -4578,10 +4619,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 "" @@ -4744,21 +4781,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" @@ -4895,6 +4920,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 "" @@ -4926,7 +4972,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 @@ -4935,7 +4981,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 @@ -4945,7 +4991,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 @@ -4979,7 +5025,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 @@ -5100,6 +5156,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 "చందాలు" @@ -5277,10 +5337,6 @@ msgstr "" msgid "People Tagcloud as tagged" msgstr "" -#: lib/subscriptionlist.php:126 -msgid "(none)" -msgstr "(ఏమీలేవు)" - #: lib/tagcloudsection.php:56 msgid "None" msgstr "ఏమీలేదు" @@ -5344,47 +5400,47 @@ msgstr "సందేశం" msgid "Moderate" msgstr "" -#: lib/util.php:837 +#: lib/util.php:884 msgid "a few seconds ago" msgstr "కొన్ని క్షణాల క్రితం" -#: lib/util.php:839 +#: lib/util.php:886 msgid "about a minute ago" msgstr "ఓ నిమిషం క్రితం" -#: lib/util.php:841 +#: lib/util.php:888 #, php-format msgid "about %d minutes ago" msgstr "%d నిమిషాల క్రితం" -#: lib/util.php:843 +#: lib/util.php:890 msgid "about an hour ago" msgstr "ఒక గంట క్రితం" -#: lib/util.php:845 +#: lib/util.php:892 #, php-format msgid "about %d hours ago" msgstr "%d గంటల క్రితం" -#: lib/util.php:847 +#: lib/util.php:894 msgid "about a day ago" msgstr "ఓ రోజు క్రితం" -#: lib/util.php:849 +#: lib/util.php:896 #, php-format msgid "about %d days ago" msgstr "%d రోజుల క్రితం" -#: lib/util.php:851 +#: lib/util.php:898 msgid "about a month ago" msgstr "ఓ నెల క్రితం" -#: lib/util.php:853 +#: lib/util.php:900 #, php-format msgid "about %d months ago" msgstr "%d నెలల క్రితం" -#: lib/util.php:855 +#: lib/util.php:902 msgid "about a year ago" msgstr "ఒక సంవత్సరం క్రితం" @@ -5398,18 +5454,7 @@ msgstr "%s అనేది సరైన రంగు కాదు!" 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 "" +#: scripts/xmppdaemon.php:301 +#, fuzzy, php-format +msgid "Message too long - maximum is %1$d characters, you sent %2$d." +msgstr "నోటిసు చాలా పొడవుగా ఉంది - %d అక్షరాలు గరిష్ఠం, మీరు %d పంపించారు" diff --git a/locale/tr/LC_MESSAGES/statusnet.po b/locale/tr/LC_MESSAGES/statusnet.po index 8d8cbbfd8..9374b52ce 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-05 22:10+0000\n" -"PO-Revision-Date: 2010-01-05 22:12:43+0000\n" +"POT-Creation-Date: 2010-01-11 23:25+0000\n" +"PO-Revision-Date: 2010-01-11 23:28:23+0000\n" "Language-Team: Turkish\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha (r60693); Translate extension (2010-01-04)\n" +"X-Generator: MediaWiki 1.16alpha (r60950); 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" @@ -39,7 +39,7 @@ msgstr "Böyle bir durum mesajı yok." #: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79 #: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75 #: actions/favoritesrss.php:74 actions/foaf.php:40 actions/foaf.php:58 -#: actions/microsummary.php:62 actions/newmessage.php:116 +#: actions/microsummary.php:62 actions/newmessage.php:116 actions/otp.php:76 #: actions/remotesubscribe.php:145 actions/remotesubscribe.php:154 #: actions/replies.php:73 actions/repliesrss.php:38 #: actions/showfavorites.php:105 actions/userbyid.php:74 @@ -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 #, 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 #, 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" @@ -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,11 +612,11 @@ 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/invite.php:56 actions/login.php:115 actions/makeadmin.php:66 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80 #: actions/othersettings.php:145 actions/passwordsettings.php:138 #: actions/profilesettings.php:194 actions/recoverpassword.php:337 @@ -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 +#: actions/joingroup.php:135 #, php-format -msgid "%s joined group %s" +msgid "%1$s joined group %2$s" msgstr "" #: actions/leavegroup.php:60 @@ -1834,68 +1802,58 @@ msgstr "Bize o profili yollamadınız" msgid "Could not find membership record." msgstr "" -#: actions/leavegroup.php:127 lib/command.php:284 +#: actions/leavegroup.php:134 #, 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 "" +msgid "%1$s left group %2$s" +msgstr "%1$s'in %2$s'deki durum mesajları " -#: actions/login.php:83 actions/register.php:137 +#: actions/login.php:80 actions/otp.php:62 actions/register.php:137 msgid "Already logged in." msgstr "Zaten giriş yapılmış." -#: actions/login.php:114 actions/login.php:124 -#, fuzzy -msgid "Invalid or expired token." -msgstr "Geçersiz durum mesajı" - -#: actions/login.php:147 +#: actions/login.php:126 msgid "Incorrect username or password." msgstr "Yanlış kullanıcı adı veya parola." -#: actions/login.php:153 +#: actions/login.php:132 actions/otp.php:120 #, fuzzy 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:188 actions/login.php:241 lib/action.php:460 #: lib/logingroupnav.php:79 msgid "Login" msgstr "Giriş" -#: actions/login.php:247 +#: actions/login.php:227 msgid "Login to site" msgstr "" -#: actions/login.php:250 actions/profilesettings.php:106 -#: actions/register.php:423 actions/showgroup.php:236 actions/tagother.php:94 +#: actions/login.php:230 actions/profilesettings.php:106 +#: actions/register.php:424 actions/showgroup.php:236 actions/tagother.php:94 #: lib/groupeditform.php:152 lib/userprofile.php:131 msgid "Nickname" msgstr "Takma ad" -#: actions/login.php:253 actions/register.php:428 +#: actions/login.php:233 actions/register.php:429 #: lib/accountsettingsaction.php:116 msgid "Password" msgstr "Parola" -#: actions/login.php:256 actions/register.php:477 +#: actions/login.php:236 actions/register.php:478 msgid "Remember me" msgstr "Beni hatırla" -#: actions/login.php:257 actions/register.php:479 +#: actions/login.php:237 actions/register.php:480 msgid "Automatically login in the future; not for shared computers!" msgstr "" "Gelecekte kendiliğinden giriş yap, paylaşılan bilgisayarlar için değildir!" -#: actions/login.php:267 +#: actions/login.php:247 msgid "Lost or forgotten password?" msgstr "Parolamı unuttum veya kaybettim" -#: actions/login.php:286 +#: actions/login.php:266 msgid "" "For security reasons, please re-enter your user name and password before " "changing your settings." @@ -1903,7 +1861,7 @@ msgstr "" "Güvenliğiniz için, ayarlarınızı değiştirmeden önce lütfen kullanıcı adınızı " "ve parolanızı tekrar giriniz." -#: actions/login.php:290 +#: actions/login.php:270 #, fuzzy, php-format msgid "" "Login with your username and password. Don't have a username yet? [Register]" @@ -1918,19 +1876,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" @@ -1970,9 +1928,9 @@ msgstr "" msgid "Message sent" msgstr "" -#: actions/newmessage.php:185 lib/command.php:376 +#: actions/newmessage.php:185 #, 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 +1961,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 @@ -2061,8 +2019,8 @@ msgstr "Bağlan" msgid "Only " msgstr "" -#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1031 -#: lib/api.php:1059 lib/api.php:1169 +#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1033 +#: lib/api.php:1061 lib/api.php:1171 msgid "Not a supported data format." msgstr "" @@ -2109,9 +2067,28 @@ 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" +#: actions/otp.php:69 +#, fuzzy +msgid "No user ID specified." +msgstr "Yeni durum mesajı" + +#: actions/otp.php:83 +#, fuzzy +msgid "No login token specified." +msgstr "Yeni durum mesajı" + +#: actions/otp.php:90 +#, fuzzy +msgid "No login token requested." +msgstr "Yetkilendirme isteği yok!" + +#: actions/otp.php:95 +#, fuzzy +msgid "Invalid login token specified." +msgstr "Geçersiz durum mesajı" + +#: actions/otp.php:104 +msgid "Login token expired." msgstr "" #: actions/outbox.php:61 @@ -2150,7 +2127,7 @@ msgid "6 or more characters" msgstr "6 veya daha fazla karakter" #: actions/passwordsettings.php:112 actions/recoverpassword.php:239 -#: actions/register.php:432 actions/smssettings.php:134 +#: actions/register.php:433 actions/smssettings.php:134 msgid "Confirm" msgstr "Onayla" @@ -2186,7 +2163,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 +2196,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 +2296,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 +2329,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 +2339,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 @@ -2386,44 +2364,44 @@ msgstr "" "1-64 küçük harf veya rakam, noktalama işaretlerine ve boşluklara izin " "verilmez" -#: actions/profilesettings.php:111 actions/register.php:447 +#: actions/profilesettings.php:111 actions/register.php:448 #: actions/showgroup.php:247 actions/tagother.php:104 #: lib/groupeditform.php:157 lib/userprofile.php:149 msgid "Full name" msgstr "Tam İsim" -#: actions/profilesettings.php:115 actions/register.php:452 +#: actions/profilesettings.php:115 actions/register.php:453 #: lib/groupeditform.php:161 msgid "Homepage" msgstr "Başlangıç Sayfası" -#: actions/profilesettings.php:117 actions/register.php:454 +#: actions/profilesettings.php:117 actions/register.php:455 msgid "URL of your homepage, blog, or profile on another site" msgstr "" "Web Sitenizin, blogunuzun ya da varsa başka bir sitedeki profilinizin adresi" -#: actions/profilesettings.php:122 actions/register.php:460 +#: actions/profilesettings.php:122 actions/register.php:461 #, fuzzy, php-format msgid "Describe yourself and your interests in %d chars" msgstr "Kendinizi ve ilgi alanlarınızı 140 karakter ile anlatın" -#: actions/profilesettings.php:125 actions/register.php:463 +#: actions/profilesettings.php:125 actions/register.php:464 #, fuzzy msgid "Describe yourself and your interests" msgstr "Kendinizi ve ilgi alanlarınızı 140 karakter ile anlatın" -#: actions/profilesettings.php:127 actions/register.php:465 +#: actions/profilesettings.php:127 actions/register.php:466 msgid "Bio" msgstr "Hakkında" -#: actions/profilesettings.php:132 actions/register.php:470 +#: actions/profilesettings.php:132 actions/register.php:471 #: actions/showgroup.php:256 actions/tagother.php:112 #: actions/userauthorization.php:158 lib/groupeditform.php:177 #: lib/userprofile.php:164 msgid "Location" msgstr "Yer" -#: actions/profilesettings.php:134 actions/register.php:472 +#: actions/profilesettings.php:134 actions/register.php:473 msgid "Where you are, like \"City, State (or Region), Country\"" msgstr "Bulunduğunuz yer, \"Şehir, Eyalet (veya Bölge), Ülke\" gibi" @@ -2485,21 +2463,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." @@ -2722,7 +2700,7 @@ msgstr "Kullanıcı ayarlamada hata oluştu." msgid "New password successfully saved. You are now logged in." msgstr "Yeni parola başarıyla kaydedildi. Şimdi giriş yaptınız." -#: actions/register.php:85 actions/register.php:189 actions/register.php:404 +#: actions/register.php:85 actions/register.php:189 actions/register.php:405 msgid "Sorry, only invited people can register." msgstr "" @@ -2735,7 +2713,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:503 lib/action.php:457 #: lib/logingroupnav.php:85 msgid "Register" msgstr "Kayıt" @@ -2748,59 +2726,55 @@ 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." -#: actions/register.php:243 actions/register.php:264 +#: actions/register.php:243 actions/register.php:265 msgid "Invalid username or password." msgstr "Geçersiz kullanıcı adı veya parola." -#: actions/register.php:342 +#: actions/register.php:343 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 +#: actions/register.php:425 msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required." msgstr "" -#: actions/register.php:429 +#: actions/register.php:430 msgid "6 or more characters. Required." msgstr "" -#: actions/register.php:433 +#: actions/register.php:434 msgid "Same as password above. Required." msgstr "" -#: actions/register.php:437 actions/register.php:441 +#: actions/register.php:438 actions/register.php:442 #: actions/siteadminpanel.php:270 lib/accountsettingsaction.php:120 msgid "Email" msgstr "Eposta" -#: actions/register.php:438 actions/register.php:442 +#: actions/register.php:439 actions/register.php:443 msgid "Used only for updates, announcements, and password recovery" msgstr "" "Sadece sistem güncellemeleri, duyurular ve parola geri alma için kullanılır." -#: actions/register.php:449 +#: actions/register.php:450 msgid "Longer name, preferably your \"real\" name" msgstr "" -#: actions/register.php:493 +#: actions/register.php:494 msgid "My text and files are available under " msgstr "Durum mesajlarim ve dosyalarim şu lisans ile korunmaktadır: " -#: actions/register.php:495 +#: actions/register.php:496 msgid "Creative Commons Attribution 3.0" msgstr "" -#: actions/register.php:496 +#: actions/register.php:497 #, fuzzy msgid "" " except this private data: password, email address, IM address, and phone " @@ -2809,13 +2783,13 @@ msgstr "" "bu özel veriler haricinde: parola, eposta adresi, IM adresi, telefon " "numarası." -#: actions/register.php:537 +#: actions/register.php:538 #, 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 " @@ -2828,7 +2802,7 @@ msgid "" "Thanks for signing up and we hope you enjoy using this service." msgstr "" -#: actions/register.php:561 +#: actions/register.php:562 msgid "" "(You should receive a message by email momentarily, with instructions on how " "to confirm your email address.)" @@ -2924,11 +2898,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 +2916,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 +2930,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 +2949,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 +2998,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 +3049,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 +3117,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 +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 @@ -3202,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 @@ -3247,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 "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 +3394,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 +3425,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 +3514,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 +3552,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 +3588,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 +3675,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 +3682,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 +3791,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 +3842,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 +3875,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 +3890,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,23 +3904,95 @@ msgstr "Bize o profili yollamadınız" msgid "Try [searching for groups](%%action.groupsearch%%) and joining them." msgstr "" -#: classes/File.php:137 +#: 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:144 #, 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 "" -#: classes/File.php:147 +#: classes/File.php:154 #, php-format msgid "A file this large would exceed your user quota of %d bytes." msgstr "" -#: classes/File.php:154 +#: classes/File.php:161 #, php-format msgid "A file this large would exceed your monthly quota of %d bytes." msgstr "" +#: classes/Login_token.php:76 +#, fuzzy, php-format +msgid "Could not create login token for %s" +msgstr "Avatar bilgisi kaydedilemedi" + #: classes/Message.php:45 msgid "You are banned from sending direct messages." msgstr "" @@ -4035,7 +4044,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 "" @@ -4086,144 +4095,144 @@ msgid "Other options" msgstr "" #: lib/action.php:144 -#, php-format -msgid "%s - %s" -msgstr "" +#, fuzzy, php-format +msgid "%1$s - %2$s" +msgstr "%1$s'in %2$s'deki durum mesajları " #: 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 +4241,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 +4257,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 +4292,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ı" @@ -4345,7 +4358,7 @@ msgstr "Parola kaydedildi." msgid "Command results" msgstr "" -#: lib/channel.php:210 +#: lib/channel.php:210 lib/mailhandler.php:142 msgid "Command complete" msgstr "" @@ -4358,7 +4371,7 @@ msgid "Sorry, this command is not yet implemented." msgstr "" #: lib/command.php:88 -#, php-format +#, fuzzy, php-format msgid "Could not find a user with nickname %s" msgstr "Kullanıcı güncellenemedi." @@ -4367,9 +4380,9 @@ msgid "It does not make a lot of sense to nudge yourself!" msgstr "" #: lib/command.php:99 -#, php-format +#, fuzzy, php-format msgid "Nudge sent to %s" -msgstr "" +msgstr "%s için cevaplar" #: lib/command.php:126 #, php-format @@ -4385,29 +4398,50 @@ msgstr "" #: lib/command.php:168 lib/command.php:415 lib/command.php:476 #: lib/command.php:532 +#, fuzzy msgid "User has no last notice" -msgstr "" +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:217 +#, fuzzy +msgid "You are already a member of that group" +msgstr "Zaten giriş yapmış durumdasıznız!" + +#: lib/command.php:234 +#, fuzzy, php-format +msgid "Could not join user %s to group %s" +msgstr "Sunucuya yönlendirme yapılamadı: %s" + +#: lib/command.php:239 +#, fuzzy, php-format +msgid "%s joined group %s" +msgstr "%1$s'in %2$s'deki durum mesajları " + +#: lib/command.php:284 +#, fuzzy, php-format +msgid "Could not remove user %s to group %s" +msgstr "OpenID formu yaratılamadı: %s" + +#: lib/command.php:289 +#, fuzzy, php-format +msgid "%s left group %s" +msgstr "%1$s'in %2$s'deki durum mesajları " #: lib/command.php:318 -#, php-format +#, fuzzy, php-format msgid "Fullname: %s" -msgstr "" +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 "" @@ -4417,22 +4451,29 @@ msgstr "" msgid "About: %s" msgstr "" -#: lib/command.php:358 scripts/xmppdaemon.php:301 +#: lib/command.php:358 #, php-format msgid "Message too long - maximum is %d characters, you sent %d" msgstr "" +#: lib/command.php:376 +#, php-format +msgid "Direct message to %s sent" +msgstr "" + #: lib/command.php:378 msgid "Error sending direct message." msgstr "" #: lib/command.php:422 +#, fuzzy msgid "Cannot repeat your own notice" -msgstr "" +msgstr "Eğer lisansı kabul etmezseniz kayıt olamazsınız." #: lib/command.php:427 +#, fuzzy msgid "Already repeated that notice" -msgstr "" +msgstr "Zaten giriş yapmış durumdasıznız!" #: lib/command.php:435 #, fuzzy, php-format @@ -4501,47 +4542,42 @@ msgstr "" msgid "Login command is disabled" msgstr "" -#: lib/command.php:664 -#, fuzzy, php-format -msgid "Could not create login token for %s" -msgstr "Avatar bilgisi kaydedilemedi" - -#: lib/command.php:669 +#: lib/command.php:661 #, php-format msgid "This link is useable only once, and is good for only 2 minutes: %s" msgstr "" -#: lib/command.php:685 +#: lib/command.php:677 #, fuzzy msgid "You are not subscribed to anyone." msgstr "Bize o profili yollamadınız" -#: lib/command.php:687 +#: lib/command.php:679 msgid "You are subscribed to this person:" msgid_plural "You are subscribed to these people:" msgstr[0] "Bize o profili yollamadınız" -#: lib/command.php:707 +#: lib/command.php:699 #, fuzzy msgid "No one is subscribed to you." msgstr "Uzaktan abonelik" -#: lib/command.php:709 +#: lib/command.php:701 msgid "This person is subscribed to you:" msgid_plural "These people are subscribed to you:" msgstr[0] "Uzaktan abonelik" -#: lib/command.php:729 +#: lib/command.php:721 #, fuzzy msgid "You are not a member of any groups." msgstr "Bize o profili yollamadınız" -#: lib/command.php:731 +#: lib/command.php:723 msgid "You are a member of this group:" msgid_plural "You are a member of these groups:" msgstr[0] "Bize o profili yollamadınız" -#: lib/command.php:745 +#: lib/command.php:737 msgid "" "Commands:\n" "on - turn on notifications\n" @@ -4704,11 +4740,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 "" @@ -4882,22 +4913,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 @@ -5031,6 +5050,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 "" @@ -5062,7 +5102,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 @@ -5071,7 +5111,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 @@ -5081,7 +5121,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 @@ -5116,7 +5156,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 @@ -5238,6 +5288,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" @@ -5420,10 +5474,6 @@ msgstr "" msgid "People Tagcloud as tagged" msgstr "" -#: lib/subscriptionlist.php:126 -msgid "(none)" -msgstr "" - #: lib/tagcloudsection.php:56 msgid "None" msgstr "" @@ -5488,47 +5538,47 @@ msgstr "" msgid "Moderate" msgstr "" -#: lib/util.php:837 +#: lib/util.php:884 msgid "a few seconds ago" msgstr "birkaç saniye önce" -#: lib/util.php:839 +#: lib/util.php:886 msgid "about a minute ago" msgstr "yaklaşık bir dakika önce" -#: lib/util.php:841 +#: lib/util.php:888 #, php-format msgid "about %d minutes ago" msgstr "yaklaşık %d dakika önce" -#: lib/util.php:843 +#: lib/util.php:890 msgid "about an hour ago" msgstr "yaklaşık bir saat önce" -#: lib/util.php:845 +#: lib/util.php:892 #, php-format msgid "about %d hours ago" msgstr "yaklaşık %d saat önce" -#: lib/util.php:847 +#: lib/util.php:894 msgid "about a day ago" msgstr "yaklaşık bir gün önce" -#: lib/util.php:849 +#: lib/util.php:896 #, php-format msgid "about %d days ago" msgstr "yaklaşık %d gün önce" -#: lib/util.php:851 +#: lib/util.php:898 msgid "about a month ago" msgstr "yaklaşık bir ay önce" -#: lib/util.php:853 +#: lib/util.php:900 #, php-format msgid "about %d months ago" msgstr "yaklaşık %d ay önce" -#: lib/util.php:855 +#: lib/util.php:902 msgid "about a year ago" msgstr "yaklaşık bir yıl önce" @@ -5542,18 +5592,7 @@ msgstr "Başlangıç sayfası adresi geçerli bir URL değil." 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." +#: scripts/xmppdaemon.php:301 +#, php-format +msgid "Message too long - maximum is %1$d characters, you sent %2$d." msgstr "" diff --git a/locale/uk/LC_MESSAGES/statusnet.po b/locale/uk/LC_MESSAGES/statusnet.po index 228202cc8..187011216 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-05 22:10+0000\n" -"PO-Revision-Date: 2010-01-05 22:12:46+0000\n" +"POT-Creation-Date: 2010-01-11 23:25+0000\n" +"PO-Revision-Date: 2010-01-11 23:28:27+0000\n" "Language-Team: Ukrainian\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha (r60693); Translate extension (2010-01-04)\n" +"X-Generator: MediaWiki 1.16alpha (r60950); 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" @@ -41,7 +41,7 @@ msgstr "Немає такої сторінки" #: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79 #: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75 #: actions/favoritesrss.php:74 actions/foaf.php:40 actions/foaf.php:58 -#: actions/microsummary.php:62 actions/newmessage.php:116 +#: actions/microsummary.php:62 actions/newmessage.php:116 actions/otp.php:76 #: actions/remotesubscribe.php:145 actions/remotesubscribe.php:154 #: actions/replies.php:73 actions/repliesrss.php:38 #: actions/showfavorites.php:105 actions/userbyid.php:74 @@ -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,11 +93,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 "" -"Ви можете [«розштовхати» %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 @@ -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,16 +265,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." @@ -299,8 +294,8 @@ msgid "Could not unfollow user: User not found." 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." @@ -386,7 +381,7 @@ msgstr "Додаткове ім’я не може бути таким сами msgid "Group not found!" msgstr "Групу не знайдено!" -#: actions/apigroupjoin.php:110 +#: actions/apigroupjoin.php:110 actions/joingroup.php:90 msgid "You are already a member of that group." msgstr "Ви вже є учасником цієї групи." @@ -394,30 +389,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 #, 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" @@ -458,7 +448,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 знаків." @@ -480,13 +470,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 @@ -553,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 "Немає імені." @@ -577,8 +570,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,11 +603,11 @@ 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/invite.php:56 actions/login.php:115 actions/makeadmin.php:66 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80 #: actions/othersettings.php:145 actions/passwordsettings.php:138 #: actions/profilesettings.php:194 actions/recoverpassword.php:337 @@ -695,19 +688,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 @@ -716,8 +705,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." @@ -827,11 +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 "Ви не можете видаляти користувачів." @@ -857,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 "Дизайн" @@ -997,7 +981,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 @@ -1022,7 +1006,7 @@ msgid "Options saved." msgstr "Опції збережено." #: actions/emailsettings.php:60 -msgid "Email Settings" +msgid "Email settings" msgstr "Налаштування пошти" #: actions/emailsettings.php:71 @@ -1059,7 +1043,7 @@ msgid "Cancel" msgstr "Скасувати" #: actions/emailsettings.php:121 -msgid "Email Address" +msgid "Email address" msgstr "Електронна адреса" #: actions/emailsettings.php:123 @@ -1133,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." @@ -1316,18 +1301,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 +1317,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." @@ -1367,13 +1345,13 @@ 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»? Його буде " +"позбавлено членства в групі, він не зможе сюди писати, і не зможе вступити " +"до групи знов." #: actions/groupblock.php:178 msgid "Do not block this user from this group" @@ -1387,9 +1365,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 +1390,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 +1406,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 "Оберіть квадратну ділянку зображення, яка й буде логотипом групи." @@ -1453,14 +1429,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 "Адмін" @@ -1564,8 +1540,8 @@ msgid "Error removing the block." msgstr "Помилка при розблокуванні." #: actions/imsettings.php:59 -msgid "IM Settings" -msgstr "Налаштування IM" +msgid "IM settings" +msgstr "Налаштування ІМ" #: actions/imsettings.php:70 #, php-format @@ -1595,8 +1571,8 @@ msgstr "" "Вашого списку контактів?)" #: actions/imsettings.php:124 -msgid "IM Address" -msgstr "Адреса IM" +msgid "IM address" +msgstr "ІМ-адреса" #: actions/imsettings.php:126 #, php-format @@ -1659,11 +1635,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 +1671,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 +1717,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,19 +1788,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 +#: actions/joingroup.php:135 #, 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." @@ -1843,67 +1805,58 @@ 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 +#: actions/leavegroup.php:134 #, 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 +#: actions/login.php:80 actions/otp.php:62 actions/register.php:137 msgid "Already logged in." msgstr "Тепер Ви увійшли." -#: actions/login.php:114 actions/login.php:124 -msgid "Invalid or expired token." -msgstr "Недійсний або неправильний токен." - -#: actions/login.php:147 +#: actions/login.php:126 msgid "Incorrect username or password." msgstr "Неточне ім’я або пароль." -#: actions/login.php:153 +#: actions/login.php:132 actions/otp.php:120 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:188 actions/login.php:241 lib/action.php:460 #: lib/logingroupnav.php:79 msgid "Login" msgstr "Увійти" -#: actions/login.php:247 +#: actions/login.php:227 msgid "Login to site" msgstr "Вхід на сайт" -#: actions/login.php:250 actions/profilesettings.php:106 -#: actions/register.php:423 actions/showgroup.php:236 actions/tagother.php:94 +#: actions/login.php:230 actions/profilesettings.php:106 +#: actions/register.php:424 actions/showgroup.php:236 actions/tagother.php:94 #: lib/groupeditform.php:152 lib/userprofile.php:131 msgid "Nickname" msgstr "Ім’я користувача" -#: actions/login.php:253 actions/register.php:428 +#: actions/login.php:233 actions/register.php:429 #: lib/accountsettingsaction.php:116 msgid "Password" msgstr "Пароль" -#: actions/login.php:256 actions/register.php:477 +#: actions/login.php:236 actions/register.php:478 msgid "Remember me" msgstr "Пам’ятати мене" -#: actions/login.php:257 actions/register.php:479 +#: actions/login.php:237 actions/register.php:480 msgid "Automatically login in the future; not for shared computers!" msgstr "" "Автоматично входити у майбутньому; не для комп’ютерів загального " "користування!" -#: actions/login.php:267 +#: actions/login.php:247 msgid "Lost or forgotten password?" msgstr "Загубили або забули пароль?" -#: actions/login.php:286 +#: actions/login.php:266 msgid "" "For security reasons, please re-enter your user name and password before " "changing your settings." @@ -1911,7 +1864,7 @@ msgstr "" "З міркувань безпеки, будь ласка, введіть ще раз ім’я та пароль, перед тим як " "змінювати налаштування." -#: actions/login.php:290 +#: actions/login.php:270 #, php-format msgid "" "Login with your username and password. Don't have a username yet? [Register]" @@ -1927,18 +1880,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" @@ -1979,10 +1932,10 @@ msgstr "" msgid "Message sent" msgstr "Повідомлення надіслано" -#: actions/newmessage.php:185 lib/command.php:376 +#: actions/newmessage.php:185 #, 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" @@ -2011,8 +1964,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 @@ -2074,8 +2027,8 @@ msgstr "тип змісту " msgid "Only " msgstr "Лише " -#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1031 -#: lib/api.php:1059 lib/api.php:1169 +#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1033 +#: lib/api.php:1061 lib/api.php:1171 msgid "Not a supported data format." msgstr "Такий формат даних не підтримується." @@ -2119,10 +2072,30 @@ 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/otp.php:69 +#, fuzzy +msgid "No user ID specified." +msgstr "Групу не визначено." + +#: actions/otp.php:83 +#, fuzzy +msgid "No login token specified." +msgstr "Зазначеного допису немає." + +#: actions/otp.php:90 +#, fuzzy +msgid "No login token requested." +msgstr "У запиті відсутній ID профілю." + +#: actions/otp.php:95 +#, fuzzy +msgid "Invalid login token specified." +msgstr "Недійсний або неправильний токен." + +#: actions/otp.php:104 +#, fuzzy +msgid "Login token expired." +msgstr "Вхід на сайт" #: actions/outbox.php:61 #, php-format @@ -2160,7 +2133,7 @@ msgid "6 or more characters" msgstr "6 або більше знаків" #: actions/passwordsettings.php:112 actions/recoverpassword.php:239 -#: actions/register.php:432 actions/smssettings.php:134 +#: actions/register.php:433 actions/smssettings.php:134 msgid "Confirm" msgstr "Підтвердити" @@ -2196,7 +2169,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 +2202,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 +2295,7 @@ msgid "When to use SSL" msgstr "Тоді використовувати SSL" #: actions/pathsadminpanel.php:308 -msgid "SSL Server" +msgid "SSL server" msgstr "SSL-сервер" #: actions/pathsadminpanel.php:309 @@ -2354,8 +2327,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" @@ -2363,8 +2336,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" @@ -2385,42 +2358,42 @@ msgid "1-64 lowercase letters or numbers, no punctuation or spaces" msgstr "" "1-64 літери нижнього регістру і цифри, ніякої пунктуації або інтервалів" -#: actions/profilesettings.php:111 actions/register.php:447 +#: actions/profilesettings.php:111 actions/register.php:448 #: actions/showgroup.php:247 actions/tagother.php:104 #: lib/groupeditform.php:157 lib/userprofile.php:149 msgid "Full name" msgstr "Повне ім’я" -#: actions/profilesettings.php:115 actions/register.php:452 +#: actions/profilesettings.php:115 actions/register.php:453 #: lib/groupeditform.php:161 msgid "Homepage" msgstr "Веб-сторінка" -#: actions/profilesettings.php:117 actions/register.php:454 +#: actions/profilesettings.php:117 actions/register.php:455 msgid "URL of your homepage, blog, or profile on another site" msgstr "URL-адреса Вашої веб-сторінки, блоґу, або профілю на іншому сайті" -#: actions/profilesettings.php:122 actions/register.php:460 +#: actions/profilesettings.php:122 actions/register.php:461 #, php-format msgid "Describe yourself and your interests in %d chars" msgstr "Опишіть себе та свої інтереси (%d знаків)" -#: actions/profilesettings.php:125 actions/register.php:463 +#: actions/profilesettings.php:125 actions/register.php:464 msgid "Describe yourself and your interests" msgstr "Опишіть себе та свої інтереси" -#: actions/profilesettings.php:127 actions/register.php:465 +#: actions/profilesettings.php:127 actions/register.php:466 msgid "Bio" msgstr "Про себе" -#: actions/profilesettings.php:132 actions/register.php:470 +#: actions/profilesettings.php:132 actions/register.php:471 #: actions/showgroup.php:256 actions/tagother.php:112 #: actions/userauthorization.php:158 lib/groupeditform.php:177 #: lib/userprofile.php:164 msgid "Location" msgstr "Локація" -#: actions/profilesettings.php:134 actions/register.php:472 +#: actions/profilesettings.php:134 actions/register.php:473 msgid "Where you are, like \"City, State (or Region), Country\"" msgstr "Де Ви живете, штибу \"Місто, область (регіон), країна\"" @@ -2485,19 +2458,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 "Налаштування збережено." @@ -2732,7 +2705,7 @@ msgstr "Помилка в налаштуваннях користувача." msgid "New password successfully saved. You are now logged in." msgstr "Новий пароль успішно збережено. Тепер Ви увійшли." -#: actions/register.php:85 actions/register.php:189 actions/register.php:404 +#: actions/register.php:85 actions/register.php:189 actions/register.php:405 msgid "Sorry, only invited people can register." msgstr "" "Пробачте, але лише ті, кого було запрошено, мають змогу зареєструватись тут." @@ -2745,7 +2718,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:503 lib/action.php:457 #: lib/logingroupnav.php:85 msgid "Register" msgstr "Реєстрація" @@ -2758,19 +2731,15 @@ 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 "Ця адреса вже використовується." -#: actions/register.php:243 actions/register.php:264 +#: actions/register.php:243 actions/register.php:265 msgid "Invalid username or password." msgstr "Недійсне ім’я або пароль." -#: actions/register.php:342 +#: actions/register.php:343 msgid "" "With this form you can create a new account. You can then post notices and " "link up to friends and colleagues. " @@ -2778,42 +2747,42 @@ msgstr "" "Ця форма дозволить створити новий акаунт. Ви зможете робити дописи і будете " "в курсі справ Ваших друзів та колег. " -#: actions/register.php:424 +#: actions/register.php:425 msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required." msgstr "" "1-64 літери нижнього регістра і цифри, ніякої пунктуації або інтервалів. " "Неодмінно." -#: actions/register.php:429 +#: actions/register.php:430 msgid "6 or more characters. Required." msgstr "6 або більше знаків. Неодмінно." -#: actions/register.php:433 +#: actions/register.php:434 msgid "Same as password above. Required." msgstr "Такий само, як і пароль вище. Неодмінно." -#: actions/register.php:437 actions/register.php:441 +#: actions/register.php:438 actions/register.php:442 #: actions/siteadminpanel.php:270 lib/accountsettingsaction.php:120 msgid "Email" msgstr "Пошта" -#: actions/register.php:438 actions/register.php:442 +#: actions/register.php:439 actions/register.php:443 msgid "Used only for updates, announcements, and password recovery" msgstr "Використовується лише для оновлень, оголошень та відновлення паролю" -#: actions/register.php:449 +#: actions/register.php:450 msgid "Longer name, preferably your \"real\" name" msgstr "Повне ім’я, звісно ж Ваше справжнє ім’я :)" -#: actions/register.php:493 +#: actions/register.php:494 msgid "My text and files are available under " msgstr "Мої повідомлення та файли доступні під " -#: actions/register.php:495 +#: actions/register.php:496 msgid "Creative Commons Attribution 3.0" msgstr "Кріейтів Комонс Авторство 3.0" -#: actions/register.php:496 +#: actions/register.php:497 msgid "" " except this private data: password, email address, IM address, and phone " "number." @@ -2821,13 +2790,13 @@ msgstr "" " окрім цих приватних даних: пароль, електронна адреса, адреса IM, телефонний " "номер." -#: actions/register.php:537 +#: actions/register.php:538 #, 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,15 +2808,14 @@ msgid "" "\n" "Thanks for signing up and we hope you enjoy using this service." msgstr "" -"Вітаємо, %s! І ласкаво просимо до %%%%site.name%%%%. Звідси Ви, можливо, " -"схочете...\n" +"Вітаємо, %1$s! І ласкаво просимо до %%%%site.name%%%%. Звідси Ви зможете...\n" "\n" -"*Подивитись [Ваш профіль](%s) та зробити свій перший допис.\n" +"*Подивитись [Ваш профіль](%2$s) та зробити свій перший допис.\n" "*Додати [адресу Jabber/GTalk](%%%%action.imsettings%%%%), аби мати змогу " "надсилати дописи через службу миттєвих повідомлень.\n" "*[Розшукати людей](%%%%action.peoplesearch%%%%), які мають спільні з Вами " "інтереси.\n" -"*Оновити [налаштування профілю](%%%%action.profilesettings%%%%), щоб інші " +"*Оновити [налаштування профілю](%%%%action.profilesettings%%%%), аби інші " "могли знати про Вас більше.\n" "*Прочитати [додаткову інформацію](%%%%doc.help%%%%), аби переконатись, що Ви " "нічого не пропустили. \n" @@ -2855,7 +2823,7 @@ msgstr "" "Дякуємо, що зареєструвались у нас, і, сподіваємось, Вам сподобається наш " "сервіс." -#: actions/register.php:561 +#: actions/register.php:562 msgid "" "(You should receive a message by email momentarily, with instructions on how " "to confirm your email address.)" @@ -2950,11 +2918,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)" @@ -2973,11 +2936,11 @@ 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 "" -"Ця стрічка дописів містить відповіді %s, але %s ще нічого не отримав у " -"відповідь." +"Ця стрічка дописів містить відповіді для %1$s, але %2$s поки що нічого не " +"отримав у відповідь." #: actions/replies.php:203 #, php-format @@ -2991,11 +2954,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 "" -"Ви можете [«розштовхати» %s](../%s) або [написати дещо варте його уваги](%%%%" -"action.newnotice%%%%?status_textarea=%s)." +"Ви можете [«розштовхати» %1$s](../%2$s) або [написати дещо варте його уваги](%" +"%%%action.newnotice%%%%?status_textarea=%3$s)." #: actions/repliesrss.php:72 #, php-format @@ -3010,11 +2973,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 +3030,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 +3078,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,15 +3153,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 @@ -3232,8 +3180,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 "" @@ -3246,11 +3194,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 "" -"Ви можете «розштовхати» %s або [щось йому написати](%%%%action.newnotice%%%%?" -"status_textarea=%s)." +"Ви можете «розштовхати» %1$s або [щось йому написати](%%%%action.newnotice%%%" +"%?status_textarea=%2$s)." #: actions/showstream.php:234 #, php-format @@ -3299,13 +3247,13 @@ msgid "Site name must have non-zero length." msgstr "Ім’я сайту не може бути порожнім." #: actions/siteadminpanel.php:154 -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 "Мову не визначено \"%s\"" +msgid "Unknown language \"%s\"." +msgstr "Невідома мова «%s»." #: actions/siteadminpanel.php:179 msgid "Invalid snapshot report URL." @@ -3490,7 +3438,7 @@ msgid "Save site settings" msgstr "Зберегти налаштування сайту" #: actions/smssettings.php:58 -msgid "SMS Settings" +msgid "SMS settings" msgstr "Налаштування СМС" #: actions/smssettings.php:69 @@ -3519,7 +3467,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 @@ -3611,8 +3559,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." @@ -3652,8 +3600,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." @@ -3693,11 +3641,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 +3724,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’." -msgstr "Ліцензія ‘%s’ не відповідає ліцензії сайту ‘%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 "Користувач" @@ -3896,7 +3836,7 @@ msgstr "" "підписатись на дописи цього користувача. Якщо Ви не збирались підписуватись " "ні на чиї дописи, просто натисніть «Відмінити»." -#: actions/userauthorization.php:188 +#: actions/userauthorization.php:188 actions/version.php:165 msgid "License" msgstr "Ліцензія" @@ -3951,8 +3891,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 @@ -3984,10 +3924,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 +3940,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,7 +3955,82 @@ msgid "Try [searching for groups](%%action.groupsearch%%) and joining them." msgstr "" "Спробуйте [знайти якісь групи](%%action.groupsearch%%) і приєднайтеся до них." -#: classes/File.php:137 +#: 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 є вільним програмним забезпеченням: Ви можете розповсюджувати та/" +"або змінювати його відповідно до умов 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:144 #, php-format msgid "" "No file may be larger than %d bytes and the file you sent was %d bytes. Try " @@ -4033,16 +4039,21 @@ msgstr "" "Ні, файл не може бути більшим за %d байтів, а те, що Ви хочете надіслати, " "важить %d байтів. Спробуйте меншу версію." -#: classes/File.php:147 +#: classes/File.php:154 #, php-format msgid "A file this large would exceed your user quota of %d bytes." msgstr "Розміри цього файлу перевищують Вашу квоту на %d байтів." -#: classes/File.php:154 +#: classes/File.php:161 #, php-format msgid "A file this large would exceed your monthly quota of %d bytes." msgstr "Розміри цього файлу перевищують Вашу місячну квоту на %d байтів." +#: classes/Login_token.php:76 +#, fuzzy, php-format +msgid "Could not create login token for %s" +msgstr "Не вдалося створити токен входу для %s." + #: classes/Message.php:45 msgid "You are banned from sending direct messages." msgstr "Вам заборонено надсилати прямі повідомлення." @@ -4096,7 +4107,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" @@ -4143,136 +4154,136 @@ msgid "Other options" msgstr "Інші опції" #: lib/action.php:144 -#, php-format -msgid "%s - %s" -msgstr "%s — %s" +#, fuzzy, php-format +msgid "%1$s - %2$s" +msgstr "%1$s (%2$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 +4292,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 +4308,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 +4340,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 "Конфігурація шляху" @@ -4374,20 +4389,18 @@ msgid "Tags for this attachment" msgstr "Теґи для цього вкладення" #: lib/authenticationplugin.php:182 lib/authenticationplugin.php:187 -#, fuzzy msgid "Password changing failed" -msgstr "Пароль замінено" +msgstr "Не вдалося змінити пароль" #: lib/authenticationplugin.php:197 -#, fuzzy msgid "Password changing is not allowed" -msgstr "Пароль замінено" +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 "Команду виконано" @@ -4400,18 +4413,18 @@ msgid "Sorry, this command is not yet implemented." msgstr "Даруйте, але виконання команди ще не завершено." #: lib/command.php:88 -#, php-format +#, fuzzy, php-format msgid "Could not find a user with nickname %s" -msgstr "Не вдалося знайти користувача з іменем %s" +msgstr "Не вдалося знайти користувача з ім’ям %s." #: lib/command.php:92 msgid "It does not make a lot of sense to nudge yourself!" msgstr "Гадаємо, користі від «розштовхування» самого себе небагато, чи не так?!" #: lib/command.php:99 -#, php-format +#, fuzzy, php-format msgid "Nudge sent to %s" -msgstr "Спробу «розштовхати» %s зараховано" +msgstr "Спробу «розштовхати» %s зараховано." #: lib/command.php:126 #, php-format @@ -4425,34 +4438,56 @@ msgstr "" "Дописи: %3$s" #: lib/command.php:152 lib/command.php:399 lib/command.php:460 +#, fuzzy msgid "Notice with that id does not exist" -msgstr "Такого допису не існує" +msgstr "Допису з таким id не існує." #: lib/command.php:168 lib/command.php:415 lib/command.php:476 #: lib/command.php:532 +#, fuzzy msgid "User has no last notice" -msgstr "Користувач не має останнього допису" +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:217 +#, fuzzy +msgid "You are already a member of that group" +msgstr "Ви вже є учасником цієї групи." + +#: lib/command.php:234 +#, fuzzy, php-format +msgid "Could not join user %s to group %s" +msgstr "Не вдалось долучити користувача %1$s до групи %2$s." + +#: lib/command.php:239 +#, fuzzy, php-format +msgid "%s joined group %s" +msgstr "%1$s приєднався до групи %2$s" + +#: lib/command.php:284 +#, fuzzy, php-format +msgid "Could not remove user %s to group %s" +msgstr "Не вдалося видалити користувача %1$s з групи %2$s." + +#: lib/command.php:289 +#, fuzzy, php-format +msgid "%s left group %s" +msgstr "%1$s залишив групу %2$s" #: lib/command.php:318 -#, php-format +#, fuzzy, php-format msgid "Fullname: %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" @@ -4462,49 +4497,58 @@ msgstr "Веб-сторінка: %s" msgid "About: %s" msgstr "Про мене: %s" -#: lib/command.php:358 scripts/xmppdaemon.php:301 -#, php-format +#: lib/command.php:358 +#, fuzzy, php-format msgid "Message too long - maximum is %d characters, you sent %d" -msgstr "Повідомлення надто довге — максимум %d знаків, а ви надсилаєте %d" +msgstr "" +"Повідомлення надто довге — максимум %1$d символів, а Ви надсилаєте %2$d." + +#: lib/command.php:376 +#, fuzzy, php-format +msgid "Direct message to %s sent" +msgstr "Пряме повідомлення для %s надіслано." #: lib/command.php:378 msgid "Error sending direct message." msgstr "Помилка при відправці прямого повідомлення." #: lib/command.php:422 +#, fuzzy msgid "Cannot repeat your own notice" -msgstr "Не можу вторувати Вашому власному допису" +msgstr "Не можу вторувати Вашому власному допису." #: lib/command.php:427 +#, fuzzy msgid "Already repeated that notice" -msgstr "Цьому допису вже вторували" +msgstr "Цьому допису вже вторували." #: lib/command.php:435 -#, php-format +#, fuzzy, php-format msgid "Notice from %s repeated" -msgstr "Допису від %s вторували" +msgstr "Допису від %s вторували." #: lib/command.php:437 msgid "Error repeating notice." msgstr "Помилка із вторуванням допису." #: lib/command.php:491 -#, php-format +#, fuzzy, php-format msgid "Notice too long - maximum is %d characters, you sent %d" -msgstr "Допис надто довгий — максимум %d знаків, а ви надсилаєте %d" +msgstr "Допис надто довгий — максимум %1$d символів, а Ви надсилаєте %2$d." #: lib/command.php:500 -#, php-format +#, fuzzy, php-format msgid "Reply to %s sent" -msgstr "Відповідь до %s надіслано" +msgstr "Відповідь для %s надіслано." #: lib/command.php:502 msgid "Error saving notice." msgstr "Проблема при збереженні допису." #: lib/command.php:556 +#, fuzzy msgid "Specify the name of the user to subscribe to" -msgstr "Зазначте ім’я користувача, до якого бажаєте підписатись" +msgstr "Зазначте ім’я користувача, до якого бажаєте підписатись." #: lib/command.php:563 #, php-format @@ -4512,8 +4556,9 @@ msgid "Subscribed to %s" msgstr "Підписано до %s" #: lib/command.php:584 +#, fuzzy msgid "Specify the name of the user to unsubscribe from" -msgstr "Зазначте ім’я користувача, від якого бажаєте відписатись" +msgstr "Зазначте ім’я користувача, від якого бажаєте відписатись." #: lib/command.php:591 #, php-format @@ -4541,54 +4586,50 @@ msgid "Can't turn on notification." msgstr "Не можна увімкнути сповіщення." #: lib/command.php:650 +#, fuzzy msgid "Login command is disabled" -msgstr "Команду входу відключено" - -#: lib/command.php:664 -#, php-format -msgid "Could not create login token for %s" -msgstr "Не вдалося створити токен входу для %s" +msgstr "Команду входу відключено." -#: lib/command.php:669 -#, php-format +#: lib/command.php:661 +#, fuzzy, php-format msgid "This link is useable only once, and is good for only 2 minutes: %s" msgstr "" -"Це посилання можна використати лише раз, воно дійсне протягом 2 хвилин: %s" +"Це посилання можна використати лише раз, воно дійсне протягом 2 хвилин: %s." -#: lib/command.php:685 +#: lib/command.php:677 msgid "You are not subscribed to anyone." msgstr "Ви не маєте жодних підписок." -#: lib/command.php:687 +#: lib/command.php:679 msgid "You are subscribed to this person:" msgid_plural "You are subscribed to these people:" msgstr[0] "Ви підписані до цієї особи:" msgstr[1] "Ви підписані до цих людей:" msgstr[2] "Ви підписані до цих людей:" -#: lib/command.php:707 +#: lib/command.php:699 msgid "No one is subscribed to you." msgstr "До Вас ніхто не підписаний." -#: lib/command.php:709 +#: lib/command.php:701 msgid "This person is subscribed to you:" msgid_plural "These people are subscribed to you:" msgstr[0] "Ця особа є підписаною до Вас:" msgstr[1] "Ці люди підписані до Вас:" msgstr[2] "Ці люди підписані до Вас:" -#: lib/command.php:729 +#: lib/command.php:721 msgid "You are not a member of any groups." msgstr "Ви не є учасником жодної групи." -#: lib/command.php:731 +#: lib/command.php:723 msgid "You are a member of this group:" msgid_plural "You are a member of these groups:" msgstr[0] "Ви є учасником групи:" msgstr[1] "Ви є учасником таких груп:" msgstr[2] "Ви є учасником таких груп:" -#: lib/command.php:745 +#: lib/command.php:737 msgid "" "Commands:\n" "on - turn on notifications\n" @@ -4780,10 +4821,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\"" @@ -4965,24 +5002,10 @@ 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" -msgstr "" -"Про себе: %s\n" -"\n" +msgid "Bio: %s" +msgstr "Про себе: %s" #: lib/mail.php:286 #, php-format @@ -5180,6 +5203,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 +#, 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 "Виникла помилка під час завантаження Вашого файлу. Спробуйте ще." @@ -5213,16 +5258,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 "Не вдається визначити мімічний тип файлу." +msgid "Could not determine file's MIME type." +msgstr "Не вдається визначити MIME-тип файлу." #: lib/mediafile.php:270 #, php-format @@ -5231,8 +5276,8 @@ msgstr " Спробуйте використати інший %s формат." #: lib/mediafile.php:275 #, php-format -msgid "%s is not a supported filetype on this server." -msgstr "%s не підтримується як тип файлу на цьому сервері." +msgid "%s is not a supported file type on this server." +msgstr "%s не підтримується як тип файлів на цьому сервері." #: lib/messageform.php:120 msgid "Send a direct notice" @@ -5264,8 +5309,18 @@ msgid "Attach a file" msgstr "Вкласти файл" #: lib/noticeform.php:212 -msgid "Share your location" -msgstr "Показувати місцезнаходження" +#, 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 @@ -5381,6 +5436,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 "Підписки" @@ -5550,10 +5609,6 @@ msgstr "Хмарка теґів (позначки самих користува msgid "People Tagcloud as tagged" msgstr "Хмарка теґів (позначки, якими Ви позначили користувачів)" -#: lib/subscriptionlist.php:126 -msgid "(none)" -msgstr "(пусто)" - #: lib/tagcloudsection.php:56 msgid "None" msgstr "Пусто" @@ -5614,47 +5669,47 @@ msgstr "Повідомлення" msgid "Moderate" msgstr "Модерувати" -#: lib/util.php:837 +#: lib/util.php:884 msgid "a few seconds ago" msgstr "мить тому" -#: lib/util.php:839 +#: lib/util.php:886 msgid "about a minute ago" msgstr "хвилину тому" -#: lib/util.php:841 +#: lib/util.php:888 #, php-format msgid "about %d minutes ago" msgstr "близько %d хвилин тому" -#: lib/util.php:843 +#: lib/util.php:890 msgid "about an hour ago" msgstr "годину тому" -#: lib/util.php:845 +#: lib/util.php:892 #, php-format msgid "about %d hours ago" msgstr "близько %d годин тому" -#: lib/util.php:847 +#: lib/util.php:894 msgid "about a day ago" msgstr "день тому" -#: lib/util.php:849 +#: lib/util.php:896 #, php-format msgid "about %d days ago" msgstr "близько %d днів тому" -#: lib/util.php:851 +#: lib/util.php:898 msgid "about a month ago" msgstr "місяць тому" -#: lib/util.php:853 +#: lib/util.php:900 #, php-format msgid "about %d months ago" msgstr "близько %d місяців тому" -#: lib/util.php:855 +#: lib/util.php:902 msgid "about a year ago" msgstr "рік тому" @@ -5668,19 +5723,8 @@ msgstr "%s є неприпустимим кольором!" 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." +#: scripts/xmppdaemon.php:301 +#, php-format +msgid "Message too long - maximum is %1$d characters, you sent %2$d." msgstr "" -"Вибачте, але не затверджено жодної електронної адреси для вхідної пошти." +"Повідомлення надто довге — максимум %1$d символів, а Ви надсилаєте %2$d." diff --git a/locale/vi/LC_MESSAGES/statusnet.po b/locale/vi/LC_MESSAGES/statusnet.po index 029f4c86f..b503aa625 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-05 22:10+0000\n" -"PO-Revision-Date: 2010-01-05 22:12:52+0000\n" +"POT-Creation-Date: 2010-01-11 23:25+0000\n" +"PO-Revision-Date: 2010-01-11 23:28:31+0000\n" "Language-Team: Vietnamese\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha (r60693); Translate extension (2010-01-04)\n" +"X-Generator: MediaWiki 1.16alpha (r60950); 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" @@ -38,7 +38,7 @@ msgstr "Không có tin nhắn nào." #: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79 #: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75 #: actions/favoritesrss.php:74 actions/foaf.php:40 actions/foaf.php:58 -#: actions/microsummary.php:62 actions/newmessage.php:116 +#: actions/microsummary.php:62 actions/newmessage.php:116 actions/otp.php:76 #: actions/remotesubscribe.php:145 actions/remotesubscribe.php:154 #: actions/replies.php:73 actions/repliesrss.php:38 #: actions/showfavorites.php:105 actions/userbyid.php:74 @@ -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 #, 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 #, 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" @@ -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,11 +617,11 @@ 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/invite.php:56 actions/login.php:115 actions/makeadmin.php:66 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80 #: actions/othersettings.php:145 actions/passwordsettings.php:138 #: actions/profilesettings.php:194 actions/recoverpassword.php:337 @@ -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 +#: actions/joingroup.php:135 #, 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,67 +1881,57 @@ 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 +#: actions/leavegroup.php:134 #, 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 +#: actions/login.php:80 actions/otp.php:62 actions/register.php:137 msgid "Already logged in." msgstr "Đã đăng nhập." -#: actions/login.php:114 actions/login.php:124 -#, fuzzy -msgid "Invalid or expired token." -msgstr "Nội dung tin nhắn không hợp lệ" - -#: actions/login.php:147 +#: actions/login.php:126 msgid "Incorrect username or password." msgstr "Sai tên đăng nhập hoặc mật khẩu." -#: actions/login.php:153 +#: actions/login.php:132 actions/otp.php:120 #, fuzzy 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:188 actions/login.php:241 lib/action.php:460 #: lib/logingroupnav.php:79 msgid "Login" msgstr "Đăng nhập" -#: actions/login.php:247 +#: actions/login.php:227 msgid "Login to site" msgstr "" -#: actions/login.php:250 actions/profilesettings.php:106 -#: actions/register.php:423 actions/showgroup.php:236 actions/tagother.php:94 +#: actions/login.php:230 actions/profilesettings.php:106 +#: actions/register.php:424 actions/showgroup.php:236 actions/tagother.php:94 #: lib/groupeditform.php:152 lib/userprofile.php:131 msgid "Nickname" msgstr "Biệt danh" -#: actions/login.php:253 actions/register.php:428 +#: actions/login.php:233 actions/register.php:429 #: lib/accountsettingsaction.php:116 msgid "Password" msgstr "Mật khẩu" -#: actions/login.php:256 actions/register.php:477 +#: actions/login.php:236 actions/register.php:478 msgid "Remember me" msgstr "Nhớ tôi" -#: actions/login.php:257 actions/register.php:479 +#: actions/login.php:237 actions/register.php:480 msgid "Automatically login in the future; not for shared computers!" msgstr "Sẽ tự động đăng nhập, không dành cho các máy sử dụng chung!" -#: actions/login.php:267 +#: actions/login.php:247 msgid "Lost or forgotten password?" msgstr "Mất hoặc quên mật khẩu?" -#: actions/login.php:286 +#: actions/login.php:266 msgid "" "For security reasons, please re-enter your user name and password before " "changing your settings." @@ -1986,7 +1939,7 @@ msgstr "" "Vì lý do bảo mật, bạn hãy nhập lại tên đăng nhập và mật khẩu trước khi thay " "đổi trong điều chỉnh." -#: actions/login.php:290 +#: actions/login.php:270 #, php-format msgid "" "Login with your username and password. Don't have a username yet? [Register]" @@ -2001,19 +1954,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" @@ -2057,9 +2010,9 @@ msgstr "" msgid "Message sent" msgstr "Tin mới nhất" -#: actions/newmessage.php:185 lib/command.php:376 +#: actions/newmessage.php:185 #, 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 +2044,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 @@ -2151,8 +2104,8 @@ msgstr "Kết nối" msgid "Only " msgstr "" -#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1031 -#: lib/api.php:1059 lib/api.php:1169 +#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1033 +#: lib/api.php:1061 lib/api.php:1171 msgid "Not a supported data format." msgstr "Không hỗ trợ định dạng dữ liệu này." @@ -2200,10 +2153,29 @@ 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/otp.php:69 +#, fuzzy +msgid "No user ID specified." +msgstr "Thông báo mới" + +#: actions/otp.php:83 +#, fuzzy +msgid "No login token specified." +msgstr "Thông báo mới" + +#: actions/otp.php:90 +#, fuzzy +msgid "No login token requested." +msgstr "Không có URL cho hồ sơ để quay về." + +#: actions/otp.php:95 +#, fuzzy +msgid "Invalid login token specified." +msgstr "Nội dung tin nhắn không hợp lệ" + +#: actions/otp.php:104 +msgid "Login token expired." +msgstr "" #: actions/outbox.php:61 #, php-format @@ -2243,7 +2215,7 @@ msgid "6 or more characters" msgstr "Nhiều hơn 6 ký tự" #: actions/passwordsettings.php:112 actions/recoverpassword.php:239 -#: actions/register.php:432 actions/smssettings.php:134 +#: actions/register.php:433 actions/smssettings.php:134 msgid "Confirm" msgstr "Xác nhận" @@ -2280,7 +2252,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 +2285,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 +2391,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 +2423,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 +2433,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 @@ -2483,43 +2456,43 @@ msgstr "Hồ sơ này không biết" msgid "1-64 lowercase letters or numbers, no punctuation or spaces" msgstr "1-64 chữ cái thường hoặc là chữ số, không có dấu chấm hay " -#: actions/profilesettings.php:111 actions/register.php:447 +#: actions/profilesettings.php:111 actions/register.php:448 #: actions/showgroup.php:247 actions/tagother.php:104 #: lib/groupeditform.php:157 lib/userprofile.php:149 msgid "Full name" msgstr "Tên đầy đủ" -#: actions/profilesettings.php:115 actions/register.php:452 +#: actions/profilesettings.php:115 actions/register.php:453 #: lib/groupeditform.php:161 msgid "Homepage" msgstr "Trang chủ hoặc Blog" -#: actions/profilesettings.php:117 actions/register.php:454 +#: actions/profilesettings.php:117 actions/register.php:455 msgid "URL of your homepage, blog, or profile on another site" msgstr "URL về Trang chính, Blog, hoặc hồ sơ cá nhân của bạn trên " -#: actions/profilesettings.php:122 actions/register.php:460 +#: actions/profilesettings.php:122 actions/register.php:461 #, fuzzy, php-format msgid "Describe yourself and your interests in %d chars" msgstr "Nói về bạn và những sở thích của bạn khoảng 140 ký tự" -#: actions/profilesettings.php:125 actions/register.php:463 +#: actions/profilesettings.php:125 actions/register.php:464 #, fuzzy msgid "Describe yourself and your interests" msgstr "Nói về bạn và những sở thích của bạn khoảng 140 ký tự" -#: actions/profilesettings.php:127 actions/register.php:465 +#: actions/profilesettings.php:127 actions/register.php:466 msgid "Bio" msgstr "Lý lịch" -#: actions/profilesettings.php:132 actions/register.php:470 +#: actions/profilesettings.php:132 actions/register.php:471 #: actions/showgroup.php:256 actions/tagother.php:112 #: actions/userauthorization.php:158 lib/groupeditform.php:177 #: lib/userprofile.php:164 msgid "Location" msgstr "Thành phố" -#: actions/profilesettings.php:134 actions/register.php:472 +#: actions/profilesettings.php:134 actions/register.php:473 msgid "Where you are, like \"City, State (or Region), Country\"" msgstr "Bạn ở đâu, \"Thành phố, Tỉnh thành, Quốc gia\"" @@ -2583,21 +2556,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." @@ -2822,7 +2795,7 @@ msgstr "Lỗi xảy ra khi tạo thành viên." msgid "New password successfully saved. You are now logged in." msgstr "Mật khẩu mới đã được lưu. Bạn có thể đăng nhập ngay bây giờ." -#: actions/register.php:85 actions/register.php:189 actions/register.php:404 +#: actions/register.php:85 actions/register.php:189 actions/register.php:405 msgid "Sorry, only invited people can register." msgstr "" @@ -2835,7 +2808,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:503 lib/action.php:457 #: lib/logingroupnav.php:85 msgid "Register" msgstr "Đăng ký" @@ -2849,73 +2822,69 @@ 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." -#: actions/register.php:243 actions/register.php:264 +#: actions/register.php:243 actions/register.php:265 msgid "Invalid username or password." msgstr "Tên đăng nhập hoặc mật khẩu không hợp lệ." -#: actions/register.php:342 +#: actions/register.php:343 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 +#: actions/register.php:425 msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required." msgstr "" "1-64 chữ cái thường hoặc là chữ số, không có dấu chấm hay khoảng trắng. Bắt " "buộc." -#: actions/register.php:429 +#: actions/register.php:430 msgid "6 or more characters. Required." msgstr "Nhiều hơn 6 ký tự. Bắt buộc" -#: actions/register.php:433 +#: actions/register.php:434 msgid "Same as password above. Required." msgstr "Cùng mật khẩu ở trên. Bắt buộc." -#: actions/register.php:437 actions/register.php:441 +#: actions/register.php:438 actions/register.php:442 #: actions/siteadminpanel.php:270 lib/accountsettingsaction.php:120 msgid "Email" msgstr "Email" -#: actions/register.php:438 actions/register.php:442 +#: actions/register.php:439 actions/register.php:443 msgid "Used only for updates, announcements, and password recovery" msgstr "Chỉ dùng để cập nhật, thông báo, và hồi phục mật khẩu" -#: actions/register.php:449 +#: actions/register.php:450 msgid "Longer name, preferably your \"real\" name" msgstr "Họ tên đầy đủ của bạn, tốt nhất là tên thật của bạn." -#: actions/register.php:493 +#: actions/register.php:494 msgid "My text and files are available under " msgstr "Ghi chú và các file của tôi đã có ở phía dưới" -#: actions/register.php:495 +#: actions/register.php:496 msgid "Creative Commons Attribution 3.0" msgstr "" -#: actions/register.php:496 +#: actions/register.php:497 #, fuzzy msgid "" " except this private data: password, email address, IM address, and phone " "number." 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 +#: actions/register.php:538 +#, 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 " @@ -2940,7 +2909,7 @@ msgstr "" "\n" "Cảm ơn bạn đã đăng ký để là thành viên và rất mong bạn sẽ thích dịch vụ này." -#: actions/register.php:561 +#: actions/register.php:562 msgid "" "(You should receive a message by email momentarily, with instructions on how " "to confirm your email address.)" @@ -3043,11 +3012,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 +3030,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 +3044,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 +3063,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 +3112,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 +3163,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 +3233,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 +3260,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 +3272,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 +3318,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 +3513,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 +3546,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 +3649,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 +3686,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 +3722,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 +3810,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 +3817,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 +3928,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 +3986,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 +4019,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 +4034,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,23 +4048,94 @@ 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 "" -#: classes/File.php:137 +#: 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:144 #, 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 "" -#: classes/File.php:147 +#: classes/File.php:154 #, php-format msgid "A file this large would exceed your user quota of %d bytes." msgstr "" -#: classes/File.php:154 +#: classes/File.php:161 #, php-format msgid "A file this large would exceed your monthly quota of %d bytes." msgstr "" +#: classes/Login_token.php:76 +#, fuzzy, php-format +msgid "Could not create login token for %s" +msgstr "Không thể tạo favorite." + #: classes/Message.php:45 #, fuzzy msgid "You are banned from sending direct messages." @@ -4187,7 +4190,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)" @@ -4240,147 +4243,147 @@ msgstr "" #: lib/action.php:144 #, fuzzy, php-format -msgid "%s - %s" +msgid "%1$s - %2$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 +4392,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 +4408,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 +4445,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" @@ -4506,7 +4514,7 @@ msgstr "Đã lưu mật khẩu." 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 "" @@ -4542,8 +4550,9 @@ msgid "" msgstr "" #: lib/command.php:152 lib/command.php:399 lib/command.php:460 +#, fuzzy msgid "Notice with that id does not exist" -msgstr "" +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 @@ -4556,22 +4565,42 @@ 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:217 +#, fuzzy +msgid "You are already a member of that group" +msgstr "Bạn đã theo những người này:" + +#: lib/command.php:234 #, fuzzy, php-format -msgid "%1$s (%2$s)" -msgstr "%s (%s)" +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." + +#: lib/command.php:239 +#, fuzzy, php-format +msgid "%s joined group %s" +msgstr "%s và nhóm" + +#: 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." + +#: lib/command.php:289 +#, fuzzy, php-format +msgid "%s left group %s" +msgstr "%s và nhóm" #: lib/command.php:318 #, fuzzy, php-format msgid "Fullname: %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" @@ -4581,19 +4610,25 @@ msgstr "Trang chủ hoặc Blog: %s" msgid "About: %s" msgstr "Giới thiệu" -#: lib/command.php:358 scripts/xmppdaemon.php:301 +#: lib/command.php:358 #, php-format msgid "Message too long - maximum is %d characters, you sent %d" msgstr "" +#: lib/command.php:376 +#, fuzzy, php-format +msgid "Direct message to %s sent" +msgstr "Tin nhắn riêng" + #: lib/command.php:378 #, fuzzy msgid "Error sending direct message." msgstr "Thư bạn đã gửi" #: lib/command.php:422 +#, fuzzy msgid "Cannot repeat your own notice" -msgstr "" +msgstr "Bạn không thể đăng ký nếu không đồng ý các điều khoản." #: lib/command.php:427 #, fuzzy @@ -4669,47 +4704,42 @@ msgstr "" msgid "Login command is disabled" msgstr "" -#: lib/command.php:664 -#, fuzzy, php-format -msgid "Could not create login token for %s" -msgstr "Không thể tạo favorite." - -#: lib/command.php:669 +#: lib/command.php:661 #, php-format msgid "This link is useable only once, and is good for only 2 minutes: %s" msgstr "" -#: lib/command.php:685 +#: lib/command.php:677 #, fuzzy msgid "You are not subscribed to anyone." msgstr "Bạn chưa cập nhật thông tin riêng" -#: lib/command.php:687 +#: lib/command.php:679 msgid "You are subscribed to this person:" msgid_plural "You are subscribed to these people:" msgstr[0] "Bạn đã theo những người này:" -#: lib/command.php:707 +#: lib/command.php:699 #, fuzzy msgid "No one is subscribed to you." msgstr "Không thể tạo favorite." -#: lib/command.php:709 +#: lib/command.php:701 msgid "This person is subscribed to you:" msgid_plural "These people are subscribed to you:" msgstr[0] "Không thể tạo favorite." -#: lib/command.php:729 +#: lib/command.php:721 #, fuzzy msgid "You are not a member of any groups." msgstr "Bạn chưa cập nhật thông tin riêng" -#: lib/command.php:731 +#: lib/command.php:723 msgid "You are a member of this group:" msgid_plural "You are a member of these groups:" msgstr[0] "Bạn chưa cập nhật thông tin riêng" -#: lib/command.php:745 +#: lib/command.php:737 msgid "" "Commands:\n" "on - turn on notifications\n" @@ -4876,10 +4906,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 "" @@ -5071,22 +5097,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 @@ -5256,6 +5270,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 "" @@ -5287,7 +5323,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 @@ -5295,7 +5331,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 @@ -5305,7 +5342,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 @@ -5341,7 +5378,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 @@ -5467,6 +5514,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" @@ -5656,10 +5708,6 @@ msgstr "" msgid "People Tagcloud as tagged" msgstr "" -#: lib/subscriptionlist.php:126 -msgid "(none)" -msgstr "" - #: lib/tagcloudsection.php:56 #, fuzzy msgid "None" @@ -5729,47 +5777,47 @@ msgstr "Tin mới nhất" msgid "Moderate" msgstr "" -#: lib/util.php:837 +#: lib/util.php:884 msgid "a few seconds ago" msgstr "vài giây trước" -#: lib/util.php:839 +#: lib/util.php:886 msgid "about a minute ago" msgstr "1 phút trước" -#: lib/util.php:841 +#: lib/util.php:888 #, php-format msgid "about %d minutes ago" msgstr "%d phút trước" -#: lib/util.php:843 +#: lib/util.php:890 msgid "about an hour ago" msgstr "1 giờ trước" -#: lib/util.php:845 +#: lib/util.php:892 #, php-format msgid "about %d hours ago" msgstr "%d giờ trước" -#: lib/util.php:847 +#: lib/util.php:894 msgid "about a day ago" msgstr "1 ngày trước" -#: lib/util.php:849 +#: lib/util.php:896 #, php-format msgid "about %d days ago" msgstr "%d ngày trước" -#: lib/util.php:851 +#: lib/util.php:898 msgid "about a month ago" msgstr "1 tháng trước" -#: lib/util.php:853 +#: lib/util.php:900 #, php-format msgid "about %d months ago" msgstr "%d tháng trước" -#: lib/util.php:855 +#: lib/util.php:902 msgid "about a year ago" msgstr "1 năm trước" @@ -5783,19 +5831,7 @@ msgstr "Trang chủ không phải là URL" 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." +#: scripts/xmppdaemon.php:301 +#, php-format +msgid "Message too long - maximum is %1$d characters, you sent %2$d." +msgstr "" diff --git a/locale/zh_CN/LC_MESSAGES/statusnet.po b/locale/zh_CN/LC_MESSAGES/statusnet.po index 576797ad3..040571a28 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-05 22:10+0000\n" -"PO-Revision-Date: 2010-01-05 22:12:55+0000\n" +"POT-Creation-Date: 2010-01-11 23:25+0000\n" +"PO-Revision-Date: 2010-01-11 23:28:35+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 (r60693); Translate extension (2010-01-04)\n" +"X-Generator: MediaWiki 1.16alpha (r60950); 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" @@ -40,7 +40,7 @@ msgstr "没有该页面" #: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79 #: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75 #: actions/favoritesrss.php:74 actions/foaf.php:40 actions/foaf.php:58 -#: actions/microsummary.php:62 actions/newmessage.php:116 +#: actions/microsummary.php:62 actions/newmessage.php:116 actions/otp.php:76 #: actions/remotesubscribe.php:145 actions/remotesubscribe.php:154 #: actions/replies.php:73 actions/repliesrss.php:38 #: actions/showfavorites.php:105 actions/userbyid.php:74 @@ -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 #, 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 #, 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" @@ -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,11 +611,11 @@ 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/invite.php:56 actions/login.php:115 actions/makeadmin.php:66 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80 #: actions/othersettings.php:145 actions/passwordsettings.php:138 #: actions/profilesettings.php:194 actions/recoverpassword.php:337 @@ -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 +#: actions/joingroup.php:135 #, 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,73 +1838,63 @@ msgstr "您未告知此个人信息" msgid "Could not find membership record." msgstr "无法更新用户记录。" -#: actions/leavegroup.php:127 lib/command.php:284 +#: actions/leavegroup.php:134 #, 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" +msgid "%1$s left group %2$s" msgstr "%s 离开群 %s" -#: actions/login.php:83 actions/register.php:137 +#: actions/login.php:80 actions/otp.php:62 actions/register.php:137 msgid "Already logged in." msgstr "已登录。" -#: actions/login.php:114 actions/login.php:124 -#, fuzzy -msgid "Invalid or expired token." -msgstr "通告内容不正确" - -#: actions/login.php:147 +#: actions/login.php:126 msgid "Incorrect username or password." msgstr "用户名或密码不正确。" -#: actions/login.php:153 +#: actions/login.php:132 actions/otp.php:120 #, fuzzy 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:188 actions/login.php:241 lib/action.php:460 #: lib/logingroupnav.php:79 msgid "Login" msgstr "登录" -#: actions/login.php:247 +#: actions/login.php:227 msgid "Login to site" msgstr "登录" -#: actions/login.php:250 actions/profilesettings.php:106 -#: actions/register.php:423 actions/showgroup.php:236 actions/tagother.php:94 +#: actions/login.php:230 actions/profilesettings.php:106 +#: actions/register.php:424 actions/showgroup.php:236 actions/tagother.php:94 #: lib/groupeditform.php:152 lib/userprofile.php:131 msgid "Nickname" msgstr "昵称" -#: actions/login.php:253 actions/register.php:428 +#: actions/login.php:233 actions/register.php:429 #: lib/accountsettingsaction.php:116 msgid "Password" msgstr "密码" -#: actions/login.php:256 actions/register.php:477 +#: actions/login.php:236 actions/register.php:478 msgid "Remember me" msgstr "记住登录状态" -#: actions/login.php:257 actions/register.php:479 +#: actions/login.php:237 actions/register.php:480 msgid "Automatically login in the future; not for shared computers!" msgstr "保持这台机器上的登录状态。不要在共用的机器上保持登录！" -#: actions/login.php:267 +#: actions/login.php:247 msgid "Lost or forgotten password?" msgstr "忘记了密码？" -#: actions/login.php:286 +#: actions/login.php:266 msgid "" "For security reasons, please re-enter your user name and password before " "changing your settings." msgstr "由于安全原因，修改设置前需要输入用户名和密码。" -#: actions/login.php:290 +#: actions/login.php:270 #, fuzzy, php-format msgid "" "Login with your username and password. Don't have a username yet? [Register]" @@ -1950,19 +1908,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" @@ -2003,9 +1961,9 @@ msgstr "不要向自己发送消息；跟自己悄悄说就得了。" msgid "Message sent" msgstr "新消息" -#: actions/newmessage.php:185 lib/command.php:376 -#, php-format -msgid "Direct message to %s sent" +#: actions/newmessage.php:185 +#, 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 +1993,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 @@ -2093,8 +2051,8 @@ msgstr "连接" msgid "Only " msgstr "" -#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1031 -#: lib/api.php:1059 lib/api.php:1169 +#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1033 +#: lib/api.php:1061 lib/api.php:1171 msgid "Not a supported data format." msgstr "不支持的数据格式。" @@ -2141,10 +2099,30 @@ 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/otp.php:69 +#, fuzzy +msgid "No user ID specified." +msgstr "没有收件人。" + +#: actions/otp.php:83 +#, fuzzy +msgid "No login token specified." +msgstr "没有收件人。" + +#: actions/otp.php:90 +#, fuzzy +msgid "No login token requested." +msgstr "服务器没有返回个人信息URL。" + +#: actions/otp.php:95 +#, fuzzy +msgid "Invalid login token specified." +msgstr "通告内容不正确" + +#: actions/otp.php:104 +#, fuzzy +msgid "Login token expired." +msgstr "登录" #: actions/outbox.php:61 #, php-format @@ -2182,7 +2160,7 @@ msgid "6 or more characters" msgstr "6 个或更多字符" #: actions/passwordsettings.php:112 actions/recoverpassword.php:239 -#: actions/register.php:432 actions/smssettings.php:134 +#: actions/register.php:433 actions/smssettings.php:134 msgid "Confirm" msgstr "确认" @@ -2218,7 +2196,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 +2229,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 +2331,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 +2363,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 +2373,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 @@ -2415,43 +2394,43 @@ msgstr "未知的帐号" msgid "1-64 lowercase letters or numbers, no punctuation or spaces" msgstr "1 到 64 个小写字母或数字，不包含标点及空白" -#: actions/profilesettings.php:111 actions/register.php:447 +#: actions/profilesettings.php:111 actions/register.php:448 #: actions/showgroup.php:247 actions/tagother.php:104 #: lib/groupeditform.php:157 lib/userprofile.php:149 msgid "Full name" msgstr "全名" -#: actions/profilesettings.php:115 actions/register.php:452 +#: actions/profilesettings.php:115 actions/register.php:453 #: lib/groupeditform.php:161 msgid "Homepage" msgstr "主页" -#: actions/profilesettings.php:117 actions/register.php:454 +#: actions/profilesettings.php:117 actions/register.php:455 msgid "URL of your homepage, blog, or profile on another site" msgstr "您的主页、博客或在其他站点的URL" -#: actions/profilesettings.php:122 actions/register.php:460 +#: actions/profilesettings.php:122 actions/register.php:461 #, fuzzy, php-format msgid "Describe yourself and your interests in %d chars" msgstr "用不超过140个字符描述您自己和您的爱好" -#: actions/profilesettings.php:125 actions/register.php:463 +#: actions/profilesettings.php:125 actions/register.php:464 #, fuzzy msgid "Describe yourself and your interests" msgstr "用不超过140个字符描述您自己和您的爱好" -#: actions/profilesettings.php:127 actions/register.php:465 +#: actions/profilesettings.php:127 actions/register.php:466 msgid "Bio" msgstr "自述" -#: actions/profilesettings.php:132 actions/register.php:470 +#: actions/profilesettings.php:132 actions/register.php:471 #: actions/showgroup.php:256 actions/tagother.php:112 #: actions/userauthorization.php:158 lib/groupeditform.php:177 #: lib/userprofile.php:164 msgid "Location" msgstr "位置" -#: actions/profilesettings.php:134 actions/register.php:472 +#: actions/profilesettings.php:134 actions/register.php:473 msgid "Where you are, like \"City, State (or Region), Country\"" msgstr "你的位置，格式类似\"城市，省份，国家\"" @@ -2513,21 +2492,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 "设置已保存。" @@ -2751,7 +2730,7 @@ msgstr "保存用户设置时出错。" msgid "New password successfully saved. You are now logged in." msgstr "新密码已保存，您现在已登录。" -#: actions/register.php:85 actions/register.php:189 actions/register.php:404 +#: actions/register.php:85 actions/register.php:189 actions/register.php:405 msgid "Sorry, only invited people can register." msgstr "对不起，请邀请那些能注册的人。" @@ -2764,7 +2743,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:503 lib/action.php:457 #: lib/logingroupnav.php:85 msgid "Register" msgstr "注册" @@ -2777,71 +2756,67 @@ 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 "电子邮件地址已存在。" -#: actions/register.php:243 actions/register.php:264 +#: actions/register.php:243 actions/register.php:265 msgid "Invalid username or password." msgstr "用户名或密码不正确。" -#: actions/register.php:342 +#: actions/register.php:343 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 +#: actions/register.php:425 msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required." msgstr "1 到 64 个小写字母或数字，不包含标点及空白。此项必填。" -#: actions/register.php:429 +#: actions/register.php:430 msgid "6 or more characters. Required." msgstr "6 个或更多字符。此项必填。" -#: actions/register.php:433 +#: actions/register.php:434 msgid "Same as password above. Required." msgstr "相同的密码。此项必填。" -#: actions/register.php:437 actions/register.php:441 +#: actions/register.php:438 actions/register.php:442 #: actions/siteadminpanel.php:270 lib/accountsettingsaction.php:120 msgid "Email" msgstr "电子邮件" -#: actions/register.php:438 actions/register.php:442 +#: actions/register.php:439 actions/register.php:443 msgid "Used only for updates, announcements, and password recovery" msgstr "只用于更新、通告或密码恢复" -#: actions/register.php:449 +#: actions/register.php:450 msgid "Longer name, preferably your \"real\" name" msgstr "长名字，最好是“实名”" -#: actions/register.php:493 +#: actions/register.php:494 msgid "My text and files are available under " msgstr "我的文字和文件采用的授权方式为" -#: actions/register.php:495 +#: actions/register.php:496 msgid "Creative Commons Attribution 3.0" msgstr "" -#: actions/register.php:496 +#: actions/register.php:497 #, fuzzy msgid "" " except this private data: password, email address, IM address, and phone " "number." msgstr "除了隐私内容：密码，电子邮件，即时通讯帐号，电话号码。" -#: actions/register.php:537 -#, php-format +#: actions/register.php:538 +#, 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 " @@ -2866,7 +2841,7 @@ msgstr "" "\n" "感谢您的注册，希望您喜欢这个服务。" -#: actions/register.php:561 +#: actions/register.php:562 msgid "" "(You should receive a message by email momentarily, with instructions on how " "to confirm your email address.)" @@ -2968,11 +2943,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 +2959,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 +2975,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 +2994,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 +3043,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 +3094,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 +3165,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 +3191,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 +3204,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 +3252,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 +3448,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 +3479,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 +3574,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 +3612,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 +3648,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 +3737,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 +3744,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 +3854,7 @@ msgstr "" "请检查详细信息，确认希望订阅此用户的通告。如果您刚才没有要求订阅任何人的通" "告，请点击\"取消\"。" -#: actions/userauthorization.php:188 +#: actions/userauthorization.php:188 actions/version.php:165 #, fuzzy msgid "License" msgstr "注册证" @@ -3961,7 +3909,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 +3942,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 +3957,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,23 +3972,95 @@ msgstr "您未告知此个人信息" msgid "Try [searching for groups](%%action.groupsearch%%) and joining them." msgstr "" -#: classes/File.php:137 +#: 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:144 #, 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 "" -#: classes/File.php:147 +#: classes/File.php:154 #, php-format msgid "A file this large would exceed your user quota of %d bytes." msgstr "" -#: classes/File.php:154 +#: classes/File.php:161 #, php-format msgid "A file this large would exceed your monthly quota of %d bytes." msgstr "" +#: classes/Login_token.php:76 +#, fuzzy, php-format +msgid "Could not create login token for %s" +msgstr "无法创建收藏。" + #: classes/Message.php:45 #, fuzzy msgid "You are banned from sending direct messages." @@ -4104,7 +4114,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)" @@ -4154,144 +4164,144 @@ msgstr "其他选项" #: lib/action.php:144 #, fuzzy, php-format -msgid "%s - %s" -msgstr "%s (%s)" +msgid "%1$s - %2$s" +msgstr "%1$s (%2$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 +4310,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 +4326,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 +4363,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短信确认" @@ -4418,7 +4433,7 @@ msgstr "密码已保存。" msgid "Command results" msgstr "执行结果" -#: lib/channel.php:210 +#: lib/channel.php:210 lib/mailhandler.php:142 msgid "Command complete" msgstr "执行完毕" @@ -4453,11 +4468,13 @@ msgid "" msgstr "" #: lib/command.php:152 lib/command.php:399 lib/command.php:460 +#, fuzzy msgid "Notice with that id does not exist" -msgstr "" +msgstr "没有找到此ID的信息。" #: lib/command.php:168 lib/command.php:415 lib/command.php:476 #: lib/command.php:532 +#, fuzzy msgid "User has no last notice" msgstr "用户没有通告。" @@ -4465,22 +4482,42 @@ msgstr "用户没有通告。" 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:217 +#, fuzzy +msgid "You are already a member of that group" +msgstr "您已经是该组成员" + +#: lib/command.php:234 +#, fuzzy, php-format +msgid "Could not join user %s to group %s" +msgstr "无法把 %s 用户添加到 %s 组" + +#: lib/command.php:239 +#, fuzzy, php-format +msgid "%s joined group %s" +msgstr "%s 加入 %s 组" + +#: lib/command.php:284 +#, fuzzy, php-format +msgid "Could not remove user %s to group %s" +msgstr "无法订阅用户：未找到。" + +#: lib/command.php:289 +#, fuzzy, php-format +msgid "%s left group %s" +msgstr "%s 离开群 %s" #: lib/command.php:318 -#, php-format +#, fuzzy, php-format msgid "Fullname: %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" @@ -4490,11 +4527,16 @@ msgstr "主页：%s" msgid "About: %s" msgstr "关于：%s" -#: lib/command.php:358 scripts/xmppdaemon.php:301 +#: lib/command.php:358 #, fuzzy, php-format msgid "Message too long - maximum is %d characters, you sent %d" msgstr "您的消息包含 %d 个字符，超出长度限制 - 不能超过 140 个字符。" +#: lib/command.php:376 +#, fuzzy, php-format +msgid "Direct message to %s sent" +msgstr "已向 %s 发送消息" + #: lib/command.php:378 msgid "Error sending direct message." msgstr "发送消息出错。" @@ -4535,6 +4577,7 @@ msgid "Error saving notice." msgstr "保存通告时出错。" #: lib/command.php:556 +#, fuzzy msgid "Specify the name of the user to subscribe to" msgstr "指定要订阅的用户名" @@ -4544,6 +4587,7 @@ msgid "Subscribed to %s" msgstr "订阅 %s" #: lib/command.php:584 +#, fuzzy msgid "Specify the name of the user to unsubscribe from" msgstr "指定要取消订阅的用户名" @@ -4576,47 +4620,42 @@ msgstr "无法开启通告。" msgid "Login command is disabled" msgstr "" -#: lib/command.php:664 -#, fuzzy, php-format -msgid "Could not create login token for %s" -msgstr "无法创建收藏。" - -#: lib/command.php:669 +#: lib/command.php:661 #, php-format msgid "This link is useable only once, and is good for only 2 minutes: %s" msgstr "" -#: lib/command.php:685 +#: lib/command.php:677 #, fuzzy msgid "You are not subscribed to anyone." msgstr "您未告知此个人信息" -#: lib/command.php:687 +#: lib/command.php:679 msgid "You are subscribed to this person:" msgid_plural "You are subscribed to these people:" msgstr[0] "您已订阅这些用户：" -#: lib/command.php:707 +#: lib/command.php:699 #, fuzzy msgid "No one is subscribed to you." msgstr "无法订阅他人更新。" -#: lib/command.php:709 +#: lib/command.php:701 msgid "This person is subscribed to you:" msgid_plural "These people are subscribed to you:" msgstr[0] "无法订阅他人更新。" -#: lib/command.php:729 +#: lib/command.php:721 #, fuzzy msgid "You are not a member of any groups." msgstr "您未告知此个人信息" -#: lib/command.php:731 +#: lib/command.php:723 msgid "You are a member of this group:" msgid_plural "You are a member of these groups:" msgstr[0] "您未告知此个人信息" -#: lib/command.php:745 +#: lib/command.php:737 msgid "" "Commands:\n" "on - turn on notifications\n" @@ -4782,11 +4821,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 "" @@ -4958,21 +4992,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" @@ -5117,6 +5139,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 "" @@ -5148,7 +5191,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 @@ -5156,7 +5199,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 @@ -5166,7 +5210,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 @@ -5202,7 +5246,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 @@ -5328,6 +5382,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 "订阅" @@ -5514,10 +5573,6 @@ msgstr "" msgid "People Tagcloud as tagged" msgstr "" -#: lib/subscriptionlist.php:126 -msgid "(none)" -msgstr "(none 没有)" - #: lib/tagcloudsection.php:56 #, fuzzy msgid "None" @@ -5588,47 +5643,47 @@ msgstr "新消息" msgid "Moderate" msgstr "" -#: lib/util.php:837 +#: lib/util.php:884 msgid "a few seconds ago" msgstr "几秒前" -#: lib/util.php:839 +#: lib/util.php:886 msgid "about a minute ago" msgstr "一分钟前" -#: lib/util.php:841 +#: lib/util.php:888 #, php-format msgid "about %d minutes ago" msgstr "%d 分钟前" -#: lib/util.php:843 +#: lib/util.php:890 msgid "about an hour ago" msgstr "一小时前" -#: lib/util.php:845 +#: lib/util.php:892 #, php-format msgid "about %d hours ago" msgstr "%d 小时前" -#: lib/util.php:847 +#: lib/util.php:894 msgid "about a day ago" msgstr "一天前" -#: lib/util.php:849 +#: lib/util.php:896 #, php-format msgid "about %d days ago" msgstr "%d 天前" -#: lib/util.php:851 +#: lib/util.php:898 msgid "about a month ago" msgstr "一个月前" -#: lib/util.php:853 +#: lib/util.php:900 #, php-format msgid "about %d months ago" msgstr "%d 个月前" -#: lib/util.php:855 +#: lib/util.php:902 msgid "about a year ago" msgstr "一年前" @@ -5642,18 +5697,7 @@ msgstr "主页的URL不正确。" 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 "对不起，发布用的电子邮件无法使用。" +#: scripts/xmppdaemon.php:301 +#, fuzzy, php-format +msgid "Message too long - maximum is %1$d characters, you sent %2$d." +msgstr "您的消息包含 %d 个字符，超出长度限制 - 不能超过 140 个字符。" diff --git a/locale/zh_TW/LC_MESSAGES/statusnet.po b/locale/zh_TW/LC_MESSAGES/statusnet.po index 906f8fab1..314bd0cdd 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-05 22:10+0000\n" -"PO-Revision-Date: 2010-01-05 22:13:02+0000\n" +"POT-Creation-Date: 2010-01-11 23:25+0000\n" +"PO-Revision-Date: 2010-01-11 23:28:38+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 (r60693); Translate extension (2010-01-04)\n" +"X-Generator: MediaWiki 1.16alpha (r60950); 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" @@ -38,7 +38,7 @@ msgstr "無此通知" #: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79 #: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75 #: actions/favoritesrss.php:74 actions/foaf.php:40 actions/foaf.php:58 -#: actions/microsummary.php:62 actions/newmessage.php:116 +#: actions/microsummary.php:62 actions/newmessage.php:116 actions/otp.php:76 #: actions/remotesubscribe.php:145 actions/remotesubscribe.php:154 #: actions/replies.php:73 actions/repliesrss.php:38 #: actions/showfavorites.php:105 actions/userbyid.php:74 @@ -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 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 #, 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" @@ -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,11 +604,11 @@ 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/invite.php:56 actions/login.php:115 actions/makeadmin.php:66 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80 #: actions/othersettings.php:145 actions/passwordsettings.php:138 #: actions/profilesettings.php:194 actions/recoverpassword.php:337 @@ -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 +#: actions/joingroup.php:135 #, php-format -msgid "%s joined group %s" +msgid "%1$s joined group %2$s" msgstr "" #: actions/leavegroup.php:60 @@ -1806,71 +1773,62 @@ msgstr "" msgid "Could not find membership record." msgstr "" -#: actions/leavegroup.php:127 lib/command.php:284 +#: actions/leavegroup.php:134 #, 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 "" +msgid "%1$s left group %2$s" +msgstr "%1$s的狀態是%2$s" -#: actions/login.php:83 actions/register.php:137 +#: actions/login.php:80 actions/otp.php:62 actions/register.php:137 msgid "Already logged in." msgstr "已登入" -#: actions/login.php:114 actions/login.php:124 -msgid "Invalid or expired token." -msgstr "" - -#: actions/login.php:147 +#: actions/login.php:126 msgid "Incorrect username or password." msgstr "使用者名稱或密碼錯誤" -#: actions/login.php:153 +#: actions/login.php:132 actions/otp.php:120 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:188 actions/login.php:241 lib/action.php:460 #: lib/logingroupnav.php:79 msgid "Login" msgstr "登入" -#: actions/login.php:247 +#: actions/login.php:227 msgid "Login to site" msgstr "" -#: actions/login.php:250 actions/profilesettings.php:106 -#: actions/register.php:423 actions/showgroup.php:236 actions/tagother.php:94 +#: actions/login.php:230 actions/profilesettings.php:106 +#: actions/register.php:424 actions/showgroup.php:236 actions/tagother.php:94 #: lib/groupeditform.php:152 lib/userprofile.php:131 msgid "Nickname" msgstr "暱稱" -#: actions/login.php:253 actions/register.php:428 +#: actions/login.php:233 actions/register.php:429 #: lib/accountsettingsaction.php:116 msgid "Password" msgstr "" -#: actions/login.php:256 actions/register.php:477 +#: actions/login.php:236 actions/register.php:478 msgid "Remember me" msgstr "" -#: actions/login.php:257 actions/register.php:479 +#: actions/login.php:237 actions/register.php:480 msgid "Automatically login in the future; not for shared computers!" msgstr "未來在同一部電腦自動登入" -#: actions/login.php:267 +#: actions/login.php:247 msgid "Lost or forgotten password?" msgstr "遺失或忘記密碼了嗎？" -#: actions/login.php:286 +#: actions/login.php:266 msgid "" "For security reasons, please re-enter your user name and password before " "changing your settings." msgstr "為安全起見，請先重新輸入你的使用者名稱與密碼再更改設定。" -#: actions/login.php:290 +#: actions/login.php:270 #, php-format msgid "" "Login with your username and password. Don't have a username yet? [Register]" @@ -1883,18 +1841,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" @@ -1934,9 +1892,9 @@ msgstr "" msgid "Message sent" msgstr "" -#: actions/newmessage.php:185 lib/command.php:376 +#: actions/newmessage.php:185 #, 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 +1922,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 @@ -2022,8 +1980,8 @@ msgstr "連結" msgid "Only " msgstr "" -#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1031 -#: lib/api.php:1059 lib/api.php:1169 +#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1033 +#: lib/api.php:1061 lib/api.php:1171 msgid "Not a supported data format." msgstr "" @@ -2069,9 +2027,28 @@ 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" +#: actions/otp.php:69 +#, fuzzy +msgid "No user ID specified." +msgstr "新訊息" + +#: actions/otp.php:83 +#, fuzzy +msgid "No login token specified." +msgstr "新訊息" + +#: actions/otp.php:90 +#, fuzzy +msgid "No login token requested." +msgstr "無確認請求" + +#: actions/otp.php:95 +#, fuzzy +msgid "Invalid login token specified." +msgstr "新訊息" + +#: actions/otp.php:104 +msgid "Login token expired." msgstr "" #: actions/outbox.php:61 @@ -2109,7 +2086,7 @@ msgid "6 or more characters" msgstr "6個以上字元" #: actions/passwordsettings.php:112 actions/recoverpassword.php:239 -#: actions/register.php:432 actions/smssettings.php:134 +#: actions/register.php:433 actions/smssettings.php:134 msgid "Confirm" msgstr "確認" @@ -2145,7 +2122,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 +2155,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 +2253,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 +2283,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 +2293,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 @@ -2335,43 +2313,43 @@ msgstr "" msgid "1-64 lowercase letters or numbers, no punctuation or spaces" msgstr "1-64個小寫英文字母或數字，勿加標點符號或空格" -#: actions/profilesettings.php:111 actions/register.php:447 +#: actions/profilesettings.php:111 actions/register.php:448 #: actions/showgroup.php:247 actions/tagother.php:104 #: lib/groupeditform.php:157 lib/userprofile.php:149 msgid "Full name" msgstr "全名" -#: actions/profilesettings.php:115 actions/register.php:452 +#: actions/profilesettings.php:115 actions/register.php:453 #: lib/groupeditform.php:161 msgid "Homepage" msgstr "個人首頁" -#: actions/profilesettings.php:117 actions/register.php:454 +#: actions/profilesettings.php:117 actions/register.php:455 msgid "URL of your homepage, blog, or profile on another site" msgstr "" -#: actions/profilesettings.php:122 actions/register.php:460 +#: actions/profilesettings.php:122 actions/register.php:461 #, fuzzy, php-format msgid "Describe yourself and your interests in %d chars" msgstr "請在140個字以內描述你自己與你的興趣" -#: actions/profilesettings.php:125 actions/register.php:463 +#: actions/profilesettings.php:125 actions/register.php:464 #, fuzzy msgid "Describe yourself and your interests" msgstr "請在140個字以內描述你自己與你的興趣" -#: actions/profilesettings.php:127 actions/register.php:465 +#: actions/profilesettings.php:127 actions/register.php:466 msgid "Bio" msgstr "自我介紹" -#: actions/profilesettings.php:132 actions/register.php:470 +#: actions/profilesettings.php:132 actions/register.php:471 #: actions/showgroup.php:256 actions/tagother.php:112 #: actions/userauthorization.php:158 lib/groupeditform.php:177 #: lib/userprofile.php:164 msgid "Location" msgstr "地點" -#: actions/profilesettings.php:134 actions/register.php:472 +#: actions/profilesettings.php:134 actions/register.php:473 msgid "Where you are, like \"City, State (or Region), Country\"" msgstr "" @@ -2433,21 +2411,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 "" @@ -2665,7 +2643,7 @@ msgstr "使用者設定發生錯誤" msgid "New password successfully saved. You are now logged in." msgstr "新密碼已儲存成功。你已登入。" -#: actions/register.php:85 actions/register.php:189 actions/register.php:404 +#: actions/register.php:85 actions/register.php:189 actions/register.php:405 msgid "Sorry, only invited people can register." msgstr "" @@ -2678,7 +2656,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:503 lib/action.php:457 #: lib/logingroupnav.php:85 msgid "Register" msgstr "" @@ -2691,71 +2669,67 @@ 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 "此電子信箱已註冊過了" -#: actions/register.php:243 actions/register.php:264 +#: actions/register.php:243 actions/register.php:265 msgid "Invalid username or password." msgstr "使用者名稱或密碼無效" -#: actions/register.php:342 +#: actions/register.php:343 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 +#: actions/register.php:425 msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required." msgstr "" -#: actions/register.php:429 +#: actions/register.php:430 msgid "6 or more characters. Required." msgstr "" -#: actions/register.php:433 +#: actions/register.php:434 msgid "Same as password above. Required." msgstr "" -#: actions/register.php:437 actions/register.php:441 +#: actions/register.php:438 actions/register.php:442 #: actions/siteadminpanel.php:270 lib/accountsettingsaction.php:120 msgid "Email" msgstr "電子信箱" -#: actions/register.php:438 actions/register.php:442 +#: actions/register.php:439 actions/register.php:443 msgid "Used only for updates, announcements, and password recovery" msgstr "" -#: actions/register.php:449 +#: actions/register.php:450 msgid "Longer name, preferably your \"real\" name" msgstr "" -#: actions/register.php:493 +#: actions/register.php:494 msgid "My text and files are available under " msgstr "" -#: actions/register.php:495 +#: actions/register.php:496 msgid "Creative Commons Attribution 3.0" msgstr "" -#: actions/register.php:496 +#: actions/register.php:497 #, fuzzy msgid "" " except this private data: password, email address, IM address, and phone " "number." msgstr "不包含這些個人資料：密碼、電子信箱、線上即時通信箱、電話號碼" -#: actions/register.php:537 +#: actions/register.php:538 #, 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 " @@ -2768,7 +2742,7 @@ msgid "" "Thanks for signing up and we hope you enjoy using this service." msgstr "" -#: actions/register.php:561 +#: actions/register.php:562 msgid "" "(You should receive a message by email momentarily, with instructions on how " "to confirm your email address.)" @@ -2862,11 +2836,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 +2854,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 +2868,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 +2886,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 +2935,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 +2985,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 +3053,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 +3080,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 +3092,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 +3136,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 +3327,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 +3358,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 +3446,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 +3484,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 +3520,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 +3605,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 +3612,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 +3716,7 @@ msgid "" "click “Reject”." msgstr "" -#: actions/userauthorization.php:188 +#: actions/userauthorization.php:188 actions/version.php:165 msgid "License" msgstr "" @@ -3819,7 +3766,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 +3799,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 +3813,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,23 +3827,95 @@ msgstr "" msgid "Try [searching for groups](%%action.groupsearch%%) and joining them." msgstr "" -#: classes/File.php:137 +#: 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:144 #, 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 "" -#: classes/File.php:147 +#: classes/File.php:154 #, php-format msgid "A file this large would exceed your user quota of %d bytes." msgstr "" -#: classes/File.php:154 +#: classes/File.php:161 #, php-format msgid "A file this large would exceed your monthly quota of %d bytes." msgstr "" +#: classes/Login_token.php:76 +#, fuzzy, php-format +msgid "Could not create login token for %s" +msgstr "無法存取個人圖像資料" + #: classes/Message.php:45 msgid "You are banned from sending direct messages." msgstr "" @@ -3958,7 +3967,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 "" @@ -4009,142 +4018,142 @@ msgid "Other options" msgstr "" #: lib/action.php:144 -#, php-format -msgid "%s - %s" -msgstr "" +#, fuzzy, php-format +msgid "%1$s - %2$s" +msgstr "%1$s的狀態是%2$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 #, 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 +4162,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 +4175,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 +4209,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 "確認信箱" @@ -4259,7 +4272,7 @@ msgstr "" msgid "Command results" msgstr "" -#: lib/channel.php:210 +#: lib/channel.php:210 lib/mailhandler.php:142 msgid "Command complete" msgstr "" @@ -4272,7 +4285,7 @@ msgid "Sorry, this command is not yet implemented." msgstr "" #: lib/command.php:88 -#, php-format +#, fuzzy, php-format msgid "Could not find a user with nickname %s" msgstr "無法更新使用者" @@ -4299,29 +4312,50 @@ msgstr "" #: lib/command.php:168 lib/command.php:415 lib/command.php:476 #: lib/command.php:532 +#, fuzzy msgid "User has no last notice" -msgstr "" +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:217 +#, fuzzy +msgid "You are already a member of that group" +msgstr "無法連結到伺服器:%s" + +#: lib/command.php:234 +#, fuzzy, php-format +msgid "Could not join user %s to group %s" +msgstr "無法連結到伺服器:%s" + +#: lib/command.php:239 +#, fuzzy, php-format +msgid "%s joined group %s" +msgstr "%1$s的狀態是%2$s" + +#: lib/command.php:284 +#, fuzzy, php-format +msgid "Could not remove user %s to group %s" +msgstr "無法從 %s 建立OpenID" + +#: lib/command.php:289 +#, fuzzy, php-format +msgid "%s left group %s" +msgstr "%1$s的狀態是%2$s" #: lib/command.php:318 -#, php-format +#, fuzzy, php-format msgid "Fullname: %s" -msgstr "" +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 "" @@ -4331,22 +4365,29 @@ msgstr "" msgid "About: %s" msgstr "" -#: lib/command.php:358 scripts/xmppdaemon.php:301 +#: lib/command.php:358 #, php-format msgid "Message too long - maximum is %d characters, you sent %d" msgstr "" +#: lib/command.php:376 +#, php-format +msgid "Direct message to %s sent" +msgstr "" + #: lib/command.php:378 msgid "Error sending direct message." msgstr "" #: lib/command.php:422 +#, fuzzy msgid "Cannot repeat your own notice" -msgstr "" +msgstr "儲存使用者發生錯誤" #: lib/command.php:427 +#, fuzzy msgid "Already repeated that notice" -msgstr "" +msgstr "無此使用者" #: lib/command.php:435 #, fuzzy, php-format @@ -4364,9 +4405,9 @@ msgid "Notice too long - maximum is %d characters, you sent %d" msgstr "" #: lib/command.php:500 -#, php-format +#, fuzzy, php-format msgid "Reply to %s sent" -msgstr "" +msgstr "&s的微型部落格" #: lib/command.php:502 msgid "Error saving notice." @@ -4414,47 +4455,42 @@ msgstr "" msgid "Login command is disabled" msgstr "" -#: lib/command.php:664 -#, fuzzy, php-format -msgid "Could not create login token for %s" -msgstr "無法存取個人圖像資料" - -#: lib/command.php:669 +#: lib/command.php:661 #, php-format msgid "This link is useable only once, and is good for only 2 minutes: %s" msgstr "" -#: lib/command.php:685 +#: lib/command.php:677 #, fuzzy msgid "You are not subscribed to anyone." msgstr "此帳號已註冊" -#: lib/command.php:687 +#: lib/command.php:679 msgid "You are subscribed to this person:" msgid_plural "You are subscribed to these people:" msgstr[0] "此帳號已註冊" -#: lib/command.php:707 +#: lib/command.php:699 #, fuzzy msgid "No one is subscribed to you." msgstr "無此訂閱" -#: lib/command.php:709 +#: lib/command.php:701 msgid "This person is subscribed to you:" msgid_plural "These people are subscribed to you:" msgstr[0] "無此訂閱" -#: lib/command.php:729 +#: lib/command.php:721 #, fuzzy msgid "You are not a member of any groups." msgstr "無法連結到伺服器:%s" -#: lib/command.php:731 +#: lib/command.php:723 msgid "You are a member of this group:" msgid_plural "You are a member of these groups:" msgstr[0] "無法連結到伺服器:%s" -#: lib/command.php:745 +#: lib/command.php:737 msgid "" "Commands:\n" "on - turn on notifications\n" @@ -4613,11 +4649,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\"" @@ -4789,22 +4820,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 @@ -4938,6 +4957,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 "" @@ -4969,7 +5009,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 @@ -4978,7 +5018,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 @@ -4988,7 +5028,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 @@ -5023,7 +5063,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 @@ -5144,6 +5194,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 "" @@ -5322,10 +5376,6 @@ msgstr "" msgid "People Tagcloud as tagged" msgstr "" -#: lib/subscriptionlist.php:126 -msgid "(none)" -msgstr "" - #: lib/tagcloudsection.php:56 msgid "None" msgstr "" @@ -5390,47 +5440,47 @@ msgstr "" msgid "Moderate" msgstr "" -#: lib/util.php:837 +#: lib/util.php:884 msgid "a few seconds ago" msgstr "" -#: lib/util.php:839 +#: lib/util.php:886 msgid "about a minute ago" msgstr "" -#: lib/util.php:841 +#: lib/util.php:888 #, php-format msgid "about %d minutes ago" msgstr "" -#: lib/util.php:843 +#: lib/util.php:890 msgid "about an hour ago" msgstr "" -#: lib/util.php:845 +#: lib/util.php:892 #, php-format msgid "about %d hours ago" msgstr "" -#: lib/util.php:847 +#: lib/util.php:894 msgid "about a day ago" msgstr "" -#: lib/util.php:849 +#: lib/util.php:896 #, php-format msgid "about %d days ago" msgstr "" -#: lib/util.php:851 +#: lib/util.php:898 msgid "about a month ago" msgstr "" -#: lib/util.php:853 +#: lib/util.php:900 #, php-format msgid "about %d months ago" msgstr "" -#: lib/util.php:855 +#: lib/util.php:902 msgid "about a year ago" msgstr "" @@ -5444,18 +5494,7 @@ msgstr "個人首頁位址錯誤" 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." +#: scripts/xmppdaemon.php:301 +#, php-format +msgid "Message too long - maximum is %1$d characters, you sent %2$d." 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/CasAuthentication/CasAuthenticationPlugin.php b/plugins/CasAuthentication/CasAuthenticationPlugin.php index 818a11f77..483b060ab 100644 --- a/plugins/CasAuthentication/CasAuthenticationPlugin.php +++ b/plugins/CasAuthentication/CasAuthenticationPlugin.php @@ -138,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/CasAuthentication/extlib/CAS.php b/plugins/CasAuthentication/extlib/CAS.php index 59238eb81..f5ea0b12a 100644 --- a/plugins/CasAuthentication/extlib/CAS.php +++ b/plugins/CasAuthentication/extlib/CAS.php @@ -1,1471 +1,1471 @@ -<?php
-
-// commented in 0.4.22-RC2 for Sylvain Derosiaux
-// error_reporting(E_ALL ^ E_NOTICE);
-
-//
-// hack by Vangelis Haniotakis to handle the absence of $_SERVER['REQUEST_URI'] in IIS
-//
-if (!$_SERVER['REQUEST_URI']) {
- $_SERVER['REQUEST_URI'] = $_SERVER['SCRIPT_NAME'].'?'.$_SERVER['QUERY_STRING'];
-}
-
-//
-// another one by Vangelis Haniotakis also to make phpCAS work with PHP5
-//
-if (version_compare(PHP_VERSION,'5','>=')) {
- require_once(dirname(__FILE__).'/CAS/domxml-php4-php5.php');
-}
-
-/**
- * @file CAS/CAS.php
- * Interface class of the phpCAS library
- *
- * @ingroup public
- */
-
-// ########################################################################
-// CONSTANTS
-// ########################################################################
-
-// ------------------------------------------------------------------------
-// CAS VERSIONS
-// ------------------------------------------------------------------------
-
-/**
- * phpCAS version. accessible for the user by phpCAS::getVersion().
- */
-define('PHPCAS_VERSION','1.0.1');
-
-// ------------------------------------------------------------------------
-// CAS VERSIONS
-// ------------------------------------------------------------------------
- /**
- * @addtogroup public
- * @{
- */
-
-/**
- * CAS version 1.0
- */
-define("CAS_VERSION_1_0",'1.0');
-/*!
- * CAS version 2.0
- */
-define("CAS_VERSION_2_0",'2.0');
-
-/** @} */
- /**
- * @addtogroup publicPGTStorage
- * @{
- */
-// ------------------------------------------------------------------------
-// FILE PGT STORAGE
-// ------------------------------------------------------------------------
- /**
- * Default path used when storing PGT's to file
- */
-define("CAS_PGT_STORAGE_FILE_DEFAULT_PATH",'/tmp');
-/**
- * phpCAS::setPGTStorageFile()'s 2nd parameter to write plain text files
- */
-define("CAS_PGT_STORAGE_FILE_FORMAT_PLAIN",'plain');
-/**
- * phpCAS::setPGTStorageFile()'s 2nd parameter to write xml files
- */
-define("CAS_PGT_STORAGE_FILE_FORMAT_XML",'xml');
-/**
- * Default format used when storing PGT's to file
- */
-define("CAS_PGT_STORAGE_FILE_DEFAULT_FORMAT",CAS_PGT_STORAGE_FILE_FORMAT_PLAIN);
-// ------------------------------------------------------------------------
-// DATABASE PGT STORAGE
-// ------------------------------------------------------------------------
- /**
- * default database type when storing PGT's to database
- */
-define("CAS_PGT_STORAGE_DB_DEFAULT_DATABASE_TYPE",'mysql');
-/**
- * default host when storing PGT's to database
- */
-define("CAS_PGT_STORAGE_DB_DEFAULT_HOSTNAME",'localhost');
-/**
- * default port when storing PGT's to database
- */
-define("CAS_PGT_STORAGE_DB_DEFAULT_PORT",'');
-/**
- * default database when storing PGT's to database
- */
-define("CAS_PGT_STORAGE_DB_DEFAULT_DATABASE",'phpCAS');
-/**
- * default table when storing PGT's to database
- */
-define("CAS_PGT_STORAGE_DB_DEFAULT_TABLE",'pgt');
-
-/** @} */
-// ------------------------------------------------------------------------
-// SERVICE ACCESS ERRORS
-// ------------------------------------------------------------------------
- /**
- * @addtogroup publicServices
- * @{
- */
-
-/**
- * phpCAS::service() error code on success
- */
-define("PHPCAS_SERVICE_OK",0);
-/**
- * phpCAS::service() error code when the PT could not retrieve because
- * the CAS server did not respond.
- */
-define("PHPCAS_SERVICE_PT_NO_SERVER_RESPONSE",1);
-/**
- * phpCAS::service() error code when the PT could not retrieve because
- * the response of the CAS server was ill-formed.
- */
-define("PHPCAS_SERVICE_PT_BAD_SERVER_RESPONSE",2);
-/**
- * phpCAS::service() error code when the PT could not retrieve because
- * the CAS server did not want to.
- */
-define("PHPCAS_SERVICE_PT_FAILURE",3);
-/**
- * phpCAS::service() error code when the service was not available.
- */
-define("PHPCAS_SERVICE_NOT AVAILABLE",4);
-
-/** @} */
-// ------------------------------------------------------------------------
-// LANGUAGES
-// ------------------------------------------------------------------------
- /**
- * @addtogroup publicLang
- * @{
- */
-
-define("PHPCAS_LANG_ENGLISH", 'english');
-define("PHPCAS_LANG_FRENCH", 'french');
-define("PHPCAS_LANG_GREEK", 'greek');
-define("PHPCAS_LANG_GERMAN", 'german');
-define("PHPCAS_LANG_JAPANESE", 'japanese');
-define("PHPCAS_LANG_SPANISH", 'spanish');
-define("PHPCAS_LANG_CATALAN", 'catalan');
-
-/** @} */
-
-/**
- * @addtogroup internalLang
- * @{
- */
-
-/**
- * phpCAS default language (when phpCAS::setLang() is not used)
- */
-define("PHPCAS_LANG_DEFAULT", PHPCAS_LANG_ENGLISH);
-
-/** @} */
-// ------------------------------------------------------------------------
-// DEBUG
-// ------------------------------------------------------------------------
- /**
- * @addtogroup publicDebug
- * @{
- */
-
-/**
- * The default directory for the debug file under Unix.
- */
-define('DEFAULT_DEBUG_DIR','/tmp/');
-
-/** @} */
-// ------------------------------------------------------------------------
-// MISC
-// ------------------------------------------------------------------------
- /**
- * @addtogroup internalMisc
- * @{
- */
-
-/**
- * This global variable is used by the interface class phpCAS.
- *
- * @hideinitializer
- */
-$GLOBALS['PHPCAS_CLIENT'] = null;
-
-/**
- * This global variable is used to store where the initializer is called from
- * (to print a comprehensive error in case of multiple calls).
- *
- * @hideinitializer
- */
-$GLOBALS['PHPCAS_INIT_CALL'] = array('done' => FALSE,
- 'file' => '?',
- 'line' => -1,
- 'method' => '?');
-
-/**
- * This global variable is used to store where the method checking
- * the authentication is called from (to print comprehensive errors)
- *
- * @hideinitializer
- */
-$GLOBALS['PHPCAS_AUTH_CHECK_CALL'] = array('done' => FALSE,
- 'file' => '?',
- 'line' => -1,
- 'method' => '?',
- 'result' => FALSE);
-
-/**
- * This global variable is used to store phpCAS debug mode.
- *
- * @hideinitializer
- */
-$GLOBALS['PHPCAS_DEBUG'] = array('filename' => FALSE,
- 'indent' => 0,
- 'unique_id' => '');
-
-/** @} */
-
-// ########################################################################
-// CLIENT CLASS
-// ########################################################################
-
-// include client class
-include_once(dirname(__FILE__).'/CAS/client.php');
-
-// ########################################################################
-// INTERFACE CLASS
-// ########################################################################
-
-/**
- * @class phpCAS
- * The phpCAS class is a simple container for the phpCAS library. It provides CAS
- * authentication for web applications written in PHP.
- *
- * @ingroup public
- * @author Pascal Aubry <pascal.aubry at univ-rennes1.fr>
- *
- * \internal All its methods access the same object ($PHPCAS_CLIENT, declared
- * at the end of CAS/client.php).
- */
-
-
-
-class phpCAS
-{
-
- // ########################################################################
- // INITIALIZATION
- // ########################################################################
-
- /**
- * @addtogroup publicInit
- * @{
- */
-
- /**
- * phpCAS client initializer.
- * @note Only one of the phpCAS::client() and phpCAS::proxy functions should be
- * called, only once, and before all other methods (except phpCAS::getVersion()
- * and phpCAS::setDebug()).
- *
- * @param $server_version the version of the CAS server
- * @param $server_hostname the hostname of the CAS server
- * @param $server_port the port the CAS server is running on
- * @param $server_uri the URI the CAS server is responding on
- * @param $start_session Have phpCAS start PHP sessions (default true)
- *
- * @return a newly created CASClient object
- */
- function client($server_version,
- $server_hostname,
- $server_port,
- $server_uri,
- $start_session = true)
- {
- global $PHPCAS_CLIENT, $PHPCAS_INIT_CALL;
-
- phpCAS::traceBegin();
- if ( is_object($PHPCAS_CLIENT) ) {
- phpCAS::error($PHPCAS_INIT_CALL['method'].'() has already been called (at '.$PHPCAS_INIT_CALL['file'].':'.$PHPCAS_INIT_CALL['line'].')');
- }
- if ( gettype($server_version) != 'string' ) {
- phpCAS::error('type mismatched for parameter $server_version (should be `string\')');
- }
- if ( gettype($server_hostname) != 'string' ) {
- phpCAS::error('type mismatched for parameter $server_hostname (should be `string\')');
- }
- if ( gettype($server_port) != 'integer' ) {
- phpCAS::error('type mismatched for parameter $server_port (should be `integer\')');
- }
- if ( gettype($server_uri) != 'string' ) {
- phpCAS::error('type mismatched for parameter $server_uri (should be `string\')');
- }
-
- // store where the initialzer is called from
- $dbg = phpCAS::backtrace();
- $PHPCAS_INIT_CALL = array('done' => TRUE,
- 'file' => $dbg[0]['file'],
- 'line' => $dbg[0]['line'],
- 'method' => __CLASS__.'::'.__FUNCTION__);
-
- // initialize the global object $PHPCAS_CLIENT
- $PHPCAS_CLIENT = new CASClient($server_version,FALSE/*proxy*/,$server_hostname,$server_port,$server_uri,$start_session);
- phpCAS::traceEnd();
- }
-
- /**
- * phpCAS proxy initializer.
- * @note Only one of the phpCAS::client() and phpCAS::proxy functions should be
- * called, only once, and before all other methods (except phpCAS::getVersion()
- * and phpCAS::setDebug()).
- *
- * @param $server_version the version of the CAS server
- * @param $server_hostname the hostname of the CAS server
- * @param $server_port the port the CAS server is running on
- * @param $server_uri the URI the CAS server is responding on
- * @param $start_session Have phpCAS start PHP sessions (default true)
- *
- * @return a newly created CASClient object
- */
- function proxy($server_version,
- $server_hostname,
- $server_port,
- $server_uri,
- $start_session = true)
- {
- global $PHPCAS_CLIENT, $PHPCAS_INIT_CALL;
-
- phpCAS::traceBegin();
- if ( is_object($PHPCAS_CLIENT) ) {
- phpCAS::error($PHPCAS_INIT_CALL['method'].'() has already been called (at '.$PHPCAS_INIT_CALL['file'].':'.$PHPCAS_INIT_CALL['line'].')');
- }
- if ( gettype($server_version) != 'string' ) {
- phpCAS::error('type mismatched for parameter $server_version (should be `string\')');
- }
- if ( gettype($server_hostname) != 'string' ) {
- phpCAS::error('type mismatched for parameter $server_hostname (should be `string\')');
- }
- if ( gettype($server_port) != 'integer' ) {
- phpCAS::error('type mismatched for parameter $server_port (should be `integer\')');
- }
- if ( gettype($server_uri) != 'string' ) {
- phpCAS::error('type mismatched for parameter $server_uri (should be `string\')');
- }
-
- // store where the initialzer is called from
- $dbg = phpCAS::backtrace();
- $PHPCAS_INIT_CALL = array('done' => TRUE,
- 'file' => $dbg[0]['file'],
- 'line' => $dbg[0]['line'],
- 'method' => __CLASS__.'::'.__FUNCTION__);
-
- // initialize the global object $PHPCAS_CLIENT
- $PHPCAS_CLIENT = new CASClient($server_version,TRUE/*proxy*/,$server_hostname,$server_port,$server_uri,$start_session);
- phpCAS::traceEnd();
- }
-
- /** @} */
- // ########################################################################
- // DEBUGGING
- // ########################################################################
-
- /**
- * @addtogroup publicDebug
- * @{
- */
-
- /**
- * Set/unset debug mode
- *
- * @param $filename the name of the file used for logging, or FALSE to stop debugging.
- */
- function setDebug($filename='')
- {
- global $PHPCAS_DEBUG;
-
- if ( $filename != FALSE && gettype($filename) != 'string' ) {
- phpCAS::error('type mismatched for parameter $dbg (should be FALSE or the name of the log file)');
- }
-
- if ( empty($filename) ) {
- if ( preg_match('/^Win.*/',getenv('OS')) ) {
- if ( isset($_ENV['TMP']) ) {
- $debugDir = $_ENV['TMP'].'/';
- } else if ( isset($_ENV['TEMP']) ) {
- $debugDir = $_ENV['TEMP'].'/';
- } else {
- $debugDir = '';
- }
- } else {
- $debugDir = DEFAULT_DEBUG_DIR;
- }
- $filename = $debugDir . 'phpCAS.log';
- }
-
- if ( empty($PHPCAS_DEBUG['unique_id']) ) {
- $PHPCAS_DEBUG['unique_id'] = substr(strtoupper(md5(uniqid(''))),0,4);
- }
-
- $PHPCAS_DEBUG['filename'] = $filename;
-
- phpCAS::trace('START ******************');
- }
-
- /** @} */
- /**
- * @addtogroup internalDebug
- * @{
- */
-
- /**
- * This method is a wrapper for debug_backtrace() that is not available
- * in all PHP versions (>= 4.3.0 only)
- */
- function backtrace()
- {
- if ( function_exists('debug_backtrace') ) {
- return debug_backtrace();
- } else {
- // poor man's hack ... but it does work ...
- return array();
- }
- }
-
- /**
- * Logs a string in debug mode.
- *
- * @param $str the string to write
- *
- * @private
- */
- function log($str)
- {
- $indent_str = ".";
- global $PHPCAS_DEBUG;
-
- if ( $PHPCAS_DEBUG['filename'] ) {
- for ($i=0;$i<$PHPCAS_DEBUG['indent'];$i++) {
- $indent_str .= '| ';
- }
- error_log($PHPCAS_DEBUG['unique_id'].' '.$indent_str.$str."\n",3,$PHPCAS_DEBUG['filename']);
- }
-
- }
-
- /**
- * This method is used by interface methods to print an error and where the function
- * was originally called from.
- *
- * @param $msg the message to print
- *
- * @private
- */
- function error($msg)
- {
- $dbg = phpCAS::backtrace();
- $function = '?';
- $file = '?';
- $line = '?';
- if ( is_array($dbg) ) {
- for ( $i=1; $i<sizeof($dbg); $i++) {
- if ( is_array($dbg[$i]) ) {
- if ( $dbg[$i]['class'] == __CLASS__ ) {
- $function = $dbg[$i]['function'];
- $file = $dbg[$i]['file'];
- $line = $dbg[$i]['line'];
- }
- }
- }
- }
- echo "<br />\n<b>phpCAS error</b>: <font color=\"FF0000\"><b>".__CLASS__."::".$function.'(): '.htmlentities($msg)."</b></font> in <b>".$file."</b> on line <b>".$line."</b><br />\n";
- phpCAS::trace($msg);
- phpCAS::traceExit();
- exit();
- }
-
- /**
- * This method is used to log something in debug mode.
- */
- function trace($str)
- {
- $dbg = phpCAS::backtrace();
- phpCAS::log($str.' ['.basename($dbg[1]['file']).':'.$dbg[1]['line'].']');
- }
-
- /**
- * This method is used to indicate the start of the execution of a function in debug mode.
- */
- function traceBegin()
- {
- global $PHPCAS_DEBUG;
-
- $dbg = phpCAS::backtrace();
- $str = '=> ';
- if ( !empty($dbg[2]['class']) ) {
- $str .= $dbg[2]['class'].'::';
- }
- $str .= $dbg[2]['function'].'(';
- if ( is_array($dbg[2]['args']) ) {
- foreach ($dbg[2]['args'] as $index => $arg) {
- if ( $index != 0 ) {
- $str .= ', ';
- }
- $str .= str_replace("\n","",var_export($arg,TRUE));
- }
- }
- $str .= ') ['.basename($dbg[2]['file']).':'.$dbg[2]['line'].']';
- phpCAS::log($str);
- $PHPCAS_DEBUG['indent'] ++;
- }
-
- /**
- * This method is used to indicate the end of the execution of a function in debug mode.
- *
- * @param $res the result of the function
- */
- function traceEnd($res='')
- {
- global $PHPCAS_DEBUG;
-
- $PHPCAS_DEBUG['indent'] --;
- $dbg = phpCAS::backtrace();
- $str = '';
- $str .= '<= '.str_replace("\n","",var_export($res,TRUE));
- phpCAS::log($str);
- }
-
- /**
- * This method is used to indicate the end of the execution of the program
- */
- function traceExit()
- {
- global $PHPCAS_DEBUG;
-
- phpCAS::log('exit()');
- while ( $PHPCAS_DEBUG['indent'] > 0 ) {
- phpCAS::log('-');
- $PHPCAS_DEBUG['indent'] --;
- }
- }
-
- /** @} */
- // ########################################################################
- // INTERNATIONALIZATION
- // ########################################################################
- /**
- * @addtogroup publicLang
- * @{
- */
-
- /**
- * This method is used to set the language used by phpCAS.
- * @note Can be called only once.
- *
- * @param $lang a string representing the language.
- *
- * @sa PHPCAS_LANG_FRENCH, PHPCAS_LANG_ENGLISH
- */
- function setLang($lang)
- {
- global $PHPCAS_CLIENT;
- if ( !is_object($PHPCAS_CLIENT) ) {
- phpCAS::error('this method should not be called before '.__CLASS__.'::client() or '.__CLASS__.'::proxy()');
- }
- if ( gettype($lang) != 'string' ) {
- phpCAS::error('type mismatched for parameter $lang (should be `string\')');
- }
- $PHPCAS_CLIENT->setLang($lang);
- }
-
- /** @} */
- // ########################################################################
- // VERSION
- // ########################################################################
- /**
- * @addtogroup public
- * @{
- */
-
- /**
- * This method returns the phpCAS version.
- *
- * @return the phpCAS version.
- */
- function getVersion()
- {
- return PHPCAS_VERSION;
- }
-
- /** @} */
- // ########################################################################
- // HTML OUTPUT
- // ########################################################################
- /**
- * @addtogroup publicOutput
- * @{
- */
-
- /**
- * This method sets the HTML header used for all outputs.
- *
- * @param $header the HTML header.
- */
- function setHTMLHeader($header)
- {
- global $PHPCAS_CLIENT;
- if ( !is_object($PHPCAS_CLIENT) ) {
- phpCAS::error('this method should not be called before '.__CLASS__.'::client() or '.__CLASS__.'::proxy()');
- }
- if ( gettype($header) != 'string' ) {
- phpCAS::error('type mismatched for parameter $header (should be `string\')');
- }
- $PHPCAS_CLIENT->setHTMLHeader($header);
- }
-
- /**
- * This method sets the HTML footer used for all outputs.
- *
- * @param $footer the HTML footer.
- */
- function setHTMLFooter($footer)
- {
- global $PHPCAS_CLIENT;
- if ( !is_object($PHPCAS_CLIENT) ) {
- phpCAS::error('this method should not be called before '.__CLASS__.'::client() or '.__CLASS__.'::proxy()');
- }
- if ( gettype($footer) != 'string' ) {
- phpCAS::error('type mismatched for parameter $footer (should be `string\')');
- }
- $PHPCAS_CLIENT->setHTMLFooter($footer);
- }
-
- /** @} */
- // ########################################################################
- // PGT STORAGE
- // ########################################################################
- /**
- * @addtogroup publicPGTStorage
- * @{
- */
-
- /**
- * This method is used to tell phpCAS to store the response of the
- * CAS server to PGT requests onto the filesystem.
- *
- * @param $format the format used to store the PGT's (`plain' and `xml' allowed)
- * @param $path the path where the PGT's should be stored
- */
- function setPGTStorageFile($format='',
- $path='')
- {
- global $PHPCAS_CLIENT,$PHPCAS_AUTH_CHECK_CALL;
-
- phpCAS::traceBegin();
- if ( !is_object($PHPCAS_CLIENT) ) {
- phpCAS::error('this method should only be called after '.__CLASS__.'::proxy()');
- }
- if ( !$PHPCAS_CLIENT->isProxy() ) {
- phpCAS::error('this method should only be called after '.__CLASS__.'::proxy()');
- }
- if ( $PHPCAS_AUTH_CHECK_CALL['done'] ) {
- phpCAS::error('this method should only be called before '.$PHPCAS_AUTH_CHECK_CALL['method'].'() (called at '.$PHPCAS_AUTH_CHECK_CALL['file'].':'.$PHPCAS_AUTH_CHECK_CALL['line'].')');
- }
- if ( gettype($format) != 'string' ) {
- phpCAS::error('type mismatched for parameter $format (should be `string\')');
- }
- if ( gettype($path) != 'string' ) {
- phpCAS::error('type mismatched for parameter $format (should be `string\')');
- }
- $PHPCAS_CLIENT->setPGTStorageFile($format,$path);
- phpCAS::traceEnd();
- }
-
- /**
- * This method is used to tell phpCAS to store the response of the
- * CAS server to PGT requests into a database.
- * @note The connection to the database is done only when needed.
- * As a consequence, bad parameters are detected only when
- * initializing PGT storage, except in debug mode.
- *
- * @param $user the user to access the data with
- * @param $password the user's password
- * @param $database_type the type of the database hosting the data
- * @param $hostname the server hosting the database
- * @param $port the port the server is listening on
- * @param $database the name of the database
- * @param $table the name of the table storing the data
- */
- function setPGTStorageDB($user,
- $password,
- $database_type='',
- $hostname='',
- $port=0,
- $database='',
- $table='')
- {
- global $PHPCAS_CLIENT,$PHPCAS_AUTH_CHECK_CALL;
-
- phpCAS::traceBegin();
- if ( !is_object($PHPCAS_CLIENT) ) {
- phpCAS::error('this method should only be called after '.__CLASS__.'::proxy()');
- }
- if ( !$PHPCAS_CLIENT->isProxy() ) {
- phpCAS::error('this method should only be called after '.__CLASS__.'::proxy()');
- }
- if ( $PHPCAS_AUTH_CHECK_CALL['done'] ) {
- phpCAS::error('this method should only be called before '.$PHPCAS_AUTH_CHECK_CALL['method'].'() (called at '.$PHPCAS_AUTH_CHECK_CALL['file'].':'.$PHPCAS_AUTH_CHECK_CALL['line'].')');
- }
- if ( gettype($user) != 'string' ) {
- phpCAS::error('type mismatched for parameter $user (should be `string\')');
- }
- if ( gettype($password) != 'string' ) {
- phpCAS::error('type mismatched for parameter $password (should be `string\')');
- }
- if ( gettype($database_type) != 'string' ) {
- phpCAS::error('type mismatched for parameter $database_type (should be `string\')');
- }
- if ( gettype($hostname) != 'string' ) {
- phpCAS::error('type mismatched for parameter $hostname (should be `string\')');
- }
- if ( gettype($port) != 'integer' ) {
- phpCAS::error('type mismatched for parameter $port (should be `integer\')');
- }
- if ( gettype($database) != 'string' ) {
- phpCAS::error('type mismatched for parameter $database (should be `string\')');
- }
- if ( gettype($table) != 'string' ) {
- phpCAS::error('type mismatched for parameter $table (should be `string\')');
- }
- $PHPCAS_CLIENT->setPGTStorageDB($this,$user,$password,$hostname,$port,$database,$table);
- phpCAS::traceEnd();
- }
-
- /** @} */
- // ########################################################################
- // ACCESS TO EXTERNAL SERVICES
- // ########################################################################
- /**
- * @addtogroup publicServices
- * @{
- */
-
- /**
- * This method is used to access an HTTP[S] service.
- *
- * @param $url the service to access.
- * @param $err_code an error code Possible values are PHPCAS_SERVICE_OK (on
- * success), PHPCAS_SERVICE_PT_NO_SERVER_RESPONSE, PHPCAS_SERVICE_PT_BAD_SERVER_RESPONSE,
- * PHPCAS_SERVICE_PT_FAILURE, PHPCAS_SERVICE_NOT AVAILABLE.
- * @param $output the output of the service (also used to give an error
- * message on failure).
- *
- * @return TRUE on success, FALSE otherwise (in this later case, $err_code
- * gives the reason why it failed and $output contains an error message).
- */
- function serviceWeb($url,&$err_code,&$output)
- {
- global $PHPCAS_CLIENT, $PHPCAS_AUTH_CHECK_CALL;
-
- phpCAS::traceBegin();
- if ( !is_object($PHPCAS_CLIENT) ) {
- phpCAS::error('this method should only be called after '.__CLASS__.'::proxy()');
- }
- if ( !$PHPCAS_CLIENT->isProxy() ) {
- phpCAS::error('this method should only be called after '.__CLASS__.'::proxy()');
- }
- if ( !$PHPCAS_AUTH_CHECK_CALL['done'] ) {
- phpCAS::error('this method should only be called after the programmer is sure the user has been authenticated (by calling '.__CLASS__.'::checkAuthentication() or '.__CLASS__.'::forceAuthentication()');
- }
- if ( !$PHPCAS_AUTH_CHECK_CALL['result'] ) {
- phpCAS::error('authentication was checked (by '.$PHPCAS_AUTH_CHECK_CALL['method'].'() at '.$PHPCAS_AUTH_CHECK_CALL['file'].':'.$PHPCAS_AUTH_CHECK_CALL['line'].') but the method returned FALSE');
- }
- if ( gettype($url) != 'string' ) {
- phpCAS::error('type mismatched for parameter $url (should be `string\')');
- }
-
- $res = $PHPCAS_CLIENT->serviceWeb($url,$err_code,$output);
-
- phpCAS::traceEnd($res);
- return $res;
- }
-
- /**
- * This method is used to access an IMAP/POP3/NNTP service.
- *
- * @param $url a string giving the URL of the service, including the mailing box
- * for IMAP URLs, as accepted by imap_open().
- * @param $flags options given to imap_open().
- * @param $err_code an error code Possible values are PHPCAS_SERVICE_OK (on
- * success), PHPCAS_SERVICE_PT_NO_SERVER_RESPONSE, PHPCAS_SERVICE_PT_BAD_SERVER_RESPONSE,
- * PHPCAS_SERVICE_PT_FAILURE, PHPCAS_SERVICE_NOT AVAILABLE.
- * @param $err_msg an error message on failure
- * @param $pt the Proxy Ticket (PT) retrieved from the CAS server to access the URL
- * on success, FALSE on error).
- *
- * @return an IMAP stream on success, FALSE otherwise (in this later case, $err_code
- * gives the reason why it failed and $err_msg contains an error message).
- */
- function serviceMail($url,$flags,&$err_code,&$err_msg,&$pt)
- {
- global $PHPCAS_CLIENT, $PHPCAS_AUTH_CHECK_CALL;
-
- phpCAS::traceBegin();
- if ( !is_object($PHPCAS_CLIENT) ) {
- phpCAS::error('this method should only be called after '.__CLASS__.'::proxy()');
- }
- if ( !$PHPCAS_CLIENT->isProxy() ) {
- phpCAS::error('this method should only be called after '.__CLASS__.'::proxy()');
- }
- if ( !$PHPCAS_AUTH_CHECK_CALL['done'] ) {
- phpCAS::error('this method should only be called after the programmer is sure the user has been authenticated (by calling '.__CLASS__.'::checkAuthentication() or '.__CLASS__.'::forceAuthentication()');
- }
- if ( !$PHPCAS_AUTH_CHECK_CALL['result'] ) {
- phpCAS::error('authentication was checked (by '.$PHPCAS_AUTH_CHECK_CALL['method'].'() at '.$PHPCAS_AUTH_CHECK_CALL['file'].':'.$PHPCAS_AUTH_CHECK_CALL['line'].') but the method returned FALSE');
- }
- if ( gettype($url) != 'string' ) {
- phpCAS::error('type mismatched for parameter $url (should be `string\')');
- }
-
- if ( gettype($flags) != 'integer' ) {
- phpCAS::error('type mismatched for parameter $flags (should be `integer\')');
- }
-
- $res = $PHPCAS_CLIENT->serviceMail($url,$flags,$err_code,$err_msg,$pt);
-
- phpCAS::traceEnd($res);
- return $res;
- }
-
- /** @} */
- // ########################################################################
- // AUTHENTICATION
- // ########################################################################
- /**
- * @addtogroup publicAuth
- * @{
- */
-
- /**
- * Set the times authentication will be cached before really accessing the CAS server in gateway mode:
- * - -1: check only once, and then never again (until you pree login)
- * - 0: always check
- * - n: check every "n" time
- *
- * @param $n an integer.
- */
- function setCacheTimesForAuthRecheck($n)
- {
- global $PHPCAS_CLIENT;
- if ( !is_object($PHPCAS_CLIENT) ) {
- phpCAS::error('this method should not be called before '.__CLASS__.'::client() or '.__CLASS__.'::proxy()');
- }
- if ( gettype($n) != 'integer' ) {
- phpCAS::error('type mismatched for parameter $header (should be `string\')');
- }
- $PHPCAS_CLIENT->setCacheTimesForAuthRecheck($n);
- }
-
- /**
- * This method is called to check if the user is authenticated (use the gateway feature).
- * @return TRUE when the user is authenticated; otherwise FALSE.
- */
- function checkAuthentication()
- {
- global $PHPCAS_CLIENT, $PHPCAS_AUTH_CHECK_CALL;
-
- phpCAS::traceBegin();
- if ( !is_object($PHPCAS_CLIENT) ) {
- phpCAS::error('this method should not be called before '.__CLASS__.'::client() or '.__CLASS__.'::proxy()');
- }
-
- $auth = $PHPCAS_CLIENT->checkAuthentication();
-
- // store where the authentication has been checked and the result
- $dbg = phpCAS::backtrace();
- $PHPCAS_AUTH_CHECK_CALL = array('done' => TRUE,
- 'file' => $dbg[0]['file'],
- 'line' => $dbg[0]['line'],
- 'method' => __CLASS__.'::'.__FUNCTION__,
- 'result' => $auth );
- phpCAS::traceEnd($auth);
- return $auth;
- }
-
- /**
- * This method is called to force authentication if the user was not already
- * authenticated. If the user is not authenticated, halt by redirecting to
- * the CAS server.
- */
- function forceAuthentication()
- {
- global $PHPCAS_CLIENT, $PHPCAS_AUTH_CHECK_CALL;
-
- phpCAS::traceBegin();
- if ( !is_object($PHPCAS_CLIENT) ) {
- phpCAS::error('this method should not be called before '.__CLASS__.'::client() or '.__CLASS__.'::proxy()');
- }
-
- $auth = $PHPCAS_CLIENT->forceAuthentication();
-
- // store where the authentication has been checked and the result
- $dbg = phpCAS::backtrace();
- $PHPCAS_AUTH_CHECK_CALL = array('done' => TRUE,
- 'file' => $dbg[0]['file'],
- 'line' => $dbg[0]['line'],
- 'method' => __CLASS__.'::'.__FUNCTION__,
- 'result' => $auth );
-
- if ( !$auth ) {
- phpCAS::trace('user is not authenticated, redirecting to the CAS server');
- $PHPCAS_CLIENT->forceAuthentication();
- } else {
- phpCAS::trace('no need to authenticate (user `'.phpCAS::getUser().'\' is already authenticated)');
- }
-
- phpCAS::traceEnd();
- return $auth;
- }
-
- /**
- * This method is called to renew the authentication.
- **/
- function renewAuthentication() {
- global $PHPCAS_CLIENT, $PHPCAS_AUTH_CHECK_CALL;
-
- phpCAS::traceBegin();
- if ( !is_object($PHPCAS_CLIENT) ) {
- phpCAS::error('this method should not be called before'.__CLASS__.'::client() or '.__CLASS__.'::proxy()');
- }
-
- // store where the authentication has been checked and the result
- $dbg = phpCAS::backtrace();
- $PHPCAS_AUTH_CHECK_CALL = array('done' => TRUE, 'file' => $dbg[0]['file'], 'line' => $dbg[0]['line'], 'method' => __CLASS__.'::'.__FUNCTION__, 'result' => $auth );
-
- $PHPCAS_CLIENT->renewAuthentication();
- phpCAS::traceEnd();
- }
-
- /**
- * This method has been left from version 0.4.1 for compatibility reasons.
- */
- function authenticate()
- {
- phpCAS::error('this method is deprecated. You should use '.__CLASS__.'::forceAuthentication() instead');
- }
-
- /**
- * This method is called to check if the user is authenticated (previously or by
- * tickets given in the URL).
- *
- * @return TRUE when the user is authenticated.
- */
- function isAuthenticated()
- {
- global $PHPCAS_CLIENT, $PHPCAS_AUTH_CHECK_CALL;
-
- phpCAS::traceBegin();
- if ( !is_object($PHPCAS_CLIENT) ) {
- phpCAS::error('this method should not be called before '.__CLASS__.'::client() or '.__CLASS__.'::proxy()');
- }
-
- // call the isAuthenticated method of the global $PHPCAS_CLIENT object
- $auth = $PHPCAS_CLIENT->isAuthenticated();
-
- // store where the authentication has been checked and the result
- $dbg = phpCAS::backtrace();
- $PHPCAS_AUTH_CHECK_CALL = array('done' => TRUE,
- 'file' => $dbg[0]['file'],
- 'line' => $dbg[0]['line'],
- 'method' => __CLASS__.'::'.__FUNCTION__,
- 'result' => $auth );
- phpCAS::traceEnd($auth);
- return $auth;
- }
-
- /**
- * Checks whether authenticated based on $_SESSION. Useful to avoid
- * server calls.
- * @return true if authenticated, false otherwise.
- * @since 0.4.22 by Brendan Arnold
- */
- function isSessionAuthenticated ()
- {
- global $PHPCAS_CLIENT;
- if ( !is_object($PHPCAS_CLIENT) ) {
- phpCAS::error('this method should not be called before '.__CLASS__.'::client() or '.__CLASS__.'::proxy()');
- }
- return($PHPCAS_CLIENT->isSessionAuthenticated());
- }
-
- /**
- * This method returns the CAS user's login name.
- * @warning should not be called only after phpCAS::forceAuthentication()
- * or phpCAS::checkAuthentication().
- *
- * @return the login name of the authenticated user
- */
- function getUser()
- {
- global $PHPCAS_CLIENT, $PHPCAS_AUTH_CHECK_CALL;
- if ( !is_object($PHPCAS_CLIENT) ) {
- phpCAS::error('this method should not be called before '.__CLASS__.'::client() or '.__CLASS__.'::proxy()');
- }
- if ( !$PHPCAS_AUTH_CHECK_CALL['done'] ) {
- phpCAS::error('this method should only be called after '.__CLASS__.'::forceAuthentication() or '.__CLASS__.'::isAuthenticated()');
- }
- if ( !$PHPCAS_AUTH_CHECK_CALL['result'] ) {
- phpCAS::error('authentication was checked (by '.$PHPCAS_AUTH_CHECK_CALL['method'].'() at '.$PHPCAS_AUTH_CHECK_CALL['file'].':'.$PHPCAS_AUTH_CHECK_CALL['line'].') but the method returned FALSE');
- }
- return $PHPCAS_CLIENT->getUser();
- }
-
- /**
- * Handle logout requests.
- */
- function handleLogoutRequests($check_client=true, $allowed_clients=false)
- {
- global $PHPCAS_CLIENT;
- if ( !is_object($PHPCAS_CLIENT) ) {
- phpCAS::error('this method should not be called before '.__CLASS__.'::client() or '.__CLASS__.'::proxy()');
- }
- return($PHPCAS_CLIENT->handleLogoutRequests($check_client, $allowed_clients));
- }
-
- /**
- * This method returns the URL to be used to login.
- * or phpCAS::isAuthenticated().
- *
- * @return the login name of the authenticated user
- */
- function getServerLoginURL()
- {
- global $PHPCAS_CLIENT;
- if ( !is_object($PHPCAS_CLIENT) ) {
- phpCAS::error('this method should not be called before '.__CLASS__.'::client() or '.__CLASS__.'::proxy()');
- }
- return $PHPCAS_CLIENT->getServerLoginURL();
- }
-
- /**
- * Set the login URL of the CAS server.
- * @param $url the login URL
- * @since 0.4.21 by Wyman Chan
- */
- function setServerLoginURL($url='')
- {
- global $PHPCAS_CLIENT;
- phpCAS::traceBegin();
- if ( !is_object($PHPCAS_CLIENT) ) {
- phpCAS::error('this method should only be called after
- '.__CLASS__.'::client()');
- }
- if ( gettype($url) != 'string' ) {
- phpCAS::error('type mismatched for parameter $url (should be
- `string\')');
- }
- $PHPCAS_CLIENT->setServerLoginURL($url);
- phpCAS::traceEnd();
- }
-
- /**
- * This method returns the URL to be used to login.
- * or phpCAS::isAuthenticated().
- *
- * @return the login name of the authenticated user
- */
- function getServerLogoutURL()
- {
- global $PHPCAS_CLIENT;
- if ( !is_object($PHPCAS_CLIENT) ) {
- phpCAS::error('this method should not be called before '.__CLASS__.'::client() or '.__CLASS__.'::proxy()');
- }
- return $PHPCAS_CLIENT->getServerLogoutURL();
- }
-
- /**
- * Set the logout URL of the CAS server.
- * @param $url the logout URL
- * @since 0.4.21 by Wyman Chan
- */
- function setServerLogoutURL($url='')
- {
- global $PHPCAS_CLIENT;
- phpCAS::traceBegin();
- if ( !is_object($PHPCAS_CLIENT) ) {
- phpCAS::error('this method should only be called after
- '.__CLASS__.'::client()');
- }
- if ( gettype($url) != 'string' ) {
- phpCAS::error('type mismatched for parameter $url (should be
- `string\')');
- }
- $PHPCAS_CLIENT->setServerLogoutURL($url);
- phpCAS::traceEnd();
- }
-
- /**
- * This method is used to logout from CAS.
- * @params $params an array that contains the optional url and service parameters that will be passed to the CAS server
- * @public
- */
- function logout($params = "") {
- global $PHPCAS_CLIENT;
- phpCAS::traceBegin();
- if (!is_object($PHPCAS_CLIENT)) {
- phpCAS::error('this method should only be called after '.__CLASS__.'::client() or'.__CLASS__.'::proxy()');
- }
- $parsedParams = array();
- if ($params != "") {
- if (is_string($params)) {
- phpCAS::error('method `phpCAS::logout($url)\' is now deprecated, use `phpCAS::logoutWithUrl($url)\' instead');
- }
- if (!is_array($params)) {
- phpCAS::error('type mismatched for parameter $params (should be `array\')');
- }
- foreach ($params as $key => $value) {
- if ($key != "service" && $key != "url") {
- phpCAS::error('only `url\' and `service\' parameters are allowed for method `phpCAS::logout($params)\'');
- }
- $parsedParams[$key] = $value;
- }
- }
- $PHPCAS_CLIENT->logout($parsedParams);
- // never reached
- phpCAS::traceEnd();
- }
-
- /**
- * This method is used to logout from CAS. Halts by redirecting to the CAS server.
- * @param $service a URL that will be transmitted to the CAS server
- */
- function logoutWithRedirectService($service) {
- global $PHPCAS_CLIENT;
- phpCAS::traceBegin();
- if ( !is_object($PHPCAS_CLIENT) ) {
- phpCAS::error('this method should only be called after '.__CLASS__.'::client() or'.__CLASS__.'::proxy()');
- }
- if (!is_string($service)) {
- phpCAS::error('type mismatched for parameter $service (should be `string\')');
- }
- $PHPCAS_CLIENT->logout(array("service" => $service));
- // never reached
- phpCAS::traceEnd();
- }
-
- /**
- * This method is used to logout from CAS. Halts by redirecting to the CAS server.
- * @param $url a URL that will be transmitted to the CAS server
- */
- function logoutWithUrl($url) {
- global $PHPCAS_CLIENT;
- phpCAS::traceBegin();
- if ( !is_object($PHPCAS_CLIENT) ) {
- phpCAS::error('this method should only be called after '.__CLASS__.'::client() or'.__CLASS__.'::proxy()');
- }
- if (!is_string($url)) {
- phpCAS::error('type mismatched for parameter $url (should be `string\')');
- }
- $PHPCAS_CLIENT->logout(array("url" => $url));
- // never reached
- phpCAS::traceEnd();
- }
-
- /**
- * This method is used to logout from CAS. Halts by redirecting to the CAS server.
- * @param $service a URL that will be transmitted to the CAS server
- * @param $url a URL that will be transmitted to the CAS server
- */
- function logoutWithRedirectServiceAndUrl($service, $url) {
- global $PHPCAS_CLIENT;
- phpCAS::traceBegin();
- if ( !is_object($PHPCAS_CLIENT) ) {
- phpCAS::error('this method should only be called after '.__CLASS__.'::client() or'.__CLASS__.'::proxy()');
- }
- if (!is_string($service)) {
- phpCAS::error('type mismatched for parameter $service (should be `string\')');
- }
- if (!is_string($url)) {
- phpCAS::error('type mismatched for parameter $url (should be `string\')');
- }
- $PHPCAS_CLIENT->logout(array("service" => $service, "url" => $url));
- // never reached
- phpCAS::traceEnd();
- }
-
- /**
- * Set the fixed URL that will be used by the CAS server to transmit the PGT.
- * When this method is not called, a phpCAS script uses its own URL for the callback.
- *
- * @param $url the URL
- */
- function setFixedCallbackURL($url='')
- {
- global $PHPCAS_CLIENT;
- phpCAS::traceBegin();
- if ( !is_object($PHPCAS_CLIENT) ) {
- phpCAS::error('this method should only be called after '.__CLASS__.'::proxy()');
- }
- if ( !$PHPCAS_CLIENT->isProxy() ) {
- phpCAS::error('this method should only be called after '.__CLASS__.'::proxy()');
- }
- if ( gettype($url) != 'string' ) {
- phpCAS::error('type mismatched for parameter $url (should be `string\')');
- }
- $PHPCAS_CLIENT->setCallbackURL($url);
- phpCAS::traceEnd();
- }
-
- /**
- * Set the fixed URL that will be set as the CAS service parameter. When this
- * method is not called, a phpCAS script uses its own URL.
- *
- * @param $url the URL
- */
- function setFixedServiceURL($url)
- {
- global $PHPCAS_CLIENT;
- phpCAS::traceBegin();
- if ( !is_object($PHPCAS_CLIENT) ) {
- phpCAS::error('this method should only be called after '.__CLASS__.'::proxy()');
- }
- if ( gettype($url) != 'string' ) {
- phpCAS::error('type mismatched for parameter $url (should be `string\')');
- }
- $PHPCAS_CLIENT->setURL($url);
- phpCAS::traceEnd();
- }
-
- /**
- * Get the URL that is set as the CAS service parameter.
- */
- function getServiceURL()
- {
- global $PHPCAS_CLIENT;
- if ( !is_object($PHPCAS_CLIENT) ) {
- phpCAS::error('this method should only be called after '.__CLASS__.'::proxy()');
- }
- return($PHPCAS_CLIENT->getURL());
- }
-
- /**
- * Retrieve a Proxy Ticket from the CAS server.
- */
- function retrievePT($target_service,&$err_code,&$err_msg)
- {
- global $PHPCAS_CLIENT;
- if ( !is_object($PHPCAS_CLIENT) ) {
- phpCAS::error('this method should only be called after '.__CLASS__.'::proxy()');
- }
- if ( gettype($target_service) != 'string' ) {
- phpCAS::error('type mismatched for parameter $target_service(should be `string\')');
- }
- return($PHPCAS_CLIENT->retrievePT($target_service,$err_code,$err_msg));
- }
-
- /**
- * Set the certificate of the CAS server.
- *
- * @param $cert the PEM certificate
- */
- function setCasServerCert($cert)
- {
- global $PHPCAS_CLIENT;
- phpCAS::traceBegin();
- if ( !is_object($PHPCAS_CLIENT) ) {
- phpCAS::error('this method should only be called after '.__CLASS__.'::client() or'.__CLASS__.'::proxy()');
- }
- if ( gettype($cert) != 'string' ) {
- phpCAS::error('type mismatched for parameter $cert (should be `string\')');
- }
- $PHPCAS_CLIENT->setCasServerCert($cert);
- phpCAS::traceEnd();
- }
-
- /**
- * Set the certificate of the CAS server CA.
- *
- * @param $cert the CA certificate
- */
- function setCasServerCACert($cert)
- {
- global $PHPCAS_CLIENT;
- phpCAS::traceBegin();
- if ( !is_object($PHPCAS_CLIENT) ) {
- phpCAS::error('this method should only be called after '.__CLASS__.'::client() or'.__CLASS__.'::proxy()');
- }
- if ( gettype($cert) != 'string' ) {
- phpCAS::error('type mismatched for parameter $cert (should be `string\')');
- }
- $PHPCAS_CLIENT->setCasServerCACert($cert);
- phpCAS::traceEnd();
- }
-
- /**
- * Set no SSL validation for the CAS server.
- */
- function setNoCasServerValidation()
- {
- global $PHPCAS_CLIENT;
- phpCAS::traceBegin();
- if ( !is_object($PHPCAS_CLIENT) ) {
- phpCAS::error('this method should only be called after '.__CLASS__.'::client() or'.__CLASS__.'::proxy()');
- }
- $PHPCAS_CLIENT->setNoCasServerValidation();
- phpCAS::traceEnd();
- }
-
- /** @} */
-
- /**
- * Change CURL options.
- * CURL is used to connect through HTTPS to CAS server
- * @param $key the option key
- * @param $value the value to set
- */
- function setExtraCurlOption($key, $value)
- {
- global $PHPCAS_CLIENT;
- phpCAS::traceBegin();
- if ( !is_object($PHPCAS_CLIENT) ) {
- phpCAS::error('this method should only be called after '.__CLASS__.'::client() or'.__CLASS__.'::proxy()');
- }
- $PHPCAS_CLIENT->setExtraCurlOption($key, $value);
- phpCAS::traceEnd();
- }
-
-}
-
-// ########################################################################
-// DOCUMENTATION
-// ########################################################################
-
-// ########################################################################
-// MAIN PAGE
-
-/**
- * @mainpage
- *
- * The following pages only show the source documentation.
- *
- */
-
-// ########################################################################
-// MODULES DEFINITION
-
-/** @defgroup public User interface */
-
-/** @defgroup publicInit Initialization
- * @ingroup public */
-
-/** @defgroup publicAuth Authentication
- * @ingroup public */
-
-/** @defgroup publicServices Access to external services
- * @ingroup public */
-
-/** @defgroup publicConfig Configuration
- * @ingroup public */
-
-/** @defgroup publicLang Internationalization
- * @ingroup publicConfig */
-
-/** @defgroup publicOutput HTML output
- * @ingroup publicConfig */
-
-/** @defgroup publicPGTStorage PGT storage
- * @ingroup publicConfig */
-
-/** @defgroup publicDebug Debugging
- * @ingroup public */
-
-
-/** @defgroup internal Implementation */
-
-/** @defgroup internalAuthentication Authentication
- * @ingroup internal */
-
-/** @defgroup internalBasic CAS Basic client features (CAS 1.0, Service Tickets)
- * @ingroup internal */
-
-/** @defgroup internalProxy CAS Proxy features (CAS 2.0, Proxy Granting Tickets)
- * @ingroup internal */
-
-/** @defgroup internalPGTStorage PGT storage
- * @ingroup internalProxy */
-
-/** @defgroup internalPGTStorageDB PGT storage in a database
- * @ingroup internalPGTStorage */
-
-/** @defgroup internalPGTStorageFile PGT storage on the filesystem
- * @ingroup internalPGTStorage */
-
-/** @defgroup internalCallback Callback from the CAS server
- * @ingroup internalProxy */
-
-/** @defgroup internalProxied CAS proxied client features (CAS 2.0, Proxy Tickets)
- * @ingroup internal */
-
-/** @defgroup internalConfig Configuration
- * @ingroup internal */
-
-/** @defgroup internalOutput HTML output
- * @ingroup internalConfig */
-
-/** @defgroup internalLang Internationalization
- * @ingroup internalConfig
- *
- * To add a new language:
- * - 1. define a new constant PHPCAS_LANG_XXXXXX in CAS/CAS.php
- * - 2. copy any file from CAS/languages to CAS/languages/XXXXXX.php
- * - 3. Make the translations
- */
-
-/** @defgroup internalDebug Debugging
- * @ingroup internal */
-
-/** @defgroup internalMisc Miscellaneous
- * @ingroup internal */
-
-// ########################################################################
-// EXAMPLES
-
-/**
- * @example example_simple.php
- */
- /**
- * @example example_proxy.php
- */
- /**
- * @example example_proxy2.php
- */
- /**
- * @example example_lang.php
- */
- /**
- * @example example_html.php
- */
- /**
- * @example example_file.php
- */
- /**
- * @example example_db.php
- */
- /**
- * @example example_service.php
- */
- /**
- * @example example_session_proxy.php
- */
- /**
- * @example example_session_service.php
- */
- /**
- * @example example_gateway.php
- */
-
-
-
-?>
+<?php + +// commented in 0.4.22-RC2 for Sylvain Derosiaux +// error_reporting(E_ALL ^ E_NOTICE); + +// +// hack by Vangelis Haniotakis to handle the absence of $_SERVER['REQUEST_URI'] in IIS +// +if (!$_SERVER['REQUEST_URI']) { + $_SERVER['REQUEST_URI'] = $_SERVER['SCRIPT_NAME'].'?'.$_SERVER['QUERY_STRING']; +} + +// +// another one by Vangelis Haniotakis also to make phpCAS work with PHP5 +// +if (version_compare(PHP_VERSION,'5','>=')) { + require_once(dirname(__FILE__).'/CAS/domxml-php4-php5.php'); +} + +/** + * @file CAS/CAS.php + * Interface class of the phpCAS library + * + * @ingroup public + */ + +// ######################################################################## +// CONSTANTS +// ######################################################################## + +// ------------------------------------------------------------------------ +// CAS VERSIONS +// ------------------------------------------------------------------------ + +/** + * phpCAS version. accessible for the user by phpCAS::getVersion(). + */ +define('PHPCAS_VERSION','1.0.1'); + +// ------------------------------------------------------------------------ +// CAS VERSIONS +// ------------------------------------------------------------------------ + /** + * @addtogroup public + * @{ + */ + +/** + * CAS version 1.0 + */ +define("CAS_VERSION_1_0",'1.0'); +/*! + * CAS version 2.0 + */ +define("CAS_VERSION_2_0",'2.0'); + +/** @} */ + /** + * @addtogroup publicPGTStorage + * @{ + */ +// ------------------------------------------------------------------------ +// FILE PGT STORAGE +// ------------------------------------------------------------------------ + /** + * Default path used when storing PGT's to file + */ +define("CAS_PGT_STORAGE_FILE_DEFAULT_PATH",'/tmp'); +/** + * phpCAS::setPGTStorageFile()'s 2nd parameter to write plain text files + */ +define("CAS_PGT_STORAGE_FILE_FORMAT_PLAIN",'plain'); +/** + * phpCAS::setPGTStorageFile()'s 2nd parameter to write xml files + */ +define("CAS_PGT_STORAGE_FILE_FORMAT_XML",'xml'); +/** + * Default format used when storing PGT's to file + */ +define("CAS_PGT_STORAGE_FILE_DEFAULT_FORMAT",CAS_PGT_STORAGE_FILE_FORMAT_PLAIN); +// ------------------------------------------------------------------------ +// DATABASE PGT STORAGE +// ------------------------------------------------------------------------ + /** + * default database type when storing PGT's to database + */ +define("CAS_PGT_STORAGE_DB_DEFAULT_DATABASE_TYPE",'mysql'); +/** + * default host when storing PGT's to database + */ +define("CAS_PGT_STORAGE_DB_DEFAULT_HOSTNAME",'localhost'); +/** + * default port when storing PGT's to database + */ +define("CAS_PGT_STORAGE_DB_DEFAULT_PORT",''); +/** + * default database when storing PGT's to database + */ +define("CAS_PGT_STORAGE_DB_DEFAULT_DATABASE",'phpCAS'); +/** + * default table when storing PGT's to database + */ +define("CAS_PGT_STORAGE_DB_DEFAULT_TABLE",'pgt'); + +/** @} */ +// ------------------------------------------------------------------------ +// SERVICE ACCESS ERRORS +// ------------------------------------------------------------------------ + /** + * @addtogroup publicServices + * @{ + */ + +/** + * phpCAS::service() error code on success + */ +define("PHPCAS_SERVICE_OK",0); +/** + * phpCAS::service() error code when the PT could not retrieve because + * the CAS server did not respond. + */ +define("PHPCAS_SERVICE_PT_NO_SERVER_RESPONSE",1); +/** + * phpCAS::service() error code when the PT could not retrieve because + * the response of the CAS server was ill-formed. + */ +define("PHPCAS_SERVICE_PT_BAD_SERVER_RESPONSE",2); +/** + * phpCAS::service() error code when the PT could not retrieve because + * the CAS server did not want to. + */ +define("PHPCAS_SERVICE_PT_FAILURE",3); +/** + * phpCAS::service() error code when the service was not available. + */ +define("PHPCAS_SERVICE_NOT AVAILABLE",4); + +/** @} */ +// ------------------------------------------------------------------------ +// LANGUAGES +// ------------------------------------------------------------------------ + /** + * @addtogroup publicLang + * @{ + */ + +define("PHPCAS_LANG_ENGLISH", 'english'); +define("PHPCAS_LANG_FRENCH", 'french'); +define("PHPCAS_LANG_GREEK", 'greek'); +define("PHPCAS_LANG_GERMAN", 'german'); +define("PHPCAS_LANG_JAPANESE", 'japanese'); +define("PHPCAS_LANG_SPANISH", 'spanish'); +define("PHPCAS_LANG_CATALAN", 'catalan'); + +/** @} */ + +/** + * @addtogroup internalLang + * @{ + */ + +/** + * phpCAS default language (when phpCAS::setLang() is not used) + */ +define("PHPCAS_LANG_DEFAULT", PHPCAS_LANG_ENGLISH); + +/** @} */ +// ------------------------------------------------------------------------ +// DEBUG +// ------------------------------------------------------------------------ + /** + * @addtogroup publicDebug + * @{ + */ + +/** + * The default directory for the debug file under Unix. + */ +define('DEFAULT_DEBUG_DIR','/tmp/'); + +/** @} */ +// ------------------------------------------------------------------------ +// MISC +// ------------------------------------------------------------------------ + /** + * @addtogroup internalMisc + * @{ + */ + +/** + * This global variable is used by the interface class phpCAS. + * + * @hideinitializer + */ +$GLOBALS['PHPCAS_CLIENT'] = null; + +/** + * This global variable is used to store where the initializer is called from + * (to print a comprehensive error in case of multiple calls). + * + * @hideinitializer + */ +$GLOBALS['PHPCAS_INIT_CALL'] = array('done' => FALSE, + 'file' => '?', + 'line' => -1, + 'method' => '?'); + +/** + * This global variable is used to store where the method checking + * the authentication is called from (to print comprehensive errors) + * + * @hideinitializer + */ +$GLOBALS['PHPCAS_AUTH_CHECK_CALL'] = array('done' => FALSE, + 'file' => '?', + 'line' => -1, + 'method' => '?', + 'result' => FALSE); + +/** + * This global variable is used to store phpCAS debug mode. + * + * @hideinitializer + */ +$GLOBALS['PHPCAS_DEBUG'] = array('filename' => FALSE, + 'indent' => 0, + 'unique_id' => ''); + +/** @} */ + +// ######################################################################## +// CLIENT CLASS +// ######################################################################## + +// include client class +include_once(dirname(__FILE__).'/CAS/client.php'); + +// ######################################################################## +// INTERFACE CLASS +// ######################################################################## + +/** + * @class phpCAS + * The phpCAS class is a simple container for the phpCAS library. It provides CAS + * authentication for web applications written in PHP. + * + * @ingroup public + * @author Pascal Aubry <pascal.aubry at univ-rennes1.fr> + * + * \internal All its methods access the same object ($PHPCAS_CLIENT, declared + * at the end of CAS/client.php). + */ + + + +class phpCAS +{ + + // ######################################################################## + // INITIALIZATION + // ######################################################################## + + /** + * @addtogroup publicInit + * @{ + */ + + /** + * phpCAS client initializer. + * @note Only one of the phpCAS::client() and phpCAS::proxy functions should be + * called, only once, and before all other methods (except phpCAS::getVersion() + * and phpCAS::setDebug()). + * + * @param $server_version the version of the CAS server + * @param $server_hostname the hostname of the CAS server + * @param $server_port the port the CAS server is running on + * @param $server_uri the URI the CAS server is responding on + * @param $start_session Have phpCAS start PHP sessions (default true) + * + * @return a newly created CASClient object + */ + function client($server_version, + $server_hostname, + $server_port, + $server_uri, + $start_session = true) + { + global $PHPCAS_CLIENT, $PHPCAS_INIT_CALL; + + phpCAS::traceBegin(); + if ( is_object($PHPCAS_CLIENT) ) { + phpCAS::error($PHPCAS_INIT_CALL['method'].'() has already been called (at '.$PHPCAS_INIT_CALL['file'].':'.$PHPCAS_INIT_CALL['line'].')'); + } + if ( gettype($server_version) != 'string' ) { + phpCAS::error('type mismatched for parameter $server_version (should be `string\')'); + } + if ( gettype($server_hostname) != 'string' ) { + phpCAS::error('type mismatched for parameter $server_hostname (should be `string\')'); + } + if ( gettype($server_port) != 'integer' ) { + phpCAS::error('type mismatched for parameter $server_port (should be `integer\')'); + } + if ( gettype($server_uri) != 'string' ) { + phpCAS::error('type mismatched for parameter $server_uri (should be `string\')'); + } + + // store where the initialzer is called from + $dbg = phpCAS::backtrace(); + $PHPCAS_INIT_CALL = array('done' => TRUE, + 'file' => $dbg[0]['file'], + 'line' => $dbg[0]['line'], + 'method' => __CLASS__.'::'.__FUNCTION__); + + // initialize the global object $PHPCAS_CLIENT + $PHPCAS_CLIENT = new CASClient($server_version,FALSE/*proxy*/,$server_hostname,$server_port,$server_uri,$start_session); + phpCAS::traceEnd(); + } + + /** + * phpCAS proxy initializer. + * @note Only one of the phpCAS::client() and phpCAS::proxy functions should be + * called, only once, and before all other methods (except phpCAS::getVersion() + * and phpCAS::setDebug()). + * + * @param $server_version the version of the CAS server + * @param $server_hostname the hostname of the CAS server + * @param $server_port the port the CAS server is running on + * @param $server_uri the URI the CAS server is responding on + * @param $start_session Have phpCAS start PHP sessions (default true) + * + * @return a newly created CASClient object + */ + function proxy($server_version, + $server_hostname, + $server_port, + $server_uri, + $start_session = true) + { + global $PHPCAS_CLIENT, $PHPCAS_INIT_CALL; + + phpCAS::traceBegin(); + if ( is_object($PHPCAS_CLIENT) ) { + phpCAS::error($PHPCAS_INIT_CALL['method'].'() has already been called (at '.$PHPCAS_INIT_CALL['file'].':'.$PHPCAS_INIT_CALL['line'].')'); + } + if ( gettype($server_version) != 'string' ) { + phpCAS::error('type mismatched for parameter $server_version (should be `string\')'); + } + if ( gettype($server_hostname) != 'string' ) { + phpCAS::error('type mismatched for parameter $server_hostname (should be `string\')'); + } + if ( gettype($server_port) != 'integer' ) { + phpCAS::error('type mismatched for parameter $server_port (should be `integer\')'); + } + if ( gettype($server_uri) != 'string' ) { + phpCAS::error('type mismatched for parameter $server_uri (should be `string\')'); + } + + // store where the initialzer is called from + $dbg = phpCAS::backtrace(); + $PHPCAS_INIT_CALL = array('done' => TRUE, + 'file' => $dbg[0]['file'], + 'line' => $dbg[0]['line'], + 'method' => __CLASS__.'::'.__FUNCTION__); + + // initialize the global object $PHPCAS_CLIENT + $PHPCAS_CLIENT = new CASClient($server_version,TRUE/*proxy*/,$server_hostname,$server_port,$server_uri,$start_session); + phpCAS::traceEnd(); + } + + /** @} */ + // ######################################################################## + // DEBUGGING + // ######################################################################## + + /** + * @addtogroup publicDebug + * @{ + */ + + /** + * Set/unset debug mode + * + * @param $filename the name of the file used for logging, or FALSE to stop debugging. + */ + function setDebug($filename='') + { + global $PHPCAS_DEBUG; + + if ( $filename != FALSE && gettype($filename) != 'string' ) { + phpCAS::error('type mismatched for parameter $dbg (should be FALSE or the name of the log file)'); + } + + if ( empty($filename) ) { + if ( preg_match('/^Win.*/',getenv('OS')) ) { + if ( isset($_ENV['TMP']) ) { + $debugDir = $_ENV['TMP'].'/'; + } else if ( isset($_ENV['TEMP']) ) { + $debugDir = $_ENV['TEMP'].'/'; + } else { + $debugDir = ''; + } + } else { + $debugDir = DEFAULT_DEBUG_DIR; + } + $filename = $debugDir . 'phpCAS.log'; + } + + if ( empty($PHPCAS_DEBUG['unique_id']) ) { + $PHPCAS_DEBUG['unique_id'] = substr(strtoupper(md5(uniqid(''))),0,4); + } + + $PHPCAS_DEBUG['filename'] = $filename; + + phpCAS::trace('START ******************'); + } + + /** @} */ + /** + * @addtogroup internalDebug + * @{ + */ + + /** + * This method is a wrapper for debug_backtrace() that is not available + * in all PHP versions (>= 4.3.0 only) + */ + function backtrace() + { + if ( function_exists('debug_backtrace') ) { + return debug_backtrace(); + } else { + // poor man's hack ... but it does work ... + return array(); + } + } + + /** + * Logs a string in debug mode. + * + * @param $str the string to write + * + * @private + */ + function log($str) + { + $indent_str = "."; + global $PHPCAS_DEBUG; + + if ( $PHPCAS_DEBUG['filename'] ) { + for ($i=0;$i<$PHPCAS_DEBUG['indent'];$i++) { + $indent_str .= '| '; + } + error_log($PHPCAS_DEBUG['unique_id'].' '.$indent_str.$str."\n",3,$PHPCAS_DEBUG['filename']); + } + + } + + /** + * This method is used by interface methods to print an error and where the function + * was originally called from. + * + * @param $msg the message to print + * + * @private + */ + function error($msg) + { + $dbg = phpCAS::backtrace(); + $function = '?'; + $file = '?'; + $line = '?'; + if ( is_array($dbg) ) { + for ( $i=1; $i<sizeof($dbg); $i++) { + if ( is_array($dbg[$i]) ) { + if ( $dbg[$i]['class'] == __CLASS__ ) { + $function = $dbg[$i]['function']; + $file = $dbg[$i]['file']; + $line = $dbg[$i]['line']; + } + } + } + } + echo "<br />\n<b>phpCAS error</b>: <font color=\"FF0000\"><b>".__CLASS__."::".$function.'(): '.htmlentities($msg)."</b></font> in <b>".$file."</b> on line <b>".$line."</b><br />\n"; + phpCAS::trace($msg); + phpCAS::traceExit(); + exit(); + } + + /** + * This method is used to log something in debug mode. + */ + function trace($str) + { + $dbg = phpCAS::backtrace(); + phpCAS::log($str.' ['.basename($dbg[1]['file']).':'.$dbg[1]['line'].']'); + } + + /** + * This method is used to indicate the start of the execution of a function in debug mode. + */ + function traceBegin() + { + global $PHPCAS_DEBUG; + + $dbg = phpCAS::backtrace(); + $str = '=> '; + if ( !empty($dbg[2]['class']) ) { + $str .= $dbg[2]['class'].'::'; + } + $str .= $dbg[2]['function'].'('; + if ( is_array($dbg[2]['args']) ) { + foreach ($dbg[2]['args'] as $index => $arg) { + if ( $index != 0 ) { + $str .= ', '; + } + $str .= str_replace("\n","",var_export($arg,TRUE)); + } + } + $str .= ') ['.basename($dbg[2]['file']).':'.$dbg[2]['line'].']'; + phpCAS::log($str); + $PHPCAS_DEBUG['indent'] ++; + } + + /** + * This method is used to indicate the end of the execution of a function in debug mode. + * + * @param $res the result of the function + */ + function traceEnd($res='') + { + global $PHPCAS_DEBUG; + + $PHPCAS_DEBUG['indent'] --; + $dbg = phpCAS::backtrace(); + $str = ''; + $str .= '<= '.str_replace("\n","",var_export($res,TRUE)); + phpCAS::log($str); + } + + /** + * This method is used to indicate the end of the execution of the program + */ + function traceExit() + { + global $PHPCAS_DEBUG; + + phpCAS::log('exit()'); + while ( $PHPCAS_DEBUG['indent'] > 0 ) { + phpCAS::log('-'); + $PHPCAS_DEBUG['indent'] --; + } + } + + /** @} */ + // ######################################################################## + // INTERNATIONALIZATION + // ######################################################################## + /** + * @addtogroup publicLang + * @{ + */ + + /** + * This method is used to set the language used by phpCAS. + * @note Can be called only once. + * + * @param $lang a string representing the language. + * + * @sa PHPCAS_LANG_FRENCH, PHPCAS_LANG_ENGLISH + */ + function setLang($lang) + { + global $PHPCAS_CLIENT; + if ( !is_object($PHPCAS_CLIENT) ) { + phpCAS::error('this method should not be called before '.__CLASS__.'::client() or '.__CLASS__.'::proxy()'); + } + if ( gettype($lang) != 'string' ) { + phpCAS::error('type mismatched for parameter $lang (should be `string\')'); + } + $PHPCAS_CLIENT->setLang($lang); + } + + /** @} */ + // ######################################################################## + // VERSION + // ######################################################################## + /** + * @addtogroup public + * @{ + */ + + /** + * This method returns the phpCAS version. + * + * @return the phpCAS version. + */ + function getVersion() + { + return PHPCAS_VERSION; + } + + /** @} */ + // ######################################################################## + // HTML OUTPUT + // ######################################################################## + /** + * @addtogroup publicOutput + * @{ + */ + + /** + * This method sets the HTML header used for all outputs. + * + * @param $header the HTML header. + */ + function setHTMLHeader($header) + { + global $PHPCAS_CLIENT; + if ( !is_object($PHPCAS_CLIENT) ) { + phpCAS::error('this method should not be called before '.__CLASS__.'::client() or '.__CLASS__.'::proxy()'); + } + if ( gettype($header) != 'string' ) { + phpCAS::error('type mismatched for parameter $header (should be `string\')'); + } + $PHPCAS_CLIENT->setHTMLHeader($header); + } + + /** + * This method sets the HTML footer used for all outputs. + * + * @param $footer the HTML footer. + */ + function setHTMLFooter($footer) + { + global $PHPCAS_CLIENT; + if ( !is_object($PHPCAS_CLIENT) ) { + phpCAS::error('this method should not be called before '.__CLASS__.'::client() or '.__CLASS__.'::proxy()'); + } + if ( gettype($footer) != 'string' ) { + phpCAS::error('type mismatched for parameter $footer (should be `string\')'); + } + $PHPCAS_CLIENT->setHTMLFooter($footer); + } + + /** @} */ + // ######################################################################## + // PGT STORAGE + // ######################################################################## + /** + * @addtogroup publicPGTStorage + * @{ + */ + + /** + * This method is used to tell phpCAS to store the response of the + * CAS server to PGT requests onto the filesystem. + * + * @param $format the format used to store the PGT's (`plain' and `xml' allowed) + * @param $path the path where the PGT's should be stored + */ + function setPGTStorageFile($format='', + $path='') + { + global $PHPCAS_CLIENT,$PHPCAS_AUTH_CHECK_CALL; + + phpCAS::traceBegin(); + if ( !is_object($PHPCAS_CLIENT) ) { + phpCAS::error('this method should only be called after '.__CLASS__.'::proxy()'); + } + if ( !$PHPCAS_CLIENT->isProxy() ) { + phpCAS::error('this method should only be called after '.__CLASS__.'::proxy()'); + } + if ( $PHPCAS_AUTH_CHECK_CALL['done'] ) { + phpCAS::error('this method should only be called before '.$PHPCAS_AUTH_CHECK_CALL['method'].'() (called at '.$PHPCAS_AUTH_CHECK_CALL['file'].':'.$PHPCAS_AUTH_CHECK_CALL['line'].')'); + } + if ( gettype($format) != 'string' ) { + phpCAS::error('type mismatched for parameter $format (should be `string\')'); + } + if ( gettype($path) != 'string' ) { + phpCAS::error('type mismatched for parameter $format (should be `string\')'); + } + $PHPCAS_CLIENT->setPGTStorageFile($format,$path); + phpCAS::traceEnd(); + } + + /** + * This method is used to tell phpCAS to store the response of the + * CAS server to PGT requests into a database. + * @note The connection to the database is done only when needed. + * As a consequence, bad parameters are detected only when + * initializing PGT storage, except in debug mode. + * + * @param $user the user to access the data with + * @param $password the user's password + * @param $database_type the type of the database hosting the data + * @param $hostname the server hosting the database + * @param $port the port the server is listening on + * @param $database the name of the database + * @param $table the name of the table storing the data + */ + function setPGTStorageDB($user, + $password, + $database_type='', + $hostname='', + $port=0, + $database='', + $table='') + { + global $PHPCAS_CLIENT,$PHPCAS_AUTH_CHECK_CALL; + + phpCAS::traceBegin(); + if ( !is_object($PHPCAS_CLIENT) ) { + phpCAS::error('this method should only be called after '.__CLASS__.'::proxy()'); + } + if ( !$PHPCAS_CLIENT->isProxy() ) { + phpCAS::error('this method should only be called after '.__CLASS__.'::proxy()'); + } + if ( $PHPCAS_AUTH_CHECK_CALL['done'] ) { + phpCAS::error('this method should only be called before '.$PHPCAS_AUTH_CHECK_CALL['method'].'() (called at '.$PHPCAS_AUTH_CHECK_CALL['file'].':'.$PHPCAS_AUTH_CHECK_CALL['line'].')'); + } + if ( gettype($user) != 'string' ) { + phpCAS::error('type mismatched for parameter $user (should be `string\')'); + } + if ( gettype($password) != 'string' ) { + phpCAS::error('type mismatched for parameter $password (should be `string\')'); + } + if ( gettype($database_type) != 'string' ) { + phpCAS::error('type mismatched for parameter $database_type (should be `string\')'); + } + if ( gettype($hostname) != 'string' ) { + phpCAS::error('type mismatched for parameter $hostname (should be `string\')'); + } + if ( gettype($port) != 'integer' ) { + phpCAS::error('type mismatched for parameter $port (should be `integer\')'); + } + if ( gettype($database) != 'string' ) { + phpCAS::error('type mismatched for parameter $database (should be `string\')'); + } + if ( gettype($table) != 'string' ) { + phpCAS::error('type mismatched for parameter $table (should be `string\')'); + } + $PHPCAS_CLIENT->setPGTStorageDB($this,$user,$password,$hostname,$port,$database,$table); + phpCAS::traceEnd(); + } + + /** @} */ + // ######################################################################## + // ACCESS TO EXTERNAL SERVICES + // ######################################################################## + /** + * @addtogroup publicServices + * @{ + */ + + /** + * This method is used to access an HTTP[S] service. + * + * @param $url the service to access. + * @param $err_code an error code Possible values are PHPCAS_SERVICE_OK (on + * success), PHPCAS_SERVICE_PT_NO_SERVER_RESPONSE, PHPCAS_SERVICE_PT_BAD_SERVER_RESPONSE, + * PHPCAS_SERVICE_PT_FAILURE, PHPCAS_SERVICE_NOT AVAILABLE. + * @param $output the output of the service (also used to give an error + * message on failure). + * + * @return TRUE on success, FALSE otherwise (in this later case, $err_code + * gives the reason why it failed and $output contains an error message). + */ + function serviceWeb($url,&$err_code,&$output) + { + global $PHPCAS_CLIENT, $PHPCAS_AUTH_CHECK_CALL; + + phpCAS::traceBegin(); + if ( !is_object($PHPCAS_CLIENT) ) { + phpCAS::error('this method should only be called after '.__CLASS__.'::proxy()'); + } + if ( !$PHPCAS_CLIENT->isProxy() ) { + phpCAS::error('this method should only be called after '.__CLASS__.'::proxy()'); + } + if ( !$PHPCAS_AUTH_CHECK_CALL['done'] ) { + phpCAS::error('this method should only be called after the programmer is sure the user has been authenticated (by calling '.__CLASS__.'::checkAuthentication() or '.__CLASS__.'::forceAuthentication()'); + } + if ( !$PHPCAS_AUTH_CHECK_CALL['result'] ) { + phpCAS::error('authentication was checked (by '.$PHPCAS_AUTH_CHECK_CALL['method'].'() at '.$PHPCAS_AUTH_CHECK_CALL['file'].':'.$PHPCAS_AUTH_CHECK_CALL['line'].') but the method returned FALSE'); + } + if ( gettype($url) != 'string' ) { + phpCAS::error('type mismatched for parameter $url (should be `string\')'); + } + + $res = $PHPCAS_CLIENT->serviceWeb($url,$err_code,$output); + + phpCAS::traceEnd($res); + return $res; + } + + /** + * This method is used to access an IMAP/POP3/NNTP service. + * + * @param $url a string giving the URL of the service, including the mailing box + * for IMAP URLs, as accepted by imap_open(). + * @param $flags options given to imap_open(). + * @param $err_code an error code Possible values are PHPCAS_SERVICE_OK (on + * success), PHPCAS_SERVICE_PT_NO_SERVER_RESPONSE, PHPCAS_SERVICE_PT_BAD_SERVER_RESPONSE, + * PHPCAS_SERVICE_PT_FAILURE, PHPCAS_SERVICE_NOT AVAILABLE. + * @param $err_msg an error message on failure + * @param $pt the Proxy Ticket (PT) retrieved from the CAS server to access the URL + * on success, FALSE on error). + * + * @return an IMAP stream on success, FALSE otherwise (in this later case, $err_code + * gives the reason why it failed and $err_msg contains an error message). + */ + function serviceMail($url,$flags,&$err_code,&$err_msg,&$pt) + { + global $PHPCAS_CLIENT, $PHPCAS_AUTH_CHECK_CALL; + + phpCAS::traceBegin(); + if ( !is_object($PHPCAS_CLIENT) ) { + phpCAS::error('this method should only be called after '.__CLASS__.'::proxy()'); + } + if ( !$PHPCAS_CLIENT->isProxy() ) { + phpCAS::error('this method should only be called after '.__CLASS__.'::proxy()'); + } + if ( !$PHPCAS_AUTH_CHECK_CALL['done'] ) { + phpCAS::error('this method should only be called after the programmer is sure the user has been authenticated (by calling '.__CLASS__.'::checkAuthentication() or '.__CLASS__.'::forceAuthentication()'); + } + if ( !$PHPCAS_AUTH_CHECK_CALL['result'] ) { + phpCAS::error('authentication was checked (by '.$PHPCAS_AUTH_CHECK_CALL['method'].'() at '.$PHPCAS_AUTH_CHECK_CALL['file'].':'.$PHPCAS_AUTH_CHECK_CALL['line'].') but the method returned FALSE'); + } + if ( gettype($url) != 'string' ) { + phpCAS::error('type mismatched for parameter $url (should be `string\')'); + } + + if ( gettype($flags) != 'integer' ) { + phpCAS::error('type mismatched for parameter $flags (should be `integer\')'); + } + + $res = $PHPCAS_CLIENT->serviceMail($url,$flags,$err_code,$err_msg,$pt); + + phpCAS::traceEnd($res); + return $res; + } + + /** @} */ + // ######################################################################## + // AUTHENTICATION + // ######################################################################## + /** + * @addtogroup publicAuth + * @{ + */ + + /** + * Set the times authentication will be cached before really accessing the CAS server in gateway mode: + * - -1: check only once, and then never again (until you pree login) + * - 0: always check + * - n: check every "n" time + * + * @param $n an integer. + */ + function setCacheTimesForAuthRecheck($n) + { + global $PHPCAS_CLIENT; + if ( !is_object($PHPCAS_CLIENT) ) { + phpCAS::error('this method should not be called before '.__CLASS__.'::client() or '.__CLASS__.'::proxy()'); + } + if ( gettype($n) != 'integer' ) { + phpCAS::error('type mismatched for parameter $header (should be `string\')'); + } + $PHPCAS_CLIENT->setCacheTimesForAuthRecheck($n); + } + + /** + * This method is called to check if the user is authenticated (use the gateway feature). + * @return TRUE when the user is authenticated; otherwise FALSE. + */ + function checkAuthentication() + { + global $PHPCAS_CLIENT, $PHPCAS_AUTH_CHECK_CALL; + + phpCAS::traceBegin(); + if ( !is_object($PHPCAS_CLIENT) ) { + phpCAS::error('this method should not be called before '.__CLASS__.'::client() or '.__CLASS__.'::proxy()'); + } + + $auth = $PHPCAS_CLIENT->checkAuthentication(); + + // store where the authentication has been checked and the result + $dbg = phpCAS::backtrace(); + $PHPCAS_AUTH_CHECK_CALL = array('done' => TRUE, + 'file' => $dbg[0]['file'], + 'line' => $dbg[0]['line'], + 'method' => __CLASS__.'::'.__FUNCTION__, + 'result' => $auth ); + phpCAS::traceEnd($auth); + return $auth; + } + + /** + * This method is called to force authentication if the user was not already + * authenticated. If the user is not authenticated, halt by redirecting to + * the CAS server. + */ + function forceAuthentication() + { + global $PHPCAS_CLIENT, $PHPCAS_AUTH_CHECK_CALL; + + phpCAS::traceBegin(); + if ( !is_object($PHPCAS_CLIENT) ) { + phpCAS::error('this method should not be called before '.__CLASS__.'::client() or '.__CLASS__.'::proxy()'); + } + + $auth = $PHPCAS_CLIENT->forceAuthentication(); + + // store where the authentication has been checked and the result + $dbg = phpCAS::backtrace(); + $PHPCAS_AUTH_CHECK_CALL = array('done' => TRUE, + 'file' => $dbg[0]['file'], + 'line' => $dbg[0]['line'], + 'method' => __CLASS__.'::'.__FUNCTION__, + 'result' => $auth ); + + if ( !$auth ) { + phpCAS::trace('user is not authenticated, redirecting to the CAS server'); + $PHPCAS_CLIENT->forceAuthentication(); + } else { + phpCAS::trace('no need to authenticate (user `'.phpCAS::getUser().'\' is already authenticated)'); + } + + phpCAS::traceEnd(); + return $auth; + } + + /** + * This method is called to renew the authentication. + **/ + function renewAuthentication() { + global $PHPCAS_CLIENT, $PHPCAS_AUTH_CHECK_CALL; + + phpCAS::traceBegin(); + if ( !is_object($PHPCAS_CLIENT) ) { + phpCAS::error('this method should not be called before'.__CLASS__.'::client() or '.__CLASS__.'::proxy()'); + } + + // store where the authentication has been checked and the result + $dbg = phpCAS::backtrace(); + $PHPCAS_AUTH_CHECK_CALL = array('done' => TRUE, 'file' => $dbg[0]['file'], 'line' => $dbg[0]['line'], 'method' => __CLASS__.'::'.__FUNCTION__, 'result' => $auth ); + + $PHPCAS_CLIENT->renewAuthentication(); + phpCAS::traceEnd(); + } + + /** + * This method has been left from version 0.4.1 for compatibility reasons. + */ + function authenticate() + { + phpCAS::error('this method is deprecated. You should use '.__CLASS__.'::forceAuthentication() instead'); + } + + /** + * This method is called to check if the user is authenticated (previously or by + * tickets given in the URL). + * + * @return TRUE when the user is authenticated. + */ + function isAuthenticated() + { + global $PHPCAS_CLIENT, $PHPCAS_AUTH_CHECK_CALL; + + phpCAS::traceBegin(); + if ( !is_object($PHPCAS_CLIENT) ) { + phpCAS::error('this method should not be called before '.__CLASS__.'::client() or '.__CLASS__.'::proxy()'); + } + + // call the isAuthenticated method of the global $PHPCAS_CLIENT object + $auth = $PHPCAS_CLIENT->isAuthenticated(); + + // store where the authentication has been checked and the result + $dbg = phpCAS::backtrace(); + $PHPCAS_AUTH_CHECK_CALL = array('done' => TRUE, + 'file' => $dbg[0]['file'], + 'line' => $dbg[0]['line'], + 'method' => __CLASS__.'::'.__FUNCTION__, + 'result' => $auth ); + phpCAS::traceEnd($auth); + return $auth; + } + + /** + * Checks whether authenticated based on $_SESSION. Useful to avoid + * server calls. + * @return true if authenticated, false otherwise. + * @since 0.4.22 by Brendan Arnold + */ + function isSessionAuthenticated () + { + global $PHPCAS_CLIENT; + if ( !is_object($PHPCAS_CLIENT) ) { + phpCAS::error('this method should not be called before '.__CLASS__.'::client() or '.__CLASS__.'::proxy()'); + } + return($PHPCAS_CLIENT->isSessionAuthenticated()); + } + + /** + * This method returns the CAS user's login name. + * @warning should not be called only after phpCAS::forceAuthentication() + * or phpCAS::checkAuthentication(). + * + * @return the login name of the authenticated user + */ + function getUser() + { + global $PHPCAS_CLIENT, $PHPCAS_AUTH_CHECK_CALL; + if ( !is_object($PHPCAS_CLIENT) ) { + phpCAS::error('this method should not be called before '.__CLASS__.'::client() or '.__CLASS__.'::proxy()'); + } + if ( !$PHPCAS_AUTH_CHECK_CALL['done'] ) { + phpCAS::error('this method should only be called after '.__CLASS__.'::forceAuthentication() or '.__CLASS__.'::isAuthenticated()'); + } + if ( !$PHPCAS_AUTH_CHECK_CALL['result'] ) { + phpCAS::error('authentication was checked (by '.$PHPCAS_AUTH_CHECK_CALL['method'].'() at '.$PHPCAS_AUTH_CHECK_CALL['file'].':'.$PHPCAS_AUTH_CHECK_CALL['line'].') but the method returned FALSE'); + } + return $PHPCAS_CLIENT->getUser(); + } + + /** + * Handle logout requests. + */ + function handleLogoutRequests($check_client=true, $allowed_clients=false) + { + global $PHPCAS_CLIENT; + if ( !is_object($PHPCAS_CLIENT) ) { + phpCAS::error('this method should not be called before '.__CLASS__.'::client() or '.__CLASS__.'::proxy()'); + } + return($PHPCAS_CLIENT->handleLogoutRequests($check_client, $allowed_clients)); + } + + /** + * This method returns the URL to be used to login. + * or phpCAS::isAuthenticated(). + * + * @return the login name of the authenticated user + */ + function getServerLoginURL() + { + global $PHPCAS_CLIENT; + if ( !is_object($PHPCAS_CLIENT) ) { + phpCAS::error('this method should not be called before '.__CLASS__.'::client() or '.__CLASS__.'::proxy()'); + } + return $PHPCAS_CLIENT->getServerLoginURL(); + } + + /** + * Set the login URL of the CAS server. + * @param $url the login URL + * @since 0.4.21 by Wyman Chan + */ + function setServerLoginURL($url='') + { + global $PHPCAS_CLIENT; + phpCAS::traceBegin(); + if ( !is_object($PHPCAS_CLIENT) ) { + phpCAS::error('this method should only be called after + '.__CLASS__.'::client()'); + } + if ( gettype($url) != 'string' ) { + phpCAS::error('type mismatched for parameter $url (should be + `string\')'); + } + $PHPCAS_CLIENT->setServerLoginURL($url); + phpCAS::traceEnd(); + } + + /** + * This method returns the URL to be used to login. + * or phpCAS::isAuthenticated(). + * + * @return the login name of the authenticated user + */ + function getServerLogoutURL() + { + global $PHPCAS_CLIENT; + if ( !is_object($PHPCAS_CLIENT) ) { + phpCAS::error('this method should not be called before '.__CLASS__.'::client() or '.__CLASS__.'::proxy()'); + } + return $PHPCAS_CLIENT->getServerLogoutURL(); + } + + /** + * Set the logout URL of the CAS server. + * @param $url the logout URL + * @since 0.4.21 by Wyman Chan + */ + function setServerLogoutURL($url='') + { + global $PHPCAS_CLIENT; + phpCAS::traceBegin(); + if ( !is_object($PHPCAS_CLIENT) ) { + phpCAS::error('this method should only be called after + '.__CLASS__.'::client()'); + } + if ( gettype($url) != 'string' ) { + phpCAS::error('type mismatched for parameter $url (should be + `string\')'); + } + $PHPCAS_CLIENT->setServerLogoutURL($url); + phpCAS::traceEnd(); + } + + /** + * This method is used to logout from CAS. + * @params $params an array that contains the optional url and service parameters that will be passed to the CAS server + * @public + */ + function logout($params = "") { + global $PHPCAS_CLIENT; + phpCAS::traceBegin(); + if (!is_object($PHPCAS_CLIENT)) { + phpCAS::error('this method should only be called after '.__CLASS__.'::client() or'.__CLASS__.'::proxy()'); + } + $parsedParams = array(); + if ($params != "") { + if (is_string($params)) { + phpCAS::error('method `phpCAS::logout($url)\' is now deprecated, use `phpCAS::logoutWithUrl($url)\' instead'); + } + if (!is_array($params)) { + phpCAS::error('type mismatched for parameter $params (should be `array\')'); + } + foreach ($params as $key => $value) { + if ($key != "service" && $key != "url") { + phpCAS::error('only `url\' and `service\' parameters are allowed for method `phpCAS::logout($params)\''); + } + $parsedParams[$key] = $value; + } + } + $PHPCAS_CLIENT->logout($parsedParams); + // never reached + phpCAS::traceEnd(); + } + + /** + * This method is used to logout from CAS. Halts by redirecting to the CAS server. + * @param $service a URL that will be transmitted to the CAS server + */ + function logoutWithRedirectService($service) { + global $PHPCAS_CLIENT; + phpCAS::traceBegin(); + if ( !is_object($PHPCAS_CLIENT) ) { + phpCAS::error('this method should only be called after '.__CLASS__.'::client() or'.__CLASS__.'::proxy()'); + } + if (!is_string($service)) { + phpCAS::error('type mismatched for parameter $service (should be `string\')'); + } + $PHPCAS_CLIENT->logout(array("service" => $service)); + // never reached + phpCAS::traceEnd(); + } + + /** + * This method is used to logout from CAS. Halts by redirecting to the CAS server. + * @param $url a URL that will be transmitted to the CAS server + */ + function logoutWithUrl($url) { + global $PHPCAS_CLIENT; + phpCAS::traceBegin(); + if ( !is_object($PHPCAS_CLIENT) ) { + phpCAS::error('this method should only be called after '.__CLASS__.'::client() or'.__CLASS__.'::proxy()'); + } + if (!is_string($url)) { + phpCAS::error('type mismatched for parameter $url (should be `string\')'); + } + $PHPCAS_CLIENT->logout(array("url" => $url)); + // never reached + phpCAS::traceEnd(); + } + + /** + * This method is used to logout from CAS. Halts by redirecting to the CAS server. + * @param $service a URL that will be transmitted to the CAS server + * @param $url a URL that will be transmitted to the CAS server + */ + function logoutWithRedirectServiceAndUrl($service, $url) { + global $PHPCAS_CLIENT; + phpCAS::traceBegin(); + if ( !is_object($PHPCAS_CLIENT) ) { + phpCAS::error('this method should only be called after '.__CLASS__.'::client() or'.__CLASS__.'::proxy()'); + } + if (!is_string($service)) { + phpCAS::error('type mismatched for parameter $service (should be `string\')'); + } + if (!is_string($url)) { + phpCAS::error('type mismatched for parameter $url (should be `string\')'); + } + $PHPCAS_CLIENT->logout(array("service" => $service, "url" => $url)); + // never reached + phpCAS::traceEnd(); + } + + /** + * Set the fixed URL that will be used by the CAS server to transmit the PGT. + * When this method is not called, a phpCAS script uses its own URL for the callback. + * + * @param $url the URL + */ + function setFixedCallbackURL($url='') + { + global $PHPCAS_CLIENT; + phpCAS::traceBegin(); + if ( !is_object($PHPCAS_CLIENT) ) { + phpCAS::error('this method should only be called after '.__CLASS__.'::proxy()'); + } + if ( !$PHPCAS_CLIENT->isProxy() ) { + phpCAS::error('this method should only be called after '.__CLASS__.'::proxy()'); + } + if ( gettype($url) != 'string' ) { + phpCAS::error('type mismatched for parameter $url (should be `string\')'); + } + $PHPCAS_CLIENT->setCallbackURL($url); + phpCAS::traceEnd(); + } + + /** + * Set the fixed URL that will be set as the CAS service parameter. When this + * method is not called, a phpCAS script uses its own URL. + * + * @param $url the URL + */ + function setFixedServiceURL($url) + { + global $PHPCAS_CLIENT; + phpCAS::traceBegin(); + if ( !is_object($PHPCAS_CLIENT) ) { + phpCAS::error('this method should only be called after '.__CLASS__.'::proxy()'); + } + if ( gettype($url) != 'string' ) { + phpCAS::error('type mismatched for parameter $url (should be `string\')'); + } + $PHPCAS_CLIENT->setURL($url); + phpCAS::traceEnd(); + } + + /** + * Get the URL that is set as the CAS service parameter. + */ + function getServiceURL() + { + global $PHPCAS_CLIENT; + if ( !is_object($PHPCAS_CLIENT) ) { + phpCAS::error('this method should only be called after '.__CLASS__.'::proxy()'); + } + return($PHPCAS_CLIENT->getURL()); + } + + /** + * Retrieve a Proxy Ticket from the CAS server. + */ + function retrievePT($target_service,&$err_code,&$err_msg) + { + global $PHPCAS_CLIENT; + if ( !is_object($PHPCAS_CLIENT) ) { + phpCAS::error('this method should only be called after '.__CLASS__.'::proxy()'); + } + if ( gettype($target_service) != 'string' ) { + phpCAS::error('type mismatched for parameter $target_service(should be `string\')'); + } + return($PHPCAS_CLIENT->retrievePT($target_service,$err_code,$err_msg)); + } + + /** + * Set the certificate of the CAS server. + * + * @param $cert the PEM certificate + */ + function setCasServerCert($cert) + { + global $PHPCAS_CLIENT; + phpCAS::traceBegin(); + if ( !is_object($PHPCAS_CLIENT) ) { + phpCAS::error('this method should only be called after '.__CLASS__.'::client() or'.__CLASS__.'::proxy()'); + } + if ( gettype($cert) != 'string' ) { + phpCAS::error('type mismatched for parameter $cert (should be `string\')'); + } + $PHPCAS_CLIENT->setCasServerCert($cert); + phpCAS::traceEnd(); + } + + /** + * Set the certificate of the CAS server CA. + * + * @param $cert the CA certificate + */ + function setCasServerCACert($cert) + { + global $PHPCAS_CLIENT; + phpCAS::traceBegin(); + if ( !is_object($PHPCAS_CLIENT) ) { + phpCAS::error('this method should only be called after '.__CLASS__.'::client() or'.__CLASS__.'::proxy()'); + } + if ( gettype($cert) != 'string' ) { + phpCAS::error('type mismatched for parameter $cert (should be `string\')'); + } + $PHPCAS_CLIENT->setCasServerCACert($cert); + phpCAS::traceEnd(); + } + + /** + * Set no SSL validation for the CAS server. + */ + function setNoCasServerValidation() + { + global $PHPCAS_CLIENT; + phpCAS::traceBegin(); + if ( !is_object($PHPCAS_CLIENT) ) { + phpCAS::error('this method should only be called after '.__CLASS__.'::client() or'.__CLASS__.'::proxy()'); + } + $PHPCAS_CLIENT->setNoCasServerValidation(); + phpCAS::traceEnd(); + } + + /** @} */ + + /** + * Change CURL options. + * CURL is used to connect through HTTPS to CAS server + * @param $key the option key + * @param $value the value to set + */ + function setExtraCurlOption($key, $value) + { + global $PHPCAS_CLIENT; + phpCAS::traceBegin(); + if ( !is_object($PHPCAS_CLIENT) ) { + phpCAS::error('this method should only be called after '.__CLASS__.'::client() or'.__CLASS__.'::proxy()'); + } + $PHPCAS_CLIENT->setExtraCurlOption($key, $value); + phpCAS::traceEnd(); + } + +} + +// ######################################################################## +// DOCUMENTATION +// ######################################################################## + +// ######################################################################## +// MAIN PAGE + +/** + * @mainpage + * + * The following pages only show the source documentation. + * + */ + +// ######################################################################## +// MODULES DEFINITION + +/** @defgroup public User interface */ + +/** @defgroup publicInit Initialization + * @ingroup public */ + +/** @defgroup publicAuth Authentication + * @ingroup public */ + +/** @defgroup publicServices Access to external services + * @ingroup public */ + +/** @defgroup publicConfig Configuration + * @ingroup public */ + +/** @defgroup publicLang Internationalization + * @ingroup publicConfig */ + +/** @defgroup publicOutput HTML output + * @ingroup publicConfig */ + +/** @defgroup publicPGTStorage PGT storage + * @ingroup publicConfig */ + +/** @defgroup publicDebug Debugging + * @ingroup public */ + + +/** @defgroup internal Implementation */ + +/** @defgroup internalAuthentication Authentication + * @ingroup internal */ + +/** @defgroup internalBasic CAS Basic client features (CAS 1.0, Service Tickets) + * @ingroup internal */ + +/** @defgroup internalProxy CAS Proxy features (CAS 2.0, Proxy Granting Tickets) + * @ingroup internal */ + +/** @defgroup internalPGTStorage PGT storage + * @ingroup internalProxy */ + +/** @defgroup internalPGTStorageDB PGT storage in a database + * @ingroup internalPGTStorage */ + +/** @defgroup internalPGTStorageFile PGT storage on the filesystem + * @ingroup internalPGTStorage */ + +/** @defgroup internalCallback Callback from the CAS server + * @ingroup internalProxy */ + +/** @defgroup internalProxied CAS proxied client features (CAS 2.0, Proxy Tickets) + * @ingroup internal */ + +/** @defgroup internalConfig Configuration + * @ingroup internal */ + +/** @defgroup internalOutput HTML output + * @ingroup internalConfig */ + +/** @defgroup internalLang Internationalization + * @ingroup internalConfig + * + * To add a new language: + * - 1. define a new constant PHPCAS_LANG_XXXXXX in CAS/CAS.php + * - 2. copy any file from CAS/languages to CAS/languages/XXXXXX.php + * - 3. Make the translations + */ + +/** @defgroup internalDebug Debugging + * @ingroup internal */ + +/** @defgroup internalMisc Miscellaneous + * @ingroup internal */ + +// ######################################################################## +// EXAMPLES + +/** + * @example example_simple.php + */ + /** + * @example example_proxy.php + */ + /** + * @example example_proxy2.php + */ + /** + * @example example_lang.php + */ + /** + * @example example_html.php + */ + /** + * @example example_file.php + */ + /** + * @example example_db.php + */ + /** + * @example example_service.php + */ + /** + * @example example_session_proxy.php + */ + /** + * @example example_session_service.php + */ + /** + * @example example_gateway.php + */ + + + +?> diff --git a/plugins/CasAuthentication/extlib/CAS/PGTStorage/pgt-db.php b/plugins/CasAuthentication/extlib/CAS/PGTStorage/pgt-db.php index 5a589e4b2..00797b9c5 100644 --- a/plugins/CasAuthentication/extlib/CAS/PGTStorage/pgt-db.php +++ b/plugins/CasAuthentication/extlib/CAS/PGTStorage/pgt-db.php @@ -1,190 +1,190 @@ -<?php
-
-/**
- * @file CAS/PGTStorage/pgt-db.php
- * Basic class for PGT database storage
- */
-
-/**
- * @class PGTStorageDB
- * The PGTStorageDB class is a class for PGT database storage. An instance of
- * this class is returned by CASClient::SetPGTStorageDB().
- *
- * @author Pascal Aubry <pascal.aubry at univ-rennes1.fr>
- *
- * @ingroup internalPGTStorageDB
- */
-
-class PGTStorageDB extends PGTStorage
-{
- /**
- * @addtogroup internalPGTStorageDB
- * @{
- */
-
- /**
- * a string representing a PEAR DB URL to connect to the database. Written by
- * PGTStorageDB::PGTStorageDB(), read by getURL().
- *
- * @hideinitializer
- * @private
- */
- var $_url='';
-
- /**
- * This method returns the PEAR DB URL to use to connect to the database.
- *
- * @return a PEAR DB URL
- *
- * @private
- */
- function getURL()
- {
- return $this->_url;
- }
-
- /**
- * The handle of the connection to the database where PGT's are stored. Written by
- * PGTStorageDB::init(), read by getLink().
- *
- * @hideinitializer
- * @private
- */
- var $_link = null;
-
- /**
- * This method returns the handle of the connection to the database where PGT's are
- * stored.
- *
- * @return a handle of connection.
- *
- * @private
- */
- function getLink()
- {
- return $this->_link;
- }
-
- /**
- * The name of the table where PGT's are stored. Written by
- * PGTStorageDB::PGTStorageDB(), read by getTable().
- *
- * @hideinitializer
- * @private
- */
- var $_table = '';
-
- /**
- * This method returns the name of the table where PGT's are stored.
- *
- * @return the name of a table.
- *
- * @private
- */
- function getTable()
- {
- return $this->_table;
- }
-
- // ########################################################################
- // DEBUGGING
- // ########################################################################
-
- /**
- * This method returns an informational string giving the type of storage
- * used by the object (used for debugging purposes).
- *
- * @return an informational string.
- * @public
- */
- function getStorageType()
- {
- return "database";
- }
-
- /**
- * This method returns an informational string giving informations on the
- * parameters of the storage.(used for debugging purposes).
- *
- * @public
- */
- function getStorageInfo()
- {
- return 'url=`'.$this->getURL().'\', table=`'.$this->getTable().'\'';
- }
-
- // ########################################################################
- // CONSTRUCTOR
- // ########################################################################
-
- /**
- * The class constructor, called by CASClient::SetPGTStorageDB().
- *
- * @param $cas_parent the CASClient instance that creates the object.
- * @param $user the user to access the data with
- * @param $password the user's password
- * @param $database_type the type of the database hosting the data
- * @param $hostname the server hosting the database
- * @param $port the port the server is listening on
- * @param $database the name of the database
- * @param $table the name of the table storing the data
- *
- * @public
- */
- function PGTStorageDB($cas_parent,$user,$password,$database_type,$hostname,$port,$database,$table)
- {
- phpCAS::traceBegin();
-
- // call the ancestor's constructor
- $this->PGTStorage($cas_parent);
-
- if ( empty($database_type) ) $database_type = CAS_PGT_STORAGE_DB_DEFAULT_DATABASE_TYPE;
- if ( empty($hostname) ) $hostname = CAS_PGT_STORAGE_DB_DEFAULT_HOSTNAME;
- if ( $port==0 ) $port = CAS_PGT_STORAGE_DB_DEFAULT_PORT;
- if ( empty($database) ) $database = CAS_PGT_STORAGE_DB_DEFAULT_DATABASE;
- if ( empty($table) ) $table = CAS_PGT_STORAGE_DB_DEFAULT_TABLE;
-
- // build and store the PEAR DB URL
- $this->_url = $database_type.':'.'//'.$user.':'.$password.'@'.$hostname.':'.$port.'/'.$database;
-
- // XXX should use setURL and setTable
- phpCAS::traceEnd();
- }
-
- // ########################################################################
- // INITIALIZATION
- // ########################################################################
-
- /**
- * This method is used to initialize the storage. Halts on error.
- *
- * @public
- */
- function init()
- {
- phpCAS::traceBegin();
- // if the storage has already been initialized, return immediatly
- if ( $this->isInitialized() )
- return;
- // call the ancestor's method (mark as initialized)
- parent::init();
-
- //include phpDB library (the test was introduced in release 0.4.8 for
- //the integration into Tikiwiki).
- if (!class_exists('DB')) {
- include_once('DB.php');
- }
-
- // try to connect to the database
- $this->_link = DB::connect($this->getURL());
- if ( DB::isError($this->_link) ) {
- phpCAS::error('could not connect to database ('.DB::errorMessage($this->_link).')');
- }
- var_dump($this->_link);
- phpCAS::traceBEnd();
- }
-
- /** @} */
-}
-
+<?php + +/** + * @file CAS/PGTStorage/pgt-db.php + * Basic class for PGT database storage + */ + +/** + * @class PGTStorageDB + * The PGTStorageDB class is a class for PGT database storage. An instance of + * this class is returned by CASClient::SetPGTStorageDB(). + * + * @author Pascal Aubry <pascal.aubry at univ-rennes1.fr> + * + * @ingroup internalPGTStorageDB + */ + +class PGTStorageDB extends PGTStorage +{ + /** + * @addtogroup internalPGTStorageDB + * @{ + */ + + /** + * a string representing a PEAR DB URL to connect to the database. Written by + * PGTStorageDB::PGTStorageDB(), read by getURL(). + * + * @hideinitializer + * @private + */ + var $_url=''; + + /** + * This method returns the PEAR DB URL to use to connect to the database. + * + * @return a PEAR DB URL + * + * @private + */ + function getURL() + { + return $this->_url; + } + + /** + * The handle of the connection to the database where PGT's are stored. Written by + * PGTStorageDB::init(), read by getLink(). + * + * @hideinitializer + * @private + */ + var $_link = null; + + /** + * This method returns the handle of the connection to the database where PGT's are + * stored. + * + * @return a handle of connection. + * + * @private + */ + function getLink() + { + return $this->_link; + } + + /** + * The name of the table where PGT's are stored. Written by + * PGTStorageDB::PGTStorageDB(), read by getTable(). + * + * @hideinitializer + * @private + */ + var $_table = ''; + + /** + * This method returns the name of the table where PGT's are stored. + * + * @return the name of a table. + * + * @private + */ + function getTable() + { + return $this->_table; + } + + // ######################################################################## + // DEBUGGING + // ######################################################################## + + /** + * This method returns an informational string giving the type of storage + * used by the object (used for debugging purposes). + * + * @return an informational string. + * @public + */ + function getStorageType() + { + return "database"; + } + + /** + * This method returns an informational string giving informations on the + * parameters of the storage.(used for debugging purposes). + * + * @public + */ + function getStorageInfo() + { + return 'url=`'.$this->getURL().'\', table=`'.$this->getTable().'\''; + } + + // ######################################################################## + // CONSTRUCTOR + // ######################################################################## + + /** + * The class constructor, called by CASClient::SetPGTStorageDB(). + * + * @param $cas_parent the CASClient instance that creates the object. + * @param $user the user to access the data with + * @param $password the user's password + * @param $database_type the type of the database hosting the data + * @param $hostname the server hosting the database + * @param $port the port the server is listening on + * @param $database the name of the database + * @param $table the name of the table storing the data + * + * @public + */ + function PGTStorageDB($cas_parent,$user,$password,$database_type,$hostname,$port,$database,$table) + { + phpCAS::traceBegin(); + + // call the ancestor's constructor + $this->PGTStorage($cas_parent); + + if ( empty($database_type) ) $database_type = CAS_PGT_STORAGE_DB_DEFAULT_DATABASE_TYPE; + if ( empty($hostname) ) $hostname = CAS_PGT_STORAGE_DB_DEFAULT_HOSTNAME; + if ( $port==0 ) $port = CAS_PGT_STORAGE_DB_DEFAULT_PORT; + if ( empty($database) ) $database = CAS_PGT_STORAGE_DB_DEFAULT_DATABASE; + if ( empty($table) ) $table = CAS_PGT_STORAGE_DB_DEFAULT_TABLE; + + // build and store the PEAR DB URL + $this->_url = $database_type.':'.'//'.$user.':'.$password.'@'.$hostname.':'.$port.'/'.$database; + + // XXX should use setURL and setTable + phpCAS::traceEnd(); + } + + // ######################################################################## + // INITIALIZATION + // ######################################################################## + + /** + * This method is used to initialize the storage. Halts on error. + * + * @public + */ + function init() + { + phpCAS::traceBegin(); + // if the storage has already been initialized, return immediatly + if ( $this->isInitialized() ) + return; + // call the ancestor's method (mark as initialized) + parent::init(); + + //include phpDB library (the test was introduced in release 0.4.8 for + //the integration into Tikiwiki). + if (!class_exists('DB')) { + include_once('DB.php'); + } + + // try to connect to the database + $this->_link = DB::connect($this->getURL()); + if ( DB::isError($this->_link) ) { + phpCAS::error('could not connect to database ('.DB::errorMessage($this->_link).')'); + } + var_dump($this->_link); + phpCAS::traceBEnd(); + } + + /** @} */ +} + ?>
\ No newline at end of file diff --git a/plugins/CasAuthentication/extlib/CAS/PGTStorage/pgt-file.php b/plugins/CasAuthentication/extlib/CAS/PGTStorage/pgt-file.php index bc07485b8..d48a60d67 100644 --- a/plugins/CasAuthentication/extlib/CAS/PGTStorage/pgt-file.php +++ b/plugins/CasAuthentication/extlib/CAS/PGTStorage/pgt-file.php @@ -1,249 +1,249 @@ -<?php
-
-/**
- * @file CAS/PGTStorage/pgt-file.php
- * Basic class for PGT file storage
- */
-
-/**
- * @class PGTStorageFile
- * The PGTStorageFile class is a class for PGT file storage. An instance of
- * this class is returned by CASClient::SetPGTStorageFile().
- *
- * @author Pascal Aubry <pascal.aubry at univ-rennes1.fr>
- *
- * @ingroup internalPGTStorageFile
- */
-
-class PGTStorageFile extends PGTStorage
-{
- /**
- * @addtogroup internalPGTStorageFile
- * @{
- */
-
- /**
- * a string telling where PGT's should be stored on the filesystem. Written by
- * PGTStorageFile::PGTStorageFile(), read by getPath().
- *
- * @private
- */
- var $_path;
-
- /**
- * This method returns the name of the directory where PGT's should be stored
- * on the filesystem.
- *
- * @return the name of a directory (with leading and trailing '/')
- *
- * @private
- */
- function getPath()
- {
- return $this->_path;
- }
-
- /**
- * a string telling the format to use to store PGT's (plain or xml). Written by
- * PGTStorageFile::PGTStorageFile(), read by getFormat().
- *
- * @private
- */
- var $_format;
-
- /**
- * This method returns the format to use when storing PGT's on the filesystem.
- *
- * @return a string corresponding to the format used (plain or xml).
- *
- * @private
- */
- function getFormat()
- {
- return $this->_format;
- }
-
- // ########################################################################
- // DEBUGGING
- // ########################################################################
-
- /**
- * This method returns an informational string giving the type of storage
- * used by the object (used for debugging purposes).
- *
- * @return an informational string.
- * @public
- */
- function getStorageType()
- {
- return "file";
- }
-
- /**
- * This method returns an informational string giving informations on the
- * parameters of the storage.(used for debugging purposes).
- *
- * @return an informational string.
- * @public
- */
- function getStorageInfo()
- {
- return 'path=`'.$this->getPath().'\', format=`'.$this->getFormat().'\'';
- }
-
- // ########################################################################
- // CONSTRUCTOR
- // ########################################################################
-
- /**
- * The class constructor, called by CASClient::SetPGTStorageFile().
- *
- * @param $cas_parent the CASClient instance that creates the object.
- * @param $format the format used to store the PGT's (`plain' and `xml' allowed).
- * @param $path the path where the PGT's should be stored
- *
- * @public
- */
- function PGTStorageFile($cas_parent,$format,$path)
- {
- phpCAS::traceBegin();
- // call the ancestor's constructor
- $this->PGTStorage($cas_parent);
-
- if (empty($format) ) $format = CAS_PGT_STORAGE_FILE_DEFAULT_FORMAT;
- if (empty($path) ) $path = CAS_PGT_STORAGE_FILE_DEFAULT_PATH;
-
- // check that the path is an absolute path
- if (getenv("OS")=="Windows_NT"){
-
- if (!preg_match('`^[a-zA-Z]:`', $path)) {
- phpCAS::error('an absolute path is needed for PGT storage to file');
- }
-
- }
- else
- {
-
- if ( $path[0] != '/' ) {
- phpCAS::error('an absolute path is needed for PGT storage to file');
- }
-
- // store the path (with a leading and trailing '/')
- $path = preg_replace('|[/]*$|','/',$path);
- $path = preg_replace('|^[/]*|','/',$path);
- }
-
- $this->_path = $path;
- // check the format and store it
- switch ($format) {
- case CAS_PGT_STORAGE_FILE_FORMAT_PLAIN:
- case CAS_PGT_STORAGE_FILE_FORMAT_XML:
- $this->_format = $format;
- break;
- default:
- phpCAS::error('unknown PGT file storage format (`'.CAS_PGT_STORAGE_FILE_FORMAT_PLAIN.'\' and `'.CAS_PGT_STORAGE_FILE_FORMAT_XML.'\' allowed)');
- }
- phpCAS::traceEnd();
- }
-
- // ########################################################################
- // INITIALIZATION
- // ########################################################################
-
- /**
- * This method is used to initialize the storage. Halts on error.
- *
- * @public
- */
- function init()
- {
- phpCAS::traceBegin();
- // if the storage has already been initialized, return immediatly
- if ( $this->isInitialized() )
- return;
- // call the ancestor's method (mark as initialized)
- parent::init();
- phpCAS::traceEnd();
- }
-
- // ########################################################################
- // PGT I/O
- // ########################################################################
-
- /**
- * This method returns the filename corresponding to a PGT Iou.
- *
- * @param $pgt_iou the PGT iou.
- *
- * @return a filename
- * @private
- */
- function getPGTIouFilename($pgt_iou)
- {
- phpCAS::traceBegin();
- $filename = $this->getPath().$pgt_iou.'.'.$this->getFormat();
- phpCAS::traceEnd($filename);
- return $filename;
- }
-
- /**
- * This method stores a PGT and its corresponding PGT Iou into a file. Echoes a
- * warning on error.
- *
- * @param $pgt the PGT
- * @param $pgt_iou the PGT iou
- *
- * @public
- */
- function write($pgt,$pgt_iou)
- {
- phpCAS::traceBegin();
- $fname = $this->getPGTIouFilename($pgt_iou);
- if ( $f=fopen($fname,"w") ) {
- if ( fputs($f,$pgt) === FALSE ) {
- phpCAS::error('could not write PGT to `'.$fname.'\'');
- }
- fclose($f);
- } else {
- phpCAS::error('could not open `'.$fname.'\'');
- }
- phpCAS::traceEnd();
- }
-
- /**
- * This method reads a PGT corresponding to a PGT Iou and deletes the
- * corresponding file.
- *
- * @param $pgt_iou the PGT iou
- *
- * @return the corresponding PGT, or FALSE on error
- *
- * @public
- */
- function read($pgt_iou)
- {
- phpCAS::traceBegin();
- $pgt = FALSE;
- $fname = $this->getPGTIouFilename($pgt_iou);
- if ( !($f=fopen($fname,"r")) ) {
- phpCAS::trace('could not open `'.$fname.'\'');
- } else {
- if ( ($pgt=fgets($f)) === FALSE ) {
- phpCAS::trace('could not read PGT from `'.$fname.'\'');
- }
- fclose($f);
- }
-
- // delete the PGT file
- @unlink($fname);
-
- phpCAS::traceEnd($pgt);
- return $pgt;
- }
-
- /** @} */
-
-}
-
-
+<?php + +/** + * @file CAS/PGTStorage/pgt-file.php + * Basic class for PGT file storage + */ + +/** + * @class PGTStorageFile + * The PGTStorageFile class is a class for PGT file storage. An instance of + * this class is returned by CASClient::SetPGTStorageFile(). + * + * @author Pascal Aubry <pascal.aubry at univ-rennes1.fr> + * + * @ingroup internalPGTStorageFile + */ + +class PGTStorageFile extends PGTStorage +{ + /** + * @addtogroup internalPGTStorageFile + * @{ + */ + + /** + * a string telling where PGT's should be stored on the filesystem. Written by + * PGTStorageFile::PGTStorageFile(), read by getPath(). + * + * @private + */ + var $_path; + + /** + * This method returns the name of the directory where PGT's should be stored + * on the filesystem. + * + * @return the name of a directory (with leading and trailing '/') + * + * @private + */ + function getPath() + { + return $this->_path; + } + + /** + * a string telling the format to use to store PGT's (plain or xml). Written by + * PGTStorageFile::PGTStorageFile(), read by getFormat(). + * + * @private + */ + var $_format; + + /** + * This method returns the format to use when storing PGT's on the filesystem. + * + * @return a string corresponding to the format used (plain or xml). + * + * @private + */ + function getFormat() + { + return $this->_format; + } + + // ######################################################################## + // DEBUGGING + // ######################################################################## + + /** + * This method returns an informational string giving the type of storage + * used by the object (used for debugging purposes). + * + * @return an informational string. + * @public + */ + function getStorageType() + { + return "file"; + } + + /** + * This method returns an informational string giving informations on the + * parameters of the storage.(used for debugging purposes). + * + * @return an informational string. + * @public + */ + function getStorageInfo() + { + return 'path=`'.$this->getPath().'\', format=`'.$this->getFormat().'\''; + } + + // ######################################################################## + // CONSTRUCTOR + // ######################################################################## + + /** + * The class constructor, called by CASClient::SetPGTStorageFile(). + * + * @param $cas_parent the CASClient instance that creates the object. + * @param $format the format used to store the PGT's (`plain' and `xml' allowed). + * @param $path the path where the PGT's should be stored + * + * @public + */ + function PGTStorageFile($cas_parent,$format,$path) + { + phpCAS::traceBegin(); + // call the ancestor's constructor + $this->PGTStorage($cas_parent); + + if (empty($format) ) $format = CAS_PGT_STORAGE_FILE_DEFAULT_FORMAT; + if (empty($path) ) $path = CAS_PGT_STORAGE_FILE_DEFAULT_PATH; + + // check that the path is an absolute path + if (getenv("OS")=="Windows_NT"){ + + if (!preg_match('`^[a-zA-Z]:`', $path)) { + phpCAS::error('an absolute path is needed for PGT storage to file'); + } + + } + else + { + + if ( $path[0] != '/' ) { + phpCAS::error('an absolute path is needed for PGT storage to file'); + } + + // store the path (with a leading and trailing '/') + $path = preg_replace('|[/]*$|','/',$path); + $path = preg_replace('|^[/]*|','/',$path); + } + + $this->_path = $path; + // check the format and store it + switch ($format) { + case CAS_PGT_STORAGE_FILE_FORMAT_PLAIN: + case CAS_PGT_STORAGE_FILE_FORMAT_XML: + $this->_format = $format; + break; + default: + phpCAS::error('unknown PGT file storage format (`'.CAS_PGT_STORAGE_FILE_FORMAT_PLAIN.'\' and `'.CAS_PGT_STORAGE_FILE_FORMAT_XML.'\' allowed)'); + } + phpCAS::traceEnd(); + } + + // ######################################################################## + // INITIALIZATION + // ######################################################################## + + /** + * This method is used to initialize the storage. Halts on error. + * + * @public + */ + function init() + { + phpCAS::traceBegin(); + // if the storage has already been initialized, return immediatly + if ( $this->isInitialized() ) + return; + // call the ancestor's method (mark as initialized) + parent::init(); + phpCAS::traceEnd(); + } + + // ######################################################################## + // PGT I/O + // ######################################################################## + + /** + * This method returns the filename corresponding to a PGT Iou. + * + * @param $pgt_iou the PGT iou. + * + * @return a filename + * @private + */ + function getPGTIouFilename($pgt_iou) + { + phpCAS::traceBegin(); + $filename = $this->getPath().$pgt_iou.'.'.$this->getFormat(); + phpCAS::traceEnd($filename); + return $filename; + } + + /** + * This method stores a PGT and its corresponding PGT Iou into a file. Echoes a + * warning on error. + * + * @param $pgt the PGT + * @param $pgt_iou the PGT iou + * + * @public + */ + function write($pgt,$pgt_iou) + { + phpCAS::traceBegin(); + $fname = $this->getPGTIouFilename($pgt_iou); + if ( $f=fopen($fname,"w") ) { + if ( fputs($f,$pgt) === FALSE ) { + phpCAS::error('could not write PGT to `'.$fname.'\''); + } + fclose($f); + } else { + phpCAS::error('could not open `'.$fname.'\''); + } + phpCAS::traceEnd(); + } + + /** + * This method reads a PGT corresponding to a PGT Iou and deletes the + * corresponding file. + * + * @param $pgt_iou the PGT iou + * + * @return the corresponding PGT, or FALSE on error + * + * @public + */ + function read($pgt_iou) + { + phpCAS::traceBegin(); + $pgt = FALSE; + $fname = $this->getPGTIouFilename($pgt_iou); + if ( !($f=fopen($fname,"r")) ) { + phpCAS::trace('could not open `'.$fname.'\''); + } else { + if ( ($pgt=fgets($f)) === FALSE ) { + phpCAS::trace('could not read PGT from `'.$fname.'\''); + } + fclose($f); + } + + // delete the PGT file + @unlink($fname); + + phpCAS::traceEnd($pgt); + return $pgt; + } + + /** @} */ + +} + + ?>
\ No newline at end of file diff --git a/plugins/CasAuthentication/extlib/CAS/PGTStorage/pgt-main.php b/plugins/CasAuthentication/extlib/CAS/PGTStorage/pgt-main.php index cd9b49967..8fd3c9e12 100644 --- a/plugins/CasAuthentication/extlib/CAS/PGTStorage/pgt-main.php +++ b/plugins/CasAuthentication/extlib/CAS/PGTStorage/pgt-main.php @@ -1,188 +1,188 @@ -<?php
-
-/**
- * @file CAS/PGTStorage/pgt-main.php
- * Basic class for PGT storage
- */
-
-/**
- * @class PGTStorage
- * The PGTStorage class is a generic class for PGT storage. This class should
- * not be instanciated itself but inherited by specific PGT storage classes.
- *
- * @author Pascal Aubry <pascal.aubry at univ-rennes1.fr>
- *
- * @ingroup internalPGTStorage
- */
-
-class PGTStorage
-{
- /**
- * @addtogroup internalPGTStorage
- * @{
- */
-
- // ########################################################################
- // CONSTRUCTOR
- // ########################################################################
-
- /**
- * The constructor of the class, should be called only by inherited classes.
- *
- * @param $cas_parent the CASclient instance that creates the current object.
- *
- * @protected
- */
- function PGTStorage($cas_parent)
- {
- phpCAS::traceBegin();
- if ( !$cas_parent->isProxy() ) {
- phpCAS::error('defining PGT storage makes no sense when not using a CAS proxy');
- }
- phpCAS::traceEnd();
- }
-
- // ########################################################################
- // DEBUGGING
- // ########################################################################
-
- /**
- * This virtual method returns an informational string giving the type of storage
- * used by the object (used for debugging purposes).
- *
- * @public
- */
- function getStorageType()
- {
- phpCAS::error(__CLASS__.'::'.__FUNCTION__.'() should never be called');
- }
-
- /**
- * This virtual method returns an informational string giving informations on the
- * parameters of the storage.(used for debugging purposes).
- *
- * @public
- */
- function getStorageInfo()
- {
- phpCAS::error(__CLASS__.'::'.__FUNCTION__.'() should never be called');
- }
-
- // ########################################################################
- // ERROR HANDLING
- // ########################################################################
-
- /**
- * string used to store an error message. Written by PGTStorage::setErrorMessage(),
- * read by PGTStorage::getErrorMessage().
- *
- * @hideinitializer
- * @private
- * @deprecated not used.
- */
- var $_error_message=FALSE;
-
- /**
- * This method sets en error message, which can be read later by
- * PGTStorage::getErrorMessage().
- *
- * @param $error_message an error message
- *
- * @protected
- * @deprecated not used.
- */
- function setErrorMessage($error_message)
- {
- $this->_error_message = $error_message;
- }
-
- /**
- * This method returns an error message set by PGTStorage::setErrorMessage().
- *
- * @return an error message when set by PGTStorage::setErrorMessage(), FALSE
- * otherwise.
- *
- * @public
- * @deprecated not used.
- */
- function getErrorMessage()
- {
- return $this->_error_message;
- }
-
- // ########################################################################
- // INITIALIZATION
- // ########################################################################
-
- /**
- * a boolean telling if the storage has already been initialized. Written by
- * PGTStorage::init(), read by PGTStorage::isInitialized().
- *
- * @hideinitializer
- * @private
- */
- var $_initialized = FALSE;
-
- /**
- * This method tells if the storage has already been intialized.
- *
- * @return a boolean
- *
- * @protected
- */
- function isInitialized()
- {
- return $this->_initialized;
- }
-
- /**
- * This virtual method initializes the object.
- *
- * @protected
- */
- function init()
- {
- $this->_initialized = TRUE;
- }
-
- // ########################################################################
- // PGT I/O
- // ########################################################################
-
- /**
- * This virtual method stores a PGT and its corresponding PGT Iuo.
- * @note Should never be called.
- *
- * @param $pgt the PGT
- * @param $pgt_iou the PGT iou
- *
- * @protected
- */
- function write($pgt,$pgt_iou)
- {
- phpCAS::error(__CLASS__.'::'.__FUNCTION__.'() should never be called');
- }
-
- /**
- * This virtual method reads a PGT corresponding to a PGT Iou and deletes
- * the corresponding storage entry.
- * @note Should never be called.
- *
- * @param $pgt_iou the PGT iou
- *
- * @protected
- */
- function read($pgt_iou)
- {
- phpCAS::error(__CLASS__.'::'.__FUNCTION__.'() should never be called');
- }
-
- /** @} */
-
-}
-
-// include specific PGT storage classes
-include_once(dirname(__FILE__).'/pgt-file.php');
-include_once(dirname(__FILE__).'/pgt-db.php');
-
+<?php + +/** + * @file CAS/PGTStorage/pgt-main.php + * Basic class for PGT storage + */ + +/** + * @class PGTStorage + * The PGTStorage class is a generic class for PGT storage. This class should + * not be instanciated itself but inherited by specific PGT storage classes. + * + * @author Pascal Aubry <pascal.aubry at univ-rennes1.fr> + * + * @ingroup internalPGTStorage + */ + +class PGTStorage +{ + /** + * @addtogroup internalPGTStorage + * @{ + */ + + // ######################################################################## + // CONSTRUCTOR + // ######################################################################## + + /** + * The constructor of the class, should be called only by inherited classes. + * + * @param $cas_parent the CASclient instance that creates the current object. + * + * @protected + */ + function PGTStorage($cas_parent) + { + phpCAS::traceBegin(); + if ( !$cas_parent->isProxy() ) { + phpCAS::error('defining PGT storage makes no sense when not using a CAS proxy'); + } + phpCAS::traceEnd(); + } + + // ######################################################################## + // DEBUGGING + // ######################################################################## + + /** + * This virtual method returns an informational string giving the type of storage + * used by the object (used for debugging purposes). + * + * @public + */ + function getStorageType() + { + phpCAS::error(__CLASS__.'::'.__FUNCTION__.'() should never be called'); + } + + /** + * This virtual method returns an informational string giving informations on the + * parameters of the storage.(used for debugging purposes). + * + * @public + */ + function getStorageInfo() + { + phpCAS::error(__CLASS__.'::'.__FUNCTION__.'() should never be called'); + } + + // ######################################################################## + // ERROR HANDLING + // ######################################################################## + + /** + * string used to store an error message. Written by PGTStorage::setErrorMessage(), + * read by PGTStorage::getErrorMessage(). + * + * @hideinitializer + * @private + * @deprecated not used. + */ + var $_error_message=FALSE; + + /** + * This method sets en error message, which can be read later by + * PGTStorage::getErrorMessage(). + * + * @param $error_message an error message + * + * @protected + * @deprecated not used. + */ + function setErrorMessage($error_message) + { + $this->_error_message = $error_message; + } + + /** + * This method returns an error message set by PGTStorage::setErrorMessage(). + * + * @return an error message when set by PGTStorage::setErrorMessage(), FALSE + * otherwise. + * + * @public + * @deprecated not used. + */ + function getErrorMessage() + { + return $this->_error_message; + } + + // ######################################################################## + // INITIALIZATION + // ######################################################################## + + /** + * a boolean telling if the storage has already been initialized. Written by + * PGTStorage::init(), read by PGTStorage::isInitialized(). + * + * @hideinitializer + * @private + */ + var $_initialized = FALSE; + + /** + * This method tells if the storage has already been intialized. + * + * @return a boolean + * + * @protected + */ + function isInitialized() + { + return $this->_initialized; + } + + /** + * This virtual method initializes the object. + * + * @protected + */ + function init() + { + $this->_initialized = TRUE; + } + + // ######################################################################## + // PGT I/O + // ######################################################################## + + /** + * This virtual method stores a PGT and its corresponding PGT Iuo. + * @note Should never be called. + * + * @param $pgt the PGT + * @param $pgt_iou the PGT iou + * + * @protected + */ + function write($pgt,$pgt_iou) + { + phpCAS::error(__CLASS__.'::'.__FUNCTION__.'() should never be called'); + } + + /** + * This virtual method reads a PGT corresponding to a PGT Iou and deletes + * the corresponding storage entry. + * @note Should never be called. + * + * @param $pgt_iou the PGT iou + * + * @protected + */ + function read($pgt_iou) + { + phpCAS::error(__CLASS__.'::'.__FUNCTION__.'() should never be called'); + } + + /** @} */ + +} + +// include specific PGT storage classes +include_once(dirname(__FILE__).'/pgt-file.php'); +include_once(dirname(__FILE__).'/pgt-db.php'); + ?>
\ No newline at end of file diff --git a/plugins/CasAuthentication/extlib/CAS/client.php b/plugins/CasAuthentication/extlib/CAS/client.php index bfea59052..bbde55a28 100644 --- a/plugins/CasAuthentication/extlib/CAS/client.php +++ b/plugins/CasAuthentication/extlib/CAS/client.php @@ -1,2297 +1,2297 @@ -<?php
-
-/**
- * @file CAS/client.php
- * Main class of the phpCAS library
- */
-
-// include internationalization stuff
-include_once(dirname(__FILE__).'/languages/languages.php');
-
-// include PGT storage classes
-include_once(dirname(__FILE__).'/PGTStorage/pgt-main.php');
-
-/**
- * @class CASClient
- * The CASClient class is a client interface that provides CAS authentication
- * to PHP applications.
- *
- * @author Pascal Aubry <pascal.aubry at univ-rennes1.fr>
- */
-
-class CASClient
-{
-
- // XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
- // XX XX
- // XX CONFIGURATION XX
- // XX XX
- // XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-
- // ########################################################################
- // HTML OUTPUT
- // ########################################################################
- /**
- * @addtogroup internalOutput
- * @{
- */
-
- /**
- * This method filters a string by replacing special tokens by appropriate values
- * and prints it. The corresponding tokens are taken into account:
- * - __CAS_VERSION__
- * - __PHPCAS_VERSION__
- * - __SERVER_BASE_URL__
- *
- * Used by CASClient::PrintHTMLHeader() and CASClient::printHTMLFooter().
- *
- * @param $str the string to filter and output
- *
- * @private
- */
- function HTMLFilterOutput($str)
- {
- $str = str_replace('__CAS_VERSION__',$this->getServerVersion(),$str);
- $str = str_replace('__PHPCAS_VERSION__',phpCAS::getVersion(),$str);
- $str = str_replace('__SERVER_BASE_URL__',$this->getServerBaseURL(),$str);
- echo $str;
- }
-
- /**
- * A string used to print the header of HTML pages. Written by CASClient::setHTMLHeader(),
- * read by CASClient::printHTMLHeader().
- *
- * @hideinitializer
- * @private
- * @see CASClient::setHTMLHeader, CASClient::printHTMLHeader()
- */
- var $_output_header = '';
-
- /**
- * This method prints the header of the HTML output (after filtering). If
- * CASClient::setHTMLHeader() was not used, a default header is output.
- *
- * @param $title the title of the page
- *
- * @see HTMLFilterOutput()
- * @private
- */
- function printHTMLHeader($title)
- {
- $this->HTMLFilterOutput(str_replace('__TITLE__',
- $title,
- (empty($this->_output_header)
- ? '<html><head><title>__TITLE__</title></head><body><h1>__TITLE__</h1>'
- : $this->_output_header)
- )
- );
- }
-
- /**
- * A string used to print the footer of HTML pages. Written by CASClient::setHTMLFooter(),
- * read by printHTMLFooter().
- *
- * @hideinitializer
- * @private
- * @see CASClient::setHTMLFooter, CASClient::printHTMLFooter()
- */
- var $_output_footer = '';
-
- /**
- * This method prints the footer of the HTML output (after filtering). If
- * CASClient::setHTMLFooter() was not used, a default footer is output.
- *
- * @see HTMLFilterOutput()
- * @private
- */
- function printHTMLFooter()
- {
- $this->HTMLFilterOutput(empty($this->_output_footer)
- ?('<hr><address>phpCAS __PHPCAS_VERSION__ '.$this->getString(CAS_STR_USING_SERVER).' <a href="__SERVER_BASE_URL__">__SERVER_BASE_URL__</a> (CAS __CAS_VERSION__)</a></address></body></html>')
- :$this->_output_footer);
- }
-
- /**
- * This method set the HTML header used for all outputs.
- *
- * @param $header the HTML header.
- *
- * @public
- */
- function setHTMLHeader($header)
- {
- $this->_output_header = $header;
- }
-
- /**
- * This method set the HTML footer used for all outputs.
- *
- * @param $footer the HTML footer.
- *
- * @public
- */
- function setHTMLFooter($footer)
- {
- $this->_output_footer = $footer;
- }
-
- /** @} */
- // ########################################################################
- // INTERNATIONALIZATION
- // ########################################################################
- /**
- * @addtogroup internalLang
- * @{
- */
- /**
- * A string corresponding to the language used by phpCAS. Written by
- * CASClient::setLang(), read by CASClient::getLang().
-
- * @note debugging information is always in english (debug purposes only).
- *
- * @hideinitializer
- * @private
- * @sa CASClient::_strings, CASClient::getString()
- */
- var $_lang = '';
-
- /**
- * This method returns the language used by phpCAS.
- *
- * @return a string representing the language
- *
- * @private
- */
- function getLang()
- {
- if ( empty($this->_lang) )
- $this->setLang(PHPCAS_LANG_DEFAULT);
- return $this->_lang;
- }
-
- /**
- * array containing the strings used by phpCAS. Written by CASClient::setLang(), read by
- * CASClient::getString() and used by CASClient::setLang().
- *
- * @note This array is filled by instructions in CAS/languages/<$this->_lang>.php
- *
- * @private
- * @see CASClient::_lang, CASClient::getString(), CASClient::setLang(), CASClient::getLang()
- */
- var $_strings;
-
- /**
- * This method returns a string depending on the language.
- *
- * @param $str the index of the string in $_string.
- *
- * @return the string corresponding to $index in $string.
- *
- * @private
- */
- function getString($str)
- {
- // call CASclient::getLang() to be sure the language is initialized
- $this->getLang();
-
- if ( !isset($this->_strings[$str]) ) {
- trigger_error('string `'.$str.'\' not defined for language `'.$this->getLang().'\'',E_USER_ERROR);
- }
- return $this->_strings[$str];
- }
-
- /**
- * This method is used to set the language used by phpCAS.
- * @note Can be called only once.
- *
- * @param $lang a string representing the language.
- *
- * @public
- * @sa CAS_LANG_FRENCH, CAS_LANG_ENGLISH
- */
- function setLang($lang)
- {
- // include the corresponding language file
- include_once(dirname(__FILE__).'/languages/'.$lang.'.php');
-
- if ( !is_array($this->_strings) ) {
- trigger_error('language `'.$lang.'\' is not implemented',E_USER_ERROR);
- }
- $this->_lang = $lang;
- }
-
- /** @} */
- // ########################################################################
- // CAS SERVER CONFIG
- // ########################################################################
- /**
- * @addtogroup internalConfig
- * @{
- */
-
- /**
- * a record to store information about the CAS server.
- * - $_server["version"]: the version of the CAS server
- * - $_server["hostname"]: the hostname of the CAS server
- * - $_server["port"]: the port the CAS server is running on
- * - $_server["uri"]: the base URI the CAS server is responding on
- * - $_server["base_url"]: the base URL of the CAS server
- * - $_server["login_url"]: the login URL of the CAS server
- * - $_server["service_validate_url"]: the service validating URL of the CAS server
- * - $_server["proxy_url"]: the proxy URL of the CAS server
- * - $_server["proxy_validate_url"]: the proxy validating URL of the CAS server
- * - $_server["logout_url"]: the logout URL of the CAS server
- *
- * $_server["version"], $_server["hostname"], $_server["port"] and $_server["uri"]
- * are written by CASClient::CASClient(), read by CASClient::getServerVersion(),
- * CASClient::getServerHostname(), CASClient::getServerPort() and CASClient::getServerURI().
- *
- * The other fields are written and read by CASClient::getServerBaseURL(),
- * CASClient::getServerLoginURL(), CASClient::getServerServiceValidateURL(),
- * CASClient::getServerProxyValidateURL() and CASClient::getServerLogoutURL().
- *
- * @hideinitializer
- * @private
- */
- var $_server = array(
- 'version' => -1,
- 'hostname' => 'none',
- 'port' => -1,
- 'uri' => 'none'
- );
-
- /**
- * This method is used to retrieve the version of the CAS server.
- * @return the version of the CAS server.
- * @private
- */
- function getServerVersion()
- {
- return $this->_server['version'];
- }
-
- /**
- * This method is used to retrieve the hostname of the CAS server.
- * @return the hostname of the CAS server.
- * @private
- */
- function getServerHostname()
- { return $this->_server['hostname']; }
-
- /**
- * This method is used to retrieve the port of the CAS server.
- * @return the port of the CAS server.
- * @private
- */
- function getServerPort()
- { return $this->_server['port']; }
-
- /**
- * This method is used to retrieve the URI of the CAS server.
- * @return a URI.
- * @private
- */
- function getServerURI()
- { return $this->_server['uri']; }
-
- /**
- * This method is used to retrieve the base URL of the CAS server.
- * @return a URL.
- * @private
- */
- function getServerBaseURL()
- {
- // the URL is build only when needed
- if ( empty($this->_server['base_url']) ) {
- $this->_server['base_url'] = 'https://'
- .$this->getServerHostname()
- .':'
- .$this->getServerPort()
- .$this->getServerURI();
- }
- return $this->_server['base_url'];
- }
-
- /**
- * This method is used to retrieve the login URL of the CAS server.
- * @param $gateway true to check authentication, false to force it
- * @param $renew true to force the authentication with the CAS server
- * NOTE : It is recommended that CAS implementations ignore the
- "gateway" parameter if "renew" is set
- * @return a URL.
- * @private
- */
- function getServerLoginURL($gateway=false,$renew=false) {
- phpCAS::traceBegin();
- // the URL is build only when needed
- if ( empty($this->_server['login_url']) ) {
- $this->_server['login_url'] = $this->getServerBaseURL();
- $this->_server['login_url'] .= 'login?service=';
- // $this->_server['login_url'] .= preg_replace('/&/','%26',$this->getURL());
- $this->_server['login_url'] .= urlencode($this->getURL());
- if($renew) {
- // It is recommended that when the "renew" parameter is set, its value be "true"
- $this->_server['login_url'] .= '&renew=true';
- } elseif ($gateway) {
- // It is recommended that when the "gateway" parameter is set, its value be "true"
- $this->_server['login_url'] .= '&gateway=true';
- }
- }
- phpCAS::traceEnd($this->_server['login_url']);
- return $this->_server['login_url'];
- }
-
- /**
- * This method sets the login URL of the CAS server.
- * @param $url the login URL
- * @private
- * @since 0.4.21 by Wyman Chan
- */
- function setServerLoginURL($url)
- {
- return $this->_server['login_url'] = $url;
- }
-
- /**
- * This method is used to retrieve the service validating URL of the CAS server.
- * @return a URL.
- * @private
- */
- function getServerServiceValidateURL()
- {
- // the URL is build only when needed
- if ( empty($this->_server['service_validate_url']) ) {
- switch ($this->getServerVersion()) {
- case CAS_VERSION_1_0:
- $this->_server['service_validate_url'] = $this->getServerBaseURL().'validate';
- break;
- case CAS_VERSION_2_0:
- $this->_server['service_validate_url'] = $this->getServerBaseURL().'serviceValidate';
- break;
- }
- }
- // return $this->_server['service_validate_url'].'?service='.preg_replace('/&/','%26',$this->getURL());
- return $this->_server['service_validate_url'].'?service='.urlencode($this->getURL());
- }
-
- /**
- * This method is used to retrieve the proxy validating URL of the CAS server.
- * @return a URL.
- * @private
- */
- function getServerProxyValidateURL()
- {
- // the URL is build only when needed
- if ( empty($this->_server['proxy_validate_url']) ) {
- switch ($this->getServerVersion()) {
- case CAS_VERSION_1_0:
- $this->_server['proxy_validate_url'] = '';
- break;
- case CAS_VERSION_2_0:
- $this->_server['proxy_validate_url'] = $this->getServerBaseURL().'proxyValidate';
- break;
- }
- }
- // return $this->_server['proxy_validate_url'].'?service='.preg_replace('/&/','%26',$this->getURL());
- return $this->_server['proxy_validate_url'].'?service='.urlencode($this->getURL());
- }
-
- /**
- * This method is used to retrieve the proxy URL of the CAS server.
- * @return a URL.
- * @private
- */
- function getServerProxyURL()
- {
- // the URL is build only when needed
- if ( empty($this->_server['proxy_url']) ) {
- switch ($this->getServerVersion()) {
- case CAS_VERSION_1_0:
- $this->_server['proxy_url'] = '';
- break;
- case CAS_VERSION_2_0:
- $this->_server['proxy_url'] = $this->getServerBaseURL().'proxy';
- break;
- }
- }
- return $this->_server['proxy_url'];
- }
-
- /**
- * This method is used to retrieve the logout URL of the CAS server.
- * @return a URL.
- * @private
- */
- function getServerLogoutURL()
- {
- // the URL is build only when needed
- if ( empty($this->_server['logout_url']) ) {
- $this->_server['logout_url'] = $this->getServerBaseURL().'logout';
- }
- return $this->_server['logout_url'];
- }
-
- /**
- * This method sets the logout URL of the CAS server.
- * @param $url the logout URL
- * @private
- * @since 0.4.21 by Wyman Chan
- */
- function setServerLogoutURL($url)
- {
- return $this->_server['logout_url'] = $url;
- }
-
- /**
- * An array to store extra curl options.
- */
- var $_curl_options = array();
-
- /**
- * This method is used to set additional user curl options.
- */
- function setExtraCurlOption($key, $value)
- {
- $this->_curl_options[$key] = $value;
- }
-
- /**
- * This method checks to see if the request is secured via HTTPS
- * @return true if https, false otherwise
- * @private
- */
- function isHttps() {
- //if ( isset($_SERVER['HTTPS']) && !empty($_SERVER['HTTPS']) ) {
- //0.4.24 by Hinnack
- if ( isset($_SERVER['HTTPS']) && !empty($_SERVER['HTTPS']) && $_SERVER['HTTPS'] == 'on') {
- return true;
- } else {
- return false;
- }
- }
-
- // ########################################################################
- // CONSTRUCTOR
- // ########################################################################
- /**
- * CASClient constructor.
- *
- * @param $server_version the version of the CAS server
- * @param $proxy TRUE if the CAS client is a CAS proxy, FALSE otherwise
- * @param $server_hostname the hostname of the CAS server
- * @param $server_port the port the CAS server is running on
- * @param $server_uri the URI the CAS server is responding on
- * @param $start_session Have phpCAS start PHP sessions (default true)
- *
- * @return a newly created CASClient object
- *
- * @public
- */
- function CASClient(
- $server_version,
- $proxy,
- $server_hostname,
- $server_port,
- $server_uri,
- $start_session = true) {
-
- phpCAS::traceBegin();
-
- if (!$this->isLogoutRequest() && !empty($_GET['ticket']) && $start_session) {
- // copy old session vars and destroy the current session
- if (!isset($_SESSION)) {
- session_start();
- }
- $old_session = $_SESSION;
- session_destroy();
- // set up a new session, of name based on the ticket
- $session_id = preg_replace('/[^\w]/','',$_GET['ticket']);
- phpCAS::LOG("Session ID: " . $session_id);
- session_id($session_id);
- if (!isset($_SESSION)) {
- session_start();
- }
- // restore old session vars
+<?php + +/** + * @file CAS/client.php + * Main class of the phpCAS library + */ + +// include internationalization stuff +include_once(dirname(__FILE__).'/languages/languages.php'); + +// include PGT storage classes +include_once(dirname(__FILE__).'/PGTStorage/pgt-main.php'); + +/** + * @class CASClient + * The CASClient class is a client interface that provides CAS authentication + * to PHP applications. + * + * @author Pascal Aubry <pascal.aubry at univ-rennes1.fr> + */ + +class CASClient +{ + + // XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX + // XX XX + // XX CONFIGURATION XX + // XX XX + // XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX + + // ######################################################################## + // HTML OUTPUT + // ######################################################################## + /** + * @addtogroup internalOutput + * @{ + */ + + /** + * This method filters a string by replacing special tokens by appropriate values + * and prints it. The corresponding tokens are taken into account: + * - __CAS_VERSION__ + * - __PHPCAS_VERSION__ + * - __SERVER_BASE_URL__ + * + * Used by CASClient::PrintHTMLHeader() and CASClient::printHTMLFooter(). + * + * @param $str the string to filter and output + * + * @private + */ + function HTMLFilterOutput($str) + { + $str = str_replace('__CAS_VERSION__',$this->getServerVersion(),$str); + $str = str_replace('__PHPCAS_VERSION__',phpCAS::getVersion(),$str); + $str = str_replace('__SERVER_BASE_URL__',$this->getServerBaseURL(),$str); + echo $str; + } + + /** + * A string used to print the header of HTML pages. Written by CASClient::setHTMLHeader(), + * read by CASClient::printHTMLHeader(). + * + * @hideinitializer + * @private + * @see CASClient::setHTMLHeader, CASClient::printHTMLHeader() + */ + var $_output_header = ''; + + /** + * This method prints the header of the HTML output (after filtering). If + * CASClient::setHTMLHeader() was not used, a default header is output. + * + * @param $title the title of the page + * + * @see HTMLFilterOutput() + * @private + */ + function printHTMLHeader($title) + { + $this->HTMLFilterOutput(str_replace('__TITLE__', + $title, + (empty($this->_output_header) + ? '<html><head><title>__TITLE__</title></head><body><h1>__TITLE__</h1>' + : $this->_output_header) + ) + ); + } + + /** + * A string used to print the footer of HTML pages. Written by CASClient::setHTMLFooter(), + * read by printHTMLFooter(). + * + * @hideinitializer + * @private + * @see CASClient::setHTMLFooter, CASClient::printHTMLFooter() + */ + var $_output_footer = ''; + + /** + * This method prints the footer of the HTML output (after filtering). If + * CASClient::setHTMLFooter() was not used, a default footer is output. + * + * @see HTMLFilterOutput() + * @private + */ + function printHTMLFooter() + { + $this->HTMLFilterOutput(empty($this->_output_footer) + ?('<hr><address>phpCAS __PHPCAS_VERSION__ '.$this->getString(CAS_STR_USING_SERVER).' <a href="__SERVER_BASE_URL__">__SERVER_BASE_URL__</a> (CAS __CAS_VERSION__)</a></address></body></html>') + :$this->_output_footer); + } + + /** + * This method set the HTML header used for all outputs. + * + * @param $header the HTML header. + * + * @public + */ + function setHTMLHeader($header) + { + $this->_output_header = $header; + } + + /** + * This method set the HTML footer used for all outputs. + * + * @param $footer the HTML footer. + * + * @public + */ + function setHTMLFooter($footer) + { + $this->_output_footer = $footer; + } + + /** @} */ + // ######################################################################## + // INTERNATIONALIZATION + // ######################################################################## + /** + * @addtogroup internalLang + * @{ + */ + /** + * A string corresponding to the language used by phpCAS. Written by + * CASClient::setLang(), read by CASClient::getLang(). + + * @note debugging information is always in english (debug purposes only). + * + * @hideinitializer + * @private + * @sa CASClient::_strings, CASClient::getString() + */ + var $_lang = ''; + + /** + * This method returns the language used by phpCAS. + * + * @return a string representing the language + * + * @private + */ + function getLang() + { + if ( empty($this->_lang) ) + $this->setLang(PHPCAS_LANG_DEFAULT); + return $this->_lang; + } + + /** + * array containing the strings used by phpCAS. Written by CASClient::setLang(), read by + * CASClient::getString() and used by CASClient::setLang(). + * + * @note This array is filled by instructions in CAS/languages/<$this->_lang>.php + * + * @private + * @see CASClient::_lang, CASClient::getString(), CASClient::setLang(), CASClient::getLang() + */ + var $_strings; + + /** + * This method returns a string depending on the language. + * + * @param $str the index of the string in $_string. + * + * @return the string corresponding to $index in $string. + * + * @private + */ + function getString($str) + { + // call CASclient::getLang() to be sure the language is initialized + $this->getLang(); + + if ( !isset($this->_strings[$str]) ) { + trigger_error('string `'.$str.'\' not defined for language `'.$this->getLang().'\'',E_USER_ERROR); + } + return $this->_strings[$str]; + } + + /** + * This method is used to set the language used by phpCAS. + * @note Can be called only once. + * + * @param $lang a string representing the language. + * + * @public + * @sa CAS_LANG_FRENCH, CAS_LANG_ENGLISH + */ + function setLang($lang) + { + // include the corresponding language file + include_once(dirname(__FILE__).'/languages/'.$lang.'.php'); + + if ( !is_array($this->_strings) ) { + trigger_error('language `'.$lang.'\' is not implemented',E_USER_ERROR); + } + $this->_lang = $lang; + } + + /** @} */ + // ######################################################################## + // CAS SERVER CONFIG + // ######################################################################## + /** + * @addtogroup internalConfig + * @{ + */ + + /** + * a record to store information about the CAS server. + * - $_server["version"]: the version of the CAS server + * - $_server["hostname"]: the hostname of the CAS server + * - $_server["port"]: the port the CAS server is running on + * - $_server["uri"]: the base URI the CAS server is responding on + * - $_server["base_url"]: the base URL of the CAS server + * - $_server["login_url"]: the login URL of the CAS server + * - $_server["service_validate_url"]: the service validating URL of the CAS server + * - $_server["proxy_url"]: the proxy URL of the CAS server + * - $_server["proxy_validate_url"]: the proxy validating URL of the CAS server + * - $_server["logout_url"]: the logout URL of the CAS server + * + * $_server["version"], $_server["hostname"], $_server["port"] and $_server["uri"] + * are written by CASClient::CASClient(), read by CASClient::getServerVersion(), + * CASClient::getServerHostname(), CASClient::getServerPort() and CASClient::getServerURI(). + * + * The other fields are written and read by CASClient::getServerBaseURL(), + * CASClient::getServerLoginURL(), CASClient::getServerServiceValidateURL(), + * CASClient::getServerProxyValidateURL() and CASClient::getServerLogoutURL(). + * + * @hideinitializer + * @private + */ + var $_server = array( + 'version' => -1, + 'hostname' => 'none', + 'port' => -1, + 'uri' => 'none' + ); + + /** + * This method is used to retrieve the version of the CAS server. + * @return the version of the CAS server. + * @private + */ + function getServerVersion() + { + return $this->_server['version']; + } + + /** + * This method is used to retrieve the hostname of the CAS server. + * @return the hostname of the CAS server. + * @private + */ + function getServerHostname() + { return $this->_server['hostname']; } + + /** + * This method is used to retrieve the port of the CAS server. + * @return the port of the CAS server. + * @private + */ + function getServerPort() + { return $this->_server['port']; } + + /** + * This method is used to retrieve the URI of the CAS server. + * @return a URI. + * @private + */ + function getServerURI() + { return $this->_server['uri']; } + + /** + * This method is used to retrieve the base URL of the CAS server. + * @return a URL. + * @private + */ + function getServerBaseURL() + { + // the URL is build only when needed + if ( empty($this->_server['base_url']) ) { + $this->_server['base_url'] = 'https://' + .$this->getServerHostname() + .':' + .$this->getServerPort() + .$this->getServerURI(); + } + return $this->_server['base_url']; + } + + /** + * This method is used to retrieve the login URL of the CAS server. + * @param $gateway true to check authentication, false to force it + * @param $renew true to force the authentication with the CAS server + * NOTE : It is recommended that CAS implementations ignore the + "gateway" parameter if "renew" is set + * @return a URL. + * @private + */ + function getServerLoginURL($gateway=false,$renew=false) { + phpCAS::traceBegin(); + // the URL is build only when needed + if ( empty($this->_server['login_url']) ) { + $this->_server['login_url'] = $this->getServerBaseURL(); + $this->_server['login_url'] .= 'login?service='; + // $this->_server['login_url'] .= preg_replace('/&/','%26',$this->getURL()); + $this->_server['login_url'] .= urlencode($this->getURL()); + if($renew) { + // It is recommended that when the "renew" parameter is set, its value be "true" + $this->_server['login_url'] .= '&renew=true'; + } elseif ($gateway) { + // It is recommended that when the "gateway" parameter is set, its value be "true" + $this->_server['login_url'] .= '&gateway=true'; + } + } + phpCAS::traceEnd($this->_server['login_url']); + return $this->_server['login_url']; + } + + /** + * This method sets the login URL of the CAS server. + * @param $url the login URL + * @private + * @since 0.4.21 by Wyman Chan + */ + function setServerLoginURL($url) + { + return $this->_server['login_url'] = $url; + } + + /** + * This method is used to retrieve the service validating URL of the CAS server. + * @return a URL. + * @private + */ + function getServerServiceValidateURL() + { + // the URL is build only when needed + if ( empty($this->_server['service_validate_url']) ) { + switch ($this->getServerVersion()) { + case CAS_VERSION_1_0: + $this->_server['service_validate_url'] = $this->getServerBaseURL().'validate'; + break; + case CAS_VERSION_2_0: + $this->_server['service_validate_url'] = $this->getServerBaseURL().'serviceValidate'; + break; + } + } + // return $this->_server['service_validate_url'].'?service='.preg_replace('/&/','%26',$this->getURL()); + return $this->_server['service_validate_url'].'?service='.urlencode($this->getURL()); + } + + /** + * This method is used to retrieve the proxy validating URL of the CAS server. + * @return a URL. + * @private + */ + function getServerProxyValidateURL() + { + // the URL is build only when needed + if ( empty($this->_server['proxy_validate_url']) ) { + switch ($this->getServerVersion()) { + case CAS_VERSION_1_0: + $this->_server['proxy_validate_url'] = ''; + break; + case CAS_VERSION_2_0: + $this->_server['proxy_validate_url'] = $this->getServerBaseURL().'proxyValidate'; + break; + } + } + // return $this->_server['proxy_validate_url'].'?service='.preg_replace('/&/','%26',$this->getURL()); + return $this->_server['proxy_validate_url'].'?service='.urlencode($this->getURL()); + } + + /** + * This method is used to retrieve the proxy URL of the CAS server. + * @return a URL. + * @private + */ + function getServerProxyURL() + { + // the URL is build only when needed + if ( empty($this->_server['proxy_url']) ) { + switch ($this->getServerVersion()) { + case CAS_VERSION_1_0: + $this->_server['proxy_url'] = ''; + break; + case CAS_VERSION_2_0: + $this->_server['proxy_url'] = $this->getServerBaseURL().'proxy'; + break; + } + } + return $this->_server['proxy_url']; + } + + /** + * This method is used to retrieve the logout URL of the CAS server. + * @return a URL. + * @private + */ + function getServerLogoutURL() + { + // the URL is build only when needed + if ( empty($this->_server['logout_url']) ) { + $this->_server['logout_url'] = $this->getServerBaseURL().'logout'; + } + return $this->_server['logout_url']; + } + + /** + * This method sets the logout URL of the CAS server. + * @param $url the logout URL + * @private + * @since 0.4.21 by Wyman Chan + */ + function setServerLogoutURL($url) + { + return $this->_server['logout_url'] = $url; + } + + /** + * An array to store extra curl options. + */ + var $_curl_options = array(); + + /** + * This method is used to set additional user curl options. + */ + function setExtraCurlOption($key, $value) + { + $this->_curl_options[$key] = $value; + } + + /** + * This method checks to see if the request is secured via HTTPS + * @return true if https, false otherwise + * @private + */ + function isHttps() { + //if ( isset($_SERVER['HTTPS']) && !empty($_SERVER['HTTPS']) ) { + //0.4.24 by Hinnack + if ( isset($_SERVER['HTTPS']) && !empty($_SERVER['HTTPS']) && $_SERVER['HTTPS'] == 'on') { + return true; + } else { + return false; + } + } + + // ######################################################################## + // CONSTRUCTOR + // ######################################################################## + /** + * CASClient constructor. + * + * @param $server_version the version of the CAS server + * @param $proxy TRUE if the CAS client is a CAS proxy, FALSE otherwise + * @param $server_hostname the hostname of the CAS server + * @param $server_port the port the CAS server is running on + * @param $server_uri the URI the CAS server is responding on + * @param $start_session Have phpCAS start PHP sessions (default true) + * + * @return a newly created CASClient object + * + * @public + */ + function CASClient( + $server_version, + $proxy, + $server_hostname, + $server_port, + $server_uri, + $start_session = true) { + + phpCAS::traceBegin(); + + if (!$this->isLogoutRequest() && !empty($_GET['ticket']) && $start_session) { + // copy old session vars and destroy the current session + if (!isset($_SESSION)) { + session_start(); + } + $old_session = $_SESSION; + session_destroy(); + // set up a new session, of name based on the ticket + $session_id = preg_replace('/[^\w]/','',$_GET['ticket']); + phpCAS::LOG("Session ID: " . $session_id); + session_id($session_id); + if (!isset($_SESSION)) { + session_start(); + } + // restore old session vars $_SESSION = $old_session; // Redirect to location without ticket. - header('Location: '.$this->getURL());
- }
-
- //activate session mechanism if desired
- if (!$this->isLogoutRequest() && $start_session) {
- session_start();
- }
-
- $this->_proxy = $proxy;
-
- //check version
- switch ($server_version) {
- case CAS_VERSION_1_0:
- if ( $this->isProxy() )
- phpCAS::error('CAS proxies are not supported in CAS '
- .$server_version);
- break;
- case CAS_VERSION_2_0:
- break;
- default:
- phpCAS::error('this version of CAS (`'
- .$server_version
- .'\') is not supported by phpCAS '
- .phpCAS::getVersion());
- }
- $this->_server['version'] = $server_version;
-
- //check hostname
- if ( empty($server_hostname)
- || !preg_match('/[\.\d\-abcdefghijklmnopqrstuvwxyz]*/',$server_hostname) ) {
- phpCAS::error('bad CAS server hostname (`'.$server_hostname.'\')');
- }
- $this->_server['hostname'] = $server_hostname;
-
- //check port
- if ( $server_port == 0
- || !is_int($server_port) ) {
- phpCAS::error('bad CAS server port (`'.$server_hostname.'\')');
- }
- $this->_server['port'] = $server_port;
-
- //check URI
- if ( !preg_match('/[\.\d\-_abcdefghijklmnopqrstuvwxyz\/]*/',$server_uri) ) {
- phpCAS::error('bad CAS server URI (`'.$server_uri.'\')');
- }
- //add leading and trailing `/' and remove doubles
- $server_uri = preg_replace('/\/\//','/','/'.$server_uri.'/');
- $this->_server['uri'] = $server_uri;
-
- //set to callback mode if PgtIou and PgtId CGI GET parameters are provided
- if ( $this->isProxy() ) {
- $this->setCallbackMode(!empty($_GET['pgtIou'])&&!empty($_GET['pgtId']));
- }
-
- if ( $this->isCallbackMode() ) {
- //callback mode: check that phpCAS is secured
- if ( !$this->isHttps() ) {
- phpCAS::error('CAS proxies must be secured to use phpCAS; PGT\'s will not be received from the CAS server');
- }
- } else {
- //normal mode: get ticket and remove it from CGI parameters for developpers
- $ticket = (isset($_GET['ticket']) ? $_GET['ticket'] : null);
- switch ($this->getServerVersion()) {
- case CAS_VERSION_1_0: // check for a Service Ticket
- if( preg_match('/^ST-/',$ticket) ) {
- phpCAS::trace('ST \''.$ticket.'\' found');
- //ST present
- $this->setST($ticket);
- //ticket has been taken into account, unset it to hide it to applications
- unset($_GET['ticket']);
- } else if ( !empty($ticket) ) {
- //ill-formed ticket, halt
- phpCAS::error('ill-formed ticket found in the URL (ticket=`'.htmlentities($ticket).'\')');
- }
- break;
- case CAS_VERSION_2_0: // check for a Service or Proxy Ticket
- if( preg_match('/^[SP]T-/',$ticket) ) {
- phpCAS::trace('ST or PT \''.$ticket.'\' found');
- $this->setPT($ticket);
- unset($_GET['ticket']);
- } else if ( !empty($ticket) ) {
- //ill-formed ticket, halt
- phpCAS::error('ill-formed ticket found in the URL (ticket=`'.htmlentities($ticket).'\')');
- }
- break;
- }
- }
- phpCAS::traceEnd();
- }
-
- /** @} */
-
- // XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
- // XX XX
- // XX AUTHENTICATION XX
- // XX XX
- // XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-
- /**
- * @addtogroup internalAuthentication
- * @{
- */
-
- /**
- * The Authenticated user. Written by CASClient::setUser(), read by CASClient::getUser().
- * @attention client applications should use phpCAS::getUser().
- *
- * @hideinitializer
- * @private
- */
- var $_user = '';
-
- /**
- * This method sets the CAS user's login name.
- *
- * @param $user the login name of the authenticated user.
- *
- * @private
- */
- function setUser($user)
- {
- $this->_user = $user;
- }
-
- /**
- * This method returns the CAS user's login name.
- * @warning should be called only after CASClient::forceAuthentication() or
- * CASClient::isAuthenticated(), otherwise halt with an error.
- *
- * @return the login name of the authenticated user
- */
- function getUser()
- {
- if ( empty($this->_user) ) {
- phpCAS::error('this method should be used only after '.__CLASS__.'::forceAuthentication() or '.__CLASS__.'::isAuthenticated()');
- }
- return $this->_user;
- }
-
- /**
- * This method is called to renew the authentication of the user
- * If the user is authenticated, renew the connection
- * If not, redirect to CAS
- * @public
- */
- function renewAuthentication(){
- phpCAS::traceBegin();
- // Either way, the user is authenticated by CAS
- if( isset( $_SESSION['phpCAS']['auth_checked'] ) )
- unset($_SESSION['phpCAS']['auth_checked']);
- if ( $this->isAuthenticated() ) {
- phpCAS::trace('user already authenticated; renew');
- $this->redirectToCas(false,true);
- } else {
- $this->redirectToCas();
- }
- phpCAS::traceEnd();
- }
-
- /**
- * This method is called to be sure that the user is authenticated. When not
- * authenticated, halt by redirecting to the CAS server; otherwise return TRUE.
- * @return TRUE when the user is authenticated; otherwise halt.
- * @public
- */
- function forceAuthentication()
- {
- phpCAS::traceBegin();
-
- if ( $this->isAuthenticated() ) {
- // the user is authenticated, nothing to be done.
- phpCAS::trace('no need to authenticate');
- $res = TRUE;
- } else {
- // the user is not authenticated, redirect to the CAS server
- if (isset($_SESSION['phpCAS']['auth_checked'])) {
- unset($_SESSION['phpCAS']['auth_checked']);
- }
- $this->redirectToCas(FALSE/* no gateway */);
- // never reached
- $res = FALSE;
- }
- phpCAS::traceEnd($res);
- return $res;
- }
-
- /**
- * An integer that gives the number of times authentication will be cached before rechecked.
- *
- * @hideinitializer
- * @private
- */
- var $_cache_times_for_auth_recheck = 0;
-
- /**
- * Set the number of times authentication will be cached before rechecked.
- *
- * @param $n an integer.
- *
- * @public
- */
- function setCacheTimesForAuthRecheck($n)
- {
- $this->_cache_times_for_auth_recheck = $n;
- }
-
- /**
- * This method is called to check whether the user is authenticated or not.
- * @return TRUE when the user is authenticated, FALSE otherwise.
- * @public
- */
- function checkAuthentication()
- {
- phpCAS::traceBegin();
-
- if ( $this->isAuthenticated() ) {
- phpCAS::trace('user is authenticated');
- $res = TRUE;
- } else if (isset($_SESSION['phpCAS']['auth_checked'])) {
- // the previous request has redirected the client to the CAS server with gateway=true
- unset($_SESSION['phpCAS']['auth_checked']);
- $res = FALSE;
- } else {
- // $_SESSION['phpCAS']['auth_checked'] = true;
- // $this->redirectToCas(TRUE/* gateway */);
- // // never reached
- // $res = FALSE;
- // avoid a check against CAS on every request
- if (! isset($_SESSION['phpCAS']['unauth_count']) )
- $_SESSION['phpCAS']['unauth_count'] = -2; // uninitialized
-
- if (($_SESSION['phpCAS']['unauth_count'] != -2 && $this->_cache_times_for_auth_recheck == -1)
- || ($_SESSION['phpCAS']['unauth_count'] >= 0 && $_SESSION['phpCAS']['unauth_count'] < $this->_cache_times_for_auth_recheck))
- {
- $res = FALSE;
-
- if ($this->_cache_times_for_auth_recheck != -1)
- {
- $_SESSION['phpCAS']['unauth_count']++;
- phpCAS::trace('user is not authenticated (cached for '.$_SESSION['phpCAS']['unauth_count'].' times of '.$this->_cache_times_for_auth_recheck.')');
- }
- else
- {
- phpCAS::trace('user is not authenticated (cached for until login pressed)');
- }
- }
- else
- {
- $_SESSION['phpCAS']['unauth_count'] = 0;
- $_SESSION['phpCAS']['auth_checked'] = true;
- phpCAS::trace('user is not authenticated (cache reset)');
- $this->redirectToCas(TRUE/* gateway */);
- // never reached
- $res = FALSE;
- }
- }
- phpCAS::traceEnd($res);
- return $res;
- }
-
- /**
- * This method is called to check if the user is authenticated (previously or by
- * tickets given in the URL).
- *
- * @return TRUE when the user is authenticated.
- *
- * @public
- */
- function isAuthenticated()
- {
- phpCAS::traceBegin();
- $res = FALSE;
- $validate_url = '';
-
- if ( $this->wasPreviouslyAuthenticated() ) {
- // the user has already (previously during the session) been
- // authenticated, nothing to be done.
- phpCAS::trace('user was already authenticated, no need to look for tickets');
- $res = TRUE;
- }
- elseif ( $this->hasST() ) {
- // if a Service Ticket was given, validate it
- phpCAS::trace('ST `'.$this->getST().'\' is present');
- $this->validateST($validate_url,$text_response,$tree_response); // if it fails, it halts
- phpCAS::trace('ST `'.$this->getST().'\' was validated');
- if ( $this->isProxy() ) {
- $this->validatePGT($validate_url,$text_response,$tree_response); // idem
- phpCAS::trace('PGT `'.$this->getPGT().'\' was validated');
- $_SESSION['phpCAS']['pgt'] = $this->getPGT();
- }
- $_SESSION['phpCAS']['user'] = $this->getUser();
- $res = TRUE;
- }
- elseif ( $this->hasPT() ) {
- // if a Proxy Ticket was given, validate it
- phpCAS::trace('PT `'.$this->getPT().'\' is present');
- $this->validatePT($validate_url,$text_response,$tree_response); // note: if it fails, it halts
- phpCAS::trace('PT `'.$this->getPT().'\' was validated');
- if ( $this->isProxy() ) {
- $this->validatePGT($validate_url,$text_response,$tree_response); // idem
- phpCAS::trace('PGT `'.$this->getPGT().'\' was validated');
- $_SESSION['phpCAS']['pgt'] = $this->getPGT();
- }
- $_SESSION['phpCAS']['user'] = $this->getUser();
- $res = TRUE;
- }
- else {
- // no ticket given, not authenticated
- phpCAS::trace('no ticket found');
- }
-
- phpCAS::traceEnd($res);
- return $res;
- }
-
- /**
- * This method tells if the current session is authenticated.
- * @return true if authenticated based soley on $_SESSION variable
- * @since 0.4.22 by Brendan Arnold
- */
- function isSessionAuthenticated ()
- {
- return !empty($_SESSION['phpCAS']['user']);
- }
-
- /**
- * This method tells if the user has already been (previously) authenticated
- * by looking into the session variables.
- *
- * @note This function switches to callback mode when needed.
- *
- * @return TRUE when the user has already been authenticated; FALSE otherwise.
- *
- * @private
- */
- function wasPreviouslyAuthenticated()
- {
- phpCAS::traceBegin();
-
- if ( $this->isCallbackMode() ) {
- $this->callback();
- }
-
- $auth = FALSE;
-
- if ( $this->isProxy() ) {
- // CAS proxy: username and PGT must be present
- if ( $this->isSessionAuthenticated() && !empty($_SESSION['phpCAS']['pgt']) ) {
- // authentication already done
- $this->setUser($_SESSION['phpCAS']['user']);
- $this->setPGT($_SESSION['phpCAS']['pgt']);
- phpCAS::trace('user = `'.$_SESSION['phpCAS']['user'].'\', PGT = `'.$_SESSION['phpCAS']['pgt'].'\'');
- $auth = TRUE;
- } elseif ( $this->isSessionAuthenticated() && empty($_SESSION['phpCAS']['pgt']) ) {
- // these two variables should be empty or not empty at the same time
- phpCAS::trace('username found (`'.$_SESSION['phpCAS']['user'].'\') but PGT is empty');
- // unset all tickets to enforce authentication
- unset($_SESSION['phpCAS']);
- $this->setST('');
- $this->setPT('');
- } elseif ( !$this->isSessionAuthenticated() && !empty($_SESSION['phpCAS']['pgt']) ) {
- // these two variables should be empty or not empty at the same time
- phpCAS::trace('PGT found (`'.$_SESSION['phpCAS']['pgt'].'\') but username is empty');
- // unset all tickets to enforce authentication
- unset($_SESSION['phpCAS']);
- $this->setST('');
- $this->setPT('');
- } else {
- phpCAS::trace('neither user not PGT found');
- }
- } else {
- // `simple' CAS client (not a proxy): username must be present
- if ( $this->isSessionAuthenticated() ) {
- // authentication already done
- $this->setUser($_SESSION['phpCAS']['user']);
- phpCAS::trace('user = `'.$_SESSION['phpCAS']['user'].'\'');
- $auth = TRUE;
- } else {
- phpCAS::trace('no user found');
- }
- }
-
- phpCAS::traceEnd($auth);
- return $auth;
- }
-
- /**
- * This method is used to redirect the client to the CAS server.
- * It is used by CASClient::forceAuthentication() and CASClient::checkAuthentication().
- * @param $gateway true to check authentication, false to force it
- * @param $renew true to force the authentication with the CAS server
- * @public
- */
- function redirectToCas($gateway=false,$renew=false){
- phpCAS::traceBegin();
- $cas_url = $this->getServerLoginURL($gateway,$renew);
- header('Location: '.$cas_url);
- phpCAS::log( "Redirect to : ".$cas_url );
-
- $this->printHTMLHeader($this->getString(CAS_STR_AUTHENTICATION_WANTED));
-
- printf('<p>'.$this->getString(CAS_STR_SHOULD_HAVE_BEEN_REDIRECTED).'</p>',$cas_url);
- $this->printHTMLFooter();
- phpCAS::traceExit();
- exit();
- }
-
-// /**
-// * This method is used to logout from CAS.
-// * @param $url a URL that will be transmitted to the CAS server (to come back to when logged out)
-// * @public
-// */
-// function logout($url = "") {
-// phpCAS::traceBegin();
-// $cas_url = $this->getServerLogoutURL();
-// // v0.4.14 sebastien.gougeon at univ-rennes1.fr
-// // header('Location: '.$cas_url);
-// if ( $url != "" ) {
-// // Adam Moore 1.0.0RC2
-// $url = '?service=' . $url . '&url=' . $url;
-// }
-// header('Location: '.$cas_url . $url);
-// session_unset();
-// session_destroy();
-// $this->printHTMLHeader($this->getString(CAS_STR_LOGOUT));
-// printf('<p>'.$this->getString(CAS_STR_SHOULD_HAVE_BEEN_REDIRECTED).'</p>',$cas_url);
-// $this->printHTMLFooter();
-// phpCAS::traceExit();
-// exit();
-// }
-
- /**
- * This method is used to logout from CAS.
- * @params $params an array that contains the optional url and service parameters that will be passed to the CAS server
- * @public
- */
- function logout($params) {
- phpCAS::traceBegin();
- $cas_url = $this->getServerLogoutURL();
- $paramSeparator = '?';
- if (isset($params['url'])) {
- $cas_url = $cas_url . $paramSeparator . "url=" . urlencode($params['url']);
- $paramSeparator = '&';
- }
- if (isset($params['service'])) {
- $cas_url = $cas_url . $paramSeparator . "service=" . urlencode($params['service']);
- }
- header('Location: '.$cas_url);
- session_unset();
- session_destroy();
- $this->printHTMLHeader($this->getString(CAS_STR_LOGOUT));
- printf('<p>'.$this->getString(CAS_STR_SHOULD_HAVE_BEEN_REDIRECTED).'</p>',$cas_url);
- $this->printHTMLFooter();
- phpCAS::traceExit();
- exit();
- }
-
- /**
- * @return true if the current request is a logout request.
- * @private
- */
- function isLogoutRequest() {
- return !empty($_POST['logoutRequest']);
- }
-
- /**
- * @return true if a logout request is allowed.
- * @private
- */
- function isLogoutRequestAllowed() {
- }
-
- /**
- * This method handles logout requests.
- * @param $check_client true to check the client bofore handling the request,
- * false not to perform any access control. True by default.
- * @param $allowed_clients an array of host names allowed to send logout requests.
- * By default, only the CAs server (declared in the constructor) will be allowed.
- * @public
- */
- function handleLogoutRequests($check_client=true, $allowed_clients=false) {
- phpCAS::traceBegin();
- if (!$this->isLogoutRequest()) {
- phpCAS::log("Not a logout request");
- phpCAS::traceEnd();
- return;
- }
- phpCAS::log("Logout requested");
- phpCAS::log("SAML REQUEST: ".$_POST['logoutRequest']);
- if ($check_client) {
- if (!$allowed_clients) {
- $allowed_clients = array( $this->getServerHostname() );
- }
- $client_ip = $_SERVER['REMOTE_ADDR'];
- $client = gethostbyaddr($client_ip);
- phpCAS::log("Client: ".$client);
- $allowed = false;
- foreach ($allowed_clients as $allowed_client) {
- if ($client == $allowed_client) {
- phpCAS::log("Allowed client '".$allowed_client."' matches, logout request is allowed");
- $allowed = true;
- break;
- } else {
- phpCAS::log("Allowed client '".$allowed_client."' does not match");
- }
- }
- if (!$allowed) {
- phpCAS::error("Unauthorized logout request from client '".$client."'");
- printf("Unauthorized!");
- phpCAS::traceExit();
- exit();
- }
- } else {
- phpCAS::log("No access control set");
- }
- // Extract the ticket from the SAML Request
- preg_match("|<samlp:SessionIndex>(.*)</samlp:SessionIndex>|", $_POST['logoutRequest'], $tick, PREG_OFFSET_CAPTURE, 3);
- $wrappedSamlSessionIndex = preg_replace('|<samlp:SessionIndex>|','',$tick[0][0]);
- $ticket2logout = preg_replace('|</samlp:SessionIndex>|','',$wrappedSamlSessionIndex);
- phpCAS::log("Ticket to logout: ".$ticket2logout);
- $session_id = preg_replace('/[^\w]/','',$ticket2logout);
- phpCAS::log("Session id: ".$session_id);
-
- // fix New session ID
- session_id($session_id);
- $_COOKIE[session_name()]=$session_id;
- $_GET[session_name()]=$session_id;
-
- // Overwrite session
- session_start();
- session_unset();
- session_destroy();
- printf("Disconnected!");
- phpCAS::traceExit();
- exit();
- }
-
- /** @} */
-
- // XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
- // XX XX
- // XX BASIC CLIENT FEATURES (CAS 1.0) XX
- // XX XX
- // XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-
- // ########################################################################
- // ST
- // ########################################################################
- /**
- * @addtogroup internalBasic
- * @{
- */
-
- /**
- * the Service Ticket provided in the URL of the request if present
- * (empty otherwise). Written by CASClient::CASClient(), read by
- * CASClient::getST() and CASClient::hasPGT().
- *
- * @hideinitializer
- * @private
- */
- var $_st = '';
-
- /**
- * This method returns the Service Ticket provided in the URL of the request.
- * @return The service ticket.
- * @private
- */
- function getST()
- { return $this->_st; }
-
- /**
- * This method stores the Service Ticket.
- * @param $st The Service Ticket.
- * @private
- */
- function setST($st)
- { $this->_st = $st; }
-
- /**
- * This method tells if a Service Ticket was stored.
- * @return TRUE if a Service Ticket has been stored.
- * @private
- */
- function hasST()
- { return !empty($this->_st); }
-
- /** @} */
-
- // ########################################################################
- // ST VALIDATION
- // ########################################################################
- /**
- * @addtogroup internalBasic
- * @{
- */
-
- /**
- * the certificate of the CAS server.
- *
- * @hideinitializer
- * @private
- */
- var $_cas_server_cert = '';
-
- /**
- * the certificate of the CAS server CA.
- *
- * @hideinitializer
- * @private
- */
- var $_cas_server_ca_cert = '';
-
- /**
- * Set to true not to validate the CAS server.
- *
- * @hideinitializer
- * @private
- */
- var $_no_cas_server_validation = false;
-
- /**
- * Set the certificate of the CAS server.
- *
- * @param $cert the PEM certificate
- */
- function setCasServerCert($cert)
- {
- $this->_cas_server_cert = $cert;
- }
-
- /**
- * Set the CA certificate of the CAS server.
- *
- * @param $cert the PEM certificate of the CA that emited the cert of the server
- */
- function setCasServerCACert($cert)
- {
- $this->_cas_server_ca_cert = $cert;
- }
-
- /**
- * Set no SSL validation for the CAS server.
- */
- function setNoCasServerValidation()
- {
- $this->_no_cas_server_validation = true;
- }
-
- /**
- * This method is used to validate a ST; halt on failure, and sets $validate_url,
- * $text_reponse and $tree_response on success. These parameters are used later
- * by CASClient::validatePGT() for CAS proxies.
- *
- * @param $validate_url the URL of the request to the CAS server.
- * @param $text_response the response of the CAS server, as is (XML text).
- * @param $tree_response the response of the CAS server, as a DOM XML tree.
- *
- * @return bool TRUE when successfull, halt otherwise by calling CASClient::authError().
- *
- * @private
- */
- function validateST($validate_url,&$text_response,&$tree_response)
- {
- phpCAS::traceBegin();
- // build the URL to validate the ticket
- $validate_url = $this->getServerServiceValidateURL().'&ticket='.$this->getST();
- if ( $this->isProxy() ) {
- // pass the callback url for CAS proxies
- $validate_url .= '&pgtUrl='.$this->getCallbackURL();
- }
-
- // open and read the URL
- if ( !$this->readURL($validate_url,''/*cookies*/,$headers,$text_response,$err_msg) ) {
- phpCAS::trace('could not open URL \''.$validate_url.'\' to validate ('.$err_msg.')');
- $this->authError('ST not validated',
- $validate_url,
- TRUE/*$no_response*/);
- }
-
- // analyze the result depending on the version
- switch ($this->getServerVersion()) {
- case CAS_VERSION_1_0:
- if (preg_match('/^no\n/',$text_response)) {
- phpCAS::trace('ST has not been validated');
- $this->authError('ST not validated',
- $validate_url,
- FALSE/*$no_response*/,
- FALSE/*$bad_response*/,
- $text_response);
- }
- if (!preg_match('/^yes\n/',$text_response)) {
- phpCAS::trace('ill-formed response');
- $this->authError('ST not validated',
- $validate_url,
- FALSE/*$no_response*/,
- TRUE/*$bad_response*/,
- $text_response);
- }
- // ST has been validated, extract the user name
- $arr = preg_split('/\n/',$text_response);
- $this->setUser(trim($arr[1]));
- break;
- case CAS_VERSION_2_0:
- // read the response of the CAS server into a DOM object
- if ( !($dom = domxml_open_mem($text_response))) {
- phpCAS::trace('domxml_open_mem() failed');
- $this->authError('ST not validated',
- $validate_url,
- FALSE/*$no_response*/,
- TRUE/*$bad_response*/,
- $text_response);
- }
- // read the root node of the XML tree
- if ( !($tree_response = $dom->document_element()) ) {
- phpCAS::trace('document_element() failed');
- $this->authError('ST not validated',
- $validate_url,
- FALSE/*$no_response*/,
- TRUE/*$bad_response*/,
- $text_response);
- }
- // insure that tag name is 'serviceResponse'
- if ( $tree_response->node_name() != 'serviceResponse' ) {
- phpCAS::trace('bad XML root node (should be `serviceResponse\' instead of `'.$tree_response->node_name().'\'');
- $this->authError('ST not validated',
- $validate_url,
- FALSE/*$no_response*/,
- TRUE/*$bad_response*/,
- $text_response);
- }
- if ( sizeof($success_elements = $tree_response->get_elements_by_tagname("authenticationSuccess")) != 0) {
- // authentication succeded, extract the user name
- if ( sizeof($user_elements = $success_elements[0]->get_elements_by_tagname("user")) == 0) {
- phpCAS::trace('<authenticationSuccess> found, but no <user>');
- $this->authError('ST not validated',
- $validate_url,
- FALSE/*$no_response*/,
- TRUE/*$bad_response*/,
- $text_response);
- }
- $user = trim($user_elements[0]->get_content());
- phpCAS::trace('user = `'.$user);
- $this->setUser($user);
-
- } else if ( sizeof($failure_elements = $tree_response->get_elements_by_tagname("authenticationFailure")) != 0) {
- phpCAS::trace('<authenticationFailure> found');
- // authentication failed, extract the error code and message
- $this->authError('ST not validated',
- $validate_url,
- FALSE/*$no_response*/,
- FALSE/*$bad_response*/,
- $text_response,
- $failure_elements[0]->get_attribute('code')/*$err_code*/,
- trim($failure_elements[0]->get_content())/*$err_msg*/);
- } else {
- phpCAS::trace('neither <authenticationSuccess> nor <authenticationFailure> found');
- $this->authError('ST not validated',
- $validate_url,
- FALSE/*$no_response*/,
- TRUE/*$bad_response*/,
- $text_response);
- }
- break;
- }
-
- // at this step, ST has been validated and $this->_user has been set,
- phpCAS::traceEnd(TRUE);
- return TRUE;
- }
-
- /** @} */
-
- // XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
- // XX XX
- // XX PROXY FEATURES (CAS 2.0) XX
- // XX XX
- // XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-
- // ########################################################################
- // PROXYING
- // ########################################################################
- /**
- * @addtogroup internalProxy
- * @{
- */
-
- /**
- * A boolean telling if the client is a CAS proxy or not. Written by CASClient::CASClient(),
- * read by CASClient::isProxy().
- *
- * @private
- */
- var $_proxy;
-
- /**
- * Tells if a CAS client is a CAS proxy or not
- *
- * @return TRUE when the CAS client is a CAs proxy, FALSE otherwise
- *
- * @private
- */
- function isProxy()
- {
- return $this->_proxy;
- }
-
- /** @} */
- // ########################################################################
- // PGT
- // ########################################################################
- /**
- * @addtogroup internalProxy
- * @{
- */
-
- /**
- * the Proxy Grnting Ticket given by the CAS server (empty otherwise).
- * Written by CASClient::setPGT(), read by CASClient::getPGT() and CASClient::hasPGT().
- *
- * @hideinitializer
- * @private
- */
- var $_pgt = '';
-
- /**
- * This method returns the Proxy Granting Ticket given by the CAS server.
- * @return The Proxy Granting Ticket.
- * @private
- */
- function getPGT()
- { return $this->_pgt; }
-
- /**
- * This method stores the Proxy Granting Ticket.
- * @param $pgt The Proxy Granting Ticket.
- * @private
- */
- function setPGT($pgt)
- { $this->_pgt = $pgt; }
-
- /**
- * This method tells if a Proxy Granting Ticket was stored.
- * @return TRUE if a Proxy Granting Ticket has been stored.
- * @private
- */
- function hasPGT()
- { return !empty($this->_pgt); }
-
- /** @} */
-
- // ########################################################################
- // CALLBACK MODE
- // ########################################################################
- /**
- * @addtogroup internalCallback
- * @{
- */
- /**
- * each PHP script using phpCAS in proxy mode is its own callback to get the
- * PGT back from the CAS server. callback_mode is detected by the constructor
- * thanks to the GET parameters.
- */
-
- /**
- * a boolean to know if the CAS client is running in callback mode. Written by
- * CASClient::setCallBackMode(), read by CASClient::isCallbackMode().
- *
- * @hideinitializer
- * @private
- */
- var $_callback_mode = FALSE;
-
- /**
- * This method sets/unsets callback mode.
- *
- * @param $callback_mode TRUE to set callback mode, FALSE otherwise.
- *
- * @private
- */
- function setCallbackMode($callback_mode)
- {
- $this->_callback_mode = $callback_mode;
- }
-
- /**
- * This method returns TRUE when the CAs client is running i callback mode,
- * FALSE otherwise.
- *
- * @return A boolean.
- *
- * @private
- */
- function isCallbackMode()
- {
- return $this->_callback_mode;
- }
-
- /**
- * the URL that should be used for the PGT callback (in fact the URL of the
- * current request without any CGI parameter). Written and read by
- * CASClient::getCallbackURL().
- *
- * @hideinitializer
- * @private
- */
- var $_callback_url = '';
-
- /**
- * This method returns the URL that should be used for the PGT callback (in
- * fact the URL of the current request without any CGI parameter, except if
- * phpCAS::setFixedCallbackURL() was used).
- *
- * @return The callback URL
- *
- * @private
- */
- function getCallbackURL()
- {
- // the URL is built when needed only
- if ( empty($this->_callback_url) ) {
- $final_uri = '';
- // remove the ticket if present in the URL
- $final_uri = 'https://';
- /* replaced by Julien Marchal - v0.4.6
- * $this->uri .= $_SERVER['SERVER_NAME'];
- */
- if(empty($_SERVER['HTTP_X_FORWARDED_SERVER'])){
- /* replaced by teedog - v0.4.12
- * $final_uri .= $_SERVER['SERVER_NAME'];
- */
- if (empty($_SERVER['SERVER_NAME'])) {
- $final_uri .= $_SERVER['HTTP_HOST'];
- } else {
- $final_uri .= $_SERVER['SERVER_NAME'];
- }
- } else {
- $final_uri .= $_SERVER['HTTP_X_FORWARDED_SERVER'];
- }
- if ( ($this->isHttps() && $_SERVER['SERVER_PORT']!=443)
- || (!$this->isHttps() && $_SERVER['SERVER_PORT']!=80) ) {
- $final_uri .= ':';
- $final_uri .= $_SERVER['SERVER_PORT'];
- }
- $request_uri = $_SERVER['REQUEST_URI'];
- $request_uri = preg_replace('/\?.*$/','',$request_uri);
- $final_uri .= $request_uri;
- $this->setCallbackURL($final_uri);
- }
- return $this->_callback_url;
- }
-
- /**
- * This method sets the callback url.
- *
- * @param $callback_url url to set callback
- *
- * @private
- */
- function setCallbackURL($url)
- {
- return $this->_callback_url = $url;
- }
-
- /**
- * This method is called by CASClient::CASClient() when running in callback
- * mode. It stores the PGT and its PGT Iou, prints its output and halts.
- *
- * @private
- */
- function callback()
- {
- phpCAS::traceBegin();
- $this->printHTMLHeader('phpCAS callback');
- $pgt_iou = $_GET['pgtIou'];
- $pgt = $_GET['pgtId'];
- phpCAS::trace('Storing PGT `'.$pgt.'\' (id=`'.$pgt_iou.'\')');
- echo '<p>Storing PGT `'.$pgt.'\' (id=`'.$pgt_iou.'\').</p>';
- $this->storePGT($pgt,$pgt_iou);
- $this->printHTMLFooter();
- phpCAS::traceExit();
- }
-
- /** @} */
-
- // ########################################################################
- // PGT STORAGE
- // ########################################################################
- /**
- * @addtogroup internalPGTStorage
- * @{
- */
-
- /**
- * an instance of a class inheriting of PGTStorage, used to deal with PGT
- * storage. Created by CASClient::setPGTStorageFile() or CASClient::setPGTStorageDB(), used
- * by CASClient::setPGTStorageFile(), CASClient::setPGTStorageDB() and CASClient::initPGTStorage().
- *
- * @hideinitializer
- * @private
- */
- var $_pgt_storage = null;
-
- /**
- * This method is used to initialize the storage of PGT's.
- * Halts on error.
- *
- * @private
- */
- function initPGTStorage()
- {
- // if no SetPGTStorageXxx() has been used, default to file
- if ( !is_object($this->_pgt_storage) ) {
- $this->setPGTStorageFile();
- }
-
- // initializes the storage
- $this->_pgt_storage->init();
- }
-
- /**
- * This method stores a PGT. Halts on error.
- *
- * @param $pgt the PGT to store
- * @param $pgt_iou its corresponding Iou
- *
- * @private
- */
- function storePGT($pgt,$pgt_iou)
- {
- // ensure that storage is initialized
- $this->initPGTStorage();
- // writes the PGT
- $this->_pgt_storage->write($pgt,$pgt_iou);
- }
-
- /**
- * This method reads a PGT from its Iou and deletes the corresponding storage entry.
- *
- * @param $pgt_iou the PGT Iou
- *
- * @return The PGT corresponding to the Iou, FALSE when not found.
- *
- * @private
- */
- function loadPGT($pgt_iou)
- {
- // ensure that storage is initialized
- $this->initPGTStorage();
- // read the PGT
- return $this->_pgt_storage->read($pgt_iou);
- }
-
- /**
- * This method is used to tell phpCAS to store the response of the
- * CAS server to PGT requests onto the filesystem.
- *
- * @param $format the format used to store the PGT's (`plain' and `xml' allowed)
- * @param $path the path where the PGT's should be stored
- *
- * @public
- */
- function setPGTStorageFile($format='',
- $path='')
- {
- // check that the storage has not already been set
- if ( is_object($this->_pgt_storage) ) {
- phpCAS::error('PGT storage already defined');
- }
-
- // create the storage object
- $this->_pgt_storage = &new PGTStorageFile($this,$format,$path);
- }
-
- /**
- * This method is used to tell phpCAS to store the response of the
- * CAS server to PGT requests into a database.
- * @note The connection to the database is done only when needed.
- * As a consequence, bad parameters are detected only when
- * initializing PGT storage.
- *
- * @param $user the user to access the data with
- * @param $password the user's password
- * @param $database_type the type of the database hosting the data
- * @param $hostname the server hosting the database
- * @param $port the port the server is listening on
- * @param $database the name of the database
- * @param $table the name of the table storing the data
- *
- * @public
- */
- function setPGTStorageDB($user,
- $password,
- $database_type,
- $hostname,
- $port,
- $database,
- $table)
- {
- // check that the storage has not already been set
- if ( is_object($this->_pgt_storage) ) {
- phpCAS::error('PGT storage already defined');
- }
-
- // warn the user that he should use file storage...
- trigger_error('PGT storage into database is an experimental feature, use at your own risk',E_USER_WARNING);
-
- // create the storage object
- $this->_pgt_storage = & new PGTStorageDB($this,$user,$password,$database_type,$hostname,$port,$database,$table);
- }
-
- // ########################################################################
- // PGT VALIDATION
- // ########################################################################
- /**
- * This method is used to validate a PGT; halt on failure.
- *
- * @param $validate_url the URL of the request to the CAS server.
- * @param $text_response the response of the CAS server, as is (XML text); result
- * of CASClient::validateST() or CASClient::validatePT().
- * @param $tree_response the response of the CAS server, as a DOM XML tree; result
- * of CASClient::validateST() or CASClient::validatePT().
- *
- * @return bool TRUE when successfull, halt otherwise by calling CASClient::authError().
- *
- * @private
- */
- function validatePGT(&$validate_url,$text_response,$tree_response)
- {
- phpCAS::traceBegin();
- if ( sizeof($arr = $tree_response->get_elements_by_tagname("proxyGrantingTicket")) == 0) {
- phpCAS::trace('<proxyGrantingTicket> not found');
- // authentication succeded, but no PGT Iou was transmitted
- $this->authError('Ticket validated but no PGT Iou transmitted',
- $validate_url,
- FALSE/*$no_response*/,
- FALSE/*$bad_response*/,
- $text_response);
- } else {
- // PGT Iou transmitted, extract it
- $pgt_iou = trim($arr[0]->get_content());
- $pgt = $this->loadPGT($pgt_iou);
- if ( $pgt == FALSE ) {
- phpCAS::trace('could not load PGT');
- $this->authError('PGT Iou was transmitted but PGT could not be retrieved',
- $validate_url,
- FALSE/*$no_response*/,
- FALSE/*$bad_response*/,
- $text_response);
- }
- $this->setPGT($pgt);
- }
- phpCAS::traceEnd(TRUE);
- return TRUE;
- }
-
- // ########################################################################
- // PGT VALIDATION
- // ########################################################################
-
- /**
- * This method is used to retrieve PT's from the CAS server thanks to a PGT.
- *
- * @param $target_service the service to ask for with the PT.
- * @param $err_code an error code (PHPCAS_SERVICE_OK on success).
- * @param $err_msg an error message (empty on success).
- *
- * @return a Proxy Ticket, or FALSE on error.
- *
- * @private
- */
- function retrievePT($target_service,&$err_code,&$err_msg)
- {
- phpCAS::traceBegin();
-
- // by default, $err_msg is set empty and $pt to TRUE. On error, $pt is
- // set to false and $err_msg to an error message. At the end, if $pt is FALSE
- // and $error_msg is still empty, it is set to 'invalid response' (the most
- // commonly encountered error).
- $err_msg = '';
-
- // build the URL to retrieve the PT
- // $cas_url = $this->getServerProxyURL().'?targetService='.preg_replace('/&/','%26',$target_service).'&pgt='.$this->getPGT();
- $cas_url = $this->getServerProxyURL().'?targetService='.urlencode($target_service).'&pgt='.$this->getPGT();
-
- // open and read the URL
- if ( !$this->readURL($cas_url,''/*cookies*/,$headers,$cas_response,$err_msg) ) {
- phpCAS::trace('could not open URL \''.$cas_url.'\' to validate ('.$err_msg.')');
- $err_code = PHPCAS_SERVICE_PT_NO_SERVER_RESPONSE;
- $err_msg = 'could not retrieve PT (no response from the CAS server)';
- phpCAS::traceEnd(FALSE);
- return FALSE;
- }
-
- $bad_response = FALSE;
-
- if ( !$bad_response ) {
- // read the response of the CAS server into a DOM object
- if ( !($dom = @domxml_open_mem($cas_response))) {
- phpCAS::trace('domxml_open_mem() failed');
- // read failed
- $bad_response = TRUE;
- }
- }
-
- if ( !$bad_response ) {
- // read the root node of the XML tree
- if ( !($root = $dom->document_element()) ) {
- phpCAS::trace('document_element() failed');
- // read failed
- $bad_response = TRUE;
- }
- }
-
- if ( !$bad_response ) {
- // insure that tag name is 'serviceResponse'
- if ( $root->node_name() != 'serviceResponse' ) {
- phpCAS::trace('node_name() failed');
- // bad root node
- $bad_response = TRUE;
- }
- }
-
- if ( !$bad_response ) {
- // look for a proxySuccess tag
- if ( sizeof($arr = $root->get_elements_by_tagname("proxySuccess")) != 0) {
- // authentication succeded, look for a proxyTicket tag
- if ( sizeof($arr = $root->get_elements_by_tagname("proxyTicket")) != 0) {
- $err_code = PHPCAS_SERVICE_OK;
- $err_msg = '';
- phpCAS::trace('original PT: '.trim($arr[0]->get_content()));
- $pt = trim($arr[0]->get_content());
- phpCAS::traceEnd($pt);
- return $pt;
- } else {
- phpCAS::trace('<proxySuccess> was found, but not <proxyTicket>');
- }
- }
- // look for a proxyFailure tag
- else if ( sizeof($arr = $root->get_elements_by_tagname("proxyFailure")) != 0) {
- // authentication failed, extract the error
- $err_code = PHPCAS_SERVICE_PT_FAILURE;
- $err_msg = 'PT retrieving failed (code=`'
- .$arr[0]->get_attribute('code')
- .'\', message=`'
- .trim($arr[0]->get_content())
- .'\')';
- phpCAS::traceEnd(FALSE);
- return FALSE;
- } else {
- phpCAS::trace('neither <proxySuccess> nor <proxyFailure> found');
- }
- }
-
- // at this step, we are sure that the response of the CAS server was ill-formed
- $err_code = PHPCAS_SERVICE_PT_BAD_SERVER_RESPONSE;
- $err_msg = 'Invalid response from the CAS server (response=`'.$cas_response.'\')';
-
- phpCAS::traceEnd(FALSE);
- return FALSE;
- }
-
- // ########################################################################
- // ACCESS TO EXTERNAL SERVICES
- // ########################################################################
-
- /**
- * This method is used to acces a remote URL.
- *
- * @param $url the URL to access.
- * @param $cookies an array containing cookies strings such as 'name=val'
- * @param $headers an array containing the HTTP header lines of the response
- * (an empty array on failure).
- * @param $body the body of the response, as a string (empty on failure).
- * @param $err_msg an error message, filled on failure.
- *
- * @return TRUE on success, FALSE otherwise (in this later case, $err_msg
- * contains an error message).
- *
- * @private
- */
- function readURL($url,$cookies,&$headers,&$body,&$err_msg)
- {
- phpCAS::traceBegin();
- $headers = '';
- $body = '';
- $err_msg = '';
-
- $res = TRUE;
-
- // initialize the CURL session
- $ch = curl_init($url);
-
- if (version_compare(PHP_VERSION,'5.1.3','>=')) {
- //only avaible in php5
- curl_setopt_array($ch, $this->_curl_options);
- } else {
- foreach ($this->_curl_options as $key => $value) {
- curl_setopt($ch, $key, $value);
- }
- }
-
- if ($this->_cas_server_cert == '' && $this->_cas_server_ca_cert == '' && !$this->_no_cas_server_validation) {
- phpCAS::error('one of the methods phpCAS::setCasServerCert(), phpCAS::setCasServerCACert() or phpCAS::setNoCasServerValidation() must be called.');
- }
- if ($this->_cas_server_cert != '' ) {
- curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, 1);
- curl_setopt($ch, CURLOPT_SSLCERT, $this->_cas_server_cert);
- } else if ($this->_cas_server_ca_cert != '') {
- curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, 1);
- curl_setopt($ch, CURLOPT_CAINFO, $this->_cas_server_ca_cert);
- } else {
- curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, 1);
- curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, 0);
- }
-
- // return the CURL output into a variable
- curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
- // get the HTTP header with a callback
- $this->_curl_headers = array(); // empty the headers array
- curl_setopt($ch, CURLOPT_HEADERFUNCTION, array($this, '_curl_read_headers'));
- // add cookies headers
- if ( is_array($cookies) ) {
- curl_setopt($ch,CURLOPT_COOKIE,implode(';',$cookies));
- }
- // perform the query
- $buf = curl_exec ($ch);
- if ( $buf === FALSE ) {
- phpCAS::trace('curl_exec() failed');
- $err_msg = 'CURL error #'.curl_errno($ch).': '.curl_error($ch);
- // close the CURL session
- curl_close ($ch);
- $res = FALSE;
- } else {
- // close the CURL session
- curl_close ($ch);
-
- $headers = $this->_curl_headers;
- $body = $buf;
- }
-
- phpCAS::traceEnd($res);
- return $res;
- }
-
- /**
- * This method is the callback used by readURL method to request HTTP headers.
- */
- var $_curl_headers = array();
- function _curl_read_headers($ch, $header)
- {
- $this->_curl_headers[] = $header;
- return strlen($header);
- }
-
- /**
- * This method is used to access an HTTP[S] service.
- *
- * @param $url the service to access.
- * @param $err_code an error code Possible values are PHPCAS_SERVICE_OK (on
- * success), PHPCAS_SERVICE_PT_NO_SERVER_RESPONSE, PHPCAS_SERVICE_PT_BAD_SERVER_RESPONSE,
- * PHPCAS_SERVICE_PT_FAILURE, PHPCAS_SERVICE_NOT AVAILABLE.
- * @param $output the output of the service (also used to give an error
- * message on failure).
- *
- * @return TRUE on success, FALSE otherwise (in this later case, $err_code
- * gives the reason why it failed and $output contains an error message).
- *
- * @public
- */
- function serviceWeb($url,&$err_code,&$output)
- {
- phpCAS::traceBegin();
- // at first retrieve a PT
- $pt = $this->retrievePT($url,$err_code,$output);
-
- $res = TRUE;
-
- // test if PT was retrieved correctly
- if ( !$pt ) {
- // note: $err_code and $err_msg are filled by CASClient::retrievePT()
- phpCAS::trace('PT was not retrieved correctly');
- $res = FALSE;
- } else {
- // add cookies if necessary
- if ( is_array($_SESSION['phpCAS']['services'][$url]['cookies']) ) {
- foreach ( $_SESSION['phpCAS']['services'][$url]['cookies'] as $name => $val ) {
- $cookies[] = $name.'='.$val;
- }
- }
-
- // build the URL including the PT
- if ( strstr($url,'?') === FALSE ) {
- $service_url = $url.'?ticket='.$pt;
- } else {
- $service_url = $url.'&ticket='.$pt;
- }
-
- phpCAS::trace('reading URL`'.$service_url.'\'');
- if ( !$this->readURL($service_url,$cookies,$headers,$output,$err_msg) ) {
- phpCAS::trace('could not read URL`'.$service_url.'\'');
- $err_code = PHPCAS_SERVICE_NOT_AVAILABLE;
- // give an error message
- $output = sprintf($this->getString(CAS_STR_SERVICE_UNAVAILABLE),
- $service_url,
- $err_msg);
- $res = FALSE;
- } else {
- // URL has been fetched, extract the cookies
- phpCAS::trace('URL`'.$service_url.'\' has been read, storing cookies:');
- foreach ( $headers as $header ) {
- // test if the header is a cookie
- if ( preg_match('/^Set-Cookie:/',$header) ) {
- // the header is a cookie, remove the beginning
- $header_val = preg_replace('/^Set-Cookie: */','',$header);
- // extract interesting information
- $name_val = strtok($header_val,'; ');
- // extract the name and the value of the cookie
- $cookie_name = strtok($name_val,'=');
- $cookie_val = strtok('=');
- // store the cookie
- $_SESSION['phpCAS']['services'][$url]['cookies'][$cookie_name] = $cookie_val;
- phpCAS::trace($cookie_name.' -> '.$cookie_val);
- }
- }
- }
- }
-
- phpCAS::traceEnd($res);
- return $res;
- }
-
- /**
- * This method is used to access an IMAP/POP3/NNTP service.
- *
- * @param $url a string giving the URL of the service, including the mailing box
- * for IMAP URLs, as accepted by imap_open().
- * @param $flags options given to imap_open().
- * @param $err_code an error code Possible values are PHPCAS_SERVICE_OK (on
- * success), PHPCAS_SERVICE_PT_NO_SERVER_RESPONSE, PHPCAS_SERVICE_PT_BAD_SERVER_RESPONSE,
- * PHPCAS_SERVICE_PT_FAILURE, PHPCAS_SERVICE_NOT AVAILABLE.
- * @param $err_msg an error message on failure
- * @param $pt the Proxy Ticket (PT) retrieved from the CAS server to access the URL
- * on success, FALSE on error).
- *
- * @return an IMAP stream on success, FALSE otherwise (in this later case, $err_code
- * gives the reason why it failed and $err_msg contains an error message).
- *
- * @public
- */
- function serviceMail($url,$flags,&$err_code,&$err_msg,&$pt)
- {
- phpCAS::traceBegin();
- // at first retrieve a PT
- $pt = $this->retrievePT($target_service,$err_code,$output);
-
- $stream = FALSE;
-
- // test if PT was retrieved correctly
- if ( !$pt ) {
- // note: $err_code and $err_msg are filled by CASClient::retrievePT()
- phpCAS::trace('PT was not retrieved correctly');
- } else {
- phpCAS::trace('opening IMAP URL `'.$url.'\'...');
- $stream = @imap_open($url,$this->getUser(),$pt,$flags);
- if ( !$stream ) {
- phpCAS::trace('could not open URL');
- $err_code = PHPCAS_SERVICE_NOT_AVAILABLE;
- // give an error message
- $err_msg = sprintf($this->getString(CAS_STR_SERVICE_UNAVAILABLE),
- $service_url,
- var_export(imap_errors(),TRUE));
- $pt = FALSE;
- $stream = FALSE;
- } else {
- phpCAS::trace('ok');
- }
- }
-
- phpCAS::traceEnd($stream);
- return $stream;
- }
-
- /** @} */
-
- // XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
- // XX XX
- // XX PROXIED CLIENT FEATURES (CAS 2.0) XX
- // XX XX
- // XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-
- // ########################################################################
- // PT
- // ########################################################################
- /**
- * @addtogroup internalProxied
- * @{
- */
-
- /**
- * the Proxy Ticket provided in the URL of the request if present
- * (empty otherwise). Written by CASClient::CASClient(), read by
- * CASClient::getPT() and CASClient::hasPGT().
- *
- * @hideinitializer
- * @private
- */
- var $_pt = '';
-
- /**
- * This method returns the Proxy Ticket provided in the URL of the request.
- * @return The proxy ticket.
- * @private
- */
- function getPT()
- {
- // return 'ST'.substr($this->_pt, 2);
- return $this->_pt;
- }
-
- /**
- * This method stores the Proxy Ticket.
- * @param $pt The Proxy Ticket.
- * @private
- */
- function setPT($pt)
- { $this->_pt = $pt; }
-
- /**
- * This method tells if a Proxy Ticket was stored.
- * @return TRUE if a Proxy Ticket has been stored.
- * @private
- */
- function hasPT()
- { return !empty($this->_pt); }
-
- /** @} */
- // ########################################################################
- // PT VALIDATION
- // ########################################################################
- /**
- * @addtogroup internalProxied
- * @{
- */
-
- /**
- * This method is used to validate a PT; halt on failure
- *
- * @return bool TRUE when successfull, halt otherwise by calling CASClient::authError().
- *
- * @private
- */
- function validatePT(&$validate_url,&$text_response,&$tree_response)
- {
- phpCAS::traceBegin();
- // build the URL to validate the ticket
- $validate_url = $this->getServerProxyValidateURL().'&ticket='.$this->getPT();
-
- if ( $this->isProxy() ) {
- // pass the callback url for CAS proxies
- $validate_url .= '&pgtUrl='.$this->getCallbackURL();
- }
-
- // open and read the URL
- if ( !$this->readURL($validate_url,''/*cookies*/,$headers,$text_response,$err_msg) ) {
- phpCAS::trace('could not open URL \''.$validate_url.'\' to validate ('.$err_msg.')');
- $this->authError('PT not validated',
- $validate_url,
- TRUE/*$no_response*/);
- }
-
- // read the response of the CAS server into a DOM object
- if ( !($dom = domxml_open_mem($text_response))) {
- // read failed
- $this->authError('PT not validated',
- $validate_url,
- FALSE/*$no_response*/,
- TRUE/*$bad_response*/,
- $text_response);
- }
- // read the root node of the XML tree
- if ( !($tree_response = $dom->document_element()) ) {
- // read failed
- $this->authError('PT not validated',
- $validate_url,
- FALSE/*$no_response*/,
- TRUE/*$bad_response*/,
- $text_response);
- }
- // insure that tag name is 'serviceResponse'
- if ( $tree_response->node_name() != 'serviceResponse' ) {
- // bad root node
- $this->authError('PT not validated',
- $validate_url,
- FALSE/*$no_response*/,
- TRUE/*$bad_response*/,
- $text_response);
- }
- if ( sizeof($arr = $tree_response->get_elements_by_tagname("authenticationSuccess")) != 0) {
- // authentication succeded, extract the user name
- if ( sizeof($arr = $tree_response->get_elements_by_tagname("user")) == 0) {
- // no user specified => error
- $this->authError('PT not validated',
- $validate_url,
- FALSE/*$no_response*/,
- TRUE/*$bad_response*/,
- $text_response);
- }
- $this->setUser(trim($arr[0]->get_content()));
-
- } else if ( sizeof($arr = $tree_response->get_elements_by_tagname("authenticationFailure")) != 0) {
- // authentication succeded, extract the error code and message
- $this->authError('PT not validated',
- $validate_url,
- FALSE/*$no_response*/,
- FALSE/*$bad_response*/,
- $text_response,
- $arr[0]->get_attribute('code')/*$err_code*/,
- trim($arr[0]->get_content())/*$err_msg*/);
- } else {
- $this->authError('PT not validated',
- $validate_url,
- FALSE/*$no_response*/,
- TRUE/*$bad_response*/,
- $text_response);
- }
-
- // at this step, PT has been validated and $this->_user has been set,
-
- phpCAS::traceEnd(TRUE);
- return TRUE;
- }
-
- /** @} */
-
- // XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
- // XX XX
- // XX MISC XX
- // XX XX
- // XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-
- /**
- * @addtogroup internalMisc
- * @{
- */
-
- // ########################################################################
- // URL
- // ########################################################################
- /**
- * the URL of the current request (without any ticket CGI parameter). Written
- * and read by CASClient::getURL().
- *
- * @hideinitializer
- * @private
- */
- var $_url = '';
-
- /**
- * This method returns the URL of the current request (without any ticket
- * CGI parameter).
- *
- * @return The URL
- *
- * @private
- */
- function getURL()
- {
- phpCAS::traceBegin();
- // the URL is built when needed only
- if ( empty($this->_url) ) {
- $final_uri = '';
- // remove the ticket if present in the URL
- $final_uri = ($this->isHttps()) ? 'https' : 'http';
- $final_uri .= '://';
- /* replaced by Julien Marchal - v0.4.6
- * $this->_url .= $_SERVER['SERVER_NAME'];
- */
- if(empty($_SERVER['HTTP_X_FORWARDED_SERVER'])){
- /* replaced by teedog - v0.4.12
- * $this->_url .= $_SERVER['SERVER_NAME'];
- */
- if (empty($_SERVER['SERVER_NAME'])) {
- $server_name = $_SERVER['HTTP_HOST'];
- } else {
- $server_name = $_SERVER['SERVER_NAME'];
- }
- } else {
- $server_name = $_SERVER['HTTP_X_FORWARDED_SERVER'];
- }
- $final_uri .= $server_name;
- if (!strpos($server_name, ':')) {
- if ( ($this->isHttps() && $_SERVER['SERVER_PORT']!=443)
- || (!$this->isHttps() && $_SERVER['SERVER_PORT']!=80) ) {
- $final_uri .= ':';
- $final_uri .= $_SERVER['SERVER_PORT'];
- }
- }
-
- $final_uri .= strtok($_SERVER['REQUEST_URI'],"?");
- $cgi_params = '?'.strtok("?");
- // remove the ticket if present in the CGI parameters
- $cgi_params = preg_replace('/&ticket=[^&]*/','',$cgi_params);
- $cgi_params = preg_replace('/\?ticket=[^&;]*/','?',$cgi_params);
- $cgi_params = preg_replace('/\?%26/','?',$cgi_params);
- $cgi_params = preg_replace('/\?&/','?',$cgi_params);
- $cgi_params = preg_replace('/\?$/','',$cgi_params);
- $final_uri .= $cgi_params;
- $this->setURL($final_uri);
- }
- phpCAS::traceEnd($this->_url);
- return $this->_url;
- }
-
- /**
- * This method sets the URL of the current request
- *
- * @param $url url to set for service
- *
- * @private
- */
- function setURL($url)
- {
- $this->_url = $url;
- }
-
- // ########################################################################
- // AUTHENTICATION ERROR HANDLING
- // ########################################################################
- /**
- * This method is used to print the HTML output when the user was not authenticated.
- *
- * @param $failure the failure that occured
- * @param $cas_url the URL the CAS server was asked for
- * @param $no_response the response from the CAS server (other
- * parameters are ignored if TRUE)
- * @param $bad_response bad response from the CAS server ($err_code
- * and $err_msg ignored if TRUE)
- * @param $cas_response the response of the CAS server
- * @param $err_code the error code given by the CAS server
- * @param $err_msg the error message given by the CAS server
- *
- * @private
- */
- function authError($failure,$cas_url,$no_response,$bad_response='',$cas_response='',$err_code='',$err_msg='')
- {
- phpCAS::traceBegin();
-
- $this->printHTMLHeader($this->getString(CAS_STR_AUTHENTICATION_FAILED));
- printf($this->getString(CAS_STR_YOU_WERE_NOT_AUTHENTICATED),$this->getURL(),$_SERVER['SERVER_ADMIN']);
- phpCAS::trace('CAS URL: '.$cas_url);
- phpCAS::trace('Authentication failure: '.$failure);
- if ( $no_response ) {
- phpCAS::trace('Reason: no response from the CAS server');
- } else {
- if ( $bad_response ) {
- phpCAS::trace('Reason: bad response from the CAS server');
- } else {
- switch ($this->getServerVersion()) {
- case CAS_VERSION_1_0:
- phpCAS::trace('Reason: CAS error');
- break;
- case CAS_VERSION_2_0:
- if ( empty($err_code) )
- phpCAS::trace('Reason: no CAS error');
- else
- phpCAS::trace('Reason: ['.$err_code.'] CAS error: '.$err_msg);
- break;
- }
- }
- phpCAS::trace('CAS response: '.$cas_response);
- }
- $this->printHTMLFooter();
- phpCAS::traceExit();
- exit();
- }
-
- /** @} */
-}
-
+ header('Location: '.$this->getURL()); + } + + //activate session mechanism if desired + if (!$this->isLogoutRequest() && $start_session) { + session_start(); + } + + $this->_proxy = $proxy; + + //check version + switch ($server_version) { + case CAS_VERSION_1_0: + if ( $this->isProxy() ) + phpCAS::error('CAS proxies are not supported in CAS ' + .$server_version); + break; + case CAS_VERSION_2_0: + break; + default: + phpCAS::error('this version of CAS (`' + .$server_version + .'\') is not supported by phpCAS ' + .phpCAS::getVersion()); + } + $this->_server['version'] = $server_version; + + //check hostname + if ( empty($server_hostname) + || !preg_match('/[\.\d\-abcdefghijklmnopqrstuvwxyz]*/',$server_hostname) ) { + phpCAS::error('bad CAS server hostname (`'.$server_hostname.'\')'); + } + $this->_server['hostname'] = $server_hostname; + + //check port + if ( $server_port == 0 + || !is_int($server_port) ) { + phpCAS::error('bad CAS server port (`'.$server_hostname.'\')'); + } + $this->_server['port'] = $server_port; + + //check URI + if ( !preg_match('/[\.\d\-_abcdefghijklmnopqrstuvwxyz\/]*/',$server_uri) ) { + phpCAS::error('bad CAS server URI (`'.$server_uri.'\')'); + } + //add leading and trailing `/' and remove doubles + $server_uri = preg_replace('/\/\//','/','/'.$server_uri.'/'); + $this->_server['uri'] = $server_uri; + + //set to callback mode if PgtIou and PgtId CGI GET parameters are provided + if ( $this->isProxy() ) { + $this->setCallbackMode(!empty($_GET['pgtIou'])&&!empty($_GET['pgtId'])); + } + + if ( $this->isCallbackMode() ) { + //callback mode: check that phpCAS is secured + if ( !$this->isHttps() ) { + phpCAS::error('CAS proxies must be secured to use phpCAS; PGT\'s will not be received from the CAS server'); + } + } else { + //normal mode: get ticket and remove it from CGI parameters for developpers + $ticket = (isset($_GET['ticket']) ? $_GET['ticket'] : null); + switch ($this->getServerVersion()) { + case CAS_VERSION_1_0: // check for a Service Ticket + if( preg_match('/^ST-/',$ticket) ) { + phpCAS::trace('ST \''.$ticket.'\' found'); + //ST present + $this->setST($ticket); + //ticket has been taken into account, unset it to hide it to applications + unset($_GET['ticket']); + } else if ( !empty($ticket) ) { + //ill-formed ticket, halt + phpCAS::error('ill-formed ticket found in the URL (ticket=`'.htmlentities($ticket).'\')'); + } + break; + case CAS_VERSION_2_0: // check for a Service or Proxy Ticket + if( preg_match('/^[SP]T-/',$ticket) ) { + phpCAS::trace('ST or PT \''.$ticket.'\' found'); + $this->setPT($ticket); + unset($_GET['ticket']); + } else if ( !empty($ticket) ) { + //ill-formed ticket, halt + phpCAS::error('ill-formed ticket found in the URL (ticket=`'.htmlentities($ticket).'\')'); + } + break; + } + } + phpCAS::traceEnd(); + } + + /** @} */ + + // XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX + // XX XX + // XX AUTHENTICATION XX + // XX XX + // XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX + + /** + * @addtogroup internalAuthentication + * @{ + */ + + /** + * The Authenticated user. Written by CASClient::setUser(), read by CASClient::getUser(). + * @attention client applications should use phpCAS::getUser(). + * + * @hideinitializer + * @private + */ + var $_user = ''; + + /** + * This method sets the CAS user's login name. + * + * @param $user the login name of the authenticated user. + * + * @private + */ + function setUser($user) + { + $this->_user = $user; + } + + /** + * This method returns the CAS user's login name. + * @warning should be called only after CASClient::forceAuthentication() or + * CASClient::isAuthenticated(), otherwise halt with an error. + * + * @return the login name of the authenticated user + */ + function getUser() + { + if ( empty($this->_user) ) { + phpCAS::error('this method should be used only after '.__CLASS__.'::forceAuthentication() or '.__CLASS__.'::isAuthenticated()'); + } + return $this->_user; + } + + /** + * This method is called to renew the authentication of the user + * If the user is authenticated, renew the connection + * If not, redirect to CAS + * @public + */ + function renewAuthentication(){ + phpCAS::traceBegin(); + // Either way, the user is authenticated by CAS + if( isset( $_SESSION['phpCAS']['auth_checked'] ) ) + unset($_SESSION['phpCAS']['auth_checked']); + if ( $this->isAuthenticated() ) { + phpCAS::trace('user already authenticated; renew'); + $this->redirectToCas(false,true); + } else { + $this->redirectToCas(); + } + phpCAS::traceEnd(); + } + + /** + * This method is called to be sure that the user is authenticated. When not + * authenticated, halt by redirecting to the CAS server; otherwise return TRUE. + * @return TRUE when the user is authenticated; otherwise halt. + * @public + */ + function forceAuthentication() + { + phpCAS::traceBegin(); + + if ( $this->isAuthenticated() ) { + // the user is authenticated, nothing to be done. + phpCAS::trace('no need to authenticate'); + $res = TRUE; + } else { + // the user is not authenticated, redirect to the CAS server + if (isset($_SESSION['phpCAS']['auth_checked'])) { + unset($_SESSION['phpCAS']['auth_checked']); + } + $this->redirectToCas(FALSE/* no gateway */); + // never reached + $res = FALSE; + } + phpCAS::traceEnd($res); + return $res; + } + + /** + * An integer that gives the number of times authentication will be cached before rechecked. + * + * @hideinitializer + * @private + */ + var $_cache_times_for_auth_recheck = 0; + + /** + * Set the number of times authentication will be cached before rechecked. + * + * @param $n an integer. + * + * @public + */ + function setCacheTimesForAuthRecheck($n) + { + $this->_cache_times_for_auth_recheck = $n; + } + + /** + * This method is called to check whether the user is authenticated or not. + * @return TRUE when the user is authenticated, FALSE otherwise. + * @public + */ + function checkAuthentication() + { + phpCAS::traceBegin(); + + if ( $this->isAuthenticated() ) { + phpCAS::trace('user is authenticated'); + $res = TRUE; + } else if (isset($_SESSION['phpCAS']['auth_checked'])) { + // the previous request has redirected the client to the CAS server with gateway=true + unset($_SESSION['phpCAS']['auth_checked']); + $res = FALSE; + } else { + // $_SESSION['phpCAS']['auth_checked'] = true; + // $this->redirectToCas(TRUE/* gateway */); + // // never reached + // $res = FALSE; + // avoid a check against CAS on every request + if (! isset($_SESSION['phpCAS']['unauth_count']) ) + $_SESSION['phpCAS']['unauth_count'] = -2; // uninitialized + + if (($_SESSION['phpCAS']['unauth_count'] != -2 && $this->_cache_times_for_auth_recheck == -1) + || ($_SESSION['phpCAS']['unauth_count'] >= 0 && $_SESSION['phpCAS']['unauth_count'] < $this->_cache_times_for_auth_recheck)) + { + $res = FALSE; + + if ($this->_cache_times_for_auth_recheck != -1) + { + $_SESSION['phpCAS']['unauth_count']++; + phpCAS::trace('user is not authenticated (cached for '.$_SESSION['phpCAS']['unauth_count'].' times of '.$this->_cache_times_for_auth_recheck.')'); + } + else + { + phpCAS::trace('user is not authenticated (cached for until login pressed)'); + } + } + else + { + $_SESSION['phpCAS']['unauth_count'] = 0; + $_SESSION['phpCAS']['auth_checked'] = true; + phpCAS::trace('user is not authenticated (cache reset)'); + $this->redirectToCas(TRUE/* gateway */); + // never reached + $res = FALSE; + } + } + phpCAS::traceEnd($res); + return $res; + } + + /** + * This method is called to check if the user is authenticated (previously or by + * tickets given in the URL). + * + * @return TRUE when the user is authenticated. + * + * @public + */ + function isAuthenticated() + { + phpCAS::traceBegin(); + $res = FALSE; + $validate_url = ''; + + if ( $this->wasPreviouslyAuthenticated() ) { + // the user has already (previously during the session) been + // authenticated, nothing to be done. + phpCAS::trace('user was already authenticated, no need to look for tickets'); + $res = TRUE; + } + elseif ( $this->hasST() ) { + // if a Service Ticket was given, validate it + phpCAS::trace('ST `'.$this->getST().'\' is present'); + $this->validateST($validate_url,$text_response,$tree_response); // if it fails, it halts + phpCAS::trace('ST `'.$this->getST().'\' was validated'); + if ( $this->isProxy() ) { + $this->validatePGT($validate_url,$text_response,$tree_response); // idem + phpCAS::trace('PGT `'.$this->getPGT().'\' was validated'); + $_SESSION['phpCAS']['pgt'] = $this->getPGT(); + } + $_SESSION['phpCAS']['user'] = $this->getUser(); + $res = TRUE; + } + elseif ( $this->hasPT() ) { + // if a Proxy Ticket was given, validate it + phpCAS::trace('PT `'.$this->getPT().'\' is present'); + $this->validatePT($validate_url,$text_response,$tree_response); // note: if it fails, it halts + phpCAS::trace('PT `'.$this->getPT().'\' was validated'); + if ( $this->isProxy() ) { + $this->validatePGT($validate_url,$text_response,$tree_response); // idem + phpCAS::trace('PGT `'.$this->getPGT().'\' was validated'); + $_SESSION['phpCAS']['pgt'] = $this->getPGT(); + } + $_SESSION['phpCAS']['user'] = $this->getUser(); + $res = TRUE; + } + else { + // no ticket given, not authenticated + phpCAS::trace('no ticket found'); + } + + phpCAS::traceEnd($res); + return $res; + } + + /** + * This method tells if the current session is authenticated. + * @return true if authenticated based soley on $_SESSION variable + * @since 0.4.22 by Brendan Arnold + */ + function isSessionAuthenticated () + { + return !empty($_SESSION['phpCAS']['user']); + } + + /** + * This method tells if the user has already been (previously) authenticated + * by looking into the session variables. + * + * @note This function switches to callback mode when needed. + * + * @return TRUE when the user has already been authenticated; FALSE otherwise. + * + * @private + */ + function wasPreviouslyAuthenticated() + { + phpCAS::traceBegin(); + + if ( $this->isCallbackMode() ) { + $this->callback(); + } + + $auth = FALSE; + + if ( $this->isProxy() ) { + // CAS proxy: username and PGT must be present + if ( $this->isSessionAuthenticated() && !empty($_SESSION['phpCAS']['pgt']) ) { + // authentication already done + $this->setUser($_SESSION['phpCAS']['user']); + $this->setPGT($_SESSION['phpCAS']['pgt']); + phpCAS::trace('user = `'.$_SESSION['phpCAS']['user'].'\', PGT = `'.$_SESSION['phpCAS']['pgt'].'\''); + $auth = TRUE; + } elseif ( $this->isSessionAuthenticated() && empty($_SESSION['phpCAS']['pgt']) ) { + // these two variables should be empty or not empty at the same time + phpCAS::trace('username found (`'.$_SESSION['phpCAS']['user'].'\') but PGT is empty'); + // unset all tickets to enforce authentication + unset($_SESSION['phpCAS']); + $this->setST(''); + $this->setPT(''); + } elseif ( !$this->isSessionAuthenticated() && !empty($_SESSION['phpCAS']['pgt']) ) { + // these two variables should be empty or not empty at the same time + phpCAS::trace('PGT found (`'.$_SESSION['phpCAS']['pgt'].'\') but username is empty'); + // unset all tickets to enforce authentication + unset($_SESSION['phpCAS']); + $this->setST(''); + $this->setPT(''); + } else { + phpCAS::trace('neither user not PGT found'); + } + } else { + // `simple' CAS client (not a proxy): username must be present + if ( $this->isSessionAuthenticated() ) { + // authentication already done + $this->setUser($_SESSION['phpCAS']['user']); + phpCAS::trace('user = `'.$_SESSION['phpCAS']['user'].'\''); + $auth = TRUE; + } else { + phpCAS::trace('no user found'); + } + } + + phpCAS::traceEnd($auth); + return $auth; + } + + /** + * This method is used to redirect the client to the CAS server. + * It is used by CASClient::forceAuthentication() and CASClient::checkAuthentication(). + * @param $gateway true to check authentication, false to force it + * @param $renew true to force the authentication with the CAS server + * @public + */ + function redirectToCas($gateway=false,$renew=false){ + phpCAS::traceBegin(); + $cas_url = $this->getServerLoginURL($gateway,$renew); + header('Location: '.$cas_url); + phpCAS::log( "Redirect to : ".$cas_url ); + + $this->printHTMLHeader($this->getString(CAS_STR_AUTHENTICATION_WANTED)); + + printf('<p>'.$this->getString(CAS_STR_SHOULD_HAVE_BEEN_REDIRECTED).'</p>',$cas_url); + $this->printHTMLFooter(); + phpCAS::traceExit(); + exit(); + } + +// /** +// * This method is used to logout from CAS. +// * @param $url a URL that will be transmitted to the CAS server (to come back to when logged out) +// * @public +// */ +// function logout($url = "") { +// phpCAS::traceBegin(); +// $cas_url = $this->getServerLogoutURL(); +// // v0.4.14 sebastien.gougeon at univ-rennes1.fr +// // header('Location: '.$cas_url); +// if ( $url != "" ) { +// // Adam Moore 1.0.0RC2 +// $url = '?service=' . $url . '&url=' . $url; +// } +// header('Location: '.$cas_url . $url); +// session_unset(); +// session_destroy(); +// $this->printHTMLHeader($this->getString(CAS_STR_LOGOUT)); +// printf('<p>'.$this->getString(CAS_STR_SHOULD_HAVE_BEEN_REDIRECTED).'</p>',$cas_url); +// $this->printHTMLFooter(); +// phpCAS::traceExit(); +// exit(); +// } + + /** + * This method is used to logout from CAS. + * @params $params an array that contains the optional url and service parameters that will be passed to the CAS server + * @public + */ + function logout($params) { + phpCAS::traceBegin(); + $cas_url = $this->getServerLogoutURL(); + $paramSeparator = '?'; + if (isset($params['url'])) { + $cas_url = $cas_url . $paramSeparator . "url=" . urlencode($params['url']); + $paramSeparator = '&'; + } + if (isset($params['service'])) { + $cas_url = $cas_url . $paramSeparator . "service=" . urlencode($params['service']); + } + header('Location: '.$cas_url); + session_unset(); + session_destroy(); + $this->printHTMLHeader($this->getString(CAS_STR_LOGOUT)); + printf('<p>'.$this->getString(CAS_STR_SHOULD_HAVE_BEEN_REDIRECTED).'</p>',$cas_url); + $this->printHTMLFooter(); + phpCAS::traceExit(); + exit(); + } + + /** + * @return true if the current request is a logout request. + * @private + */ + function isLogoutRequest() { + return !empty($_POST['logoutRequest']); + } + + /** + * @return true if a logout request is allowed. + * @private + */ + function isLogoutRequestAllowed() { + } + + /** + * This method handles logout requests. + * @param $check_client true to check the client bofore handling the request, + * false not to perform any access control. True by default. + * @param $allowed_clients an array of host names allowed to send logout requests. + * By default, only the CAs server (declared in the constructor) will be allowed. + * @public + */ + function handleLogoutRequests($check_client=true, $allowed_clients=false) { + phpCAS::traceBegin(); + if (!$this->isLogoutRequest()) { + phpCAS::log("Not a logout request"); + phpCAS::traceEnd(); + return; + } + phpCAS::log("Logout requested"); + phpCAS::log("SAML REQUEST: ".$_POST['logoutRequest']); + if ($check_client) { + if (!$allowed_clients) { + $allowed_clients = array( $this->getServerHostname() ); + } + $client_ip = $_SERVER['REMOTE_ADDR']; + $client = gethostbyaddr($client_ip); + phpCAS::log("Client: ".$client); + $allowed = false; + foreach ($allowed_clients as $allowed_client) { + if ($client == $allowed_client) { + phpCAS::log("Allowed client '".$allowed_client."' matches, logout request is allowed"); + $allowed = true; + break; + } else { + phpCAS::log("Allowed client '".$allowed_client."' does not match"); + } + } + if (!$allowed) { + phpCAS::error("Unauthorized logout request from client '".$client."'"); + printf("Unauthorized!"); + phpCAS::traceExit(); + exit(); + } + } else { + phpCAS::log("No access control set"); + } + // Extract the ticket from the SAML Request + preg_match("|<samlp:SessionIndex>(.*)</samlp:SessionIndex>|", $_POST['logoutRequest'], $tick, PREG_OFFSET_CAPTURE, 3); + $wrappedSamlSessionIndex = preg_replace('|<samlp:SessionIndex>|','',$tick[0][0]); + $ticket2logout = preg_replace('|</samlp:SessionIndex>|','',$wrappedSamlSessionIndex); + phpCAS::log("Ticket to logout: ".$ticket2logout); + $session_id = preg_replace('/[^\w]/','',$ticket2logout); + phpCAS::log("Session id: ".$session_id); + + // fix New session ID + session_id($session_id); + $_COOKIE[session_name()]=$session_id; + $_GET[session_name()]=$session_id; + + // Overwrite session + session_start(); + session_unset(); + session_destroy(); + printf("Disconnected!"); + phpCAS::traceExit(); + exit(); + } + + /** @} */ + + // XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX + // XX XX + // XX BASIC CLIENT FEATURES (CAS 1.0) XX + // XX XX + // XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX + + // ######################################################################## + // ST + // ######################################################################## + /** + * @addtogroup internalBasic + * @{ + */ + + /** + * the Service Ticket provided in the URL of the request if present + * (empty otherwise). Written by CASClient::CASClient(), read by + * CASClient::getST() and CASClient::hasPGT(). + * + * @hideinitializer + * @private + */ + var $_st = ''; + + /** + * This method returns the Service Ticket provided in the URL of the request. + * @return The service ticket. + * @private + */ + function getST() + { return $this->_st; } + + /** + * This method stores the Service Ticket. + * @param $st The Service Ticket. + * @private + */ + function setST($st) + { $this->_st = $st; } + + /** + * This method tells if a Service Ticket was stored. + * @return TRUE if a Service Ticket has been stored. + * @private + */ + function hasST() + { return !empty($this->_st); } + + /** @} */ + + // ######################################################################## + // ST VALIDATION + // ######################################################################## + /** + * @addtogroup internalBasic + * @{ + */ + + /** + * the certificate of the CAS server. + * + * @hideinitializer + * @private + */ + var $_cas_server_cert = ''; + + /** + * the certificate of the CAS server CA. + * + * @hideinitializer + * @private + */ + var $_cas_server_ca_cert = ''; + + /** + * Set to true not to validate the CAS server. + * + * @hideinitializer + * @private + */ + var $_no_cas_server_validation = false; + + /** + * Set the certificate of the CAS server. + * + * @param $cert the PEM certificate + */ + function setCasServerCert($cert) + { + $this->_cas_server_cert = $cert; + } + + /** + * Set the CA certificate of the CAS server. + * + * @param $cert the PEM certificate of the CA that emited the cert of the server + */ + function setCasServerCACert($cert) + { + $this->_cas_server_ca_cert = $cert; + } + + /** + * Set no SSL validation for the CAS server. + */ + function setNoCasServerValidation() + { + $this->_no_cas_server_validation = true; + } + + /** + * This method is used to validate a ST; halt on failure, and sets $validate_url, + * $text_reponse and $tree_response on success. These parameters are used later + * by CASClient::validatePGT() for CAS proxies. + * + * @param $validate_url the URL of the request to the CAS server. + * @param $text_response the response of the CAS server, as is (XML text). + * @param $tree_response the response of the CAS server, as a DOM XML tree. + * + * @return bool TRUE when successfull, halt otherwise by calling CASClient::authError(). + * + * @private + */ + function validateST($validate_url,&$text_response,&$tree_response) + { + phpCAS::traceBegin(); + // build the URL to validate the ticket + $validate_url = $this->getServerServiceValidateURL().'&ticket='.$this->getST(); + if ( $this->isProxy() ) { + // pass the callback url for CAS proxies + $validate_url .= '&pgtUrl='.$this->getCallbackURL(); + } + + // open and read the URL + if ( !$this->readURL($validate_url,''/*cookies*/,$headers,$text_response,$err_msg) ) { + phpCAS::trace('could not open URL \''.$validate_url.'\' to validate ('.$err_msg.')'); + $this->authError('ST not validated', + $validate_url, + TRUE/*$no_response*/); + } + + // analyze the result depending on the version + switch ($this->getServerVersion()) { + case CAS_VERSION_1_0: + if (preg_match('/^no\n/',$text_response)) { + phpCAS::trace('ST has not been validated'); + $this->authError('ST not validated', + $validate_url, + FALSE/*$no_response*/, + FALSE/*$bad_response*/, + $text_response); + } + if (!preg_match('/^yes\n/',$text_response)) { + phpCAS::trace('ill-formed response'); + $this->authError('ST not validated', + $validate_url, + FALSE/*$no_response*/, + TRUE/*$bad_response*/, + $text_response); + } + // ST has been validated, extract the user name + $arr = preg_split('/\n/',$text_response); + $this->setUser(trim($arr[1])); + break; + case CAS_VERSION_2_0: + // read the response of the CAS server into a DOM object + if ( !($dom = domxml_open_mem($text_response))) { + phpCAS::trace('domxml_open_mem() failed'); + $this->authError('ST not validated', + $validate_url, + FALSE/*$no_response*/, + TRUE/*$bad_response*/, + $text_response); + } + // read the root node of the XML tree + if ( !($tree_response = $dom->document_element()) ) { + phpCAS::trace('document_element() failed'); + $this->authError('ST not validated', + $validate_url, + FALSE/*$no_response*/, + TRUE/*$bad_response*/, + $text_response); + } + // insure that tag name is 'serviceResponse' + if ( $tree_response->node_name() != 'serviceResponse' ) { + phpCAS::trace('bad XML root node (should be `serviceResponse\' instead of `'.$tree_response->node_name().'\''); + $this->authError('ST not validated', + $validate_url, + FALSE/*$no_response*/, + TRUE/*$bad_response*/, + $text_response); + } + if ( sizeof($success_elements = $tree_response->get_elements_by_tagname("authenticationSuccess")) != 0) { + // authentication succeded, extract the user name + if ( sizeof($user_elements = $success_elements[0]->get_elements_by_tagname("user")) == 0) { + phpCAS::trace('<authenticationSuccess> found, but no <user>'); + $this->authError('ST not validated', + $validate_url, + FALSE/*$no_response*/, + TRUE/*$bad_response*/, + $text_response); + } + $user = trim($user_elements[0]->get_content()); + phpCAS::trace('user = `'.$user); + $this->setUser($user); + + } else if ( sizeof($failure_elements = $tree_response->get_elements_by_tagname("authenticationFailure")) != 0) { + phpCAS::trace('<authenticationFailure> found'); + // authentication failed, extract the error code and message + $this->authError('ST not validated', + $validate_url, + FALSE/*$no_response*/, + FALSE/*$bad_response*/, + $text_response, + $failure_elements[0]->get_attribute('code')/*$err_code*/, + trim($failure_elements[0]->get_content())/*$err_msg*/); + } else { + phpCAS::trace('neither <authenticationSuccess> nor <authenticationFailure> found'); + $this->authError('ST not validated', + $validate_url, + FALSE/*$no_response*/, + TRUE/*$bad_response*/, + $text_response); + } + break; + } + + // at this step, ST has been validated and $this->_user has been set, + phpCAS::traceEnd(TRUE); + return TRUE; + } + + /** @} */ + + // XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX + // XX XX + // XX PROXY FEATURES (CAS 2.0) XX + // XX XX + // XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX + + // ######################################################################## + // PROXYING + // ######################################################################## + /** + * @addtogroup internalProxy + * @{ + */ + + /** + * A boolean telling if the client is a CAS proxy or not. Written by CASClient::CASClient(), + * read by CASClient::isProxy(). + * + * @private + */ + var $_proxy; + + /** + * Tells if a CAS client is a CAS proxy or not + * + * @return TRUE when the CAS client is a CAs proxy, FALSE otherwise + * + * @private + */ + function isProxy() + { + return $this->_proxy; + } + + /** @} */ + // ######################################################################## + // PGT + // ######################################################################## + /** + * @addtogroup internalProxy + * @{ + */ + + /** + * the Proxy Grnting Ticket given by the CAS server (empty otherwise). + * Written by CASClient::setPGT(), read by CASClient::getPGT() and CASClient::hasPGT(). + * + * @hideinitializer + * @private + */ + var $_pgt = ''; + + /** + * This method returns the Proxy Granting Ticket given by the CAS server. + * @return The Proxy Granting Ticket. + * @private + */ + function getPGT() + { return $this->_pgt; } + + /** + * This method stores the Proxy Granting Ticket. + * @param $pgt The Proxy Granting Ticket. + * @private + */ + function setPGT($pgt) + { $this->_pgt = $pgt; } + + /** + * This method tells if a Proxy Granting Ticket was stored. + * @return TRUE if a Proxy Granting Ticket has been stored. + * @private + */ + function hasPGT() + { return !empty($this->_pgt); } + + /** @} */ + + // ######################################################################## + // CALLBACK MODE + // ######################################################################## + /** + * @addtogroup internalCallback + * @{ + */ + /** + * each PHP script using phpCAS in proxy mode is its own callback to get the + * PGT back from the CAS server. callback_mode is detected by the constructor + * thanks to the GET parameters. + */ + + /** + * a boolean to know if the CAS client is running in callback mode. Written by + * CASClient::setCallBackMode(), read by CASClient::isCallbackMode(). + * + * @hideinitializer + * @private + */ + var $_callback_mode = FALSE; + + /** + * This method sets/unsets callback mode. + * + * @param $callback_mode TRUE to set callback mode, FALSE otherwise. + * + * @private + */ + function setCallbackMode($callback_mode) + { + $this->_callback_mode = $callback_mode; + } + + /** + * This method returns TRUE when the CAs client is running i callback mode, + * FALSE otherwise. + * + * @return A boolean. + * + * @private + */ + function isCallbackMode() + { + return $this->_callback_mode; + } + + /** + * the URL that should be used for the PGT callback (in fact the URL of the + * current request without any CGI parameter). Written and read by + * CASClient::getCallbackURL(). + * + * @hideinitializer + * @private + */ + var $_callback_url = ''; + + /** + * This method returns the URL that should be used for the PGT callback (in + * fact the URL of the current request without any CGI parameter, except if + * phpCAS::setFixedCallbackURL() was used). + * + * @return The callback URL + * + * @private + */ + function getCallbackURL() + { + // the URL is built when needed only + if ( empty($this->_callback_url) ) { + $final_uri = ''; + // remove the ticket if present in the URL + $final_uri = 'https://'; + /* replaced by Julien Marchal - v0.4.6 + * $this->uri .= $_SERVER['SERVER_NAME']; + */ + if(empty($_SERVER['HTTP_X_FORWARDED_SERVER'])){ + /* replaced by teedog - v0.4.12 + * $final_uri .= $_SERVER['SERVER_NAME']; + */ + if (empty($_SERVER['SERVER_NAME'])) { + $final_uri .= $_SERVER['HTTP_HOST']; + } else { + $final_uri .= $_SERVER['SERVER_NAME']; + } + } else { + $final_uri .= $_SERVER['HTTP_X_FORWARDED_SERVER']; + } + if ( ($this->isHttps() && $_SERVER['SERVER_PORT']!=443) + || (!$this->isHttps() && $_SERVER['SERVER_PORT']!=80) ) { + $final_uri .= ':'; + $final_uri .= $_SERVER['SERVER_PORT']; + } + $request_uri = $_SERVER['REQUEST_URI']; + $request_uri = preg_replace('/\?.*$/','',$request_uri); + $final_uri .= $request_uri; + $this->setCallbackURL($final_uri); + } + return $this->_callback_url; + } + + /** + * This method sets the callback url. + * + * @param $callback_url url to set callback + * + * @private + */ + function setCallbackURL($url) + { + return $this->_callback_url = $url; + } + + /** + * This method is called by CASClient::CASClient() when running in callback + * mode. It stores the PGT and its PGT Iou, prints its output and halts. + * + * @private + */ + function callback() + { + phpCAS::traceBegin(); + $this->printHTMLHeader('phpCAS callback'); + $pgt_iou = $_GET['pgtIou']; + $pgt = $_GET['pgtId']; + phpCAS::trace('Storing PGT `'.$pgt.'\' (id=`'.$pgt_iou.'\')'); + echo '<p>Storing PGT `'.$pgt.'\' (id=`'.$pgt_iou.'\').</p>'; + $this->storePGT($pgt,$pgt_iou); + $this->printHTMLFooter(); + phpCAS::traceExit(); + } + + /** @} */ + + // ######################################################################## + // PGT STORAGE + // ######################################################################## + /** + * @addtogroup internalPGTStorage + * @{ + */ + + /** + * an instance of a class inheriting of PGTStorage, used to deal with PGT + * storage. Created by CASClient::setPGTStorageFile() or CASClient::setPGTStorageDB(), used + * by CASClient::setPGTStorageFile(), CASClient::setPGTStorageDB() and CASClient::initPGTStorage(). + * + * @hideinitializer + * @private + */ + var $_pgt_storage = null; + + /** + * This method is used to initialize the storage of PGT's. + * Halts on error. + * + * @private + */ + function initPGTStorage() + { + // if no SetPGTStorageXxx() has been used, default to file + if ( !is_object($this->_pgt_storage) ) { + $this->setPGTStorageFile(); + } + + // initializes the storage + $this->_pgt_storage->init(); + } + + /** + * This method stores a PGT. Halts on error. + * + * @param $pgt the PGT to store + * @param $pgt_iou its corresponding Iou + * + * @private + */ + function storePGT($pgt,$pgt_iou) + { + // ensure that storage is initialized + $this->initPGTStorage(); + // writes the PGT + $this->_pgt_storage->write($pgt,$pgt_iou); + } + + /** + * This method reads a PGT from its Iou and deletes the corresponding storage entry. + * + * @param $pgt_iou the PGT Iou + * + * @return The PGT corresponding to the Iou, FALSE when not found. + * + * @private + */ + function loadPGT($pgt_iou) + { + // ensure that storage is initialized + $this->initPGTStorage(); + // read the PGT + return $this->_pgt_storage->read($pgt_iou); + } + + /** + * This method is used to tell phpCAS to store the response of the + * CAS server to PGT requests onto the filesystem. + * + * @param $format the format used to store the PGT's (`plain' and `xml' allowed) + * @param $path the path where the PGT's should be stored + * + * @public + */ + function setPGTStorageFile($format='', + $path='') + { + // check that the storage has not already been set + if ( is_object($this->_pgt_storage) ) { + phpCAS::error('PGT storage already defined'); + } + + // create the storage object + $this->_pgt_storage = &new PGTStorageFile($this,$format,$path); + } + + /** + * This method is used to tell phpCAS to store the response of the + * CAS server to PGT requests into a database. + * @note The connection to the database is done only when needed. + * As a consequence, bad parameters are detected only when + * initializing PGT storage. + * + * @param $user the user to access the data with + * @param $password the user's password + * @param $database_type the type of the database hosting the data + * @param $hostname the server hosting the database + * @param $port the port the server is listening on + * @param $database the name of the database + * @param $table the name of the table storing the data + * + * @public + */ + function setPGTStorageDB($user, + $password, + $database_type, + $hostname, + $port, + $database, + $table) + { + // check that the storage has not already been set + if ( is_object($this->_pgt_storage) ) { + phpCAS::error('PGT storage already defined'); + } + + // warn the user that he should use file storage... + trigger_error('PGT storage into database is an experimental feature, use at your own risk',E_USER_WARNING); + + // create the storage object + $this->_pgt_storage = & new PGTStorageDB($this,$user,$password,$database_type,$hostname,$port,$database,$table); + } + + // ######################################################################## + // PGT VALIDATION + // ######################################################################## + /** + * This method is used to validate a PGT; halt on failure. + * + * @param $validate_url the URL of the request to the CAS server. + * @param $text_response the response of the CAS server, as is (XML text); result + * of CASClient::validateST() or CASClient::validatePT(). + * @param $tree_response the response of the CAS server, as a DOM XML tree; result + * of CASClient::validateST() or CASClient::validatePT(). + * + * @return bool TRUE when successfull, halt otherwise by calling CASClient::authError(). + * + * @private + */ + function validatePGT(&$validate_url,$text_response,$tree_response) + { + phpCAS::traceBegin(); + if ( sizeof($arr = $tree_response->get_elements_by_tagname("proxyGrantingTicket")) == 0) { + phpCAS::trace('<proxyGrantingTicket> not found'); + // authentication succeded, but no PGT Iou was transmitted + $this->authError('Ticket validated but no PGT Iou transmitted', + $validate_url, + FALSE/*$no_response*/, + FALSE/*$bad_response*/, + $text_response); + } else { + // PGT Iou transmitted, extract it + $pgt_iou = trim($arr[0]->get_content()); + $pgt = $this->loadPGT($pgt_iou); + if ( $pgt == FALSE ) { + phpCAS::trace('could not load PGT'); + $this->authError('PGT Iou was transmitted but PGT could not be retrieved', + $validate_url, + FALSE/*$no_response*/, + FALSE/*$bad_response*/, + $text_response); + } + $this->setPGT($pgt); + } + phpCAS::traceEnd(TRUE); + return TRUE; + } + + // ######################################################################## + // PGT VALIDATION + // ######################################################################## + + /** + * This method is used to retrieve PT's from the CAS server thanks to a PGT. + * + * @param $target_service the service to ask for with the PT. + * @param $err_code an error code (PHPCAS_SERVICE_OK on success). + * @param $err_msg an error message (empty on success). + * + * @return a Proxy Ticket, or FALSE on error. + * + * @private + */ + function retrievePT($target_service,&$err_code,&$err_msg) + { + phpCAS::traceBegin(); + + // by default, $err_msg is set empty and $pt to TRUE. On error, $pt is + // set to false and $err_msg to an error message. At the end, if $pt is FALSE + // and $error_msg is still empty, it is set to 'invalid response' (the most + // commonly encountered error). + $err_msg = ''; + + // build the URL to retrieve the PT + // $cas_url = $this->getServerProxyURL().'?targetService='.preg_replace('/&/','%26',$target_service).'&pgt='.$this->getPGT(); + $cas_url = $this->getServerProxyURL().'?targetService='.urlencode($target_service).'&pgt='.$this->getPGT(); + + // open and read the URL + if ( !$this->readURL($cas_url,''/*cookies*/,$headers,$cas_response,$err_msg) ) { + phpCAS::trace('could not open URL \''.$cas_url.'\' to validate ('.$err_msg.')'); + $err_code = PHPCAS_SERVICE_PT_NO_SERVER_RESPONSE; + $err_msg = 'could not retrieve PT (no response from the CAS server)'; + phpCAS::traceEnd(FALSE); + return FALSE; + } + + $bad_response = FALSE; + + if ( !$bad_response ) { + // read the response of the CAS server into a DOM object + if ( !($dom = @domxml_open_mem($cas_response))) { + phpCAS::trace('domxml_open_mem() failed'); + // read failed + $bad_response = TRUE; + } + } + + if ( !$bad_response ) { + // read the root node of the XML tree + if ( !($root = $dom->document_element()) ) { + phpCAS::trace('document_element() failed'); + // read failed + $bad_response = TRUE; + } + } + + if ( !$bad_response ) { + // insure that tag name is 'serviceResponse' + if ( $root->node_name() != 'serviceResponse' ) { + phpCAS::trace('node_name() failed'); + // bad root node + $bad_response = TRUE; + } + } + + if ( !$bad_response ) { + // look for a proxySuccess tag + if ( sizeof($arr = $root->get_elements_by_tagname("proxySuccess")) != 0) { + // authentication succeded, look for a proxyTicket tag + if ( sizeof($arr = $root->get_elements_by_tagname("proxyTicket")) != 0) { + $err_code = PHPCAS_SERVICE_OK; + $err_msg = ''; + phpCAS::trace('original PT: '.trim($arr[0]->get_content())); + $pt = trim($arr[0]->get_content()); + phpCAS::traceEnd($pt); + return $pt; + } else { + phpCAS::trace('<proxySuccess> was found, but not <proxyTicket>'); + } + } + // look for a proxyFailure tag + else if ( sizeof($arr = $root->get_elements_by_tagname("proxyFailure")) != 0) { + // authentication failed, extract the error + $err_code = PHPCAS_SERVICE_PT_FAILURE; + $err_msg = 'PT retrieving failed (code=`' + .$arr[0]->get_attribute('code') + .'\', message=`' + .trim($arr[0]->get_content()) + .'\')'; + phpCAS::traceEnd(FALSE); + return FALSE; + } else { + phpCAS::trace('neither <proxySuccess> nor <proxyFailure> found'); + } + } + + // at this step, we are sure that the response of the CAS server was ill-formed + $err_code = PHPCAS_SERVICE_PT_BAD_SERVER_RESPONSE; + $err_msg = 'Invalid response from the CAS server (response=`'.$cas_response.'\')'; + + phpCAS::traceEnd(FALSE); + return FALSE; + } + + // ######################################################################## + // ACCESS TO EXTERNAL SERVICES + // ######################################################################## + + /** + * This method is used to acces a remote URL. + * + * @param $url the URL to access. + * @param $cookies an array containing cookies strings such as 'name=val' + * @param $headers an array containing the HTTP header lines of the response + * (an empty array on failure). + * @param $body the body of the response, as a string (empty on failure). + * @param $err_msg an error message, filled on failure. + * + * @return TRUE on success, FALSE otherwise (in this later case, $err_msg + * contains an error message). + * + * @private + */ + function readURL($url,$cookies,&$headers,&$body,&$err_msg) + { + phpCAS::traceBegin(); + $headers = ''; + $body = ''; + $err_msg = ''; + + $res = TRUE; + + // initialize the CURL session + $ch = curl_init($url); + + if (version_compare(PHP_VERSION,'5.1.3','>=')) { + //only avaible in php5 + curl_setopt_array($ch, $this->_curl_options); + } else { + foreach ($this->_curl_options as $key => $value) { + curl_setopt($ch, $key, $value); + } + } + + if ($this->_cas_server_cert == '' && $this->_cas_server_ca_cert == '' && !$this->_no_cas_server_validation) { + phpCAS::error('one of the methods phpCAS::setCasServerCert(), phpCAS::setCasServerCACert() or phpCAS::setNoCasServerValidation() must be called.'); + } + if ($this->_cas_server_cert != '' ) { + curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, 1); + curl_setopt($ch, CURLOPT_SSLCERT, $this->_cas_server_cert); + } else if ($this->_cas_server_ca_cert != '') { + curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, 1); + curl_setopt($ch, CURLOPT_CAINFO, $this->_cas_server_ca_cert); + } else { + curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, 1); + curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, 0); + } + + // return the CURL output into a variable + curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1); + // get the HTTP header with a callback + $this->_curl_headers = array(); // empty the headers array + curl_setopt($ch, CURLOPT_HEADERFUNCTION, array($this, '_curl_read_headers')); + // add cookies headers + if ( is_array($cookies) ) { + curl_setopt($ch,CURLOPT_COOKIE,implode(';',$cookies)); + } + // perform the query + $buf = curl_exec ($ch); + if ( $buf === FALSE ) { + phpCAS::trace('curl_exec() failed'); + $err_msg = 'CURL error #'.curl_errno($ch).': '.curl_error($ch); + // close the CURL session + curl_close ($ch); + $res = FALSE; + } else { + // close the CURL session + curl_close ($ch); + + $headers = $this->_curl_headers; + $body = $buf; + } + + phpCAS::traceEnd($res); + return $res; + } + + /** + * This method is the callback used by readURL method to request HTTP headers. + */ + var $_curl_headers = array(); + function _curl_read_headers($ch, $header) + { + $this->_curl_headers[] = $header; + return strlen($header); + } + + /** + * This method is used to access an HTTP[S] service. + * + * @param $url the service to access. + * @param $err_code an error code Possible values are PHPCAS_SERVICE_OK (on + * success), PHPCAS_SERVICE_PT_NO_SERVER_RESPONSE, PHPCAS_SERVICE_PT_BAD_SERVER_RESPONSE, + * PHPCAS_SERVICE_PT_FAILURE, PHPCAS_SERVICE_NOT AVAILABLE. + * @param $output the output of the service (also used to give an error + * message on failure). + * + * @return TRUE on success, FALSE otherwise (in this later case, $err_code + * gives the reason why it failed and $output contains an error message). + * + * @public + */ + function serviceWeb($url,&$err_code,&$output) + { + phpCAS::traceBegin(); + // at first retrieve a PT + $pt = $this->retrievePT($url,$err_code,$output); + + $res = TRUE; + + // test if PT was retrieved correctly + if ( !$pt ) { + // note: $err_code and $err_msg are filled by CASClient::retrievePT() + phpCAS::trace('PT was not retrieved correctly'); + $res = FALSE; + } else { + // add cookies if necessary + if ( is_array($_SESSION['phpCAS']['services'][$url]['cookies']) ) { + foreach ( $_SESSION['phpCAS']['services'][$url]['cookies'] as $name => $val ) { + $cookies[] = $name.'='.$val; + } + } + + // build the URL including the PT + if ( strstr($url,'?') === FALSE ) { + $service_url = $url.'?ticket='.$pt; + } else { + $service_url = $url.'&ticket='.$pt; + } + + phpCAS::trace('reading URL`'.$service_url.'\''); + if ( !$this->readURL($service_url,$cookies,$headers,$output,$err_msg) ) { + phpCAS::trace('could not read URL`'.$service_url.'\''); + $err_code = PHPCAS_SERVICE_NOT_AVAILABLE; + // give an error message + $output = sprintf($this->getString(CAS_STR_SERVICE_UNAVAILABLE), + $service_url, + $err_msg); + $res = FALSE; + } else { + // URL has been fetched, extract the cookies + phpCAS::trace('URL`'.$service_url.'\' has been read, storing cookies:'); + foreach ( $headers as $header ) { + // test if the header is a cookie + if ( preg_match('/^Set-Cookie:/',$header) ) { + // the header is a cookie, remove the beginning + $header_val = preg_replace('/^Set-Cookie: */','',$header); + // extract interesting information + $name_val = strtok($header_val,'; '); + // extract the name and the value of the cookie + $cookie_name = strtok($name_val,'='); + $cookie_val = strtok('='); + // store the cookie + $_SESSION['phpCAS']['services'][$url]['cookies'][$cookie_name] = $cookie_val; + phpCAS::trace($cookie_name.' -> '.$cookie_val); + } + } + } + } + + phpCAS::traceEnd($res); + return $res; + } + + /** + * This method is used to access an IMAP/POP3/NNTP service. + * + * @param $url a string giving the URL of the service, including the mailing box + * for IMAP URLs, as accepted by imap_open(). + * @param $flags options given to imap_open(). + * @param $err_code an error code Possible values are PHPCAS_SERVICE_OK (on + * success), PHPCAS_SERVICE_PT_NO_SERVER_RESPONSE, PHPCAS_SERVICE_PT_BAD_SERVER_RESPONSE, + * PHPCAS_SERVICE_PT_FAILURE, PHPCAS_SERVICE_NOT AVAILABLE. + * @param $err_msg an error message on failure + * @param $pt the Proxy Ticket (PT) retrieved from the CAS server to access the URL + * on success, FALSE on error). + * + * @return an IMAP stream on success, FALSE otherwise (in this later case, $err_code + * gives the reason why it failed and $err_msg contains an error message). + * + * @public + */ + function serviceMail($url,$flags,&$err_code,&$err_msg,&$pt) + { + phpCAS::traceBegin(); + // at first retrieve a PT + $pt = $this->retrievePT($target_service,$err_code,$output); + + $stream = FALSE; + + // test if PT was retrieved correctly + if ( !$pt ) { + // note: $err_code and $err_msg are filled by CASClient::retrievePT() + phpCAS::trace('PT was not retrieved correctly'); + } else { + phpCAS::trace('opening IMAP URL `'.$url.'\'...'); + $stream = @imap_open($url,$this->getUser(),$pt,$flags); + if ( !$stream ) { + phpCAS::trace('could not open URL'); + $err_code = PHPCAS_SERVICE_NOT_AVAILABLE; + // give an error message + $err_msg = sprintf($this->getString(CAS_STR_SERVICE_UNAVAILABLE), + $service_url, + var_export(imap_errors(),TRUE)); + $pt = FALSE; + $stream = FALSE; + } else { + phpCAS::trace('ok'); + } + } + + phpCAS::traceEnd($stream); + return $stream; + } + + /** @} */ + + // XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX + // XX XX + // XX PROXIED CLIENT FEATURES (CAS 2.0) XX + // XX XX + // XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX + + // ######################################################################## + // PT + // ######################################################################## + /** + * @addtogroup internalProxied + * @{ + */ + + /** + * the Proxy Ticket provided in the URL of the request if present + * (empty otherwise). Written by CASClient::CASClient(), read by + * CASClient::getPT() and CASClient::hasPGT(). + * + * @hideinitializer + * @private + */ + var $_pt = ''; + + /** + * This method returns the Proxy Ticket provided in the URL of the request. + * @return The proxy ticket. + * @private + */ + function getPT() + { + // return 'ST'.substr($this->_pt, 2); + return $this->_pt; + } + + /** + * This method stores the Proxy Ticket. + * @param $pt The Proxy Ticket. + * @private + */ + function setPT($pt) + { $this->_pt = $pt; } + + /** + * This method tells if a Proxy Ticket was stored. + * @return TRUE if a Proxy Ticket has been stored. + * @private + */ + function hasPT() + { return !empty($this->_pt); } + + /** @} */ + // ######################################################################## + // PT VALIDATION + // ######################################################################## + /** + * @addtogroup internalProxied + * @{ + */ + + /** + * This method is used to validate a PT; halt on failure + * + * @return bool TRUE when successfull, halt otherwise by calling CASClient::authError(). + * + * @private + */ + function validatePT(&$validate_url,&$text_response,&$tree_response) + { + phpCAS::traceBegin(); + // build the URL to validate the ticket + $validate_url = $this->getServerProxyValidateURL().'&ticket='.$this->getPT(); + + if ( $this->isProxy() ) { + // pass the callback url for CAS proxies + $validate_url .= '&pgtUrl='.$this->getCallbackURL(); + } + + // open and read the URL + if ( !$this->readURL($validate_url,''/*cookies*/,$headers,$text_response,$err_msg) ) { + phpCAS::trace('could not open URL \''.$validate_url.'\' to validate ('.$err_msg.')'); + $this->authError('PT not validated', + $validate_url, + TRUE/*$no_response*/); + } + + // read the response of the CAS server into a DOM object + if ( !($dom = domxml_open_mem($text_response))) { + // read failed + $this->authError('PT not validated', + $validate_url, + FALSE/*$no_response*/, + TRUE/*$bad_response*/, + $text_response); + } + // read the root node of the XML tree + if ( !($tree_response = $dom->document_element()) ) { + // read failed + $this->authError('PT not validated', + $validate_url, + FALSE/*$no_response*/, + TRUE/*$bad_response*/, + $text_response); + } + // insure that tag name is 'serviceResponse' + if ( $tree_response->node_name() != 'serviceResponse' ) { + // bad root node + $this->authError('PT not validated', + $validate_url, + FALSE/*$no_response*/, + TRUE/*$bad_response*/, + $text_response); + } + if ( sizeof($arr = $tree_response->get_elements_by_tagname("authenticationSuccess")) != 0) { + // authentication succeded, extract the user name + if ( sizeof($arr = $tree_response->get_elements_by_tagname("user")) == 0) { + // no user specified => error + $this->authError('PT not validated', + $validate_url, + FALSE/*$no_response*/, + TRUE/*$bad_response*/, + $text_response); + } + $this->setUser(trim($arr[0]->get_content())); + + } else if ( sizeof($arr = $tree_response->get_elements_by_tagname("authenticationFailure")) != 0) { + // authentication succeded, extract the error code and message + $this->authError('PT not validated', + $validate_url, + FALSE/*$no_response*/, + FALSE/*$bad_response*/, + $text_response, + $arr[0]->get_attribute('code')/*$err_code*/, + trim($arr[0]->get_content())/*$err_msg*/); + } else { + $this->authError('PT not validated', + $validate_url, + FALSE/*$no_response*/, + TRUE/*$bad_response*/, + $text_response); + } + + // at this step, PT has been validated and $this->_user has been set, + + phpCAS::traceEnd(TRUE); + return TRUE; + } + + /** @} */ + + // XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX + // XX XX + // XX MISC XX + // XX XX + // XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX + + /** + * @addtogroup internalMisc + * @{ + */ + + // ######################################################################## + // URL + // ######################################################################## + /** + * the URL of the current request (without any ticket CGI parameter). Written + * and read by CASClient::getURL(). + * + * @hideinitializer + * @private + */ + var $_url = ''; + + /** + * This method returns the URL of the current request (without any ticket + * CGI parameter). + * + * @return The URL + * + * @private + */ + function getURL() + { + phpCAS::traceBegin(); + // the URL is built when needed only + if ( empty($this->_url) ) { + $final_uri = ''; + // remove the ticket if present in the URL + $final_uri = ($this->isHttps()) ? 'https' : 'http'; + $final_uri .= '://'; + /* replaced by Julien Marchal - v0.4.6 + * $this->_url .= $_SERVER['SERVER_NAME']; + */ + if(empty($_SERVER['HTTP_X_FORWARDED_SERVER'])){ + /* replaced by teedog - v0.4.12 + * $this->_url .= $_SERVER['SERVER_NAME']; + */ + if (empty($_SERVER['SERVER_NAME'])) { + $server_name = $_SERVER['HTTP_HOST']; + } else { + $server_name = $_SERVER['SERVER_NAME']; + } + } else { + $server_name = $_SERVER['HTTP_X_FORWARDED_SERVER']; + } + $final_uri .= $server_name; + if (!strpos($server_name, ':')) { + if ( ($this->isHttps() && $_SERVER['SERVER_PORT']!=443) + || (!$this->isHttps() && $_SERVER['SERVER_PORT']!=80) ) { + $final_uri .= ':'; + $final_uri .= $_SERVER['SERVER_PORT']; + } + } + + $final_uri .= strtok($_SERVER['REQUEST_URI'],"?"); + $cgi_params = '?'.strtok("?"); + // remove the ticket if present in the CGI parameters + $cgi_params = preg_replace('/&ticket=[^&]*/','',$cgi_params); + $cgi_params = preg_replace('/\?ticket=[^&;]*/','?',$cgi_params); + $cgi_params = preg_replace('/\?%26/','?',$cgi_params); + $cgi_params = preg_replace('/\?&/','?',$cgi_params); + $cgi_params = preg_replace('/\?$/','',$cgi_params); + $final_uri .= $cgi_params; + $this->setURL($final_uri); + } + phpCAS::traceEnd($this->_url); + return $this->_url; + } + + /** + * This method sets the URL of the current request + * + * @param $url url to set for service + * + * @private + */ + function setURL($url) + { + $this->_url = $url; + } + + // ######################################################################## + // AUTHENTICATION ERROR HANDLING + // ######################################################################## + /** + * This method is used to print the HTML output when the user was not authenticated. + * + * @param $failure the failure that occured + * @param $cas_url the URL the CAS server was asked for + * @param $no_response the response from the CAS server (other + * parameters are ignored if TRUE) + * @param $bad_response bad response from the CAS server ($err_code + * and $err_msg ignored if TRUE) + * @param $cas_response the response of the CAS server + * @param $err_code the error code given by the CAS server + * @param $err_msg the error message given by the CAS server + * + * @private + */ + function authError($failure,$cas_url,$no_response,$bad_response='',$cas_response='',$err_code='',$err_msg='') + { + phpCAS::traceBegin(); + + $this->printHTMLHeader($this->getString(CAS_STR_AUTHENTICATION_FAILED)); + printf($this->getString(CAS_STR_YOU_WERE_NOT_AUTHENTICATED),$this->getURL(),$_SERVER['SERVER_ADMIN']); + phpCAS::trace('CAS URL: '.$cas_url); + phpCAS::trace('Authentication failure: '.$failure); + if ( $no_response ) { + phpCAS::trace('Reason: no response from the CAS server'); + } else { + if ( $bad_response ) { + phpCAS::trace('Reason: bad response from the CAS server'); + } else { + switch ($this->getServerVersion()) { + case CAS_VERSION_1_0: + phpCAS::trace('Reason: CAS error'); + break; + case CAS_VERSION_2_0: + if ( empty($err_code) ) + phpCAS::trace('Reason: no CAS error'); + else + phpCAS::trace('Reason: ['.$err_code.'] CAS error: '.$err_msg); + break; + } + } + phpCAS::trace('CAS response: '.$cas_response); + } + $this->printHTMLFooter(); + phpCAS::traceExit(); + exit(); + } + + /** @} */ +} + ?>
\ No newline at end of file diff --git a/plugins/CasAuthentication/extlib/CAS/domxml-php4-php5.php b/plugins/CasAuthentication/extlib/CAS/domxml-php4-php5.php index d64747514..a0dfb99c7 100644 --- a/plugins/CasAuthentication/extlib/CAS/domxml-php4-php5.php +++ b/plugins/CasAuthentication/extlib/CAS/domxml-php4-php5.php @@ -1,277 +1,277 @@ -<?php
-/**
- * @file domxml-php4-php5.php
- * Require PHP5, uses built-in DOM extension.
- * To be used in PHP4 scripts using DOMXML extension.
- * Allows PHP4/DOMXML scripts to run on PHP5/DOM.
- * (Requires PHP5/XSL extension for domxml_xslt functions)
- *
- * Typical use:
- * <pre>
- * {
- * if (version_compare(PHP_VERSION,'5','>='))
- * require_once('domxml-php4-to-php5.php');
- * }
- * </pre>
- *
- * Version 1.5.5, 2005-01-18, http://alexandre.alapetite.net/doc-alex/domxml-php4-php5/
- *
- * ------------------------------------------------------------------<br>
- * Written by Alexandre Alapetite, http://alexandre.alapetite.net/cv/
- *
- * Copyright 2004, Licence: Creative Commons "Attribution-ShareAlike 2.0 France" BY-SA (FR),
- * http://creativecommons.org/licenses/by-sa/2.0/fr/
- * http://alexandre.alapetite.net/divers/apropos/#by-sa
- * - Attribution. You must give the original author credit
- * - Share Alike. If you alter, transform, or build upon this work,
- * you may distribute the resulting work only under a license identical to this one
- * - The French law is authoritative
- * - Any of these conditions can be waived if you get permission from Alexandre Alapetite
- * - Please send to Alexandre Alapetite the modifications you make,
- * in order to improve this file for the benefit of everybody
- *
- * If you want to distribute this code, please do it as a link to:
- * http://alexandre.alapetite.net/doc-alex/domxml-php4-php5/
- */
-
-function domxml_new_doc($version) {return new php4DOMDocument('');}
-function domxml_open_file($filename) {return new php4DOMDocument($filename);}
-function domxml_open_mem($str)
-{
- $dom=new php4DOMDocument('');
- $dom->myDOMNode->loadXML($str);
- return $dom;
-}
-function xpath_eval($xpath_context,$eval_str,$contextnode=null) {return $xpath_context->query($eval_str,$contextnode);}
-function xpath_new_context($dom_document) {return new php4DOMXPath($dom_document);}
-
-class php4DOMAttr extends php4DOMNode
-{
- function php4DOMAttr($aDOMAttr) {$this->myDOMNode=$aDOMAttr;}
- function Name() {return $this->myDOMNode->name;}
- function Specified() {return $this->myDOMNode->specified;}
- function Value() {return $this->myDOMNode->value;}
-}
-
-class php4DOMDocument extends php4DOMNode
-{
- function php4DOMDocument($filename='')
- {
- $this->myDOMNode=new DOMDocument();
- if ($filename!='') $this->myDOMNode->load($filename);
- }
- function create_attribute($name,$value)
- {
- $myAttr=$this->myDOMNode->createAttribute($name);
- $myAttr->value=$value;
- return new php4DOMAttr($myAttr,$this);
- }
- function create_cdata_section($content) {return new php4DOMNode($this->myDOMNode->createCDATASection($content),$this);}
- function create_comment($data) {return new php4DOMNode($this->myDOMNode->createComment($data),$this);}
- function create_element($name) {return new php4DOMElement($this->myDOMNode->createElement($name),$this);}
- function create_text_node($content) {return new php4DOMNode($this->myDOMNode->createTextNode($content),$this);}
- function document_element() {return new php4DOMElement($this->myDOMNode->documentElement,$this);}
- function dump_file($filename,$compressionmode=false,$format=false) {return $this->myDOMNode->save($filename);}
- function dump_mem($format=false,$encoding=false) {return $this->myDOMNode->saveXML();}
- function get_element_by_id($id) {return new php4DOMElement($this->myDOMNode->getElementById($id),$this);}
- function get_elements_by_tagname($name)
- {
- $myDOMNodeList=$this->myDOMNode->getElementsByTagName($name);
- $nodeSet=array();
- $i=0;
- if (isset($myDOMNodeList))
- while ($node=$myDOMNodeList->item($i))
- {
- $nodeSet[]=new php4DOMElement($node,$this);
- $i++;
- }
- return $nodeSet;
- }
- function html_dump_mem() {return $this->myDOMNode->saveHTML();}
- function root() {return new php4DOMElement($this->myDOMNode->documentElement,$this);}
-}
-
-class php4DOMElement extends php4DOMNode
-{
- function get_attribute($name) {return $this->myDOMNode->getAttribute($name);}
- function get_elements_by_tagname($name)
- {
- $myDOMNodeList=$this->myDOMNode->getElementsByTagName($name);
- $nodeSet=array();
- $i=0;
- if (isset($myDOMNodeList))
- while ($node=$myDOMNodeList->item($i))
- {
- $nodeSet[]=new php4DOMElement($node,$this->myOwnerDocument);
- $i++;
- }
- return $nodeSet;
- }
- function has_attribute($name) {return $this->myDOMNode->hasAttribute($name);}
- function remove_attribute($name) {return $this->myDOMNode->removeAttribute($name);}
- function set_attribute($name,$value) {return $this->myDOMNode->setAttribute($name,$value);}
- function tagname() {return $this->myDOMNode->tagName;}
-}
-
-class php4DOMNode
-{
- var $myDOMNode;
- var $myOwnerDocument;
- function php4DOMNode($aDomNode,$aOwnerDocument)
- {
- $this->myDOMNode=$aDomNode;
- $this->myOwnerDocument=$aOwnerDocument;
- }
- function __get($name)
- {
- if ($name=='type') return $this->myDOMNode->nodeType;
- elseif ($name=='tagname') return $this->myDOMNode->tagName;
- elseif ($name=='content') return $this->myDOMNode->textContent;
- else
- {
- $myErrors=debug_backtrace();
- trigger_error('Undefined property: '.get_class($this).'::$'.$name.' ['.$myErrors[0]['file'].':'.$myErrors[0]['line'].']',E_USER_NOTICE);
- return false;
- }
- }
- function append_child($newnode) {return new php4DOMElement($this->myDOMNode->appendChild($newnode->myDOMNode),$this->myOwnerDocument);}
- function append_sibling($newnode) {return new php4DOMElement($this->myDOMNode->parentNode->appendChild($newnode->myDOMNode),$this->myOwnerDocument);}
- function attributes()
- {
- $myDOMNodeList=$this->myDOMNode->attributes;
- $nodeSet=array();
- $i=0;
- if (isset($myDOMNodeList))
- while ($node=$myDOMNodeList->item($i))
- {
- $nodeSet[]=new php4DOMAttr($node,$this->myOwnerDocument);
- $i++;
- }
- return $nodeSet;
- }
- function child_nodes()
- {
- $myDOMNodeList=$this->myDOMNode->childNodes;
- $nodeSet=array();
- $i=0;
- if (isset($myDOMNodeList))
- while ($node=$myDOMNodeList->item($i))
- {
- $nodeSet[]=new php4DOMElement($node,$this->myOwnerDocument);
- $i++;
- }
- return $nodeSet;
- }
- function children() {return $this->child_nodes();}
- function clone_node($deep=false) {return new php4DOMElement($this->myDOMNode->cloneNode($deep),$this->myOwnerDocument);}
- function first_child() {return new php4DOMElement($this->myDOMNode->firstChild,$this->myOwnerDocument);}
- function get_content() {return $this->myDOMNode->textContent;}
- function has_attributes() {return $this->myDOMNode->hasAttributes();}
- function has_child_nodes() {return $this->myDOMNode->hasChildNodes();}
- function insert_before($newnode,$refnode) {return new php4DOMElement($this->myDOMNode->insertBefore($newnode->myDOMNode,$refnode->myDOMNode),$this->myOwnerDocument);}
- function is_blank_node()
- {
- $myDOMNodeList=$this->myDOMNode->childNodes;
- $i=0;
- if (isset($myDOMNodeList))
- while ($node=$myDOMNodeList->item($i))
- {
- if (($node->nodeType==XML_ELEMENT_NODE)||
- (($node->nodeType==XML_TEXT_NODE)&&!ereg('^([[:cntrl:]]|[[:space:]])*$',$node->nodeValue)))
- return false;
- $i++;
- }
- return true;
- }
- function last_child() {return new php4DOMElement($this->myDOMNode->lastChild,$this->myOwnerDocument);}
- function new_child($name,$content)
- {
- $mySubNode=$this->myDOMNode->ownerDocument->createElement($name);
- $mySubNode->appendChild($this->myDOMNode->ownerDocument->createTextNode($content));
- $this->myDOMNode->appendChild($mySubNode);
- return new php4DOMElement($mySubNode,$this->myOwnerDocument);
- }
- function next_sibling() {return new php4DOMElement($this->myDOMNode->nextSibling,$this->myOwnerDocument);}
- function node_name() {return $this->myDOMNode->localName;}
- function node_type() {return $this->myDOMNode->nodeType;}
- function node_value() {return $this->myDOMNode->nodeValue;}
- function owner_document() {return $this->myOwnerDocument;}
- function parent_node() {return new php4DOMElement($this->myDOMNode->parentNode,$this->myOwnerDocument);}
- function prefix() {return $this->myDOMNode->prefix;}
- function previous_sibling() {return new php4DOMElement($this->myDOMNode->previousSibling,$this->myOwnerDocument);}
- function remove_child($oldchild) {return new php4DOMElement($this->myDOMNode->removeChild($oldchild->myDOMNode),$this->myOwnerDocument);}
- function replace_child($oldnode,$newnode) {return new php4DOMElement($this->myDOMNode->replaceChild($oldnode->myDOMNode,$newnode->myDOMNode),$this->myOwnerDocument);}
- function set_content($text)
- {
- if (($this->myDOMNode->hasChildNodes())&&($this->myDOMNode->firstChild->nodeType==XML_TEXT_NODE))
- $this->myDOMNode->removeChild($this->myDOMNode->firstChild);
- return $this->myDOMNode->appendChild($this->myDOMNode->ownerDocument->createTextNode($text));
- }
-}
-
-class php4DOMNodelist
-{
- var $myDOMNodelist;
- var $nodeset;
- function php4DOMNodelist($aDOMNodelist,$aOwnerDocument)
- {
- $this->myDOMNodelist=$aDOMNodelist;
- $this->nodeset=array();
- $i=0;
- if (isset($this->myDOMNodelist))
- while ($node=$this->myDOMNodelist->item($i))
- {
- $this->nodeset[]=new php4DOMElement($node,$aOwnerDocument);
- $i++;
- }
- }
-}
-
-class php4DOMXPath
-{
- var $myDOMXPath;
- var $myOwnerDocument;
- function php4DOMXPath($dom_document)
- {
- $this->myOwnerDocument=$dom_document;
- $this->myDOMXPath=new DOMXPath($dom_document->myDOMNode);
- }
- function query($eval_str,$contextnode)
- {
- if (isset($contextnode)) return new php4DOMNodelist($this->myDOMXPath->query($eval_str,$contextnode->myDOMNode),$this->myOwnerDocument);
- else return new php4DOMNodelist($this->myDOMXPath->query($eval_str),$this->myOwnerDocument);
- }
- function xpath_register_ns($prefix,$namespaceURI) {return $this->myDOMXPath->registerNamespace($prefix,$namespaceURI);}
-}
-
-if (extension_loaded('xsl'))
-{//See also: http://alexandre.alapetite.net/doc-alex/xslt-php4-php5/
- function domxml_xslt_stylesheet($xslstring) {return new php4DomXsltStylesheet(DOMDocument::loadXML($xslstring));}
- function domxml_xslt_stylesheet_doc($dom_document) {return new php4DomXsltStylesheet($dom_document);}
- function domxml_xslt_stylesheet_file($xslfile) {return new php4DomXsltStylesheet(DOMDocument::load($xslfile));}
- class php4DomXsltStylesheet
- {
- var $myxsltProcessor;
- function php4DomXsltStylesheet($dom_document)
- {
- $this->myxsltProcessor=new xsltProcessor();
- $this->myxsltProcessor->importStyleSheet($dom_document);
- }
- function process($dom_document,$xslt_parameters=array(),$param_is_xpath=false)
- {
- foreach ($xslt_parameters as $param=>$value)
- $this->myxsltProcessor->setParameter('',$param,$value);
- $myphp4DOMDocument=new php4DOMDocument();
- $myphp4DOMDocument->myDOMNode=$this->myxsltProcessor->transformToDoc($dom_document->myDOMNode);
- return $myphp4DOMDocument;
- }
- function result_dump_file($dom_document,$filename)
- {
- $html=$dom_document->myDOMNode->saveHTML();
- file_put_contents($filename,$html);
- return $html;
- }
- function result_dump_mem($dom_document) {return $dom_document->myDOMNode->saveHTML();}
- }
-}
+<?php +/** + * @file domxml-php4-php5.php + * Require PHP5, uses built-in DOM extension. + * To be used in PHP4 scripts using DOMXML extension. + * Allows PHP4/DOMXML scripts to run on PHP5/DOM. + * (Requires PHP5/XSL extension for domxml_xslt functions) + * + * Typical use: + * <pre> + * { + * if (version_compare(PHP_VERSION,'5','>=')) + * require_once('domxml-php4-to-php5.php'); + * } + * </pre> + * + * Version 1.5.5, 2005-01-18, http://alexandre.alapetite.net/doc-alex/domxml-php4-php5/ + * + * ------------------------------------------------------------------<br> + * Written by Alexandre Alapetite, http://alexandre.alapetite.net/cv/ + * + * Copyright 2004, Licence: Creative Commons "Attribution-ShareAlike 2.0 France" BY-SA (FR), + * http://creativecommons.org/licenses/by-sa/2.0/fr/ + * http://alexandre.alapetite.net/divers/apropos/#by-sa + * - Attribution. You must give the original author credit + * - Share Alike. If you alter, transform, or build upon this work, + * you may distribute the resulting work only under a license identical to this one + * - The French law is authoritative + * - Any of these conditions can be waived if you get permission from Alexandre Alapetite + * - Please send to Alexandre Alapetite the modifications you make, + * in order to improve this file for the benefit of everybody + * + * If you want to distribute this code, please do it as a link to: + * http://alexandre.alapetite.net/doc-alex/domxml-php4-php5/ + */ + +function domxml_new_doc($version) {return new php4DOMDocument('');} +function domxml_open_file($filename) {return new php4DOMDocument($filename);} +function domxml_open_mem($str) +{ + $dom=new php4DOMDocument(''); + $dom->myDOMNode->loadXML($str); + return $dom; +} +function xpath_eval($xpath_context,$eval_str,$contextnode=null) {return $xpath_context->query($eval_str,$contextnode);} +function xpath_new_context($dom_document) {return new php4DOMXPath($dom_document);} + +class php4DOMAttr extends php4DOMNode +{ + function php4DOMAttr($aDOMAttr) {$this->myDOMNode=$aDOMAttr;} + function Name() {return $this->myDOMNode->name;} + function Specified() {return $this->myDOMNode->specified;} + function Value() {return $this->myDOMNode->value;} +} + +class php4DOMDocument extends php4DOMNode +{ + function php4DOMDocument($filename='') + { + $this->myDOMNode=new DOMDocument(); + if ($filename!='') $this->myDOMNode->load($filename); + } + function create_attribute($name,$value) + { + $myAttr=$this->myDOMNode->createAttribute($name); + $myAttr->value=$value; + return new php4DOMAttr($myAttr,$this); + } + function create_cdata_section($content) {return new php4DOMNode($this->myDOMNode->createCDATASection($content),$this);} + function create_comment($data) {return new php4DOMNode($this->myDOMNode->createComment($data),$this);} + function create_element($name) {return new php4DOMElement($this->myDOMNode->createElement($name),$this);} + function create_text_node($content) {return new php4DOMNode($this->myDOMNode->createTextNode($content),$this);} + function document_element() {return new php4DOMElement($this->myDOMNode->documentElement,$this);} + function dump_file($filename,$compressionmode=false,$format=false) {return $this->myDOMNode->save($filename);} + function dump_mem($format=false,$encoding=false) {return $this->myDOMNode->saveXML();} + function get_element_by_id($id) {return new php4DOMElement($this->myDOMNode->getElementById($id),$this);} + function get_elements_by_tagname($name) + { + $myDOMNodeList=$this->myDOMNode->getElementsByTagName($name); + $nodeSet=array(); + $i=0; + if (isset($myDOMNodeList)) + while ($node=$myDOMNodeList->item($i)) + { + $nodeSet[]=new php4DOMElement($node,$this); + $i++; + } + return $nodeSet; + } + function html_dump_mem() {return $this->myDOMNode->saveHTML();} + function root() {return new php4DOMElement($this->myDOMNode->documentElement,$this);} +} + +class php4DOMElement extends php4DOMNode +{ + function get_attribute($name) {return $this->myDOMNode->getAttribute($name);} + function get_elements_by_tagname($name) + { + $myDOMNodeList=$this->myDOMNode->getElementsByTagName($name); + $nodeSet=array(); + $i=0; + if (isset($myDOMNodeList)) + while ($node=$myDOMNodeList->item($i)) + { + $nodeSet[]=new php4DOMElement($node,$this->myOwnerDocument); + $i++; + } + return $nodeSet; + } + function has_attribute($name) {return $this->myDOMNode->hasAttribute($name);} + function remove_attribute($name) {return $this->myDOMNode->removeAttribute($name);} + function set_attribute($name,$value) {return $this->myDOMNode->setAttribute($name,$value);} + function tagname() {return $this->myDOMNode->tagName;} +} + +class php4DOMNode +{ + var $myDOMNode; + var $myOwnerDocument; + function php4DOMNode($aDomNode,$aOwnerDocument) + { + $this->myDOMNode=$aDomNode; + $this->myOwnerDocument=$aOwnerDocument; + } + function __get($name) + { + if ($name=='type') return $this->myDOMNode->nodeType; + elseif ($name=='tagname') return $this->myDOMNode->tagName; + elseif ($name=='content') return $this->myDOMNode->textContent; + else + { + $myErrors=debug_backtrace(); + trigger_error('Undefined property: '.get_class($this).'::$'.$name.' ['.$myErrors[0]['file'].':'.$myErrors[0]['line'].']',E_USER_NOTICE); + return false; + } + } + function append_child($newnode) {return new php4DOMElement($this->myDOMNode->appendChild($newnode->myDOMNode),$this->myOwnerDocument);} + function append_sibling($newnode) {return new php4DOMElement($this->myDOMNode->parentNode->appendChild($newnode->myDOMNode),$this->myOwnerDocument);} + function attributes() + { + $myDOMNodeList=$this->myDOMNode->attributes; + $nodeSet=array(); + $i=0; + if (isset($myDOMNodeList)) + while ($node=$myDOMNodeList->item($i)) + { + $nodeSet[]=new php4DOMAttr($node,$this->myOwnerDocument); + $i++; + } + return $nodeSet; + } + function child_nodes() + { + $myDOMNodeList=$this->myDOMNode->childNodes; + $nodeSet=array(); + $i=0; + if (isset($myDOMNodeList)) + while ($node=$myDOMNodeList->item($i)) + { + $nodeSet[]=new php4DOMElement($node,$this->myOwnerDocument); + $i++; + } + return $nodeSet; + } + function children() {return $this->child_nodes();} + function clone_node($deep=false) {return new php4DOMElement($this->myDOMNode->cloneNode($deep),$this->myOwnerDocument);} + function first_child() {return new php4DOMElement($this->myDOMNode->firstChild,$this->myOwnerDocument);} + function get_content() {return $this->myDOMNode->textContent;} + function has_attributes() {return $this->myDOMNode->hasAttributes();} + function has_child_nodes() {return $this->myDOMNode->hasChildNodes();} + function insert_before($newnode,$refnode) {return new php4DOMElement($this->myDOMNode->insertBefore($newnode->myDOMNode,$refnode->myDOMNode),$this->myOwnerDocument);} + function is_blank_node() + { + $myDOMNodeList=$this->myDOMNode->childNodes; + $i=0; + if (isset($myDOMNodeList)) + while ($node=$myDOMNodeList->item($i)) + { + if (($node->nodeType==XML_ELEMENT_NODE)|| + (($node->nodeType==XML_TEXT_NODE)&&!ereg('^([[:cntrl:]]|[[:space:]])*$',$node->nodeValue))) + return false; + $i++; + } + return true; + } + function last_child() {return new php4DOMElement($this->myDOMNode->lastChild,$this->myOwnerDocument);} + function new_child($name,$content) + { + $mySubNode=$this->myDOMNode->ownerDocument->createElement($name); + $mySubNode->appendChild($this->myDOMNode->ownerDocument->createTextNode($content)); + $this->myDOMNode->appendChild($mySubNode); + return new php4DOMElement($mySubNode,$this->myOwnerDocument); + } + function next_sibling() {return new php4DOMElement($this->myDOMNode->nextSibling,$this->myOwnerDocument);} + function node_name() {return $this->myDOMNode->localName;} + function node_type() {return $this->myDOMNode->nodeType;} + function node_value() {return $this->myDOMNode->nodeValue;} + function owner_document() {return $this->myOwnerDocument;} + function parent_node() {return new php4DOMElement($this->myDOMNode->parentNode,$this->myOwnerDocument);} + function prefix() {return $this->myDOMNode->prefix;} + function previous_sibling() {return new php4DOMElement($this->myDOMNode->previousSibling,$this->myOwnerDocument);} + function remove_child($oldchild) {return new php4DOMElement($this->myDOMNode->removeChild($oldchild->myDOMNode),$this->myOwnerDocument);} + function replace_child($oldnode,$newnode) {return new php4DOMElement($this->myDOMNode->replaceChild($oldnode->myDOMNode,$newnode->myDOMNode),$this->myOwnerDocument);} + function set_content($text) + { + if (($this->myDOMNode->hasChildNodes())&&($this->myDOMNode->firstChild->nodeType==XML_TEXT_NODE)) + $this->myDOMNode->removeChild($this->myDOMNode->firstChild); + return $this->myDOMNode->appendChild($this->myDOMNode->ownerDocument->createTextNode($text)); + } +} + +class php4DOMNodelist +{ + var $myDOMNodelist; + var $nodeset; + function php4DOMNodelist($aDOMNodelist,$aOwnerDocument) + { + $this->myDOMNodelist=$aDOMNodelist; + $this->nodeset=array(); + $i=0; + if (isset($this->myDOMNodelist)) + while ($node=$this->myDOMNodelist->item($i)) + { + $this->nodeset[]=new php4DOMElement($node,$aOwnerDocument); + $i++; + } + } +} + +class php4DOMXPath +{ + var $myDOMXPath; + var $myOwnerDocument; + function php4DOMXPath($dom_document) + { + $this->myOwnerDocument=$dom_document; + $this->myDOMXPath=new DOMXPath($dom_document->myDOMNode); + } + function query($eval_str,$contextnode) + { + if (isset($contextnode)) return new php4DOMNodelist($this->myDOMXPath->query($eval_str,$contextnode->myDOMNode),$this->myOwnerDocument); + else return new php4DOMNodelist($this->myDOMXPath->query($eval_str),$this->myOwnerDocument); + } + function xpath_register_ns($prefix,$namespaceURI) {return $this->myDOMXPath->registerNamespace($prefix,$namespaceURI);} +} + +if (extension_loaded('xsl')) +{//See also: http://alexandre.alapetite.net/doc-alex/xslt-php4-php5/ + function domxml_xslt_stylesheet($xslstring) {return new php4DomXsltStylesheet(DOMDocument::loadXML($xslstring));} + function domxml_xslt_stylesheet_doc($dom_document) {return new php4DomXsltStylesheet($dom_document);} + function domxml_xslt_stylesheet_file($xslfile) {return new php4DomXsltStylesheet(DOMDocument::load($xslfile));} + class php4DomXsltStylesheet + { + var $myxsltProcessor; + function php4DomXsltStylesheet($dom_document) + { + $this->myxsltProcessor=new xsltProcessor(); + $this->myxsltProcessor->importStyleSheet($dom_document); + } + function process($dom_document,$xslt_parameters=array(),$param_is_xpath=false) + { + foreach ($xslt_parameters as $param=>$value) + $this->myxsltProcessor->setParameter('',$param,$value); + $myphp4DOMDocument=new php4DOMDocument(); + $myphp4DOMDocument->myDOMNode=$this->myxsltProcessor->transformToDoc($dom_document->myDOMNode); + return $myphp4DOMDocument; + } + function result_dump_file($dom_document,$filename) + { + $html=$dom_document->myDOMNode->saveHTML(); + file_put_contents($filename,$html); + return $html; + } + function result_dump_mem($dom_document) {return $dom_document->myDOMNode->saveHTML();} + } +} ?>
\ No newline at end of file diff --git a/plugins/CasAuthentication/extlib/CAS/languages/catalan.php b/plugins/CasAuthentication/extlib/CAS/languages/catalan.php index 3d67473d9..0b139c7ca 100644 --- a/plugins/CasAuthentication/extlib/CAS/languages/catalan.php +++ b/plugins/CasAuthentication/extlib/CAS/languages/catalan.php @@ -1,27 +1,27 @@ -<?php
-
-/**
- * @file languages/spanish.php
- * @author Iván-Benjamín García Torà <ivaniclixx AT gmail DOT com>
- * @sa @link internalLang Internationalization @endlink
- * @ingroup internalLang
- */
-
-$this->_strings = array(
- CAS_STR_USING_SERVER
- => 'usant servidor',
- CAS_STR_AUTHENTICATION_WANTED
- => 'Autentificació CAS necessària!',
- CAS_STR_LOGOUT
- => 'Sortida de CAS necessària!',
- CAS_STR_SHOULD_HAVE_BEEN_REDIRECTED
- => 'Ja hauria d\ haver estat redireccionat al servidor CAS. Feu click <a href="%s">aquí</a> per a continuar.',
- CAS_STR_AUTHENTICATION_FAILED
- => 'Autentificació CAS fallida!',
- CAS_STR_YOU_WERE_NOT_AUTHENTICATED
- => '<p>No estàs autentificat.</p><p>Pots tornar a intentar-ho fent click <a href="%s">aquí</a>.</p><p>Si el problema persisteix hauría de contactar amb l\'<a href="mailto:%s">administrador d\'aquest llocc</a>.</p>',
- CAS_STR_SERVICE_UNAVAILABLE
- => 'El servei `<b>%s</b>\' no està disponible (<b>%s</b>).'
-);
-
-?>
+<?php + +/** + * @file languages/spanish.php + * @author Iván-Benjamín García Torà <ivaniclixx AT gmail DOT com> + * @sa @link internalLang Internationalization @endlink + * @ingroup internalLang + */ + +$this->_strings = array( + CAS_STR_USING_SERVER + => 'usant servidor', + CAS_STR_AUTHENTICATION_WANTED + => 'Autentificació CAS necessària!', + CAS_STR_LOGOUT + => 'Sortida de CAS necessària!', + CAS_STR_SHOULD_HAVE_BEEN_REDIRECTED + => 'Ja hauria d\ haver estat redireccionat al servidor CAS. Feu click <a href="%s">aquí</a> per a continuar.', + CAS_STR_AUTHENTICATION_FAILED + => 'Autentificació CAS fallida!', + CAS_STR_YOU_WERE_NOT_AUTHENTICATED + => '<p>No estàs autentificat.</p><p>Pots tornar a intentar-ho fent click <a href="%s">aquí</a>.</p><p>Si el problema persisteix hauría de contactar amb l\'<a href="mailto:%s">administrador d\'aquest llocc</a>.</p>', + CAS_STR_SERVICE_UNAVAILABLE + => 'El servei `<b>%s</b>\' no està disponible (<b>%s</b>).' +); + +?> diff --git a/plugins/CasAuthentication/extlib/CAS/languages/english.php b/plugins/CasAuthentication/extlib/CAS/languages/english.php index c14345031..d38d42c1f 100644 --- a/plugins/CasAuthentication/extlib/CAS/languages/english.php +++ b/plugins/CasAuthentication/extlib/CAS/languages/english.php @@ -1,27 +1,27 @@ -<?php
-
-/**
- * @file languages/english.php
- * @author Pascal Aubry <pascal.aubry at univ-rennes1.fr>
- * @sa @link internalLang Internationalization @endlink
- * @ingroup internalLang
- */
-
-$this->_strings = array(
- CAS_STR_USING_SERVER
- => 'using server',
- CAS_STR_AUTHENTICATION_WANTED
- => 'CAS Authentication wanted!',
- CAS_STR_LOGOUT
- => 'CAS logout wanted!',
- CAS_STR_SHOULD_HAVE_BEEN_REDIRECTED
- => 'You should already have been redirected to the CAS server. Click <a href="%s">here</a> to continue.',
- CAS_STR_AUTHENTICATION_FAILED
- => 'CAS Authentication failed!',
- CAS_STR_YOU_WERE_NOT_AUTHENTICATED
- => '<p>You were not authenticated.</p><p>You may submit your request again by clicking <a href="%s">here</a>.</p><p>If the problem persists, you may contact <a href="mailto:%s">the administrator of this site</a>.</p>',
- CAS_STR_SERVICE_UNAVAILABLE
- => 'The service `<b>%s</b>\' is not available (<b>%s</b>).'
-);
-
+<?php + +/** + * @file languages/english.php + * @author Pascal Aubry <pascal.aubry at univ-rennes1.fr> + * @sa @link internalLang Internationalization @endlink + * @ingroup internalLang + */ + +$this->_strings = array( + CAS_STR_USING_SERVER + => 'using server', + CAS_STR_AUTHENTICATION_WANTED + => 'CAS Authentication wanted!', + CAS_STR_LOGOUT + => 'CAS logout wanted!', + CAS_STR_SHOULD_HAVE_BEEN_REDIRECTED + => 'You should already have been redirected to the CAS server. Click <a href="%s">here</a> to continue.', + CAS_STR_AUTHENTICATION_FAILED + => 'CAS Authentication failed!', + CAS_STR_YOU_WERE_NOT_AUTHENTICATED + => '<p>You were not authenticated.</p><p>You may submit your request again by clicking <a href="%s">here</a>.</p><p>If the problem persists, you may contact <a href="mailto:%s">the administrator of this site</a>.</p>', + CAS_STR_SERVICE_UNAVAILABLE + => 'The service `<b>%s</b>\' is not available (<b>%s</b>).' +); + ?>
\ No newline at end of file diff --git a/plugins/CasAuthentication/extlib/CAS/languages/french.php b/plugins/CasAuthentication/extlib/CAS/languages/french.php index 675a7fc04..32d141685 100644 --- a/plugins/CasAuthentication/extlib/CAS/languages/french.php +++ b/plugins/CasAuthentication/extlib/CAS/languages/french.php @@ -1,28 +1,28 @@ -<?php
-
-/**
- * @file languages/english.php
- * @author Pascal Aubry <pascal.aubry at univ-rennes1.fr>
- * @sa @link internalLang Internationalization @endlink
- * @ingroup internalLang
- */
-
-$this->_strings = array(
- CAS_STR_USING_SERVER
- => 'utilisant le serveur',
- CAS_STR_AUTHENTICATION_WANTED
- => 'Authentication CAS ncessaire !',
- CAS_STR_LOGOUT
- => 'Dconnexion demande !',
- CAS_STR_SHOULD_HAVE_BEEN_REDIRECTED
- => 'Vous auriez du etre redirig(e) vers le serveur CAS. Cliquez <a href="%s">ici</a> pour continuer.',
- CAS_STR_AUTHENTICATION_FAILED
- => 'Authentification CAS infructueuse !',
- CAS_STR_YOU_WERE_NOT_AUTHENTICATED
- => '<p>Vous n\'avez pas t authentifi(e).</p><p>Vous pouvez soumettre votre requete nouveau en cliquant <a href="%s">ici</a>.</p><p>Si le problme persiste, vous pouvez contacter <a href="mailto:%s">l\'administrateur de ce site</a>.</p>',
- CAS_STR_SERVICE_UNAVAILABLE
- => 'Le service `<b>%s</b>\' est indisponible (<b>%s</b>)'
-
-);
-
+<?php + +/** + * @file languages/english.php + * @author Pascal Aubry <pascal.aubry at univ-rennes1.fr> + * @sa @link internalLang Internationalization @endlink + * @ingroup internalLang + */ + +$this->_strings = array( + CAS_STR_USING_SERVER + => 'utilisant le serveur', + CAS_STR_AUTHENTICATION_WANTED + => 'Authentication CAS ncessaire !', + CAS_STR_LOGOUT + => 'Dconnexion demande !', + CAS_STR_SHOULD_HAVE_BEEN_REDIRECTED + => 'Vous auriez du etre redirig(e) vers le serveur CAS. Cliquez <a href="%s">ici</a> pour continuer.', + CAS_STR_AUTHENTICATION_FAILED + => 'Authentification CAS infructueuse !', + CAS_STR_YOU_WERE_NOT_AUTHENTICATED + => '<p>Vous n\'avez pas t authentifi(e).</p><p>Vous pouvez soumettre votre requete nouveau en cliquant <a href="%s">ici</a>.</p><p>Si le problme persiste, vous pouvez contacter <a href="mailto:%s">l\'administrateur de ce site</a>.</p>', + CAS_STR_SERVICE_UNAVAILABLE + => 'Le service `<b>%s</b>\' est indisponible (<b>%s</b>)' + +); + ?>
\ No newline at end of file diff --git a/plugins/CasAuthentication/extlib/CAS/languages/german.php b/plugins/CasAuthentication/extlib/CAS/languages/german.php index 29daeb35d..55c3238fd 100644 --- a/plugins/CasAuthentication/extlib/CAS/languages/german.php +++ b/plugins/CasAuthentication/extlib/CAS/languages/german.php @@ -1,27 +1,27 @@ -<?php
-
-/**
- * @file languages/german.php
- * @author Henrik Genssen <hg at mediafactory.de>
- * @sa @link internalLang Internationalization @endlink
- * @ingroup internalLang
- */
-
-$this->_strings = array(
- CAS_STR_USING_SERVER
- => 'via Server',
- CAS_STR_AUTHENTICATION_WANTED
- => 'CAS Authentifizierung erforderlich!',
- CAS_STR_LOGOUT
- => 'CAS Abmeldung!',
- CAS_STR_SHOULD_HAVE_BEEN_REDIRECTED
- => 'eigentlich häten Sie zum CAS Server weitergeleitet werden sollen. Drücken Sie <a href="%s">hier</a> um fortzufahren.',
- CAS_STR_AUTHENTICATION_FAILED
- => 'CAS Anmeldung fehlgeschlagen!',
- CAS_STR_YOU_WERE_NOT_AUTHENTICATED
- => '<p>Sie wurden nicht angemeldet.</p><p>Um es erneut zu versuchen klicken Sie <a href="%s">hier</a>.</p><p>Wenn das Problem bestehen bleibt, kontkatieren Sie den <a href="mailto:%s">Administrator</a> dieser Seite.</p>',
- CAS_STR_SERVICE_UNAVAILABLE
- => 'Der Dienst `<b>%s</b>\' ist nicht verfügbar (<b>%s</b>).'
-);
-
+<?php + +/** + * @file languages/german.php + * @author Henrik Genssen <hg at mediafactory.de> + * @sa @link internalLang Internationalization @endlink + * @ingroup internalLang + */ + +$this->_strings = array( + CAS_STR_USING_SERVER + => 'via Server', + CAS_STR_AUTHENTICATION_WANTED + => 'CAS Authentifizierung erforderlich!', + CAS_STR_LOGOUT + => 'CAS Abmeldung!', + CAS_STR_SHOULD_HAVE_BEEN_REDIRECTED + => 'eigentlich häten Sie zum CAS Server weitergeleitet werden sollen. Drücken Sie <a href="%s">hier</a> um fortzufahren.', + CAS_STR_AUTHENTICATION_FAILED + => 'CAS Anmeldung fehlgeschlagen!', + CAS_STR_YOU_WERE_NOT_AUTHENTICATED + => '<p>Sie wurden nicht angemeldet.</p><p>Um es erneut zu versuchen klicken Sie <a href="%s">hier</a>.</p><p>Wenn das Problem bestehen bleibt, kontkatieren Sie den <a href="mailto:%s">Administrator</a> dieser Seite.</p>', + CAS_STR_SERVICE_UNAVAILABLE + => 'Der Dienst `<b>%s</b>\' ist nicht verfügbar (<b>%s</b>).' +); + ?>
\ No newline at end of file diff --git a/plugins/CasAuthentication/extlib/CAS/languages/greek.php b/plugins/CasAuthentication/extlib/CAS/languages/greek.php index c17b1d663..d41bf783b 100644 --- a/plugins/CasAuthentication/extlib/CAS/languages/greek.php +++ b/plugins/CasAuthentication/extlib/CAS/languages/greek.php @@ -1,27 +1,27 @@ -<?php
-
-/**
- * @file languages/greek.php
- * @author Vangelis Haniotakis <haniotak at ucnet.uoc.gr>
- * @sa @link internalLang Internationalization @endlink
- * @ingroup internalLang
- */
-
-$this->_strings = array(
- CAS_STR_USING_SERVER
- => ' ',
- CAS_STR_AUTHENTICATION_WANTED
- => ' CAS!',
- CAS_STR_LOGOUT
- => ' CAS!',
- CAS_STR_SHOULD_HAVE_BEEN_REDIRECTED
- => ' CAS. <a href="%s"></a> .',
- CAS_STR_AUTHENTICATION_FAILED
- => ' CAS !',
- CAS_STR_YOU_WERE_NOT_AUTHENTICATED
- => '<p> .</p><p> , <a href="%s"></a>.</p><p> , <a href="mailto:%s"></a>.</p>',
- CAS_STR_SERVICE_UNAVAILABLE
- => ' `<b>%s</b>\' (<b>%s</b>).'
-);
-
+<?php + +/** + * @file languages/greek.php + * @author Vangelis Haniotakis <haniotak at ucnet.uoc.gr> + * @sa @link internalLang Internationalization @endlink + * @ingroup internalLang + */ + +$this->_strings = array( + CAS_STR_USING_SERVER + => ' ', + CAS_STR_AUTHENTICATION_WANTED + => ' CAS!', + CAS_STR_LOGOUT + => ' CAS!', + CAS_STR_SHOULD_HAVE_BEEN_REDIRECTED + => ' CAS. <a href="%s"></a> .', + CAS_STR_AUTHENTICATION_FAILED + => ' CAS !', + CAS_STR_YOU_WERE_NOT_AUTHENTICATED + => '<p> .</p><p> , <a href="%s"></a>.</p><p> , <a href="mailto:%s"></a>.</p>', + CAS_STR_SERVICE_UNAVAILABLE + => ' `<b>%s</b>\' (<b>%s</b>).' +); + ?>
\ No newline at end of file diff --git a/plugins/CasAuthentication/extlib/CAS/languages/languages.php b/plugins/CasAuthentication/extlib/CAS/languages/languages.php index 2c6f8bb3b..001cfe445 100644 --- a/plugins/CasAuthentication/extlib/CAS/languages/languages.php +++ b/plugins/CasAuthentication/extlib/CAS/languages/languages.php @@ -1,24 +1,24 @@ -<?php
-
-/**
- * @file languages/languages.php
- * Internationalization constants
- * @author Pascal Aubry <pascal.aubry at univ-rennes1.fr>
- * @sa @link internalLang Internationalization @endlink
- * @ingroup internalLang
- */
-
-//@{
-/**
- * a phpCAS string index
- */
-define("CAS_STR_USING_SERVER", 1);
-define("CAS_STR_AUTHENTICATION_WANTED", 2);
-define("CAS_STR_LOGOUT", 3);
-define("CAS_STR_SHOULD_HAVE_BEEN_REDIRECTED", 4);
-define("CAS_STR_AUTHENTICATION_FAILED", 5);
-define("CAS_STR_YOU_WERE_NOT_AUTHENTICATED", 6);
-define("CAS_STR_SERVICE_UNAVAILABLE", 7);
-//@}
-
+<?php + +/** + * @file languages/languages.php + * Internationalization constants + * @author Pascal Aubry <pascal.aubry at univ-rennes1.fr> + * @sa @link internalLang Internationalization @endlink + * @ingroup internalLang + */ + +//@{ +/** + * a phpCAS string index + */ +define("CAS_STR_USING_SERVER", 1); +define("CAS_STR_AUTHENTICATION_WANTED", 2); +define("CAS_STR_LOGOUT", 3); +define("CAS_STR_SHOULD_HAVE_BEEN_REDIRECTED", 4); +define("CAS_STR_AUTHENTICATION_FAILED", 5); +define("CAS_STR_YOU_WERE_NOT_AUTHENTICATED", 6); +define("CAS_STR_SERVICE_UNAVAILABLE", 7); +//@} + ?>
\ No newline at end of file diff --git a/plugins/CasAuthentication/extlib/CAS/languages/spanish.php b/plugins/CasAuthentication/extlib/CAS/languages/spanish.php index 3a8ffc253..04067ca03 100644 --- a/plugins/CasAuthentication/extlib/CAS/languages/spanish.php +++ b/plugins/CasAuthentication/extlib/CAS/languages/spanish.php @@ -1,27 +1,27 @@ -<?php
-
-/**
- * @file languages/spanish.php
- * @author Iván-Benjamín García Torà <ivaniclixx AT gmail DOT com>
- * @sa @link internalLang Internationalization @endlink
- * @ingroup internalLang
- */
-
-$this->_strings = array(
- CAS_STR_USING_SERVER
- => 'usando servidor',
- CAS_STR_AUTHENTICATION_WANTED
- => '¡Autentificación CAS necesaria!',
- CAS_STR_LOGOUT
- => '¡Salida CAS necesaria!',
- CAS_STR_SHOULD_HAVE_BEEN_REDIRECTED
- => 'Ya debería haber sido redireccionado al servidor CAS. Haga click <a href="%s">aquí</a> para continuar.',
- CAS_STR_AUTHENTICATION_FAILED
- => '¡Autentificación CAS fallida!',
- CAS_STR_YOU_WERE_NOT_AUTHENTICATED
- => '<p>No estás autentificado.</p><p>Puedes volver a intentarlo haciendo click <a href="%s">aquí</a>.</p><p>Si el problema persiste debería contactar con el <a href="mailto:%s">administrador de este sitio</a>.</p>',
- CAS_STR_SERVICE_UNAVAILABLE
- => 'El servicio `<b>%s</b>\' no está disponible (<b>%s</b>).'
-);
-
-?>
+<?php + +/** + * @file languages/spanish.php + * @author Iván-Benjamín García Torà <ivaniclixx AT gmail DOT com> + * @sa @link internalLang Internationalization @endlink + * @ingroup internalLang + */ + +$this->_strings = array( + CAS_STR_USING_SERVER + => 'usando servidor', + CAS_STR_AUTHENTICATION_WANTED + => '¡Autentificación CAS necesaria!', + CAS_STR_LOGOUT + => '¡Salida CAS necesaria!', + CAS_STR_SHOULD_HAVE_BEEN_REDIRECTED + => 'Ya debería haber sido redireccionado al servidor CAS. Haga click <a href="%s">aquí</a> para continuar.', + CAS_STR_AUTHENTICATION_FAILED + => '¡Autentificación CAS fallida!', + CAS_STR_YOU_WERE_NOT_AUTHENTICATED + => '<p>No estás autentificado.</p><p>Puedes volver a intentarlo haciendo click <a href="%s">aquí</a>.</p><p>Si el problema persiste debería contactar con el <a href="mailto:%s">administrador de este sitio</a>.</p>', + CAS_STR_SERVICE_UNAVAILABLE + => 'El servicio `<b>%s</b>\' no está disponible (<b>%s</b>).' +); + +?> diff --git a/plugins/DiskCachePlugin.php b/plugins/DiskCachePlugin.php new file mode 100644 index 000000000..b709ea3b3 --- /dev/null +++ b/plugins/DiskCachePlugin.php @@ -0,0 +1,168 @@ +<?php +/** + * StatusNet - the distributed open-source microblogging tool + * Copyright (C) 2009, StatusNet, Inc. + * + * Plugin to implement cache interface with disk files + * + * PHP version 5 + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * + * @category Cache + * @package StatusNet + * @author Evan Prodromou <evan@status.net> + * @copyright 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')) { + // This check helps protect against security problems; + // your code file can't be executed directly from the web. + exit(1); +} + +/** + * A plugin to cache data on local disk + * + * @category Cache + * @package StatusNet + * @author Evan Prodromou <evan@status.net> + * @copyright 2009 StatusNet, Inc. + * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 + * @link http://status.net/ + */ + +class DiskCachePlugin extends Plugin +{ + var $root = '/tmp'; + + function keyToFilename($key) + { + return $this->root . '/' . str_replace(':', '/', $key); + } + + /** + * Get a value associated with a key + * + * The value should have been set previously. + * + * @param string &$key in; Lookup key + * @param mixed &$value out; value associated with key + * + * @return boolean hook success + */ + + function onStartCacheGet(&$key, &$value) + { + $filename = $this->keyToFilename($key); + + if (file_exists($filename)) { + $data = file_get_contents($filename); + if ($data !== false) { + $value = unserialize($data); + } + } + + Event::handle('EndCacheGet', array($key, &$value)); + return false; + } + + /** + * Associate a value with a key + * + * @param string &$key in; Key to use for lookups + * @param mixed &$value in; Value to associate + * @param integer &$flag in; Flag (passed through to Memcache) + * @param integer &$expiry in; Expiry (passed through to Memcache) + * @param boolean &$success out; Whether the set was successful + * + * @return boolean hook success + */ + + function onStartCacheSet(&$key, &$value, &$flag, &$expiry, &$success) + { + $filename = $this->keyToFilename($key); + $parent = dirname($filename); + + $sofar = ''; + + foreach (explode('/', $parent) as $part) { + if (empty($part)) { + continue; + } + $sofar .= '/' . $part; + if (!is_dir($sofar)) { + $this->debug("Creating new directory '$sofar'"); + $success = mkdir($sofar, 0750); + if (!$success) { + $this->log(LOG_ERR, "Can't create directory '$sofar'"); + return false; + } + } + } + + if (is_dir($filename)) { + $success = false; + return false; + } + + // Write to a temp file and move to destination + + $tempname = tempnam(null, 'statusnetdiskcache'); + + $result = file_put_contents($tempname, serialize($value)); + + if ($result === false) { + $this->log(LOG_ERR, "Couldn't write '$key' to temp file '$tempname'"); + return false; + } + + $result = rename($tempname, $filename); + + if (!$result) { + $this->log(LOG_ERR, "Couldn't move temp file '$tempname' to path '$filename' for key '$key'"); + @unlink($tempname); + return false; + } + + Event::handle('EndCacheSet', array($key, $value, $flag, + $expiry)); + + return false; + } + + /** + * Delete a value associated with a key + * + * @param string &$key in; Key to lookup + * @param boolean &$success out; whether it worked + * + * @return boolean hook success + */ + + function onStartCacheDelete(&$key, &$success) + { + $filename = $this->keyToFilename($key); + + if (file_exists($filename) && !is_dir($filename)) { + unlink($filename); + } + + Event::handle('EndCacheDelete', array($key)); + return false; + } +} + 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/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/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 index 034444222..d9768b680 100644 --- a/plugins/Imap/ImapPlugin.php +++ b/plugins/Imap/ImapPlugin.php @@ -82,4 +82,15 @@ class ImapPlugin extends Plugin } 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/imapdaemon.php b/plugins/Imap/imapdaemon.php index a45c603ce..7e60e1376 100755 --- a/plugins/Imap/imapdaemon.php +++ b/plugins/Imap/imapdaemon.php @@ -117,7 +117,7 @@ class IMAPMailHandler extends MailHandler { $this->log(LOG_INFO, "Error: $from $msg"); $headers['To'] = $from; - $headers['Subject'] = "Error"; + $headers['Subject'] = _m('Error'); return mail_send(array($from), $headers, $msg); } 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 c14fa21a9..eb3a05117 100644 --- a/plugins/LdapAuthentication/LdapAuthenticationPlugin.php +++ b/plugins/LdapAuthentication/LdapAuthenticationPlugin.php @@ -346,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 e5e22c0dd..7f48ce5e1 100644 --- a/plugins/LdapAuthorization/LdapAuthorizationPlugin.php +++ b/plugins/LdapAuthorization/LdapAuthorizationPlugin.php @@ -206,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/Minify/MinifyPlugin.php b/plugins/Minify/MinifyPlugin.php index 718bfd163..b49b6a4ba 100644 --- a/plugins/Minify/MinifyPlugin.php +++ b/plugins/Minify/MinifyPlugin.php @@ -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/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/PoweredByStatusNet/PoweredByStatusNetPlugin.php b/plugins/PoweredByStatusNet/PoweredByStatusNetPlugin.php index bae6c529d..c59fcca89 100644 --- a/plugins/PoweredByStatusNet/PoweredByStatusNetPlugin.php +++ b/plugins/PoweredByStatusNet/PoweredByStatusNetPlugin.php @@ -57,7 +57,7 @@ class PoweredByStatusNetPlugin extends Plugin { $versions[] = array('name' => 'PoweredByStatusNet', 'version' => STATUSNET_VERSION, - 'author' => 'Sarven Capdaisli', + '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.')); diff --git a/plugins/PubSubHubBub/PubSubHubBubPlugin.php b/plugins/PubSubHubBub/PubSubHubBubPlugin.php index d9c047de8..367b35403 100644 --- a/plugins/PubSubHubBub/PubSubHubBubPlugin.php +++ b/plugins/PubSubHubBub/PubSubHubBubPlugin.php @@ -120,4 +120,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/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 d157ea067..d9d2137f8 100644 --- a/plugins/ReverseUsernameAuthentication/ReverseUsernameAuthenticationPlugin.php +++ b/plugins/ReverseUsernameAuthentication/ReverseUsernameAuthenticationPlugin.php @@ -53,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/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/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/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; |